diff --git a/.editorconfig b/.editorconfig
index 75866cfb..68bf01fa 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,17 +1,18 @@
 # editorconfig.org
 root = true
 
+# Unix-style newlines with a newline ending every file
 [*]
-indent_style = tab
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.{json,yml,md,babelrc,eslintrc,remarkrc}]
 indent_style = space
 indent_size = 2
+trim_trailing_whitespace = true
 
 [*.{js}]
 indent_style = space
-indent_size = 4
\ No newline at end of file
+indent_size = 4
+trim_trailing_whitespace = true