diff --git a/.editorconfig b/.editorconfig
index f9d7a83..f8d19dc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,26 @@
 root = true
 
 [*]
-insert_final_newline = true
+charset = utf-8
+end_of_line = lf
 indent_size = 2
 indent_style = space
-end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.rs]
+indent_size = 4
+
+[*.kt]
+indent_size = 4
+
+[tests/**/*.rs]
+charset = utf-8
+end_of_line = unset
+indent_size = unset
+indent_style = unset
+trim_trailing_whitespace = unset
+insert_final_newline = unset