diff --git a/.config/kak/autoload/filetype/kakrc.kak b/.config/kak/autoload/filetype/kakrc.kak
index 1914e464..3f9e1c36 100644
--- a/.config/kak/autoload/filetype/kakrc.kak
+++ b/.config/kak/autoload/filetype/kakrc.kak
@@ -1,3 +1,5 @@
+# FROM STDRC, PATCHED BY DANIEL
+# Adds default aliases as keywords
 # http://kakoune.org
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
@@ -63,6 +65,7 @@ evaluate-commands %sh{
               select set-face set-option set-register source trigger-user-hook try
               unalias unmap unset-face unset-option update-option
               write write! write-all write-all-quit write-quit write-quit!"
+    aliases="addhl decl def compl eval exec rmhl rmhooks face set unset"
     attributes="global buffer window current
                 normal insert prompt goto view user object
                 number-lines show-matching show-whitespaces fill regex dynregex group flag-lines
@@ -80,6 +83,9 @@ evaluate-commands %sh{
                    add-highlighter shared/kakrc/code/attributes regex (?:\s|\A)\K($(join "${attributes}" '|'))(?:(?=\s)|\z) 0:attribute
                    add-highlighter shared/kakrc/code/types regex (?:\s|\A)\K($(join "${types}" '|'))(?:(?=\s)|\z) 0:type
                    add-highlighter shared/kakrc/code/values regex (?:\s|\A)\K($(join "${values}" '|'))(?:(?=\s)|\z) 0:value"
+    if [ -n "$kak_opt_extra_kak_keywords" ]; then
+        printf '%\n' "add-highlighter shared/kakrc/code/aliases regex (?:\s|\A)\K($(join "${kak_opt_extra_kak_keywords}" '|'))(?:(?=\s)|\z) 0:keyword"
+    fi
 }
 
 add-highlighter shared/kakrc/code/colors regex \b(rgb:[0-9a-fA-F]{6}|rgba:[0-9a-fA-F]{8})\b 0:value