diff --git a/rc/kakrc.kak b/rc/kakrc.kak
index 3b9b9b7d..51323a81 100644
--- a/rc/kakrc.kak
+++ b/rc/kakrc.kak
@@ -8,11 +8,11 @@ addhl -group / regions -default code kakrc \
     single_string %{(^|\h)'} %{(?<!\\)(\\\\)*'} '' \
     shell '%sh\{' '\}' '\{'
 
-addhl -group /kakrc/code regex \<(hook|rmhooks|addhl|rmhl|add|exec|eval|source|runtime|def|decl|echo|edit|set)\> 0:keyword
-addhl -group /kakrc/code regex \<(default|black|red|green|yellow|blue|magenta|cyan|white)\> 0:value
-addhl -group /kakrc/code regex (?<=\<hook)\h+((global|buffer|window)|(\S+))\h+(\S+)\h+(\H+) 2:attribute 3:error 4:identifier 5:string
-addhl -group /kakrc/code regex (?<=\<set)\h+((global|buffer|window)|(\S+))\h+(\S+)\h+(\S+) 2:attribute 3:error 4:identifier 5:value
-addhl -group /kakrc/code regex (?<=\<regex)\h+(\S+) 1:string
+addhl -group /kakrc/code regex \<(hook|rmhooks|addhl|rmhl|add|exec|eval|source|runtime|def|decl|echo|edit|set|map|face|prompt|menu|info|try|catch|nameclient|namebuf|cd)\> 0:keyword
+addhl -group /kakrc/code regex \<(default|black|red|green|yellow|blue|magenta|cyan|white|(?:rgb:[0-9a-fA-F]{6}))\> 0:value
+addhl -group /kakrc/code regex (?:\<hook)\h+(?:(global|buffer|window)|(\S+))\h+(\S+)\h+(\S+)? 1:attribute 2:error 3:identifier 4:string
+addhl -group /kakrc/code regex (?:\<set)\h+(?:(global|buffer|window)|(\S+))\h+(\S+)\h+(\S+)? 1:attribute 2:error 3:identifier 4:string
+addhl -group /kakrc/code regex (?:\<map)\h+(?:(global|buffer|window)|(\S+))\h+(?:(normal|insert|prompt|menu)|(\S+))\h+(\S+)\h+(\S+)? 1:attribute 2:error 3:attribute 4:error 5:identifier 6:string
 
 addhl -group /kakrc/double_string fill string
 addhl -group /kakrc/single_string fill string