diff --git a/queries/highlights.scm b/queries/highlights.scm
index af744484..f8ca8ee7 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -35,6 +35,14 @@
 (attribute attribute: (identifier) @property)
 (type (identifier) @type)
 
+; Class definitions
+(class_definition
+  name: (identifier) @type)
+
+; Generics
+(generic_type (identifier) @type)
+
+
 ; Literals
 
 [