diff --git a/.editorconfig b/.editorconfig
index b564998..12b2424 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,19 +9,19 @@ trim_trailing_whitespace = true
 
 [*.go]
 indent_style = tab
+indent_size = 8
+
+[*.{tmpl,html}]
+indent_style = tab
 indent_size = 4
 
-[*.tmpl]
-indent_style = tab
-indent_size = 2
-
-[Makefile]
-indent_style = tab
-
 [*.{less,yml}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.js]
 indent_style = space
 indent_size = 4
+
+[Makefile]
+indent_style = tab