diff --git a/colors/base16.kak b/colors/base16.kak
index 99149c7d..4fd0f441 100644
--- a/colors/base16.kak
+++ b/colors/base16.kak
@@ -20,7 +20,9 @@
     echo "
         face value ${orange_dark}+b
         face type ${orange_light}
-        face identifier ${magenta_dark}
+        face variable ${magenta_dark}
+        face module ${green_dark}
+        face function ${cyan_light}
         face string ${green_dark}
         face keyword ${purple_dark}+b
         face operator ${cyan_light}
diff --git a/colors/default.kak b/colors/default.kak
index f0743925..4c2307d3 100644
--- a/colors/default.kak
+++ b/colors/default.kak
@@ -3,7 +3,9 @@
 # For Code
 face value red
 face type yellow
-face identifier green
+face variable green
+face module green
+face function cyan
 face string magenta
 face keyword blue
 face operator yellow
diff --git a/colors/github.kak b/colors/github.kak
index ef2d1221..6ef8dc3d 100644
--- a/colors/github.kak
+++ b/colors/github.kak
@@ -6,7 +6,9 @@
 ## code
 face value rgb:0086B3+b
 face type rgb:795DA3
-face identifier rgb:0086B3
+face variable rgb:0086B3
+face module rgb:0086B3
+face function rgb:A71D5D
 face string rgb:183691
 face keyword rgb:A71D5D+b
 face operator yellow
diff --git a/colors/lucius.kak b/colors/lucius.kak
index b73e60dd..1a4dd334 100644
--- a/colors/lucius.kak
+++ b/colors/lucius.kak
@@ -26,7 +26,9 @@
         # then we map them to code
         face value ${lucius_light_green}
         face type ${lucius_blue}
-        face identifier ${lucius_green}
+        face variable ${lucius_green}
+        face module ${lucius_green}
+        face function ${lucius_light_blue}
         face string ${lucius_light_green}
         face keyword ${lucius_light_blue}
         face operator ${lucius_green}
diff --git a/colors/reeder.kak b/colors/reeder.kak
index 09e1ca9c..5e4ead2a 100644
--- a/colors/reeder.kak
+++ b/colors/reeder.kak
@@ -24,7 +24,9 @@
         # then we map them to code
         face value      ${orange_light}+b
         face type       ${orange}
-        face identifier default
+        face variable   default
+        face module     ${green}
+        face function   default
         face string     ${green}
         face keyword    ${brown_dark}
         face operator   default
diff --git a/colors/solarized.kak b/colors/solarized.kak
index 45021a07..f616c093 100644
--- a/colors/solarized.kak
+++ b/colors/solarized.kak
@@ -24,7 +24,9 @@
         # then we map them to code
         face value      ${cyan}
         face type       ${yellow}
-        face identifier ${blue}
+        face variable   ${blue}
+        face module     ${cyan}
+        face function   default
         face string     ${cyan}
         face keyword    ${green}
         face operator   default
diff --git a/colors/tomorrow-night.kak b/colors/tomorrow-night.kak
index 16461300..348c3841 100644
--- a/colors/tomorrow-night.kak
+++ b/colors/tomorrow-night.kak
@@ -3,29 +3,31 @@
 ##
 
 %sh{
-    foreground='rgb:c5c8c6'
-    background='rgb:272727'
-    selection='rgb:373b41'
-    window='rgb:383838'
-    text='rgb:D8D8D8'
-    text_light='rgb:4E4E4E'
-    line='rgb:282a2e'
-    comment='rgb:969896'
-    red='rgb:cc6666'
-    orange='rgb:d88860'
-    yellow='rgb:f0c674'
-    green='rgb:b5bd68'
-    green_dark='rgb:a1b56c'
-    blue='rgb:81a2be'
-    aqua='rgb:87afaf'
-    magenta='rgb:ab4642'
-    purple='rgb:b294bb'
+    foreground="rgb:c5c8c6"
+    background="rgb:272727"
+    selection="rgb:373b41"
+    window="rgb:383838"
+    text="rgb:D8D8D8"
+    text_light="rgb:4E4E4E"
+    line="rgb:282a2e"
+    comment="rgb:969896"
+    red="rgb:cc6666"
+    orange="rgb:d88860"
+    yellow="rgb:f0c674"
+    green="rgb:b5bd68"
+    green_dark="rgb:a1b56c"
+    blue="rgb:81a2be"
+    aqua="rgb:87afaf"
+    magenta="rgb:ab4642"
+    purple="rgb:b294bb"
 
     ## code
     echo "
         face value ${orange}
         face type ${yellow}
-        face identifier ${magenta}
+        face variable ${magenta}
+        face module ${green}
+        face function ${aqua}
         face string ${green_dark}
         face keyword ${purple}
         face operator ${aqua}
diff --git a/colors/zenburn.kak b/colors/zenburn.kak
index e2d7b26f..a022b0e8 100644
--- a/colors/zenburn.kak
+++ b/colors/zenburn.kak
@@ -20,9 +20,10 @@
     zenspecial="rgb:cfbfaf"
     zenfunction="rgb:efef8f"
     zenstatement="rgb:e3ceab"
-    zenidentifier="rgb:efdcbc"
+    zenvariable="rgb:efdcbc"
     zentype="rgb:dfdfbf"
     zenstring="rgb:cc9393"
+    zenmodule="${zenstring}"
     zenexception="rgb:c3bf9f+b"
     zenmatching="rgb:3f3f3f,rgb:8cd0d3"
     zenpadding="rgb:f0dfaf,rgb:343434+b"
@@ -31,7 +32,9 @@
         # then we map them to code
         face value ${zenconstant}
         face type ${zentype}
-        face identifier ${zenidentifier}
+        face variable ${zenvariable}
+        face module ${zenstring}
+        face function ${zenfunction}
         face string ${zenstring}
         face keyword ${zenkeyword}
         face operator ${zenfunction}
@@ -48,7 +51,7 @@
         face mono ${zennumber}
         face block ${zenstatement}
         face link ${zenstring}
-        face bullet ${zenidentifier}
+        face bullet ${zenvariable}
         face list ${zentype}
 
         # and built in faces
diff --git a/rc/base/css.kak b/rc/base/css.kak
index 9848da77..d995b1b0 100644
--- a/rc/base/css.kak
+++ b/rc/base/css.kak
@@ -31,7 +31,7 @@ add-highlighter -group /css/declaration regex !important 0:keyword
 # element#id element.class
 # universal selector
 add-highlighter -group /css/selector regex         [A-Za-z][A-Za-z0-9_-]* 0:keyword
-add-highlighter -group /css/selector regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:identifier
+add-highlighter -group /css/selector regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:variable
 
 # Commands
 # ‾‾‾‾‾‾‾‾
diff --git a/rc/base/fish.kak b/rc/base/fish.kak
index f2875b33..a417b1ea 100644
--- a/rc/base/fish.kak
+++ b/rc/base/fish.kak
@@ -17,11 +17,11 @@ add-highlighter -group / regions -default code fish \
     comment       '#' '$'              ''
 
 add-highlighter -group /fish/double_string fill string
-add-highlighter -group /fish/double_string regex (\$\w+)|(\{\$\w+\}) 0:identifier
+add-highlighter -group /fish/double_string regex (\$\w+)|(\{\$\w+\}) 0:variable
 add-highlighter -group /fish/single_string fill string
 add-highlighter -group /fish/comment       fill comment
 
-add-highlighter -group /fish/code regex (\$\w+)|(\{\$\w+\}) 0:identifier
+add-highlighter -group /fish/code regex (\$\w+)|(\{\$\w+\}) 0:variable
 
 # Command names are collected using `builtin --names` and 'eval' from `functions --names`
 add-highlighter -group /fish/code regex \b(and|begin|bg|bind|block|break|breakpoint|builtin|case|cd|command|commandline|complete|contains|continue|count|echo|else|emit|end|eval|exec|exit|fg|for|function|functions|history|if|jobs|not|or|printf|pwd|random|read|return|set|set_color|source|status|switch|test|ulimit|while)\b 0:keyword
diff --git a/rc/base/gas.kak b/rc/base/gas.kak
index 04ec6a35..0a657dd1 100644
--- a/rc/base/gas.kak
+++ b/rc/base/gas.kak
@@ -29,7 +29,7 @@ add-highlighter -group /gas/code regex ((^|\s+)\.([248]byte|align|arch(_extensio
 add-highlighter -group /gas/code regex ((^|\s+)\.(abort|ABORT|align|app-file|ascii|asciz|balign[wl]|byte|comm|data|def|desc|dim|double|eject|else|endif|equ|extern|file|fill|float|global|globl|hword|ident|if|include|int|irp|irpc|lcomm|iflags|line|linkonce|ln|mri|list|loc|local|long|macro|nolist|octa|org|print|purgem|p2align[wl]|psize|quad|rept|sbttl|section|set|short|single|size|skip|space|stab[dns]|string|struct|tag|text|title|type|title|uleb128|val|vtable_entry|weak|word|rodata|zero)(\h+|$)) 0:type
 
 # Registers
-add-highlighter -group /gas/code regex \%(([re](ax|bx|cx|dx|si|di|bp|sp))|(al|bl|cl|dl|sil|dil|bpl|spl)|(r[8-9][dwb])|(r1[0-5][dwb])|(cs|ds|es|fs|gs|ss|ip|eflags)|([xy]mm[0-9]|[xy]mm1[0-5]))\b 0:identifier
+add-highlighter -group /gas/code regex \%(([re](ax|bx|cx|dx|si|di|bp|sp))|(al|bl|cl|dl|sil|dil|bpl|spl)|(r[8-9][dwb])|(r1[0-5][dwb])|(cs|ds|es|fs|gs|ss|ip|eflags)|([xy]mm[0-9]|[xy]mm1[0-5]))\b 0:variable
 
 # General Instructions
 add-highlighter -group /gas/code regex \
diff --git a/rc/base/ini.kak b/rc/base/ini.kak
index 871187ca..47b39d33 100644
--- a/rc/base/ini.kak
+++ b/rc/base/ini.kak
@@ -6,7 +6,7 @@ add-highlighter -group / regions -default code ini \
     comment (^|\h)\K\# $ ''
 
 add-highlighter -group /ini/code regex "^\h*\[[^\]]*\]" 0:title
-add-highlighter -group /ini/code regex "^\h*([^\[][^=\n]*=)([^\n]*)" 1:identifier 2:value
+add-highlighter -group /ini/code regex "^\h*([^\[][^=\n]*=)([^\n]*)" 1:variable 2:value
 
 add-highlighter -group /ini/comment fill comment
 
diff --git a/rc/base/javascript.kak b/rc/base/javascript.kak
index a59f245a..39c7e1c5 100644
--- a/rc/base/javascript.kak
+++ b/rc/base/javascript.kak
@@ -27,7 +27,7 @@ add-highlighter -group /javascript/comment       fill comment
 add-highlighter -group /javascript/literal       fill string
 add-highlighter -group /javascript/literal       regex \${.*?} 0:value
 
-add-highlighter -group /javascript/code regex \$\w* 0:identifier
+add-highlighter -group /javascript/code regex \$\w* 0:variable
 add-highlighter -group /javascript/code regex \b(document|false|null|parent|self|this|true|undefined|window)\b 0:value
 add-highlighter -group /javascript/code regex "-?[0-9]*\.?[0-9]+" 0:value
 add-highlighter -group /javascript/code regex \b(Array|Boolean|Date|Function|Number|Object|RegExp|String)\b 0:type
diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak
index 8fbc17aa..745f77ca 100644
--- a/rc/base/lisp.kak
+++ b/rc/base/lisp.kak
@@ -20,7 +20,7 @@ add-highlighter -group /lisp/comment fill comment
 
 add-highlighter -group /lisp/code regex \b(nil|true|false)\b 0:value
 add-highlighter -group /lisp/code regex (((\Q***\E)|(///)|(\Q+++\E)){1,3})|(1[+-])|(<|>|<=|=|>=|) 0:operator
-add-highlighter -group /lisp/code regex \b(([':]\w+)|([*]\H+[*]))\b 0:identifier
+add-highlighter -group /lisp/code regex \b(([':]\w+)|([*]\H+[*]))\b 0:variable
 add-highlighter -group /lisp/code regex \b(def[a-z]+|if|do|let|lambda|catch|and|assert|while|def|do|fn|finally|let|loop|new|quote|recur|set!|throw|try|var|case|if-let|if-not|when|when-first|when-let|when-not|(cond(->|->>)?))\b 0:keyword
 
 # Commands
diff --git a/rc/base/perl.kak b/rc/base/perl.kak
index 24e53657..27fc720f 100644
--- a/rc/base/perl.kak
+++ b/rc/base/perl.kak
@@ -65,7 +65,7 @@ add-highlighter -group /perl/code regex \b-(B|b|C|c|d|e|f|g|k|l|M|O|o|p|r|R|S|s|
 add-highlighter -group /perl/code regex %{(?:\b[stqrmwy]+)?/[^\n/]*/([msixpodualngecr]+\b)?} 0:magenta
 add-highlighter -group /perl/code regex %{(?:\b[stqrmwy]+)?/[^\n/]+/[^\n/]*/([msixpeodualngcr]+\b)?} 0:magenta
 
-add-highlighter -group /perl/code regex \$[a-zA-Z_][a-zA-Z0-9_]* 0:identifier
+add-highlighter -group /perl/code regex \$[a-zA-Z_][a-zA-Z0-9_]* 0:variable
 
 add-highlighter -group /perl/code regex \$(a|b|LAST_REGEXP_CODE_RESULT|LIST_SEPARATOR|MATCH|MULTILINE_MATCHING|NR|OFMT|OFS|ORS|OS_ERROR|OSNAME|OUTPUT_AUTO_FLUSH|OUTPUT_FIELD_SEPARATOR|OUTPUT_RECORD_SEPARATOR)\b 0:value
 add-highlighter -group /perl/code regex \$(LAST_REGEXP_CODE_RESULT|LIST_SEPARATOR|MATCH|MULTILINE_MATCHING|NR|OFMT|OFS|ORS|OS_ERROR|OSNAME|OUTPUT_AUTO_FLUSH|OUTPUT_FIELD_SEPARATOR|OUTPUT_RECORD_SEPARATOR|PERL_VERSION|ACCUMULATOR|PERLDB|ARG|PID|ARGV|POSTMATCH|PREMATCH|BASETIME|PROCESS_ID|CHILD_ERROR|PROGRAM_NAME|COMPILING|REAL_GROUP_ID|DEBUGGING|REAL_USER_ID|EFFECTIVE_GROUP_ID|RS|EFFECTIVE_USER_ID|SUBSCRIPT_SEPARATOR|EGID|SUBSEP|ERRNO|SYSTEM_FD_MAX|EUID|UID|EVAL_ERROR|WARNING|EXCEPTIONS_BEING_CAUGHT|EXECUTABLE_NAME|EXTENDED_OS_ERROR|FORMAT_FORMFEED|FORMAT_LINE_BREAK_CHARACTERS|FORMAT_LINES_LEFT|FORMAT_LINES_PER_PAGE|FORMAT_NAME|FORMAT_PAGE_NUMBER|FORMAT_TOP_NAME|GID|INPLACE_EDIT|INPUT_LINE_NUMBER|INPUT_RECORD_SEPARATOR|LAST_MATCH_END|LAST_PAREN_MATCH)\b 0:value
diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak
index 0c939a5b..c22c44e2 100644
--- a/rc/base/ruby.kak
+++ b/rc/base/ruby.kak
@@ -45,7 +45,7 @@ add-highlighter -group /ruby/comment fill comment
 
 add-highlighter -group /ruby/literal fill meta
 
-add-highlighter -group /ruby/code regex \b([A-Za-z]\w*:(?=[^:]))|([$@][A-Za-z]\w*)|((?<=[^:]):[A-Za-z]\w*[=?!]?)|([A-Z]\w*|^|\h)\K::(?=[A-Z]) 0:identifier
+add-highlighter -group /ruby/code regex \b([A-Za-z]\w*:(?=[^:]))|([$@][A-Za-z]\w*)|((?<=[^:]):[A-Za-z]\w*[=?!]?)|([A-Z]\w*|^|\h)\K::(?=[A-Z]) 0:variable
 
 %sh{
     # Grammar
diff --git a/rc/base/scala.kak b/rc/base/scala.kak
index ab7a0d19..0aee0a97 100644
--- a/rc/base/scala.kak
+++ b/rc/base/scala.kak
@@ -18,7 +18,7 @@ add-highlighter -group / regions -default code scala \
     comment /[*] [*]/                 /[*]
 
 add-highlighter -group /scala/string  fill string
-add-highlighter -group /scala/literal fill identifier
+add-highlighter -group /scala/literal fill variable
 add-highlighter -group /scala/comment fill comment
 
 # Keywords are collected at
@@ -29,7 +29,7 @@ add-highlighter -group /scala/code regex \b(this|true|false|null)\b 0:value
 add-highlighter -group /scala/code regex \b(become|case|catch|class|def|do|else|extends|final|finally|for|forSome|goto|if|initialize|macro|match|new|object|onTransition|return|startWith|stay|throw|trait|try|unbecome|using|val|var|when|while|with|yield)\b 0:keyword
 add-highlighter -group /scala/code regex \b(abstract|final|implicit|implicitly|lazy|override|private|protected|require|sealed|super)\b 0:attribute
 add-highlighter -group /scala/code regex \b(⇒|=>|<:|:>|=:=|::|&&|\|\|)\b 0:operator
-add-highlighter -group /scala/code regex "'[_A-Za-z0-9$]+" 0:identifier
+add-highlighter -group /scala/code regex "'[_A-Za-z0-9$]+" 0:variable
 
 # Commands
 # ‾‾‾‾‾‾‾‾
diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index 102eb4e6..228d127e 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -134,7 +134,7 @@ def -hidden c-family-insert-on-newline %[ eval -draft %[
             add-highlighter -group /FT/comment fill comment
             add-highlighter -group /FT/disabled fill rgb:666666
             add-highlighter -group /FT/macro fill meta
-            add-highlighter -group /FT/macro regex ^\h*#include\h+(\S*) 1:identifier
+            add-highlighter -group /FT/macro regex ^\h*#include\h+(\S*) 1:module
             ' | sed -e "s/FT/${ft}/g; s/QUOTE/'/g; s/MAYBEAT/${maybe_at}/;"
     done
 }
diff --git a/rc/core/kakrc.kak b/rc/core/kakrc.kak
index 4bf34855..85ddb374 100644
--- a/rc/core/kakrc.kak
+++ b/rc/core/kakrc.kak
@@ -38,9 +38,9 @@ add-highlighter -group / regions -default code kakrc \
 }
 
 add-highlighter -group /kakrc/code regex \brgb:[0-9a-fA-F]{6}\b 0:value
-add-highlighter -group /kakrc/code regex (?:\bhook)\h+(?:-group\h+\S+\h+)?(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:Error 3:identifier
-add-highlighter -group /kakrc/code regex (?:\bset)\h+(?:-add)?\h+(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:Error 3:identifier
-add-highlighter -group /kakrc/code regex (?:\bmap)\h+(?:(global|buffer|window)|(\S+))\h+(?:(normal|insert|menu|prompt|goto|view|user|object)|(\S+))\h+(\S+) 1:attribute 2:Error 3:attribute 4:Error 5:identifier
+add-highlighter -group /kakrc/code regex (?:\bhook)\h+(?:-group\h+\S+\h+)?(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:Error 3:variable
+add-highlighter -group /kakrc/code regex (?:\bset)\h+(?:-add)?\h+(?:(global|buffer|window)|(\S+))\h+(\S+) 1:attribute 2:Error 3:variable
+add-highlighter -group /kakrc/code regex (?:\bmap)\h+(?:(global|buffer|window)|(\S+))\h+(?:(normal|insert|menu|prompt|goto|view|user|object)|(\S+))\h+(\S+) 1:attribute 2:Error 3:attribute 4:Error 5:variable
 
 add-highlighter -group /kakrc/double_string fill string
 add-highlighter -group /kakrc/single_string fill string
diff --git a/rc/core/makefile.kak b/rc/core/makefile.kak
index 3ef2e592..3e610408 100644
--- a/rc/core/makefile.kak
+++ b/rc/core/makefile.kak
@@ -15,7 +15,7 @@ add-highlighter -group / regions -default content makefile \
 add-highlighter -group /makefile/comment fill comment
 add-highlighter -group /makefile/eval fill value
 
-add-highlighter -group /makefile/content regex ^[\w.%-]+\h*:\s 0:identifier
+add-highlighter -group /makefile/content regex ^[\w.%-]+\h*:\s 0:variable
 add-highlighter -group /makefile/content regex [+?:]= 0:operator
 
 %sh{
diff --git a/rc/core/sh.kak b/rc/core/sh.kak
index 515c2d79..37936f0d 100644
--- a/rc/core/sh.kak
+++ b/rc/core/sh.kak
@@ -31,11 +31,11 @@ add-highlighter -group /sh/heredoc fill string
 }
 
 add-highlighter -group /sh/code regex [\[\]\(\)&|]{1,2} 0:operator
-add-highlighter -group /sh/code regex (\w+)= 1:identifier
-add-highlighter -group /sh/code regex ^\h*(\w+)\h*\(\) 1:identifier
+add-highlighter -group /sh/code regex (\w+)= 1:variable
+add-highlighter -group /sh/code regex ^\h*(\w+)\h*\(\) 1:variable
 
 add-highlighter -group /sh/code regex \$(\w+|\{.+?\}|#|@|\?|\$|!|-|\*) 0:value
-add-highlighter -group /sh/double_string regex \$(\w+|\{.+?\}) 0:identifier
+add-highlighter -group /sh/double_string regex \$(\w+|\{.+?\}) 0:variable
 
 hook -group sh-highlight global WinSetOption filetype=sh %{ add-highlighter ref sh }
 hook -group sh-highlight global WinSetOption filetype=(?!sh).* %{ remove-highlighter sh }
diff --git a/rc/extra/cabal.kak b/rc/extra/cabal.kak
index ae636938..5a64d978 100644
--- a/rc/extra/cabal.kak
+++ b/rc/extra/cabal.kak
@@ -19,7 +19,7 @@ add-highlighter -group /cabal/comment fill comment
 
 add-highlighter -group /cabal/code regex \b(true|false)\b|(([<>]?=?)?\d+(\.\d+)+) 0:value
 add-highlighter -group /cabal/code regex \b(if|else)\b 0:keyword
-add-highlighter -group /cabal/code regex ^\h*([A-Za-z][A-Za-z0-9_-]*)\h*: 1:identifier
+add-highlighter -group /cabal/code regex ^\h*([A-Za-z][A-Za-z0-9_-]*)\h*: 1:variable
 
 # Commands
 # ‾‾‾‾‾‾‾‾
diff --git a/rc/extra/coffee.kak b/rc/extra/coffee.kak
index 73809b3b..081a6372 100644
--- a/rc/extra/coffee.kak
+++ b/rc/extra/coffee.kak
@@ -36,7 +36,7 @@ add-highlighter -group /coffee/comment fill comment
 # Keywords are collected at
 # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#Keywords
 # http://coffeescript.org/documentation/docs/lexer.html#section-63
-add-highlighter -group /coffee/code regex [$@]\w* 0:identifier
+add-highlighter -group /coffee/code regex [$@]\w* 0:variable
 add-highlighter -group /coffee/code regex \b(Array|Boolean|Date|Function|Number|Object|RegExp|String)\b 0:type
 add-highlighter -group /coffee/code regex \b(document|false|no|null|off|on|parent|self|this|true|undefined|window|yes)\b 0:value
 add-highlighter -group /coffee/code regex \b(and|is|isnt|not|or)\b 0:operator
diff --git a/rc/extra/haml.kak b/rc/extra/haml.kak
index 6bb30200..75169e43 100644
--- a/rc/extra/haml.kak
+++ b/rc/extra/haml.kak
@@ -28,7 +28,7 @@ add-highlighter -group /haml/coffee ref coffee
 add-highlighter -group /haml/sass   ref sass
 
 add-highlighter -group /haml/code regex ^\h*(:[a-z]+|-|=)|^(!!!)$ 0:meta
-add-highlighter -group /haml/code regex ^\h*%([A-Za-z][A-Za-z0-9_-]*)([#.][A-Za-z][A-Za-z0-9_-]*)? 1:keyword 2:identifier
+add-highlighter -group /haml/code regex ^\h*%([A-Za-z][A-Za-z0-9_-]*)([#.][A-Za-z][A-Za-z0-9_-]*)? 1:keyword 2:variable
 
 # Commands
 # ‾‾‾‾‾‾‾‾
diff --git a/rc/extra/moon.kak b/rc/extra/moon.kak
index 78807da8..cbba288c 100644
--- a/rc/extra/moon.kak
+++ b/rc/extra/moon.kak
@@ -24,7 +24,7 @@ add-highlighter -group /moon/single_string fill string
 
 add-highlighter -group /moon/comment fill comment
 
-add-highlighter -group /moon/code regex ([.\\](?=[A-Za-z]\w*))|(\b[A-Za-z]\w*:)|(\b[A-Za-z]\w*\K!+)|(\W\K[@:][A-Za-z]\w*) 0:identifier
+add-highlighter -group /moon/code regex ([.\\](?=[A-Za-z]\w*))|(\b[A-Za-z]\w*:)|(\b[A-Za-z]\w*\K!+)|(\W\K[@:][A-Za-z]\w*) 0:variable
 add-highlighter -group /moon/code regex \b(and|break|catch|class|continue|do|else(if)?|export|extends|false|finally|for|from|if|import|in|local|nil|not|or|return|super|switch|then|true|try|unless|using|when|while|with)\b 0:keyword
 
 # Commands
diff --git a/rc/extra/php.kak b/rc/extra/php.kak
index 7889c2a5..f3242441 100644
--- a/rc/extra/php.kak
+++ b/rc/extra/php.kak
@@ -19,7 +19,7 @@ add-highlighter -group /php/double_string fill string
 add-highlighter -group /php/single_string fill string
 add-highlighter -group /php/comment       fill comment
 
-add-highlighter -group /php/code regex \$\w* 0:identifier
+add-highlighter -group /php/code regex \$\w* 0:variable
 add-highlighter -group /php/code regex \b(false|null|parent|self|this|true)\b 0:value
 add-highlighter -group /php/code regex "-?[0-9]*\.?[0-9]+" 0:value
 add-highlighter -group /php/code regex \b((string|int|bool)|[A-Z][a-z].*?)\b 0:type
diff --git a/rc/extra/pony.kak b/rc/extra/pony.kak
index a5f577b6..1c045d9b 100644
--- a/rc/extra/pony.kak
+++ b/rc/extra/pony.kak
@@ -59,7 +59,7 @@ addhl -group /pony/comment       fill comment
         addhl -group /pony/code regex '\b(${keywords})\b' 0:keyword
         addhl -group /pony/code regex ';' 0:keyword
         addhl -group /pony/code regex '^\s*|' 0:keyword
-        addhl -group /pony/code regex '\b(${struct})\b' 0:identifier
+        addhl -group /pony/code regex '\b(${struct})\b' 0:variable
         addhl -group /pony/code regex '\b(${capabilities})\b(!|^)?' 1:builtin 2:builtin
     "
 
diff --git a/rc/extra/pug.kak b/rc/extra/pug.kak
index c8983a78..7a338a01 100644
--- a/rc/extra/pug.kak
+++ b/rc/extra/pug.kak
@@ -38,7 +38,7 @@ add-highlighter -group /pug/puglang          regex   \b(\block|extends|include|a
 add-highlighter -group /pug/attribute        regex   [()=]                             0:operator
 add-highlighter -group /pug/text             regex   \h*(\|)                           1:meta
 add-highlighter -group /pug/code             regex   ^\h*([A-Za-z][A-Za-z0-9_-]*)      1:type
-add-highlighter -group /pug/code             regex   (\#[A-Za-z][A-Za-z0-9_-]*)        1:identifier
+add-highlighter -group /pug/code             regex   (\#[A-Za-z][A-Za-z0-9_-]*)        1:variable
 add-highlighter -group /pug/code             regex   ((?:\.[A-Za-z][A-Za-z0-9_-]*)*)   1:value
 
 # Commands
diff --git a/rc/extra/ragel.kak b/rc/extra/ragel.kak
index cc396cf5..416743af 100644
--- a/rc/extra/ragel.kak
+++ b/rc/extra/ragel.kak
@@ -22,7 +22,7 @@ add-highlighter -group /ragel/string  fill string
 add-highlighter -group /ragel/comment fill comment
 
 add-highlighter -group /ragel/code regex \b(true|false)\b 0:value
-add-highlighter -group /ragel/code regex '%%\{|\}%%|<\w+>' 0:identifier
+add-highlighter -group /ragel/code regex '%%\{|\}%%|<\w+>' 0:variable
 add-highlighter -group /ragel/code regex :=|=>|->|:>|:>>|<: 0:operator
 add-highlighter -group /ragel/code regex \b(action|alnum|alpha|any|ascii|case|cntrl|contained|context|data|digit|empty|eof|err|error|exec|export|exports|extend|fblen|fbreak|fbuf|fc|fcall|fcurs|fentry|fexec|fgoto|fhold|first_final|fnext|fpc|fret|from|fstack|ftargs|graph|import|include|init|inwhen|lerr|lower|machine|nocs|noend|noerror|nofinal|noprefix|outwhen|postpop|prepush|print|punct|range|space|start|to|upper|when|write|xdigit|zlen)\b 0:keyword
 
diff --git a/rc/extra/sass.kak b/rc/extra/sass.kak
index 37c5f192..0910ee68 100644
--- a/rc/extra/sass.kak
+++ b/rc/extra/sass.kak
@@ -19,7 +19,7 @@ add-highlighter -group / regions -default code sass \
 add-highlighter -group /sass/string  fill string
 add-highlighter -group /sass/comment fill comment
 
-add-highlighter -group /sass/code regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:identifier
+add-highlighter -group /sass/code regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:variable
 add-highlighter -group /sass/code regex &|@[A-Za-z][A-Za-z0-9_-]* 0:meta
 add-highlighter -group /sass/code regex (#[0-9A-Fa-f]+)|((\d*\.)?\d+(em|px)) 0:value
 add-highlighter -group /sass/code regex ([A-Za-z][A-Za-z0-9_-]*)\h*: 1:keyword
diff --git a/rc/extra/taskpaper.kak b/rc/extra/taskpaper.kak
index 8fb02be0..c4bb0638 100644
--- a/rc/extra/taskpaper.kak
+++ b/rc/extra/taskpaper.kak
@@ -14,7 +14,7 @@ hook global BufCreate .*\.taskpaper %{
 add-highlighter -group / group taskpaper
 
 add-highlighter -group /taskpaper regex ^\h*([^:\n]+):\h*\n 1:header
-add-highlighter -group /taskpaper regex \h@\w+(?:\(([^)]*)\))? 0:identifier 1:value
+add-highlighter -group /taskpaper regex \h@\w+(?:\(([^)]*)\))? 0:variable 1:value
 add-highlighter -group /taskpaper regex ^\h*([^-:\n]+)\n 1:+i
 add-highlighter -group /taskpaper regex ^\h*-\h+[^\n]*@done[^\n]* 0:+d
 add-highlighter -group /taskpaper regex (([a-z]+://\S+)|((mailto:)[\w+-]+@\S+)) 0:link