diff --git a/.editorconfig b/.editorconfig
index fac7a92..a63f7f6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,2 +1,29 @@
+root = true
+
 [*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 max_line_length = 120
+tab_width = 4
+
+[{*.cfg, *.ini, *.html, *.yaml, *.yml}]
+indent_size = 2
+
+[*.json]
+indent_size = 2
+insert_final_newline = true
+
+# trailing spaces in markdown indicate word wrap
+[*.md]
+trim_trailing_whitespace = false
+
+[*.py]
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+use_parentheses = True
+ensure_newline_before_comments = True