diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index b20ee1dd..f4d41b3c 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -119,10 +119,10 @@ index-columns=flags:4,labels<=,name<20%,subject,date>=
 #   column-name={{if match .Folder "^(Gesendet|Sent)$"}}{{index (.To | names) 0}}{{else}}{{index (.From | names) 0}}{{end}}
 #
 # Default settings
-column-flags={{.StyleMap .Flags (case `^!$` "important-flag") (case `r|a` "reply-flag") (default "flags") | join ""}}
-column-name={{.Style (index (.From | names) 0) "name"}}
-column-subject={{.Style (printf "%s%s" .ThreadPrefix .Subject) "subject"}}
-column-date={{.Style (.DateAutoFormat .Date.Local) "date"}}
+column-flags= {{.StyleMap .Flags (case `^!$` "important-flag") (case `r|a` "reply-flag") (default "flags") | join ""}}
+column-name= {{.Style (index (.From | names) 0) "name"}}
+column-subject= {{.Style (printf "%s%s" .ThreadPrefix .Subject) "subject"}}
+column-date= {{.Style (.DateAutoFormat .Date.Local) "date"}}
 column-labels = {{.StyleMap (.Labels | join "," | replace `\bArchive(/|$|,)` `A$1` | replace `\bLists(/|$|,)` `L$1` | replace `Sourcehut` `Srht` | replace `Recipt` `Rcpt` | replace `Inbox` `I` | replace `Sent` `S` | replace `Draft(s)?` `Dr` | replace `Snoozed` `Snz` | split "," ) (exclude (switch .Folder (case `Inbox` `I`) (default "x"))) (case `^A(/)?.*` "archive") (case `^L(/)?.*` "lists") (default "labels") | join ","}}
 
 #
diff --git a/.config/helix/runtime/queries/ini/highlights.scm b/.config/helix/runtime/queries/ini/highlights.scm
new file mode 100644
index 00000000..51804257
--- /dev/null
+++ b/.config/helix/runtime/queries/ini/highlights.scm
@@ -0,0 +1,9 @@
+(section_name) @namespace
+
+(setting_name) @keyword
+(setting_value) @string
+
+(comment) @comment
+
+; ((setting_value) @constant.builtin
+;  (#match? @constant.builtin ".*"))
diff --git a/.config/helix/runtime/queries/ini/injections.scm b/.config/helix/runtime/queries/ini/injections.scm
index 56e937b6..6d7454a3 100644
--- a/.config/helix/runtime/queries/ini/injections.scm
+++ b/.config/helix/runtime/queries/ini/injections.scm
@@ -1,4 +1,4 @@
 ((setting_value) @injection.content
-  (#match? @injection.content "\\{\\{.*\\}\\}")
- (#set! injection.language "gotmpl")
- (#set! injection.include-children))
+  (#match? @injection.content ".*\\{\\{.*\\}\\}.*")
+  (#set! injection.language "gotmpl")
+  (#set! injection.include-children))