diff --git a/.eslintrc.json b/.eslintrc.json
index d9e6193..16aeb7d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,76 +1,44 @@
 {
-  "env": {
-    "browser": true,
-    "node": true,
-    "es6": true,
-    "es2017": true
-  },
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
   "overrides": [
     {
       "files": [
         "*.ts"
       ],
-      "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/recommended-requiring-type-checking"
-      ],
-      "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "ecmaVersion": 10,
         "project": [
           "./tsconfig.serve.json",
           "./src/tsconfig.app.json",
           "./src/tsconfig.spec.json",
           "./e2e/tsconfig.e2e.json"
         ],
-        "sourceType": "module",
-        "ecmaFeatures": {
-          "modules": true
-        }
+        "createDefaultProgram": true
       },
-      "plugins": [
-        "@typescript-eslint",
-        "@angular-eslint/eslint-plugin"
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
-        "@typescript-eslint/indent": [
+        "@angular-eslint/directive-selector":  0,
+        "@angular-eslint/component-selector": [
           "error",
-          2,
           {
-            "SwitchCase": 1,
-            "CallExpression": {
-              "arguments": "first"
-            },
-            "FunctionExpression": {
-              "parameters": "first"
-            },
-            "FunctionDeclaration": {
-              "parameters": "first"
-            }
+            "type": "element",
+            "prefix": "app",
+            "style": "kebab-case"
           }
-        ],
-        "@typescript-eslint/no-empty-function": 0,
-        "@typescript-eslint/no-explicit-any": 0,
-        "@typescript-eslint/no-var-requires": 0,
-        "@typescript-eslint/no-unsafe-call": 0,
-        "@typescript-eslint/no-unsafe-member-access": 0,
-        "@typescript-eslint/no-unsafe-assignment": 0,
-        "@typescript-eslint/no-unsafe-return": 0,
-        "@typescript-eslint/no-floating-promises": 0,
-        "@typescript-eslint/semi": "error",
-        "@angular-eslint/use-injectable-provided-in": "error",
-        "@angular-eslint/no-attribute-decorator": "error"
+        ]
       }
     },
     {
       "files": [
         "*.component.html"
       ],
-      "parser": "@angular-eslint/template-parser",
-      "plugins": [
-        "@angular-eslint/template"
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
       ],
       "rules": {
         "@angular-eslint/template/banana-in-box": "error",
@@ -78,4 +46,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index ad62eb6..6193a9f 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -6,18 +6,24 @@
     "baseUrl": "",
     "types": []
   },
-  "include": [
+  "files": [
     "main.ts",
-    "polyfills.ts",
-    "app/**/*.ts",
-    "environments/**/*.ts"
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.d.ts"
   ],
   "exclude": [
     "**/*.spec.ts"
   ],
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "fullTemplateTypeCheck": true,
+    "annotateForClosureCompiler": true,
     "strictInjectionParameters": true,
-    "preserveWhitespaces": true
+    "skipTemplateCodegen": false,
+    "preserveWhitespaces": true,
+    "skipMetadataEmit": false,
+    "disableTypeScriptVersionCheck": true
   }
 }