diff --git a/.editorconfig b/.editorconfig
index f966739fa..a5145badd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,37 +8,27 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 8
-indent_style = tab
+indent_size = 2
+indent_style = space
 insert_final_newline = true
 tab_width = 8
+trim_trailing_whitespace = true
 
 [{Makefile,Makefile.*,makefile,*.mk}]
-trim_trailing_whitespace = true
+indent_style = tab
 #max_line_length = 80
 
-[*.{c,cc,C,cxx,cpp,h,hh,H,hxx,hpp,inc,y}]
-indent_size = 2
-indent_style = space
-trim_trailing_whitespace = true
+#[*.{c,cc,C,cxx,cpp,h,hh,H,hxx,hpp,inc,y}]
 #max_line_length = 120
 
-[{*.rb,Rakefile,rakefile,*.rake,*.gemspec,*.gembox}]
-indent_size = 2
-indent_style = space
-trim_trailing_whitespace = true
+#[{*.rb,Rakefile,rakefile,*.rake,*.gemspec,*.gembox}]
 #max_line_length = 120
 
 # limitation to US-ASCII
 [*.bat]
 end_of_line = crlf
-indent_style = space
 #max_line_length = 80
 
-[*.{yaml,yml}]
-indent_size = 2
-indent_style = space
+#[*.{yaml,yml}]
 
-[*.md]
-indent_size = 2
-indent_style = space
+#[*.md]