diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index cf253a474..c350e5ad1 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -8,19 +8,13 @@
 [
  "alias"
  "begin"
- "break"
  "class"
- "def"
  "do"
  "end"
  "ensure"
  "module"
- "next"
- "redo"
  "rescue"
- "retry"
  "then"
- "undef"
  ] @keyword
 
 [
@@ -35,6 +29,14 @@
  "not"
 ] @keyword.operator
 
+[
+  "def"
+  "undef"
+] @keyword.function
+
+(method
+  "end" @keyword.function)
+
 [
  "case"
  "else"
@@ -44,10 +46,23 @@
  "when"
  ] @conditional
 
+(if
+  "end" @conditional)
+(if
+  (then) @conditional)
+(unless
+  (then) @conditional)
+(elsif
+  (then) @conditional)
+
 [
  "for"
  "until"
  "while"
+ "break"
+ "redo"
+ "retry"
+ "next"
  ] @repeat
 
 (constant) @type