diff --git a/eslint/.eslintrc b/eslint/.eslintrc
index 88aa88c7..8f800d85 100644
--- a/eslint/.eslintrc
+++ b/eslint/.eslintrc
@@ -3,7 +3,6 @@
     	"./.eslintrc-reset",
     	"./.eslintrc-magento",
     	"./.eslintrc-jquery",
-    	"./.eslintrc-misc",
-    	"./.eslintrc-jscs"
+    	"./.eslintrc-misc"
     ]
 }
diff --git a/eslint/.eslintrc-jscs b/eslint/.eslintrc-jscs
deleted file mode 100644
index 728e7dca..00000000
--- a/eslint/.eslintrc-jscs
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "rules": {
-    "no-with": 2,
-    "space-before-function-paren": [
-      2,
-      {
-        "anonymous": "always",
-        "named": "never",
-        "asyncArrow": "always"
-      }
-    ],
-    "curly": [
-      2,
-      "all"
-    ],
-    "keyword-spacing": [
-      2,
-      {}
-    ],
-    "no-empty": [
-      2,
-      {
-        "allowEmptyCatch": true
-      }
-    ],
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multiple-empty-lines": 2,
-    "no-multi-str": 2,
-    "space-unary-ops": [
-      2,
-      {
-        "words": false,
-        "nonwords": false
-      }
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
-    "comma-dangle": [
-      2,
-      "never"
-    ],
-    "no-trailing-spaces": 2,
-    "comma-style": [
-      2,
-      "last"
-    ],
-    "eol-last": 2,
-    "one-var": [
-      2,
-      "always"
-    ],
-    "space-infix-ops": 2,
-    "space-before-blocks": [
-      2,
-      "always"
-    ],
-    "quotes": [
-      2,
-      "single"
-    ]
-  }
-}
diff --git a/eslint/.eslintrc-magento b/eslint/.eslintrc-magento
index 3e984418..066499cf 100644
--- a/eslint/.eslintrc-magento
+++ b/eslint/.eslintrc-magento
@@ -8,8 +8,13 @@
         "node": true
     },
     "rules": {
+        "comma-dangle": [2, "never"],
+        "comma-style": [2, "last"],
+        "curly": [2, "all"],
+        "eol-last": 2,
         "eqeqeq": [2, "smart"],
         "guard-for-in": 2,
+        "keyword-spacing": [2, {}],
         "lines-around-comment": [
             2,
             {
@@ -30,6 +35,7 @@
         "no-constant-condition": 2,
         "no-debugger": 2,
         "no-else-return": 2,
+        "no-empty": [2, {"allowEmptyCatch": true}],
         "no-eval": 2,
         "no-ex-assign": 2,
         "no-extend-native": 2,
@@ -46,7 +52,9 @@
         "no-lone-blocks": 2,
         "no-lonely-if": 2,
         "no-loop-func": 2,
+        "no-mixed-spaces-and-tabs": 2,
         "no-multi-str": 2,
+        "no-multiple-empty-lines": 2,
         "no-native-reassign": 2,
         "no-negated-in-lhs": 2,
         "no-new-object": 2,
@@ -56,6 +64,7 @@
         "no-return-assign": 2,
         "no-self-compare": 2,
         "no-shadow": 2,
+        "no-trailing-spaces": 2,
         "no-undef": 2,
         "no-undef-init": 2,
         "no-unreachable": 2,
@@ -69,10 +78,17 @@
         ],
         "no-use-before-define": 2,
         "no-with": 2,
+        "one-var": [2, "always"],
         "operator-assignment": [2, "always"],
+        "quotes": [2, "single"],
         "radix": 2,
         "semi": [2, "always"],
         "semi-spacing": 2,
+        "space-before-blocks": [2, "always"],
+        "space-before-function-paren": [2, {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
+        "space-in-parens": [2, "never"],
+        "space-infix-ops": 2,
+        "space-unary-ops": [2, {"words": false, "nonwords": false}],
         "strict": ["error", "function"],
         "use-isnan": 2,
         "valid-typeof": 2,