diff --git a/package-lock.json b/package-lock.json
index 5f798b3..971af58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5550,9 +5550,9 @@
       }
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true
     },
     "diffie-hellman": {
@@ -13629,23 +13629,23 @@
       "dev": true
     },
     "tslint": {
-      "version": "5.17.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.17.0.tgz",
-      "integrity": "sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.0.0.tgz",
+      "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
         "chalk": "^2.3.0",
         "commander": "^2.12.1",
-        "diff": "^3.2.0",
+        "diff": "^4.0.1",
         "glob": "^7.1.1",
         "js-yaml": "^3.13.1",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "resolve": "^1.3.2",
         "semver": "^5.3.0",
-        "tslib": "^1.8.0",
+        "tslib": "^1.10.0",
         "tsutils": "^2.29.0"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index 99a749e..e4a51d9 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,8 @@
     "prestart": "npm run build:lib",
     "start": "npm run serve",
     "release": "standard-version",
-    "prepare": "npm run build"
+    "prepare": "npm run build",
+    "lint": "tslint ./src/**/*.ts -t verbose"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "latest",
@@ -59,10 +60,9 @@
     "rimraf": "2.6.1",
     "rxjs": "6.5.4",
     "standard-version": "7.0.1",
-    "tslint": "5.17.0",
+    "tslint": "^6.0.0",
     "typescript": "3.7.5",
     "zone.js": "0.10.2",
-
     "codemirror-minified": "5.49.2",
     "jointjs": "3.1.0",
     "ts-disposables": "2.2.3"
diff --git a/tslint.json b/tslint.json
index 72e1fa4..3690782 100644
--- a/tslint.json
+++ b/tslint.json
@@ -19,9 +19,47 @@
     ],
     "member-access": false,
     "member-ordering": [
-      true,
-      "static-before-instance",
-      "variables-before-functions"
+      {
+        "name": "static field",
+        "kinds": [
+          "public-static-field",
+          "protected-static-field",
+          "private-static-field"
+        ]
+      },
+      {
+        "name": "instance field",
+        "kinds": [
+          "public-instance-field",
+          "protected-instance-field",
+          "private-instance-field"
+        ]
+      },
+      {
+        "name": "static method",
+        "kinds": [
+          "public-static-method",
+          "private-static-method",
+          "protected-static-method",
+          "public-static-accessor",
+          "protected-static-accessor",
+          "private-static-accessor"
+        ]
+      },
+      {
+        "name": "instance method",
+        "kinds": [
+          "public-constructor",
+          "protected-constructor",
+          "private-constructor",
+          "public-instance-method",
+          "protected-instance-method",
+          "private-instance-method",
+          "public-instance-accessor",
+          "protected-instance-accessor",
+          "private-instance-accessor"
+        ]
+      }
     ],
     "no-arg": true,
     "no-bitwise": true,
@@ -43,7 +81,6 @@
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [