diff --git a/.editorconfig b/.editorconfig
index 9055021c9f..ad9d6beae3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,26 +2,13 @@
 
 root = true
 
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 [Makefile]
 indent_style = tab
-indent_size = 8
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.less]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 2