diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index bc58a7e59..b996d627c 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -102,7 +102,8 @@
   "|"
 ] @punctuation.delimiter
 
-(className) @type
+(dataclass name: (className) @type)
+(datatype name: (className) @type)
 
 (varName) @variable
 
@@ -111,6 +112,7 @@
 
 (string) @string
 
+(charpred (className) @function)
 (aritylessPredicateExpr (literalId) @function)
 (predicateName) @function