diff --git a/app/src/about/about.ts b/app/src/about/about.ts
index d2b50e3..a1532b6 100644
--- a/app/src/about/about.ts
+++ b/app/src/about/about.ts
@@ -9,6 +9,6 @@ import {MATERIAL_DIRECTIVES} from 'ng2-material/all';
 export class About {
   clickMessage = '';
   onClickMe() {
-    this.clickMessage ='You are my hero!';
+    this.clickMessage = 'You are my hero!';
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/app.spec.ts b/app/src/app.spec.ts
index 0a115d5..2e1880e 100644
--- a/app/src/app.spec.ts
+++ b/app/src/app.spec.ts
@@ -8,7 +8,7 @@ describe('AppComponent component', () => {
       subscribe: function() {
       }
     };
-    //noinspection TypeScriptValidateTypes
+    // noinspection TypeScriptValidateTypes
     var appComponent = new AppComponent(null, routerMock);
     expect(appComponent).toBeDefined();
   });
diff --git a/app/src/app.ts b/app/src/app.ts
index b2e4e73..0fa34dd 100644
--- a/app/src/app.ts
+++ b/app/src/app.ts
@@ -30,4 +30,4 @@ export class AppComponent {
   clicked(message: string) {
     console.log(message);
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/boot.ts b/app/src/boot.ts
index 1c02bb9..43caf3e 100644
--- a/app/src/boot.ts
+++ b/app/src/boot.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import 'ng2-material/dist/ng2-material.css!';
 import 'assets/material-icons.css!';
 import 'assets/app.css!';
@@ -12,6 +10,6 @@ import {ROUTER_PROVIDERS} from 'angular2/router';
 
 import {AppComponent} from './app';
 
-//noinspection TypeScriptValidateTypes
+// noinspection TypeScriptValidateTypes
 bootstrap(AppComponent, [HTTP_PROVIDERS, ROUTER_PROVIDERS])
-  .catch(err => console.error(err));
\ No newline at end of file
+  .catch(err => console.error(err));
diff --git a/app/src/home/home.ts b/app/src/home/home.ts
index 9082464..ba5672f 100644
--- a/app/src/home/home.ts
+++ b/app/src/home/home.ts
@@ -10,4 +10,4 @@ export class Home {
   constructor() {
 
   }
-}
\ No newline at end of file
+}
diff --git a/tools/tslint.json b/tools/tslint.json
deleted file mode 100644
index bbf6492..0000000
--- a/tools/tslint.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "rules": {
-    "ban": [
-      true,
-      [
-        "_",
-        "extend"
-      ],
-      [
-        "_",
-        "isNull"
-      ],
-      [
-        "_",
-        "isDefined"
-      ]
-    ],
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space",
-      "check-lowercase"
-    ],
-    "curly": true,
-    "eofline": true,
-    "forin": true,
-    "indent": [
-      true,
-      4
-    ],
-    "interface-name": true,
-    "jsdoc-format": true,
-    "label-position": true,
-    "label-undefined": true,
-    "max-line-length": [
-      false,
-      140
-    ],
-    "member-ordering": [
-      true,
-      "public-before-private",
-      "static-before-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-construct": true,
-    "no-constructor-vars": true,
-    "no-debugger": true,
-    "no-duplicate-key": true,
-    "no-duplicate-variable": true,
-    "no-empty": true,
-    "no-eval": true,
-    "no-string-literal": true,
-    "no-switch-case-fall-through": true,
-    "no-trailing-comma": true,
-    "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "no-unused-variable": true,
-    "no-unreachable": true,
-    "no-use-before-declare": true,
-    "no-var-requires": true,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "radix": true,
-    "semicolon": true,
-    "triple-equals": [
-      false
-    ],
-    "typedef": [
-      true,
-      "callSignature",
-      "indexSignature",
-      "parameter",
-      "propertySignature",
-      "variableDeclarator"
-    ],
-    "typedef-whitespace": [
-      true,
-      [
-        "callSignature",
-        "noSpace"
-      ],
-      [
-        "catchClause",
-        "noSpace"
-      ],
-      [
-        "indexSignature",
-        "space"
-      ]
-    ],
-    "use-strict": [
-      true,
-      "check-module",
-      "check-function"
-    ],
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ]
-  }
-}
diff --git a/tslint.json b/tslint.json
new file mode 100644
index 0000000..dc1d5d3
--- /dev/null
+++ b/tslint.json
@@ -0,0 +1,64 @@
+{
+  "rules": {
+    "no-inferrable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "eofline": true,
+    "no-duplicate-variable": true,
+    "no-eval": true,
+    "no-arg": true,
+    "no-internal-module": true,
+    "no-trailing-whitespace": true,
+    "no-bitwise": true,
+    "no-shadowed-variable": true,
+    "one-line": [
+      true,
+      "check-catch",
+      "check-else",
+      "check-open-brace",
+      "check-whitespace"
+    ],
+    "quotemark": [
+      true,
+      "single",
+      "avoid-escape"
+    ],
+    "semicolon": true,
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "curly": true,
+    "variable-name": [
+      true,
+      "ban-keywords",
+      "check-format",
+      "allow-trailing-underscore"
+    ],
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ]
+  }
+}