diff --git a/.editorconfig b/.editorconfig
index 471170c449..954cb72e8f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,10 +1,12 @@
+# http://editorconfig.org
+root = true
+
 [*]
 indent_style = tab
-indent_size = 4
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-end_of_line = lf
 
 [*.yml]
 indent_style = space
@@ -17,4 +19,4 @@ indent_style = space
 trim_trailing_whitespace = false
 
 [Dockerfile]
-indent_style = space
+indent_style = space
\ No newline at end of file
diff --git a/tgui/.editorconfig b/tgui/.editorconfig
index 33092d4928..c0f2cb2c8b 100644
--- a/tgui/.editorconfig
+++ b/tgui/.editorconfig
@@ -7,7 +7,4 @@ indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-max_line_length = 80
+insert_final_newline = true
\ No newline at end of file
diff --git a/tools/build/.editorconfig b/tools/build/.editorconfig
index 954cb72e8f..c0f2cb2c8b 100644
--- a/tools/build/.editorconfig
+++ b/tools/build/.editorconfig
@@ -2,21 +2,9 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.py]
-indent_style = space
-
-[*.md]
-trim_trailing_whitespace = false
-
-[Dockerfile]
-indent_style = space
\ No newline at end of file
+insert_final_newline = true
\ No newline at end of file