diff --git a/package.json b/package.json
index 94a2a80..7e5df0f 100644
--- a/package.json
+++ b/package.json
@@ -18,13 +18,15 @@
     "mkdirs": "mkdirp packages deploys",
     "fetch": "yarn run mkdirs && node scripts/fetch-package.js",
     "asar-webapp": "asar p webapp webapp.asar",
-    "start": "yarn run tsbuild && electron .",
-    "lint": "eslint src/ scripts/ hak/",
+    "start": "yarn run build:ts && electron .",
+    "lint": "yarn lint:types && yarn lint:js",
+    "lint:js": "eslint src/ scripts/ hak/",
+    "lint:types": "tsc --noEmit",
     "build:native": "yarn run hak",
-    "build32": "electron-builder --ia32",
-    "build64": "electron-builder --x64",
-    "build": "yarn run tsbuild && electron-builder",
-    "tsbuild": "tsc",
+    "build32": "yarn run build:ts && electron-builder --ia32",
+    "build64": "yarn run build:ts && electron-builder --x64",
+    "build": "yarn run build:ts && electron-builder",
+    "build:ts": "tsc",
     "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
     "docker:build:native": "scripts/in-docker.sh yarn run hak",
     "docker:build": "scripts/in-docker.sh yarn run build",
diff --git a/tsconfig.json b/tsconfig.json
index 2dedf3c..6249dbb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,5 @@
 {
   "compilerOptions": {
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "module": "commonjs",
@@ -20,6 +18,7 @@
     ]
   },
   "include": [
+    ".eslintrc.js",
     "./src/**/*.ts"
   ]
 }