diff --git a/.editorconfig b/.editorconfig
index 8151c94..d3c92ec 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,10 +20,10 @@ indent_style = tab
 [Makefile]
 indent_style = tab
 
-[*.{json,yml,yaml}]
+[*.{json,yml,yaml,xml,iml}]
 indent_size = 2
 
-[*.{html,htm}]
+[*.{html,htm,xhtml,xhtm}]
 indent_size = 2
 
 [*.{json.tftpl, tf, hcl, tfvars, tfstate, tfstate.backup}]
@@ -52,3 +52,7 @@ insert_final_newline = unset
 trim_trailing_whitespace = unset
 indent_style = unset
 indent_size = unset
+
+[.gitmodules]
+indent_style = unset
+indent_size = unset