diff --git a/rc/filetype/lua.kak b/rc/filetype/lua.kak
index 7e9c06573..318a20e53 100644
--- a/rc/filetype/lua.kak
+++ b/rc/filetype/lua.kak
@@ -45,7 +45,14 @@ add-highlighter shared/lua/double_string region '"'   (?<!\\)(?:\\\\)*" fill str
 add-highlighter shared/lua/single_string region "'"   (?<!\\)(?:\\\\)*' fill string
 add-highlighter shared/lua/comment       region '--'  $                 fill comment
 
-add-highlighter shared/lua/code/ regex \b(and|break|do|else|elseif|end|false|for|function|goto|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b 0:keyword
+add-highlighter shared/lua/code/keyword regex \b(and|break|do|else|elseif|end|for|function|goto|if|in|not|or|repeat|return|then|until|while)\b 0:keyword
+add-highlighter shared/lua/code/value regex \b(false|nil|true|[0-9]+(:?\.[0-9])?(:?[eE]-?[0-9]+)?|0x[0-9a-fA-F])\b 0:value
+add-highlighter shared/lua/code/operator regex (\+|-|\*|/|%|\^|==?|~=|<=?|>=?|\.\.|#) 0:operator
+add-highlighter shared/lua/code/builtin regex \b(_G|_E)\b 0:builtin
+add-highlighter shared/lua/code/module regex \b(_G|_E)\b 0:module
+add-highlighter shared/lua/code/attribute regex \b(local)\b 0:attribute
+add-highlighter shared/lua/code/function_declaration regex \b(?:function\h+)(?:\w+\h*\.\h*)*([a-zA-Z_]\w*)\( 1:function
+add-highlighter shared/lua/code/function_call regex \b([a-zA-Z_]\w*)\h*(?=[\(\{]) 1:function
 
 # Commands
 # ‾‾‾‾‾‾‾‾