diff --git a/.editorconfig b/.editorconfig
index 04447ce..28af62f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,10 +5,10 @@
 root = true
 # All files
 [*]
+indent_size = 2
 indent_style = space
 # Code files
 [*.{cs,csx,vb,vbx}]
-indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8-bom
@@ -18,6 +18,7 @@ charset = utf-8-bom
 [*.{cs,vb}]
 # Organize usings
 dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
 # this. preferences
 dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent
@@ -140,4 +141,4 @@ quote_type = single
 
 [*.md]
 max_line_length = off
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true