diff --git a/.editorconfig b/.editorconfig
index 5612a5e74..87694ddab 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,21 +12,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.{css,less}]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
 [*.php]
-indent_style = space
 indent_size = 4
diff --git a/.eslintrc b/.eslintrc
index 778c29256..9e89e6ba6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -27,7 +27,12 @@
     "$": true,
     "moment": true
   },
+  "plugins": [
+    "react"
+  ],
   "rules": {
+    "react/jsx-uses-vars": 1,
+
 /**
  * Strict mode
  */
diff --git a/stubs/extension/.editorconfig b/stubs/extension/.editorconfig
index 5612a5e74..87694ddab 100644
--- a/stubs/extension/.editorconfig
+++ b/stubs/extension/.editorconfig
@@ -12,21 +12,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.{css,less}]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
 [*.php]
-indent_style = space
 indent_size = 4
diff --git a/stubs/extension/.eslintrc b/stubs/extension/.eslintrc
index 778c29256..9e89e6ba6 100644
--- a/stubs/extension/.eslintrc
+++ b/stubs/extension/.eslintrc
@@ -27,7 +27,12 @@
     "$": true,
     "moment": true
   },
+  "plugins": [
+    "react"
+  ],
   "rules": {
+    "react/jsx-uses-vars": 1,
+
 /**
  * Strict mode
  */
diff --git a/stubs/extension/js/admin/package.json b/stubs/extension/js/admin/package.json
index 3e0ef919d..62ea6c691 100644
--- a/stubs/extension/js/admin/package.json
+++ b/stubs/extension/js/admin/package.json
@@ -2,6 +2,6 @@
   "private": true,
   "devDependencies": {
     "gulp": "^3.8.11",
-    "flarum-gulp": "git+https://github.com/flarum/gulp.git"
+    "flarum-gulp": "^0.1.0"
   }
 }
diff --git a/stubs/extension/js/forum/package.json b/stubs/extension/js/forum/package.json
index 3e0ef919d..62ea6c691 100644
--- a/stubs/extension/js/forum/package.json
+++ b/stubs/extension/js/forum/package.json
@@ -2,6 +2,6 @@
   "private": true,
   "devDependencies": {
     "gulp": "^3.8.11",
-    "flarum-gulp": "git+https://github.com/flarum/gulp.git"
+    "flarum-gulp": "^0.1.0"
   }
 }