diff --git a/runtime/queries/ecma/highlights.scm b/runtime/queries/ecma/highlights.scm
index 212bb8754555..7285ab9603ba 100644
--- a/runtime/queries/ecma/highlights.scm
+++ b/runtime/queries/ecma/highlights.scm
@@ -167,55 +167,76 @@
 ]  @punctuation.bracket
 
 [
-  "as"
   "async"
   "debugger"
   "delete"
   "extends"
   "from"
-  "function"
   "get"
-  "in"
-  "instanceof"
   "new"
-  "of"
   "set"
-  "static"
   "target"
-  "try"
   "typeof"
+  "instanceof"
   "void"
   "with"
 ] @keyword
 
+[
+  "of"
+  "as"
+  "in"
+] @keyword.operator
+
+[
+  "function"
+] @keyword.function
+
 [
   "class"
   "let"
-  "const"
   "var"
 ] @keyword.storage.type
 
 [
-  "switch"
-  "case"
+  "const"
+  "static"
+] @keyword.storage.modifier
+
+[
   "default"
-  "if"
-  "else"
   "yield"
-  "throw"
   "finally"
-  "return"
-  "catch"
-  "continue"
-  "while"
-  "break"
-  "for"
   "do"
   "await"
 ] @keyword.control
 
+[
+  "if"
+  "else"
+  "switch"
+  "case"
+  "while"
+] @keyword.control.conditional
+
+[
+  "for"
+] @keyword.control.repeat
+
 [
   "import"
   "export"
 ] @keyword.control.import 
 
+[
+  "return"
+  "break"
+  "continue"
+] @keyword.control.return
+
+[
+  "throw"
+  "try"
+  "catch"
+] @keyword.control.exception
+