diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 9f455e7f..f61c9b79 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -436,9 +436,32 @@
 
 (match_pattern
   (scoped_identifier
-    name: ((identifier) @type.enum.variant
+    path: [(identifier) @type (scoped_identifier name: (identifier) @type)]
+    name: (identifier) @type.enum.variant
+    (#match? @type "^[A-Z]")
+    (#match? @type.enum.variant "^[A-Z]")))
+
+(match_pattern
+  (struct_pattern
+    type: (scoped_type_identifier
+      path: [(identifier) @type (scoped_identifier name: (identifier) @type)]
+      name: (type_identifier) @type.enum.variant
+      (#match? @type "^[A-Z]")
+      (#match? @type.enum.variant "^[A-Z]"))))
+
+(match_pattern
+  (tuple_struct_pattern
+    type: (scoped_identifier
+      path: [(identifier) @type (scoped_identifier name: (identifier) @type)]
+      name: (identifier) @type.enum.variant
+      (#match? @type "^[A-Z]")
       (#match? @type.enum.variant "^[A-Z]"))))
 
+(match_pattern
+  (scoped_identifier
+    name: (identifier) @constant
+    (#match? @constant "^[A-Z_]+$")))
+
 ; ---
 ; Macros
 ; ---