diff --git a/.editorconfig b/.editorconfig
index cc98f14c..476dd162 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,24 +2,19 @@
 # properties used in this file, please see the EditorConfig documentation:
 # http://editorconfig.org/
 
-# indicate this is the root of the project
 root = true
 
 [*]
 charset = utf-8
-
 end_of_line = LF
+indent_size = 4
+indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{yml,json}]
+indent_size = 2
 indent_style = space
-indent_size = 4
 
-[Makefile]
-indent_style = tab
-
-[*.md]
+[*.{md,diff}]
 trim_trailing_whitespace = false
-
-[*.go]
-indent_style = tab
\ No newline at end of file
diff --git a/gui/.editorconfig b/gui/.editorconfig
index 056b9e8e..476dd162 100644
--- a/gui/.editorconfig
+++ b/gui/.editorconfig
@@ -1,24 +1,20 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
+# EditorConfig coding styles definitions. For more information about the
+# properties used in this file, please see the EditorConfig documentation:
+# http://editorconfig.org/
 
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = tab
+end_of_line = LF
 indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.yml]
-indent_style = space
+[*.{yml,json}]
 indent_size = 2
-
-[*.json]
 indent_style = space
-indent_size = 2
 
-[*.{diff,md}]
+[*.{md,diff}]
 trim_trailing_whitespace = false