diff --git a/.eslintrc b/.eslintrc
index 0f41e10..fb60bc2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -5,12 +5,17 @@
     "browser" : true,
     "webextensions": true
   },
-  "plugins": ["react"],
-  "parser": "babel-eslint",
+  "plugins": [
+    "react",
+    "@typescript-eslint"
+  ],
+  "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaFeatures": {
       "jsx": true
-    }
+    },
+    "sourceType": "module",
+    "project": "./tsconfig.json"
   },
   "extends": [ "eslint:all", "plugin:react/recommended" ],
   "rules": {
@@ -48,7 +53,7 @@
     "no-ternary": "off",
     "no-undefined": "off",
     "no-undef-init": "off",
-    "no-unused-vars": ["error", { "varsIgnorePattern": "h" }],
+    "no-unused-vars": "off",
     "no-use-before-define": "off",
     "no-warning-comments": "off",
     "object-curly-newline": ["error", { "consistent": true }],
@@ -71,6 +76,7 @@
 
     "react/jsx-indent": ["error", 2],
     "react/prop-types": "off",
-    "react/react-in-jsx-scope": "off"
+    "react/react-in-jsx-scope": "off",
+    "@typescript-eslint/no-unused-vars": "error"
   }
 }
diff --git a/package.json b/package.json
index f617c14..590504b 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "start": "webpack --mode development -w --debug --devtool inline-source-map",
     "build": "NODE_ENV=production webpack --mode production --progress --display-error-details",
     "package": "npm run build && script/package",
-    "lint": "eslint --ext .jsx,.js src",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx src",
     "test": "karma start",
     "test:e2e": "mocha --timeout 8000 e2e"
   },