diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
index cd4eedade..ca870dd47 100644
--- a/queries/cooklang/highlights.scm
+++ b/queries/cooklang/highlights.scm
@@ -1,22 +1,22 @@
 (metadata) @comment
 
 (ingredient
-  "@" @tag
-  (name)? @markup.heading
+  "@" @punctuation.delimiter
+  (name)? @string.special.symbol
   (amount
     (quantity)? @number
-    (units)? @tag.attribute)?)
+    (units)? @constant)?)
 
 (timer
-  "~" @tag
-  (name)? @markup.heading
+  "~" @punctuation.delimiter
+  (name)? @string.special.symbol
   (amount
     (quantity)? @number
-    (units)? @tag.attribute)?)
+    (units)? @constant)?)
 
 (cookware
-  "#" @tag
-  (name)? @markup.heading
+  "#" @punctuation.delimiter
+  (name)? @string.special.symbol
   (amount
     (quantity)? @number
-    (units)? @tag.attribute)?)
+    (units)? @constant)?)
diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
index fbe297839..764818234 100644
--- a/queries/godot_resource/highlights.scm
+++ b/queries/godot_resource/highlights.scm
@@ -22,9 +22,6 @@
 [
   "["
   "]"
-] @tag.delimiter
-
-[
   "("
   ")"
   "{"
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 984e702e4..3df9b5b80 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -88,7 +88,7 @@
 
 ; Namespace
 (namespace_declaration
-  (namespace_scope) @tag
+  (namespace_scope) @string.special
   [
     (namespace) @module
     (_