diff --git a/queries/caddy/folds.scm b/queries/caddy/folds.scm
index 0b062847d..fd7d23999 100644
--- a/queries/caddy/folds.scm
+++ b/queries/caddy/folds.scm
@@ -1,2 +1 @@
 (block) @fold
-
diff --git a/queries/caddy/highlights.scm b/queries/caddy/highlights.scm
index 94eb773c0..c248c7c5b 100644
--- a/queries/caddy/highlights.scm
+++ b/queries/caddy/highlights.scm
@@ -1,6 +1,6 @@
 (comment) @comment @spell
 
-[ 
+[
   (env)
   (argv)
   (block_variable)
@@ -8,8 +8,13 @@
 ] @constant
 
 (value) @variable
-(directive (keyword) @attribute)
-(global_options (option (keyword) @attribute))
+
+(directive
+  (keyword) @attribute)
+
+(global_options
+  (option
+    (keyword) @attribute))
 
 (keyword) @keyword
 
@@ -21,10 +26,7 @@
     "}"
   ] @punctuation.special)
 
-
-[
-  (auto)
-] @variable.builtin
+(auto) @variable.builtin
 
 [
   (string_literal)
@@ -32,8 +34,8 @@
   (address)
 ] @string
 
-[ 
-  (matcher) 
+[
+  (matcher)
   (route)
   (snippet_name)
 ] @string.special
@@ -49,4 +51,3 @@
   "{"
   "}"
 ] @punctuation.bracket
-
diff --git a/queries/caddy/indents.scm b/queries/caddy/indents.scm
index 84bc3997b..b746788ab 100644
--- a/queries/caddy/indents.scm
+++ b/queries/caddy/indents.scm
@@ -1,6 +1,4 @@
-[
-  (block)
-] @indent.begin
+(block) @indent.begin
 
 (block
   "}" @indent.branch)
@@ -8,4 +6,3 @@
 (comment) @indent.auto
 
 (ERROR) @indent.auto
-
diff --git a/queries/caddy/injections.scm b/queries/caddy/injections.scm
index 5889ab7f7..2f0e58eb6 100644
--- a/queries/caddy/injections.scm
+++ b/queries/caddy/injections.scm
@@ -1,3 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-