diff --git a/.editorconfig b/.editorconfig
index 15a88a14eb0..5b3a4ff79fd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,3 @@
-# http://editorconfig.org
 root = true
 
 [*]
@@ -10,23 +9,15 @@ end_of_line = lf
 [*.md]
 trim_trailing_whitespace = false
 
-[*.go]
-indent_style = tab
-indent_size = 8
-
-[*.{tmpl,html}]
+[*.{go,tmpl,html}]
 indent_style = tab
 indent_size = 4
 
-[*.less]
+[*.{less,css}]
 indent_style = space
 indent_size = 4
 
-[*.{yml,json}]
-indent_style = space
-indent_size = 2
-
-[*.js]
+[*.{js,json,yml}]
 indent_style = space
 indent_size = 2