Adds faces module and function. Renames identifier face to variable.

8 files changed, 44 insertions, 27 deletions

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