diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index f33a7c2d3ae8..1aa35aa7c790 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -7,33 +7,45 @@
 
 (command_name) @function
 
-(variable_name) @property
+(variable_name) @variable.other.member
 
 [
-  "case"
-  "do"
-  "done"
-  "elif"
+  "if"
+  "then"
   "else"
-  "esac"
-  "export"
+  "elif"
   "fi"
-  "for"
-  "function"
-  "if"
+  "case"
   "in"
+  "esac"
+] @keyword.control.conditional
+
+[
+  "for"
+  "do"
+  "done"
   "select"
-  "then"
-  "unset"
   "until"
   "while"
+] @keyword.control.repeat
+
+[
+  "declare"
+  "typeset"
+  "export"
+  "readonly"
+  "local"
+  "unset"
+  "unsetenv"
 ] @keyword
 
+"function" @keyword.function
+
 (comment) @comment
 
 (function_definition name: (word) @function)
 
-(file_descriptor) @number
+(file_descriptor) @constant.numeric.integer
 
 [
   (command_substitution)