diff --git a/.editorconfig b/.editorconfig
index 34d3f1aec82..a3966328353 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,18 +3,18 @@
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = tab
+indent_style = space
 indent_size = 4
-max_line_length = 120
+max_line_length = 99
 
 # CMake & Text
 [*.{cmake,txt}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = tab
-indent_size = 4
-max_line_length = 120
+indent_style = space
+indent_size = 2
+max_line_length = 99
 
 # Python
 [*.py]
@@ -30,9 +30,9 @@ max_line_length = 120
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = tab
-indent_size = 4
-max_line_length = 120
+indent_style = space
+indent_size = 2
+max_line_length = 99
 
 # reStructuredText
 [*.rst]