Make FaceRegistry scoped

set-face now takes a scope argument, and faces can be overridden on
a buffer or window basis.

colorscheme apply on global scope, which should be good enough for
now.

Fixes #1411

11 files changed, 472 insertions, 472 deletions

diff --git a/colors/base16.kak b/colors/base16.kak
index 6284df5e..055b5d95 100644
--- a/colors/base16.kak
+++ b/colors/base16.kak
@@ -18,56 +18,56 @@
 
     ## code
     echo "
-        face value ${orange_dark}+b
-        face type ${orange_light}
-        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}
-        face attribute ${orange_dark}
-        face comment ${grey_dark}
-        face meta ${orange_light}
-        face builtin default+b
+        face global value ${orange_dark}+b
+        face global type ${orange_light}
+        face global variable ${magenta_dark}
+        face global module ${green_dark}
+        face global function ${cyan_light}
+        face global string ${green_dark}
+        face global keyword ${purple_dark}+b
+        face global operator ${cyan_light}
+        face global attribute ${orange_dark}
+        face global comment ${grey_dark}
+        face global meta ${orange_light}
+        face global builtin default+b
     "
 
     ## markup
     echo "
-        face title blue
-        face header ${cyan_light}
-        face bold ${orange_light}
-        face italic ${orange_dark}
-        face mono ${green_dark}
-        face block ${orange_dark}
-        face link blue
-        face bullet ${magenta_light}
-        face list ${magenta_dark}
+        face global title blue
+        face global header ${cyan_light}
+        face global bold ${orange_light}
+        face global italic ${orange_dark}
+        face global mono ${green_dark}
+        face global block ${orange_dark}
+        face global link blue
+        face global bullet ${magenta_light}
+        face global list ${magenta_dark}
     "
 
     ## builtin
     echo "
-        face Default ${grey_light},${black_lighter}
-        face PrimarySelection white,blue
-        face SecondarySelection black,blue
-        face PrimaryCursor black,white
-        face SecondaryCursor black,white
-        face PrimaryCursorEol black,${cyan_light}
-        face SecondaryCursorEol black,${cyan_light}
-        face LineNumbers ${grey_light},${black_lighter}
-        face LineNumberCursor ${grey_light},rgb:282828+b
-        face MenuForeground ${grey_light},blue
-        face MenuBackground blue,${grey_light}
-        face MenuInfo ${cyan_light}
-        face Information ${black_light},${cyan_light}
-        face Error ${grey_light},${magenta_light}
-        face StatusLine ${grey_light},${black_lighterer}
-        face StatusLineMode ${orange_dark}
-        face StatusLineInfo ${cyan_light}
-        face StatusLineValue ${green_dark}
-        face StatusCursor ${black_lighterer},${cyan_light}
-        face Prompt ${black_light},${cyan_light}
-        face MatchingChar ${cyan_light},${black_light}+b
-        face BufferPadding ${cyan_light},${black_lighter}
+        face global Default ${grey_light},${black_lighter}
+        face global PrimarySelection white,blue
+        face global SecondarySelection black,blue
+        face global PrimaryCursor black,white
+        face global SecondaryCursor black,white
+        face global PrimaryCursorEol black,${cyan_light}
+        face global SecondaryCursorEol black,${cyan_light}
+        face global LineNumbers ${grey_light},${black_lighter}
+        face global LineNumberCursor ${grey_light},rgb:282828+b
+        face global MenuForeground ${grey_light},blue
+        face global MenuBackground blue,${grey_light}
+        face global MenuInfo ${cyan_light}
+        face global Information ${black_light},${cyan_light}
+        face global Error ${grey_light},${magenta_light}
+        face global StatusLine ${grey_light},${black_lighterer}
+        face global StatusLineMode ${orange_dark}
+        face global StatusLineInfo ${cyan_light}
+        face global StatusLineValue ${green_dark}
+        face global StatusCursor ${black_lighterer},${cyan_light}
+        face global Prompt ${black_light},${cyan_light}
+        face global MatchingChar ${cyan_light},${black_light}+b
+        face global BufferPadding ${cyan_light},${black_lighter}
     "
 }
diff --git a/colors/default.kak b/colors/default.kak
index 4a00045c..518c86d3 100644
--- a/colors/default.kak
+++ b/colors/default.kak
@@ -1,50 +1,50 @@
 # Kakoune default color scheme
 
 # For Code
-face value red
-face type yellow
-face variable green
-face module green
-face function cyan
-face string magenta
-face keyword blue
-face operator yellow
-face attribute green
-face comment cyan
-face meta magenta
-face builtin default+b
+face global value red
+face global type yellow
+face global variable green
+face global module green
+face global function cyan
+face global string magenta
+face global keyword blue
+face global operator yellow
+face global attribute green
+face global comment cyan
+face global meta magenta
+face global builtin default+b
 
 # For markup
-face title blue
-face header cyan
-face bold red
-face italic yellow
-face mono green
-face block magenta
-face link cyan
-face bullet cyan
-face list yellow
+face global title blue
+face global header cyan
+face global bold red
+face global italic yellow
+face global mono green
+face global block magenta
+face global link cyan
+face global bullet cyan
+face global list yellow
 
 # builtin faces
-face Default default,default
-face PrimarySelection white,blue
-face SecondarySelection black,blue
-face PrimaryCursor black,white
-face SecondaryCursor black,white
-face PrimaryCursorEol black,cyan
-face SecondaryCursorEol black,cyan
-face LineNumbers default,default
-face LineNumberCursor default,default+r
-face MenuForeground white,blue
-face MenuBackground blue,white
-face MenuInfo cyan
-face Information black,yellow
-face Error black,red
-face StatusLine cyan,default
-face StatusLineMode yellow,default
-face StatusLineInfo blue,default
-face StatusLineValue green,default
-face StatusCursor black,cyan
-face Prompt yellow,default
-face MatchingChar default,default+b
-face BufferPadding blue,default
+face global Default default,default
+face global PrimarySelection white,blue
+face global SecondarySelection black,blue
+face global PrimaryCursor black,white
+face global SecondaryCursor black,white
+face global PrimaryCursorEol black,cyan
+face global SecondaryCursorEol black,cyan
+face global LineNumbers default,default
+face global LineNumberCursor default,default+r
+face global MenuForeground white,blue
+face global MenuBackground blue,white
+face global MenuInfo cyan
+face global Information black,yellow
+face global Error black,red
+face global StatusLine cyan,default
+face global StatusLineMode yellow,default
+face global StatusLineInfo blue,default
+face global StatusLineValue green,default
+face global StatusCursor black,cyan
+face global Prompt yellow,default
+face global MatchingChar default,default+b
+face global BufferPadding blue,default
diff --git a/colors/desertex.kak b/colors/desertex.kak
index 25981320..b1fe21dd 100644
--- a/colors/desertex.kak
+++ b/colors/desertex.kak
@@ -1,79 +1,79 @@
 # desertex theme
 
 # Code
-face value      rgb:fa8072
-face type       rgb:dfdfbf
-face identifier rgb:87ceeb
-face string     rgb:fa8072
-face error      rgb:c3bf9f+b
-face keyword    rgb:eedc82
-face operator   rgb:87ceeb
-face attribute  rgb:eedc82
-face comment    rgb:7ccd7c+i
+face global value      rgb:fa8072
+face global type       rgb:dfdfbf
+face global identifier rgb:87ceeb
+face global string     rgb:fa8072
+face global error      rgb:c3bf9f+b
+face global keyword    rgb:eedc82
+face global operator   rgb:87ceeb
+face global attribute  rgb:eedc82
+face global comment    rgb:7ccd7c+i
 
 # #include <...>
-face meta rgb:ee799f
+face global meta rgb:ee799f
 
 # Markup
-face title  blue
-face header cyan
-face bold   red
-face italic yellow
-face mono   green
-face block  magenta
-face link   cyan
-face bullet cyan
-face list   yellow
+face global title  blue
+face global header cyan
+face global bold   red
+face global italic yellow
+face global mono   green
+face global block  magenta
+face global link   cyan
+face global bullet cyan
+face global list   yellow
 
 # Builtin
 # fg,bg+attributes
-# face Default default,rgb:262626 <- change the terminal bg color instead
-face Default default,default
+# face global Default default,rgb:262626 <- change the terminal bg color instead
+face global Default default,default
 
-face PrimarySelection   white,blue
-face SecondarySelection black,blue
+face global PrimarySelection   white,blue
+face global SecondarySelection black,blue
 
-face PrimaryCursor   black,white
-face SecondaryCursor black,white
+face global PrimaryCursor   black,white
+face global SecondaryCursor black,white
 
-face PrimaryCursorEol   black,rgb:7ccd7c
-face SecondaryCursorEol black,rgb:7ccd7c
+face global PrimaryCursorEol   black,rgb:7ccd7c
+face global SecondaryCursorEol black,rgb:7ccd7c
 
-face LineNumbers      rgb:605958
-face LineNumberCursor yellow,default+b
+face global LineNumbers      rgb:605958
+face global LineNumberCursor yellow,default+b
 
 # Bottom menu:
 # text + background
-face MenuBackground black,rgb:c2bfa5+b
+face global MenuBackground black,rgb:c2bfa5+b
 # selected entry in the menu (use 302028 when true color support is fixed)
-face MenuForeground rgb:f0a0c0,magenta
+face global MenuForeground rgb:f0a0c0,magenta
 
 # completion menu info
-face MenuInfo white,rgb:445599
+face global MenuInfo white,rgb:445599
 
 # assistant, [+]
-face Information black,yellow
+face global Information black,yellow
 
-face Error      white,red
-face StatusLine cyan,default
+face global Error      white,red
+face global StatusLine cyan,default
 
 # Status line modes and prompts:
 # insert, prompt, enter key...
-face StatusLineMode rgb:ffd75f,default
+face global StatusLineMode rgb:ffd75f,default
 
 # 1 sel
-face StatusLineInfo blue,default
+face global StatusLineInfo blue,default
 
 # param=value, reg=value. ex: "ey
-face StatusLineValue green,default
+face global StatusLineValue green,default
 
-face StatusCursor black,cyan
+face global StatusCursor black,cyan
 
 # :
-face Prompt blue
+face global Prompt blue
 
 # (), {}
-face MatchingChar cyan+b
+face global MatchingChar cyan+b
 
 # EOF tildas (~)
-face BufferPadding blue,default
+face global BufferPadding blue,default
diff --git a/colors/github.kak b/colors/github.kak
index ae5bb934..75a5be57 100644
--- a/colors/github.kak
+++ b/colors/github.kak
@@ -4,47 +4,47 @@
 ##
 
 ## code
-face value rgb:0086B3+b
-face type rgb:795DA3
-face variable rgb:0086B3
-face module rgb:0086B3
-face function rgb:A71D5D
-face string rgb:183691
-face keyword rgb:A71D5D+b
-face operator yellow
-face attribute rgb:A71D5D
-face comment rgb:AAAAAA
-face meta rgb:183691
-face builtin default+b
+face global value rgb:0086B3+b
+face global type rgb:795DA3
+face global variable rgb:0086B3
+face global module rgb:0086B3
+face global function rgb:A71D5D
+face global string rgb:183691
+face global keyword rgb:A71D5D+b
+face global operator yellow
+face global attribute rgb:A71D5D
+face global comment rgb:AAAAAA
+face global meta rgb:183691
+face global builtin default+b
 
 ## markup
-face title blue
-face header cyan
-face bold red
-face italic yellow
-face mono green
-face block magenta
-face link cyan
-face bullet cyan
-face list yellow
+face global title blue
+face global header cyan
+face global bold red
+face global italic yellow
+face global mono green
+face global block magenta
+face global link cyan
+face global bullet cyan
+face global list yellow
 
 ## builtin
-face Default rgb:121213,rgb:F8F8FF
-face PrimarySelection default,rgb:A6F3A6
-face SecondarySelection default,rgb:DBFFDB
-face PrimaryCursor black,rgb:888888
-face SecondaryCursor black,rgb:888888
-face PrimaryCursorEol black,rgb:A71D5D
-face SecondaryCursorEol black,rgb:A71D5D
-face LineNumbers rgb:A0A0A0,rgb:ECECEC
-face LineNumberCursor rgb:434343,rgb:DDDDDD
-face MenuForeground rgb:434343,rgb:CDCDFD
-face MenuBackground rgb:F8F8FF,rgb:808080
-face Information rgb:F8F8FF,rgb:4078C0
-face Error rgb:F8F8FF,rgb:BD2C00
-face StatusLine rgb:434343,rgb:DDDDDD
-face StatusCursor rgb:434343,rgb:CDCDFD
-face Prompt rgb:F8F8FF,rgb:4078C0
-face MatchingChar rgb:F8F8FF,rgb:4078C0+b
-face Search default,default+u
-face BufferPadding rgb:A0A0A0,rgb:F8F8FF
+face global Default rgb:121213,rgb:F8F8FF
+face global PrimarySelection default,rgb:A6F3A6
+face global SecondarySelection default,rgb:DBFFDB
+face global PrimaryCursor black,rgb:888888
+face global SecondaryCursor black,rgb:888888
+face global PrimaryCursorEol black,rgb:A71D5D
+face global SecondaryCursorEol black,rgb:A71D5D
+face global LineNumbers rgb:A0A0A0,rgb:ECECEC
+face global LineNumberCursor rgb:434343,rgb:DDDDDD
+face global MenuForeground rgb:434343,rgb:CDCDFD
+face global MenuBackground rgb:F8F8FF,rgb:808080
+face global Information rgb:F8F8FF,rgb:4078C0
+face global Error rgb:F8F8FF,rgb:BD2C00
+face global StatusLine rgb:434343,rgb:DDDDDD
+face global StatusCursor rgb:434343,rgb:CDCDFD
+face global Prompt rgb:F8F8FF,rgb:4078C0
+face global MatchingChar rgb:F8F8FF,rgb:4078C0+b
+face global Search default,default+u
+face global BufferPadding rgb:A0A0A0,rgb:F8F8FF
diff --git a/colors/gruvbox.kak b/colors/gruvbox.kak
index a3559af2..315a338e 100644
--- a/colors/gruvbox.kak
+++ b/colors/gruvbox.kak
@@ -24,52 +24,52 @@
 
     echo "
         # Code highlighting
-        face value     ${purple}
-        face type      ${yellow}
-        face variable  ${blue}
-        face module    ${green}
-        face function  default
-        face string    ${green}
-        face keyword   ${red}
-        face operator  default
-        face attribute ${orange}
-        face comment   ${gray}
-        face meta      ${aqua}
-        face builtin   default+b
+        face global value     ${purple}
+        face global type      ${yellow}
+        face global variable  ${blue}
+        face global module    ${green}
+        face global function  default
+        face global string    ${green}
+        face global keyword   ${red}
+        face global operator  default
+        face global attribute ${orange}
+        face global comment   ${gray}
+        face global meta      ${aqua}
+        face global builtin   default+b
 
         # Markdown highlighting
-        face title     ${green}+b
-        face header    ${orange}
-        face bold      ${fg}+b
-        face italic    ${fg3}
-        face mono      ${fg4}
-        face block     default
-        face link      default
-        face bullet    default
-        face list      default
+        face global title     ${green}+b
+        face global header    ${orange}
+        face global bold      ${fg}+b
+        face global italic    ${fg3}
+        face global mono      ${fg4}
+        face global block     default
+        face global link      default
+        face global bullet    default
+        face global list      default
 
-        face Default            ${fg},${bg}
-        face PrimarySelection   ${fg},${blue}
-        face SecondarySelection ${bg},${blue}
-        face PrimaryCursor      ${bg},${fg}
-        face SecondaryCursor    ${bg},${fg}
-        face PrimaryCursorEol   ${bg},${fg4}
-        face SecondaryCursorEol ${bg},${fg4}
-        face LineNumbers        ${bg4}
-        face LineNumberCursor   ${yellow},${bg1}
-        face MenuForeground     ${bg2},${blue}
-        face MenuBackground     default,${bg2}
-        face MenuInfo           ${bg}
-        face Information        ${bg},${fg}
-        face Error              default,${red}
-        face StatusLine         default
-        face StatusLineMode     ${yellow}+b
-        face StatusLineInfo     ${purple}
-        face StatusLineValue    ${red}
-        face StatusCursor       ${bg},${fg}
-        face Prompt             ${yellow}
-        face MatchingChar       default+b
-        face BufferPadding      ${bg2},${bg}
-        face Whitespace         ${bg2}
+        face global Default            ${fg},${bg}
+        face global PrimarySelection   ${fg},${blue}
+        face global SecondarySelection ${bg},${blue}
+        face global PrimaryCursor      ${bg},${fg}
+        face global SecondaryCursor    ${bg},${fg}
+        face global PrimaryCursorEol   ${bg},${fg4}
+        face global SecondaryCursorEol ${bg},${fg4}
+        face global LineNumbers        ${bg4}
+        face global LineNumberCursor   ${yellow},${bg1}
+        face global MenuForeground     ${bg2},${blue}
+        face global MenuBackground     default,${bg2}
+        face global MenuInfo           ${bg}
+        face global Information        ${bg},${fg}
+        face global Error              default,${red}
+        face global StatusLine         default
+        face global StatusLineMode     ${yellow}+b
+        face global StatusLineInfo     ${purple}
+        face global StatusLineValue    ${red}
+        face global StatusCursor       ${bg},${fg}
+        face global Prompt             ${yellow}
+        face global MatchingChar       default+b
+        face global BufferPadding      ${bg2},${bg}
+        face global Whitespace         ${bg2}
     "
 }
diff --git a/colors/lucius.kak b/colors/lucius.kak
index 0d8e7318..8ca99c6e 100644
--- a/colors/lucius.kak
+++ b/colors/lucius.kak
@@ -24,52 +24,52 @@
 
     echo "
         # then we map them to code
-        face value ${lucius_light_green}
-        face type ${lucius_blue}
-        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}
-        face attribute ${lucius_light_blue}
-        face comment ${lucius_grey}
-        face meta ${lucius_purple}
-        face builtin default+b
+        face global value ${lucius_light_green}
+        face global type ${lucius_blue}
+        face global variable ${lucius_green}
+        face global module ${lucius_green}
+        face global function ${lucius_light_blue}
+        face global string ${lucius_light_green}
+        face global keyword ${lucius_light_blue}
+        face global operator ${lucius_green}
+        face global attribute ${lucius_light_blue}
+        face global comment ${lucius_grey}
+        face global meta ${lucius_purple}
+        face global builtin default+b
 
         # and markup
-        face title ${lucius_light_blue}
-        face header ${lucius_light_green}
-        face bold ${lucius_blue}
-        face italic ${lucius_green}
-        face mono ${lucius_light_green}
-        face block ${lucius_light_blue}
-        face link ${lucius_light_green}
-        face bullet ${lucius_green}
-        face list ${lucius_blue}
+        face global title ${lucius_light_blue}
+        face global header ${lucius_light_green}
+        face global bold ${lucius_blue}
+        face global italic ${lucius_green}
+        face global mono ${lucius_light_green}
+        face global block ${lucius_light_blue}
+        face global link ${lucius_light_green}
+        face global bullet ${lucius_green}
+        face global list ${lucius_blue}
 
         # and built in faces
-        face Default ${lucius_lighter_grey},${lucius_darker_grey}
-        face PrimarySelection ${lucius_darker_grey},${lucius_orange}
-        face SecondarySelection  ${lucius_lighter_grey},${lucius_dark_blue}
-        face PrimaryCursor ${lucius_darker_grey},${lucius_lighter_grey}
-        face SecondaryCursor ${lucius_darker_grey},${lucius_lighter_grey}
-        face PrimaryCursorEol ${lucius_darker_grey},${lucius_dark_green}
-        face SecondaryCursorEol ${lucius_darker_grey},${lucius_dark_green}
-        face LineNumbers ${lucius_grey},${lucius_dark_grey}
-        face LineNumberCursor ${lucius_grey},${lucius_dark_grey}+b
-        face MenuForeground ${lucius_blue},${lucius_dark_blue}
-        face MenuBackground ${lucius_darker_grey},${lucius_light_grey}
-        face MenuInfo ${lucius_grey}
-        face Information ${lucius_lighter_grey},${lucius_dark_green}
-        face Error ${lucius_light_red},${lucius_dark_red}
-        face StatusLine ${lucius_lighter_grey},${lucius_dark_grey}
-        face StatusLineMode ${lucius_lighter_grey},${lucius_dark_green}+b
-        face StatusLineInfo ${lucius_dark_grey},${lucius_lighter_grey}
-        face StatusLineValue ${lucius_lighter_grey}
-        face StatusCursor default,${lucius_blue}
-        face Prompt ${lucius_lighter_grey}
-        face MatchingChar ${lucius_lighter_grey},${lucius_bright_green}
-        face BufferPadding ${lucius_green},${lucius_darker_grey}
+        face global Default ${lucius_lighter_grey},${lucius_darker_grey}
+        face global PrimarySelection ${lucius_darker_grey},${lucius_orange}
+        face global SecondarySelection  ${lucius_lighter_grey},${lucius_dark_blue}
+        face global PrimaryCursor ${lucius_darker_grey},${lucius_lighter_grey}
+        face global SecondaryCursor ${lucius_darker_grey},${lucius_lighter_grey}
+        face global PrimaryCursorEol ${lucius_darker_grey},${lucius_dark_green}
+        face global SecondaryCursorEol ${lucius_darker_grey},${lucius_dark_green}
+        face global LineNumbers ${lucius_grey},${lucius_dark_grey}
+        face global LineNumberCursor ${lucius_grey},${lucius_dark_grey}+b
+        face global MenuForeground ${lucius_blue},${lucius_dark_blue}
+        face global MenuBackground ${lucius_darker_grey},${lucius_light_grey}
+        face global MenuInfo ${lucius_grey}
+        face global Information ${lucius_lighter_grey},${lucius_dark_green}
+        face global Error ${lucius_light_red},${lucius_dark_red}
+        face global StatusLine ${lucius_lighter_grey},${lucius_dark_grey}
+        face global StatusLineMode ${lucius_lighter_grey},${lucius_dark_green}+b
+        face global StatusLineInfo ${lucius_dark_grey},${lucius_lighter_grey}
+        face global StatusLineValue ${lucius_lighter_grey}
+        face global StatusCursor default,${lucius_blue}
+        face global Prompt ${lucius_lighter_grey}
+        face global MatchingChar ${lucius_lighter_grey},${lucius_bright_green}
+        face global BufferPadding ${lucius_green},${lucius_darker_grey}
     "
 }
diff --git a/colors/reeder.kak b/colors/reeder.kak
index bf52291e..dd19cd24 100644
--- a/colors/reeder.kak
+++ b/colors/reeder.kak
@@ -22,52 +22,52 @@
     # Base color definitions
     echo "
         # then we map them to code
-        face value      ${orange_light}+b
-        face type       ${orange}
-        face variable   default
-        face module     ${green}
-        face function   default
-        face string     ${green}
-        face keyword    ${brown_dark}
-        face operator   default
-        face attribute  ${green}
-        face comment    ${brown_light}
-        face meta       ${brown_dark}
-        face builtin   default+b
+        face global value      ${orange_light}+b
+        face global type       ${orange}
+        face global variable   default
+        face global module     ${green}
+        face global function   default
+        face global string     ${green}
+        face global keyword    ${brown_dark}
+        face global operator   default
+        face global attribute  ${green}
+        face global comment    ${brown_light}
+        face global meta       ${brown_dark}
+        face global builtin   default+b
 
         # and markup
-        face title      ${orange}+b
-        face header     ${orange}+b
-        face bold       default+b
-        face italic     default+i
-        face mono       ${green_light}
-        face block      ${green}
-        face link       ${orange}
-        face bullet     ${brown_dark}
-        face list       ${black}
+        face global title      ${orange}+b
+        face global header     ${orange}+b
+        face global bold       default+b
+        face global italic     default+i
+        face global mono       ${green_light}
+        face global block      ${green}
+        face global link       ${orange}
+        face global bullet     ${brown_dark}
+        face global list       ${black}
 
         # and built in faces
-        face Default            ${black_light},${white}
-        face PrimarySelection   ${black},${brown_lighter}
-        face SecondarySelection ${black_light},${grey_light}
-        face PrimaryCursor      ${black},${grey_dark}
-        face SecondaryCursor    ${black},${grey_dark}
-        face PrimaryCursorEol   ${black},${brown_dark}
-        face SecondaryCursorEol ${black},${brown_dark}
-        face LineNumbers        ${grey_dark},${white}
-        face LineNumberCursor   ${grey_dark},${brown_lighter}
-        face MenuForeground     ${orange},${brown_lighter}
-        face MenuBackground     ${black_light},${brown_lighter}
-        face MenuInfo           default,${black}
-        face Information        ${black_light},${brown_lighter}
-        face Error              default,${red}
-        face StatusLine         ${black},${grey_light}
-        face StatusLineMode     ${orange}
-        face StatusLineInfo     ${black}+b
-        face StatusLineValue    ${green_light}
-        face StatusCursor       ${orange},${white_light}
-        face Prompt             ${black_light}
-        face MatchingChar       default+b
-        face BufferPadding      ${grey_dark},${white}
+        face global Default            ${black_light},${white}
+        face global PrimarySelection   ${black},${brown_lighter}
+        face global SecondarySelection ${black_light},${grey_light}
+        face global PrimaryCursor      ${black},${grey_dark}
+        face global SecondaryCursor    ${black},${grey_dark}
+        face global PrimaryCursorEol   ${black},${brown_dark}
+        face global SecondaryCursorEol ${black},${brown_dark}
+        face global LineNumbers        ${grey_dark},${white}
+        face global LineNumberCursor   ${grey_dark},${brown_lighter}
+        face global MenuForeground     ${orange},${brown_lighter}
+        face global MenuBackground     ${black_light},${brown_lighter}
+        face global MenuInfo           default,${black}
+        face global Information        ${black_light},${brown_lighter}
+        face global Error              default,${red}
+        face global StatusLine         ${black},${grey_light}
+        face global StatusLineMode     ${orange}
+        face global StatusLineInfo     ${black}+b
+        face global StatusLineValue    ${green_light}
+        face global StatusCursor       ${orange},${white_light}
+        face global Prompt             ${black_light}
+        face global MatchingChar       default+b
+        face global BufferPadding      ${grey_dark},${white}
     "
 }
diff --git a/colors/solarized-dark.kak b/colors/solarized-dark.kak
index 93e24831..67598329 100644
--- a/colors/solarized-dark.kak
+++ b/colors/solarized-dark.kak
@@ -20,53 +20,53 @@
 
    echo "
         # code
-        face value              ${cyan}
-        face type               ${yellow}
-        face variable           ${blue}
-        face module             ${cyan}
-        face function           ${blue}
-        face string             ${cyan}
-        face keyword            ${green}
-        face operator           ${green}
-        face attribute          ${violet}
-        face comment            ${base01}
-        face meta               ${orange}
-        face builtin            default+b
+        face global value              ${cyan}
+        face global type               ${yellow}
+        face global variable           ${blue}
+        face global module             ${cyan}
+        face global function           ${blue}
+        face global string             ${cyan}
+        face global keyword            ${green}
+        face global operator           ${green}
+        face global attribute          ${violet}
+        face global comment            ${base01}
+        face global meta               ${orange}
+        face global builtin            default+b
 
         # markup
-        face title              ${blue}+b
-        face header             ${blue}
-        face bold               ${base0}+b
-        face italic             ${base0}+i
-        face mono               ${base1}
-        face block              ${cyan}
-        face link               ${base1}
-        face bullet             ${yellow}
-        face list               ${green}
+        face global title              ${blue}+b
+        face global header             ${blue}
+        face global bold               ${base0}+b
+        face global italic             ${base0}+i
+        face global mono               ${base1}
+        face global block              ${cyan}
+        face global link               ${base1}
+        face global bullet             ${yellow}
+        face global list               ${green}
 
         # builtin
-        face Default            ${base0},${base03}
-        face PrimarySelection   ${base03},${blue}
-        face SecondarySelection ${base01},${base1}
-        face PrimaryCursor      ${base03},${base0}
-        face SecondaryCursor    ${base03},${base01}
-        face PrimaryCursorEol   ${base03},${base2}
-        face SecondaryCursorEol ${base03},${base3}
-        face LineNumbers        ${base01},${base02}
-        face LineNumberCursor   ${base1},${base02}
-        face LineNumbersWrapped ${base02},${base02}
-        face MenuForeground     ${base03},${yellow}
-        face MenuBackground     ${base1},${base02}
-        face MenuInfo           ${base01}
-        face Information        ${base02},${base1}
-        face Error              ${red},default+b
-        face StatusLine         ${base1},${base02}+b
-        face StatusLineMode     ${orange}
-        face StatusLineInfo     ${cyan}
-        face StatusLineValue    ${green}
-        face StatusCursor       ${base00},${base3}
-        face Prompt             ${yellow}+b
-        face MatchingChar       ${red},${base01}+b
-        face BufferPadding      ${base01},${base03}
+        face global Default            ${base0},${base03}
+        face global PrimarySelection   ${base03},${blue}
+        face global SecondarySelection ${base01},${base1}
+        face global PrimaryCursor      ${base03},${base0}
+        face global SecondaryCursor    ${base03},${base01}
+        face global PrimaryCursorEol   ${base03},${base2}
+        face global SecondaryCursorEol ${base03},${base3}
+        face global LineNumbers        ${base01},${base02}
+        face global LineNumberCursor   ${base1},${base02}
+        face global LineNumbersWrapped ${base02},${base02}
+        face global MenuForeground     ${base03},${yellow}
+        face global MenuBackground     ${base1},${base02}
+        face global MenuInfo           ${base01}
+        face global Information        ${base02},${base1}
+        face global Error              ${red},default+b
+        face global StatusLine         ${base1},${base02}+b
+        face global StatusLineMode     ${orange}
+        face global StatusLineInfo     ${cyan}
+        face global StatusLineValue    ${green}
+        face global StatusCursor       ${base00},${base3}
+        face global Prompt             ${yellow}+b
+        face global MatchingChar       ${red},${base01}+b
+        face global BufferPadding      ${base01},${base03}
     "
 }
diff --git a/colors/solarized-light.kak b/colors/solarized-light.kak
index 979f9151..9f357794 100644
--- a/colors/solarized-light.kak
+++ b/colors/solarized-light.kak
@@ -20,53 +20,53 @@
 
     echo "
         # code
-        face value              ${cyan}
-        face type               ${yellow}
-        face variable           ${blue}
-        face module             ${cyan}
-        face function           ${blue}
-        face string             ${cyan}
-        face keyword            ${green}
-        face operator           ${green}
-        face attribute          ${violet}
-        face comment            ${base1}
-        face meta               ${orange}
-        face builtin            default+b
+        face global value              ${cyan}
+        face global type               ${yellow}
+        face global variable           ${blue}
+        face global module             ${cyan}
+        face global function           ${blue}
+        face global string             ${cyan}
+        face global keyword            ${green}
+        face global operator           ${green}
+        face global attribute          ${violet}
+        face global comment            ${base1}
+        face global meta               ${orange}
+        face global builtin            default+b
 
         # markup
-        face title              ${blue}+b
-        face header             ${blue}
-        face bold               ${base01}+b
-        face italic             ${base01}+i
-        face mono               ${base1}
-        face block              ${cyan}
-        face link               ${base01}
-        face bullet             ${yellow}
-        face list               ${green}
+        face global title              ${blue}+b
+        face global header             ${blue}
+        face global bold               ${base01}+b
+        face global italic             ${base01}+i
+        face global mono               ${base1}
+        face global block              ${cyan}
+        face global link               ${base01}
+        face global bullet             ${yellow}
+        face global list               ${green}
 
         # builtin
-        face Default            ${base00},${base3}
-        face PrimarySelection   ${base3},${blue}
-        face SecondarySelection ${base1},${base01}
-        face PrimaryCursor      ${base3},${base00}
-        face SecondaryCursor    ${base3},${base1}
-        face PrimaryCursorEol   ${base3},${yellow}
-        face SecondaryCursorEol ${base3},${orange}
-        face LineNumbers        ${base1},${base2}
-        face LineNumberCursor   ${base01},${base2}
-        face LineNumbersWrapped ${base2},${base2}
-        face MenuForeground     ${base3},${yellow}
-        face MenuBackground     ${base01},${base2}
-        face MenuInfo           ${base1}
-        face Information        ${base2},${base1}
-        face Error              ${red},default+b
-        face StatusLine         ${base01},${base2}+b
-        face StatusLineMode     ${orange}
-        face StatusLineInfo     ${cyan}
-        face StatusLineValue    ${green}
-        face StatusCursor       ${base0},${base03}
-        face Prompt             ${yellow}+b
-        face MatchingChar       ${red},${base2}+b
-        face BufferPadding      ${base1},${base3}
+        face global Default            ${base00},${base3}
+        face global PrimarySelection   ${base3},${blue}
+        face global SecondarySelection ${base1},${base01}
+        face global PrimaryCursor      ${base3},${base00}
+        face global SecondaryCursor    ${base3},${base1}
+        face global PrimaryCursorEol   ${base3},${yellow}
+        face global SecondaryCursorEol ${base3},${orange}
+        face global LineNumbers        ${base1},${base2}
+        face global LineNumberCursor   ${base01},${base2}
+        face global LineNumbersWrapped ${base2},${base2}
+        face global MenuForeground     ${base3},${yellow}
+        face global MenuBackground     ${base01},${base2}
+        face global MenuInfo           ${base1}
+        face global Information        ${base2},${base1}
+        face global Error              ${red},default+b
+        face global StatusLine         ${base01},${base2}+b
+        face global StatusLineMode     ${orange}
+        face global StatusLineInfo     ${cyan}
+        face global StatusLineValue    ${green}
+        face global StatusCursor       ${base0},${base03}
+        face global Prompt             ${yellow}+b
+        face global MatchingChar       ${red},${base2}+b
+        face global BufferPadding      ${base1},${base3}
     "
 }
diff --git a/colors/tomorrow-night.kak b/colors/tomorrow-night.kak
index 065a45a1..59065ff6 100644
--- a/colors/tomorrow-night.kak
+++ b/colors/tomorrow-night.kak
@@ -23,56 +23,56 @@
 
     ## code
     echo "
-        face value ${orange}
-        face type ${yellow}
-        face variable ${magenta}
-        face module ${green}
-        face function ${aqua}
-        face string ${green_dark}
-        face keyword ${purple}
-        face operator ${aqua}
-        face attribute ${purple}
-        face comment ${comment}
-        face meta ${purple}
-        face builtin ${orange}
+        face global value ${orange}
+        face global type ${yellow}
+        face global variable ${magenta}
+        face global module ${green}
+        face global function ${aqua}
+        face global string ${green_dark}
+        face global keyword ${purple}
+        face global operator ${aqua}
+        face global attribute ${purple}
+        face global comment ${comment}
+        face global meta ${purple}
+        face global builtin ${orange}
     "
 
     ## markup
     echo "
-        face title blue
-        face header ${aqua}
-        face bold ${yellow}
-        face italic ${orange}
-        face mono ${green_dark}
-        face block ${orange}
-        face link blue
-        face bullet ${red}
-        face list ${red}
+        face global title blue
+        face global header ${aqua}
+        face global bold ${yellow}
+        face global italic ${orange}
+        face global mono ${green_dark}
+        face global block ${orange}
+        face global link blue
+        face global bullet ${red}
+        face global list ${red}
     "
 
     ## builtin
     echo "
-        face Default ${text},${background}
-        face PrimarySelection default,${selection}
-        face SecondarySelection default,${selection}
-        face PrimaryCursor black,${aqua}
-        face SecondaryCursor black,${aqua}
-        face PrimaryCursorEol black,${green_dark}
-        face SecondaryCursorEol black,${green_dark}
-        face LineNumbers ${text_light},${background}
-        face LineNumberCursor ${yellow},rgb:282828+b
-        face MenuForeground ${text_light},blue
-        face MenuBackground ${aqua},${window}
-        face MenuInfo ${aqua}
-        face Information white,${window}
-        face Error white,${red}
-        face StatusLine ${text},${window}
-        face StatusLineMode ${yellow}+b
-        face StatusLineInfo ${aqua}
-        face StatusLineValue ${green_dark}
-        face StatusCursor ${window},${aqua}
-        face Prompt ${background},${aqua}
-        face MatchingChar ${yellow},${background}+b
-        face BufferPadding ${aqua},${background}
+        face global Default ${text},${background}
+        face global PrimarySelection default,${selection}
+        face global SecondarySelection default,${selection}
+        face global PrimaryCursor black,${aqua}
+        face global SecondaryCursor black,${aqua}
+        face global PrimaryCursorEol black,${green_dark}
+        face global SecondaryCursorEol black,${green_dark}
+        face global LineNumbers ${text_light},${background}
+        face global LineNumberCursor ${yellow},rgb:282828+b
+        face global MenuForeground ${text_light},blue
+        face global MenuBackground ${aqua},${window}
+        face global MenuInfo ${aqua}
+        face global Information white,${window}
+        face global Error white,${red}
+        face global StatusLine ${text},${window}
+        face global StatusLineMode ${yellow}+b
+        face global StatusLineInfo ${aqua}
+        face global StatusLineValue ${green_dark}
+        face global StatusCursor ${window},${aqua}
+        face global Prompt ${background},${aqua}
+        face global MatchingChar ${yellow},${background}+b
+        face global BufferPadding ${aqua},${background}
     "
 }
diff --git a/colors/zenburn.kak b/colors/zenburn.kak
index 5f8fc689..ac7f2ab9 100644
--- a/colors/zenburn.kak
+++ b/colors/zenburn.kak
@@ -31,52 +31,52 @@
 
     echo "
         # then we map them to code
-        face value ${zenconstant}
-        face type ${zentype}
-        face variable ${zenvariable}
-        face module ${zenstring}
-        face function ${zenfunction}
-        face string ${zenstring}
-        face keyword ${zenkeyword}
-        face operator ${zenfunction}
-        face attribute ${zenstatement}
-        face comment ${zencomment}
-        face meta ${zenspecial}
-        face builtin default+b
+        face global value ${zenconstant}
+        face global type ${zentype}
+        face global variable ${zenvariable}
+        face global module ${zenstring}
+        face global function ${zenfunction}
+        face global string ${zenstring}
+        face global keyword ${zenkeyword}
+        face global operator ${zenfunction}
+        face global attribute ${zenstatement}
+        face global comment ${zencomment}
+        face global meta ${zenspecial}
+        face global builtin default+b
 
         # and markup
-        face title ${zenkeyword}
-        face header ${zenconstant}
-        face bold ${zenstorageClass}
-        face italic ${zenfunction}
-        face mono ${zennumber}
-        face block ${zenstatement}
-        face link ${zenstring}
-        face bullet ${zenvariable}
-        face list ${zentype}
+        face global title ${zenkeyword}
+        face global header ${zenconstant}
+        face global bold ${zenstorageClass}
+        face global italic ${zenfunction}
+        face global mono ${zennumber}
+        face global block ${zenstatement}
+        face global link ${zenstring}
+        face global bullet ${zenvariable}
+        face global list ${zentype}
 
         # and built in faces
-        face Default ${zendefault}
-        face PrimarySelection ${zentext},${zenselectionbg}
-        face SecondarySelection ${zensecondaryfg},${zenselectionbg}
-        face PrimaryCursor ${zencursor}
-        face SecondaryCursor ${zencursor}
-        face PrimaryCursorEol ${zencursoreol}
-        face SecondaryCursorEol ${zencursoreol}
-        face LineNumbers ${zendefault}
-        face LineNumberCursor ${zenstatus}
-        face MenuForeground ${zenmenufg}
-        face MenuBackground ${zenmenubg}
-        face MenuInfo rgb:cc9393
-        face Information ${zeninfo}
-        face Error default,red
-        face StatusLine ${zenstatus}
-        face StatusLineMode ${zencomment}
-        face StatusLineInfo ${zenspecial}
-        face StatusLineValue ${zennumber}
-        face StatusCursor ${zenstatuscursor}
-        face Prompt ${zenconstant}
-        face MatchingChar default+b
-        face BufferPadding ${zenpadding}
+        face global Default ${zendefault}
+        face global PrimarySelection ${zentext},${zenselectionbg}
+        face global SecondarySelection ${zensecondaryfg},${zenselectionbg}
+        face global PrimaryCursor ${zencursor}
+        face global SecondaryCursor ${zencursor}
+        face global PrimaryCursorEol ${zencursoreol}
+        face global SecondaryCursorEol ${zencursoreol}
+        face global LineNumbers ${zendefault}
+        face global LineNumberCursor ${zenstatus}
+        face global MenuForeground ${zenmenufg}
+        face global MenuBackground ${zenmenubg}
+        face global MenuInfo rgb:cc9393
+        face global Information ${zeninfo}
+        face global Error default,red
+        face global StatusLine ${zenstatus}
+        face global StatusLineMode ${zencomment}
+        face global StatusLineInfo ${zenspecial}
+        face global StatusLineValue ${zennumber}
+        face global StatusCursor ${zenstatuscursor}
+        face global Prompt ${zenconstant}
+        face global MatchingChar default+b
+        face global BufferPadding ${zenpadding}
     "
 }