diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index 623dab143..009920a82 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -1,12 +1,8 @@
 [
   "as"
-  "asc"
   "by"
   "class"
-  "desc"
   "extends"
-  "forall"
-  "forex"
   "from"
   "implies"
   "in"
@@ -43,9 +39,7 @@
   "strictsum"
 ] @function.builtin
 
-[
-  "import"
-] @include 
+"import" @include
 
 [
   "if"
@@ -53,6 +47,16 @@
   "else"
 ] @conditional
 
+[
+  "forall"
+  "forex"
+] @repeat
+
+[
+  "asc"
+  "desc"
+] @type.qualifier
+
 [
   (true)
   (false)
@@ -106,9 +110,10 @@
 (module name: (moduleName) @namespace)
 
 (dataclass name: (className) @type)
-(datatype name: (className) @type)
 (typeExpr name: (className) @type)
 
+(datatype name: (className) @type.definition)
+
 (importModuleExpr qualName: (simpleId) @variable)
 (varName) @variable