diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 8c86cea94..c3ce3dd94 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -59,10 +59,14 @@
   "execute"
   "normal"
   "set"
+  "setfiletype"
   "setlocal"
   "silent"
   "echo"
+  "echon"
+  "echohl"
   "echomsg"
+  "echoerr"
   "autocmd"
   "augroup"
   "return"
@@ -130,6 +134,8 @@
   "match"
   "cluster"
   "region"
+  "clear"
+  "include"
 ] @keyword)
 
 (syntax_argument name: _ @keyword)