diff --git a/.editorconfig b/.editorconfig
index c801fc2a0b5..d4a00b0b0fd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,16 @@
-[*.{js,html}]
+# editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+
+[*.{js,html,css}]
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
+
+[*.{json,yml}]
+indent_style = space
+indent_size = 2