diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 0cb60ca999778..89c4c71462bfe 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -92,7 +92,7 @@
 
 (binary_operator operator: _ @operator)
 (unary_operator operator: _ @operator)
-["/" ":" "#" "->"] @operator
+["/" ":" "->"] @operator
 
 (tripledot) @comment.discard
 
@@ -118,6 +118,14 @@
 
 ; Punctuation
 ["," "." "-" ";"] @punctuation.delimiter
-["(" ")" "{" "}" "[" "]" "<<" ">>"] @punctuation.bracket
+
+(list "[" @rainbow "]" @rainbow)
+(record "#" @rainbow "{" @rainbow "}" @rainbow)
+(map "#" @rainbow "{" @rainbow "}" @rainbow)
+(map_update "{" @rainbow "}" @rainbow)
+(tuple "{" @rainbow "}" @rainbow)
+(arguments "(" @rainbow ")" @rainbow)
+(parenthesized_expression "(" @rainbow ")" @rainbow)
+(bitstring "<<" @rainbow ">>" @rainbow)
 
 ; (ERROR) @error
diff --git a/runtime/queries/toml/highlights.scm b/runtime/queries/toml/highlights.scm
index 3c4425f8c3f63..6ecce2a4cfb72 100644
--- a/runtime/queries/toml/highlights.scm
+++ b/runtime/queries/toml/highlights.scm
@@ -27,9 +27,7 @@
 
 "=" @operator
 
-"[" @punctuation.bracket
-"]" @punctuation.bracket
-"[[" @punctuation.bracket
-"]]" @punctuation.bracket
-"{" @punctuation.bracket
-"}" @punctuation.bracket
+(table_array_element "[[" @rainbow "]]" @rainbow)
+(table "[" @rainbow "]" @rainbow)
+(array "[" @rainbow "]" @rainbow)
+(inline_table "{" @rainbow "}" @rainbow)
diff --git a/runtime/queries/tsq/highlights.scm b/runtime/queries/tsq/highlights.scm
index fd5917fb1f6f6..84fe52cb6019c 100644
--- a/runtime/queries/tsq/highlights.scm
+++ b/runtime/queries/tsq/highlights.scm
@@ -8,6 +8,12 @@
 ((query . (comment) @keyword.directive)
  (#match? @keyword.directive "^;\ +inherits *:"))
 
+(group "(" @rainbow ")" @rainbow)
+(named_node "(" @rainbow ")" @rainbow)
+(wildcard_node "(" @rainbow ")" @rainbow)
+(predicate "(" @rainbow ")" @rainbow)
+(alternation "[" @rainbow "]" @rainbow)
+
 [
   "("
   ")"