diff --git a/lockfile.json b/lockfile.json
index 527e0061c..12f4a1d4c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -104,12 +104,12 @@
   "json": {
     "revision": "203e239408d642be83edde8988d6e7b20a19f0e8"
   },
-  "jsonc": {
-    "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
-  },
   "json5": {
     "revision": "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"
   },
+  "jsonc": {
+    "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
+  },
   "julia": {
     "revision": "12ea597262125fc22fd2e91aa953ac69b19c26ca"
   },
@@ -207,7 +207,7 @@
     "revision": "8f6b1f357d1231c420404b5f7a368a73c25adfa2"
   },
   "vim": {
-    "revision": "4ac838e468a38455dc14158c25350830e70ddf9a"
+    "revision": "342cd0c05813024f98020bd499d87742dd400cbb"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index eadede98b..7c723da2f 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -64,6 +64,7 @@
   "ruby"
   "perl"
   "python"
+  "highlight"
 ] @keyword
 (map_statement cmd: _ @keyword)
 (command_name) @function.macro
@@ -77,10 +78,14 @@
   "<unique>"
 ] @constant.builtin
 
-[
-  (augroup_name)
-  (au_event)
-] @constant
+(hl_attribute
+  key: _ @property
+  val: _ @constant)
+
+(hl_group) @variable
+(augroup_name) @namespace
+
+(au_event) @constant
 (normal_statement (commands) @constant)
 
 ;; Literals