diff --git a/.eslintrc.json b/.eslintrc.json
index f81c96e..ca83e5b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,9 +1,3 @@
 {
-  "extends": "eslint:recommended",
-  "parserOptions": {
-    "ecmaVersion": 6
-  },
-  "rules": {
-    "no-control-regex": "off"
-  }
+  "extends": "dmajda"
 }
diff --git a/package.json b/package.json
index 714d3c7..e8a2787 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,8 @@
     "babel-preset-es2015": "6.14.0",
     "babelify": "7.3.0",
     "browserify": "13.1.0",
-    "eslint": "3.6.1",
+    "eslint": "3.7.1",
+    "eslint-config-dmajda": "1.0.0",
     "express": "4.14.0",
     "glob": "7.0.6",
     "jasmine-node": "1.14.5",