diff --git a/client/tsconfig.json b/client/tsconfig.json
index 4f9d006..076ea46 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,21 +1,18 @@
 {
+    "extends": "../tsconfig.json",
     "compilerOptions": {
         "sourceMap": true,
         "jsx": "react",
-        "experimentalDecorators": true,
-        "target": "es2017",
         "lib": [
             "es2017",
             "dom",
             "scripthost"
         ],
-        "module": "commonjs",
         "types": [
             "webpack-env",
             "core-js",
             "node"
         ],
-        "strict": true,
         "baseUrl": "..",
         "paths": {
             "@common/*": [
@@ -26,6 +23,10 @@
             ]
         }
     },
+    "include": [
+        "./client/**/*.ts",
+        "./client/**/*.tsx"
+    ],
     "references": [{
         "path": "../common"
     }]
diff --git a/common/tsconfig.json b/common/tsconfig.json
index 5539fa7..d4efc09 100644
--- a/common/tsconfig.json
+++ b/common/tsconfig.json
@@ -1,16 +1,7 @@
 {
+    "extends": "../tsconfig.json",
     "compilerOptions": {
         "outDir": "../dist/common",
-        "experimentalDecorators": true,
-        "target": "es2017",
-        "lib": [
-            "es2017"
-        ],
-        "types": [
-            "node"
-        ],
-        "module": "commonjs",
-        "strict": true,
         "baseUrl": "..",
         "composite": true,
         "declaration": true,
diff --git a/server/Database.ts b/server/Database.ts
index 04ca250..0f6fef2 100644
--- a/server/Database.ts
+++ b/server/Database.ts
@@ -1,15 +1,9 @@
 import * as path from "path";
-import {
-  Connection,
-  createConnection,
-  EntityManager,
-  getConnectionOptions,
-  Repository
-} from "typeorm";
+import { Connection, createConnection, getConnectionOptions } from "typeorm";
 
 import logger from "@common/logger";
 
-import { SprinklersDevice, User } from "./entities";
+import { User } from "./entities";
 import { SprinklersDeviceRepository, UserRepository } from "./repositories/";
 
 export class Database {
diff --git a/server/tsconfig.json b/server/tsconfig.json
index bdaa6e8..b92891c 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -1,35 +1,25 @@
 {
-  "compilerOptions": {
-    "outDir": "../dist",
-    "sourceMap": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "target": "es2017",
-    "module": "commonjs",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "types": [
-      "webpack-env",
-      "node"
-    ],
-    "strict": true,
-    "allowJs": true,
-    "baseUrl": "..",
-    "paths": {
-      "@common/*": [
-        "./common/*"
-      ],
-      "@server/*": [
-        "./server/*"
-      ]
-    }
-  },
-  "references": [{
-    "path": "../common"
-  }],
-  "include": [
-    "./**/*.ts"
-  ]
+    "extends": "../tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../dist",
+        "sourceMap": true,
+        "emitDecoratorMetadata": true,
+        "strict": true,
+        "allowJs": true,
+        "baseUrl": "..",
+        "paths": {
+            "@common/*": [
+                "./common/*"
+            ],
+            "@server/*": [
+                "./server/*"
+            ]
+        }
+    },
+    "references": [{
+        "path": "../common"
+    }],
+    "include": [
+        "./**/*.ts"
+    ]
 }
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..4041df4
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "target": "es2017",
+        "module": "commonjs",
+        "lib": [
+            "es2017"
+        ],
+        "types": [
+            "node"
+        ],
+        "strict": true
+    }
+}
\ No newline at end of file