diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index c02ee3f2a..6fb23ac6d 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -12,7 +12,7 @@
   name: (identifier) @variable)
 
 (field_definition
-  name: (identifier) @property)
+  name: (identifier) @variable.member)
 
 (negated_field
   "!" @operator
@@ -63,6 +63,15 @@
 ((comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "^;+%s*format%-ignore%s*$"))
 
+((predicate
+  name: (identifier) @_name
+  parameters: (parameters
+    .
+    (capture)?
+    .
+    (identifier) @property))
+  (#eq? @_name "set"))
+
 ((predicate
   name: (identifier) @_name
   parameters: (parameters