diff --git a/runtime/queries/typoscript/folds.scm b/runtime/queries/typoscript/folds.scm
index 81f5ff785..da8d750aa 100644
--- a/runtime/queries/typoscript/folds.scm
+++ b/runtime/queries/typoscript/folds.scm
@@ -1,8 +1,9 @@
 [
   (block)
   (condition_block)
-  (import_legacy)+
-  (import)+
-  (comment)+
   (multiline_value)
 ] @fold
+
+(import_legacy)+ @fold
+(import)+ @fold
+(comment)+ @fold
diff --git a/runtime/queries/typoscript/highlights.scm b/runtime/queries/typoscript/highlights.scm
index 4c26495ed..81b450858 100644
--- a/runtime/queries/typoscript/highlights.scm
+++ b/runtime/queries/typoscript/highlights.scm
@@ -4,25 +4,19 @@
 
 (constant) @constant
 
-(symfony_function) @function.call
-
 (symfony_method) @function.method.call
 
 [
   (modifier_function)
   (symfony_function)
-] @function
+] @function.call
 
 [
   (modifier_predefined)
   (symfony_predefined_function)
 ] @function.builtin
 
-[
-  (symfony_function_parameter)
-  (symfony_method_parameter)
-  (modifier_parameter)
-] @variable.parameter
+(modifier_parameter) @variable.parameter
 
 (symfony_function_parameter
   (symfony_variable) @variable.parameter)
@@ -60,21 +54,16 @@
   (symfony_string)
 ] @string
 
-(reference_line
-  "=<" @operator)
-
 (deletion_line
   ">" @operator)
 
 (copy_line
   "<" @operator)
 
-(modification_line
-  ":=" @operator)
-
 [
   "="
-  "."
+  "=<"
+  ":="
   "?."
   (symfony_condition_operator)
   (condition_bool_legacy)
@@ -84,9 +73,10 @@
 (symfony_ternary_operator) @keyword.conditional.ternary
 
 ((symfony_condition_operator) @keyword.operator
-  (#match? @keyword.operator "and|or|xor|not|not in|in|contains|starts with|ends with|matches"))
+  (#any-of? @keyword.operator "and" "or" "xor" "not" "not in" "in" "contains" "starts with" "ends with" "matches"))
 
 "," @punctuation.delimiter
+"." @punctuation.delimiter
 
 [
   "("
@@ -96,11 +86,11 @@
   (block_punctuation)
 ] @punctuation.bracket
 
-(condition
-  "[" @keyword.conditional)
-
-(condition
-  "]" @keyword.conditional)
+; (condition
+;   "[" @keyword.conditional)
+;
+; (condition
+;   "]" @keyword.conditional)
 
 (symfony_number) @number
 
diff --git a/runtime/queries/typoscript/injections.scm b/runtime/queries/typoscript/injections.scm
index 272485199..cfbb09cd1 100644
--- a/runtime/queries/typoscript/injections.scm
+++ b/runtime/queries/typoscript/injections.scm
@@ -4,8 +4,8 @@
   (multiline_value
     (multiline_value_content) @injection.content))
   (#lua-match? @_id "_CSS_DEFAULT_STYLE$")
-  (#set! injection.language "css")
-  (#set! injection.overlay "constant"))
+  (#set! injection.language "css"))
+  ; (#set! injection.overlay "constant"))
 
 ((comment) @injection.content
   (#set! injection.language "comment"))