diff --git a/.editorconfig b/.editorconfig
index 87db35a6c..9d7fc7993 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,33 @@ max_line_length = 120
 indent_style = tab
 indent_size = 2
 
+[*.rs]
+indent_style = space
+indent_size = 4
+max_line_length = 100
+
+[*.{erl,hrl,app.src,escript}]
+indent_style = space
+indent_size = 4
+max_line_length = 96
+
+[fluxer_gateway/{rebar.config,elvis.config,.erlfmt}]
+indent_style = space
+indent_size = 4
+max_line_length = 96
+
+[*.{c,h,py}]
+indent_style = space
+indent_size = 4
+
+[fluxer_app/rust/libfluxwebp/**.{c,h}]
+indent_style = space
+indent_size = 2
+
+[*.{md,mdx,proto,tpl}]
+indent_style = space
+indent_size = 2
+
 [*.{yml,yaml,Dockerfile}]
 indent_style = space
 indent_size = 2
diff --git a/fluxer_gateway/.erlfmt b/fluxer_gateway/.erlfmt
index 89f90c717..3cb13169f 100644
--- a/fluxer_gateway/.erlfmt
+++ b/fluxer_gateway/.erlfmt
@@ -1,5 +1,13 @@
 % erlfmt configuration
 % Options here are used by editor integrations and the escript.
 % Rebar3 reads from rebar.config's {erlfmt, [...]} section.
-{print_width, 100}.
-{files, ["{src,include,test}/*.{hrl,erl,app.src}", "rebar.config"]}.
+{print_width, 96}.
+{files, [
+    "src/**/*.erl",
+    "src/*.app.src",
+    "include/**/*.hrl",
+    "test/**/*.erl",
+    "elvis.config",
+    "rebar.config",
+    "rebar.config.script"
+]}.