diff --git a/languages/ruby/highlights.scm b/languages/ruby/highlights.scm
index 708ea2e..2f97044 100644
--- a/languages/ruby/highlights.scm
+++ b/languages/ruby/highlights.scm
@@ -4,35 +4,55 @@
   (global_variable)
 ] @variable
 
-; Keywords
+; Keywords — definition
 [
-  "alias"
-  "and"
-  "begin"
-  "break"
-  "case"
   "class"
   "def"
-  "do"
+  "module"
+] @keyword.function
+
+; Keywords — conditional
+[
+  "case"
   "else"
   "elsif"
-  "end"
-  "ensure"
-  "for"
   "if"
-  "in"
-  "module"
-  "next"
-  "or"
-  "rescue"
-  "retry"
-  "return"
   "then"
   "unless"
-  "until"
   "when"
+] @keyword.control.conditional
+
+; Keywords — loop
+[
+  "do"
+  "for"
+  "until"
   "while"
+] @keyword.control.repeat
+
+; Keywords — flow return/jump
+[
+  "break"
+  "next"
+  "retry"
+  "return"
   "yield"
+] @keyword.control.return
+
+; Keywords — exception handling
+[
+  "begin"
+  "ensure"
+  "rescue"
+] @keyword.exception
+
+; Keywords — general
+[
+  "alias"
+  "and"
+  "end"
+  "in"
+  "or"
 ] @keyword
 
 ((identifier) @keyword