diff --git a/colors/base16.kak b/colors/base16.kak
index b46e77ab..e17cf9e0 100644
--- a/colors/base16.kak
+++ b/colors/base16.kak
@@ -48,12 +48,12 @@ evaluate-commands %sh{
     ## builtin
     echo "
         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 PrimarySelection white,blue+fg
+        face global SecondarySelection black,blue+fg
+        face global PrimaryCursor black,white+fg
+        face global SecondaryCursor black,white+fg
+        face global PrimaryCursorEol black,${cyan_light}+fg
+        face global SecondaryCursorEol black,${cyan_light}+fg
         face global LineNumbers ${grey_light},${black_lighter}
         face global LineNumberCursor ${grey_light},rgb:282828+b
         face global MenuForeground ${grey_light},blue
diff --git a/colors/default.kak b/colors/default.kak
index 518c86d3..fc2fc379 100644
--- a/colors/default.kak
+++ b/colors/default.kak
@@ -27,12 +27,12 @@ face global list yellow
 
 # builtin faces
 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 PrimarySelection white,blue+fg
+face global SecondarySelection black,blue+fg
+face global PrimaryCursor black,white+fg
+face global SecondaryCursor black,white+fg
+face global PrimaryCursorEol black,cyan+fg
+face global SecondaryCursorEol black,cyan+fg
 face global LineNumbers default,default
 face global LineNumberCursor default,default+r
 face global MenuForeground white,blue
diff --git a/colors/desertex.kak b/colors/desertex.kak
index b1fe21dd..ad28fe1e 100644
--- a/colors/desertex.kak
+++ b/colors/desertex.kak
@@ -30,14 +30,14 @@ face global list   yellow
 # face global Default default,rgb:262626 <- change the terminal bg color instead
 face global Default default,default
 
-face global PrimarySelection   white,blue
-face global SecondarySelection black,blue
+face global PrimarySelection   white,blue+fg
+face global SecondarySelection black,blue+fg
 
-face global PrimaryCursor   black,white
-face global SecondaryCursor black,white
+face global PrimaryCursor   black,white+fg
+face global SecondaryCursor black,white+fg
 
-face global PrimaryCursorEol   black,rgb:7ccd7c
-face global SecondaryCursorEol black,rgb:7ccd7c
+face global PrimaryCursorEol   black,rgb:7ccd7c+fg
+face global SecondaryCursorEol black,rgb:7ccd7c+fg
 
 face global LineNumbers      rgb:605958
 face global LineNumberCursor yellow,default+b
diff --git a/colors/github.kak b/colors/github.kak
index 75a5be57..72a250e2 100644
--- a/colors/github.kak
+++ b/colors/github.kak
@@ -30,12 +30,12 @@ face global list yellow
 
 ## builtin
 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 PrimarySelection default,rgb:A6F3A6+fg
+face global SecondarySelection default,rgb:DBFFDB+fg
+face global PrimaryCursor black,rgb:888888+fg
+face global SecondaryCursor black,rgb:888888+fg
+face global PrimaryCursorEol black,rgb:A71D5D+fg
+face global SecondaryCursorEol black,rgb:A71D5D+fg
 face global LineNumbers rgb:A0A0A0,rgb:ECECEC
 face global LineNumberCursor rgb:434343,rgb:DDDDDD
 face global MenuForeground rgb:434343,rgb:CDCDFD
diff --git a/colors/gruvbox.kak b/colors/gruvbox.kak
index fcac50b7..f4d3eb40 100644
--- a/colors/gruvbox.kak
+++ b/colors/gruvbox.kak
@@ -49,12 +49,12 @@ evaluate-commands %sh{
         face global list      default
 
         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 PrimarySelection   ${fg},${blue}+fg
+        face global SecondarySelection ${bg},${blue}+fg
+        face global PrimaryCursor      ${bg},${fg}+fg
+        face global SecondaryCursor    ${bg},${fg}+fg
+        face global PrimaryCursorEol   ${bg},${fg4}+fg
+        face global SecondaryCursorEol ${bg},${fg4}+fg
         face global LineNumbers        ${bg4}
         face global LineNumberCursor   ${yellow},${bg1}
         face global LineNumbersWrapped ${bg1}
diff --git a/colors/lucius.kak b/colors/lucius.kak
index 670888b4..589f37e4 100644
--- a/colors/lucius.kak
+++ b/colors/lucius.kak
@@ -50,12 +50,12 @@ evaluate-commands %sh{
 
         # and built in faces
         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 PrimarySelection ${lucius_darker_grey},${lucius_orange}+fg
+        face global SecondarySelection  ${lucius_lighter_grey},${lucius_dark_blue}+fg
+        face global PrimaryCursor ${lucius_darker_grey},${lucius_lighter_grey}+fg
+        face global SecondaryCursor ${lucius_darker_grey},${lucius_lighter_grey}+fg
+        face global PrimaryCursorEol ${lucius_darker_grey},${lucius_dark_green}+fg
+        face global SecondaryCursorEol ${lucius_darker_grey},${lucius_dark_green}+fg
         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}
diff --git a/colors/red-phoenix.kak b/colors/red-phoenix.kak
index 571468da..0431cd6b 100644
--- a/colors/red-phoenix.kak
+++ b/colors/red-phoenix.kak
@@ -63,12 +63,12 @@ evaluate-commands %sh{
     ## builtin
     echo "
         face global Default ${text},${background}
-        face global PrimarySelection default,${selection}
-        face global SecondarySelection default,${selection}
-        face global PrimaryCursor black,${tan1}
-        face global SecondaryCursor black,${tan2}
-        face global PrimaryCursorEol black,${orange1}
-        face global SecondaryCursorEol black,${orange2}
+        face global PrimarySelection default,${selection}+fg
+        face global SecondarySelection default,${selection}+fg
+        face global PrimaryCursor black,${tan1}+fg
+        face global SecondaryCursor black,${tan2}+fg
+        face global PrimaryCursorEol black,${orange1}+fg
+        face global SecondaryCursorEol black,${orange2}+fg
         face global LineNumbers ${text_light},${background}
         face global LineNumberCursor ${text},${gray1}+b
         face global MenuForeground ${text_light},blue
diff --git a/colors/reeder.kak b/colors/reeder.kak
index c1cb083b..d90bd24f 100644
--- a/colors/reeder.kak
+++ b/colors/reeder.kak
@@ -48,12 +48,12 @@ evaluate-commands %sh{
 
         # and built in faces
         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 PrimarySelection   ${black},${brown_lighter}+fg
+        face global SecondarySelection ${black_light},${grey_light}+fg
+        face global PrimaryCursor      ${black},${grey_dark}+fg
+        face global SecondaryCursor    ${black},${grey_dark}+fg
+        face global PrimaryCursorEol   ${black},${brown_dark}+fg
+        face global SecondaryCursorEol ${black},${brown_dark}+fg
         face global LineNumbers        ${grey_dark},${white}
         face global LineNumberCursor   ${grey_dark},${brown_lighter}
         face global MenuForeground     ${orange},${brown_lighter}
diff --git a/colors/solarized-dark-termcolors.kak b/colors/solarized-dark-termcolors.kak
index f1636804..0e106733 100644
--- a/colors/solarized-dark-termcolors.kak
+++ b/colors/solarized-dark-termcolors.kak
@@ -28,12 +28,12 @@ face global list               green
 
 # builtin
 face global Default            bright-blue,bright-black
-face global PrimarySelection   bright-black,blue
-face global SecondarySelection bright-green,bright-cyan
-face global PrimaryCursor      bright-black,bright-blue
-face global SecondaryCursor    bright-black,bright-green
-face global PrimaryCursorEol   bright-black,white
-face global SecondaryCursorEol bright-black,bright-white
+face global PrimarySelection   bright-black,blue+fg
+face global SecondarySelection bright-green,bright-cyan+fg
+face global PrimaryCursor      bright-black,bright-blue+fg
+face global SecondaryCursor    bright-black,bright-green+fg
+face global PrimaryCursorEol   bright-black,white+fg
+face global SecondaryCursorEol bright-black,bright-white+fg
 face global LineNumbers        bright-green,black
 face global LineNumberCursor   bright-cyan,black
 face global LineNumbersWrapped black,black
diff --git a/colors/solarized-dark.kak b/colors/solarized-dark.kak
index 3b92c709..34b9b9b4 100644
--- a/colors/solarized-dark.kak
+++ b/colors/solarized-dark.kak
@@ -46,12 +46,12 @@ evaluate-commands %sh{
 
         # builtin
         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 PrimarySelection   ${base03},${blue}+fg
+        face global SecondarySelection ${base01},${base1}+fg
+        face global PrimaryCursor      ${base03},${base0}+fg
+        face global SecondaryCursor    ${base03},${base01}+fg
+        face global PrimaryCursorEol   ${base03},${base2}+fg
+        face global SecondaryCursorEol ${base03},${base3}+fg
         face global LineNumbers        ${base01},${base02}
         face global LineNumberCursor   ${base1},${base02}
         face global LineNumbersWrapped ${base02},${base02}
diff --git a/colors/solarized-light-termcolors.kak b/colors/solarized-light-termcolors.kak
index fbb30091..0b0badde 100644
--- a/colors/solarized-light-termcolors.kak
+++ b/colors/solarized-light-termcolors.kak
@@ -28,12 +28,12 @@ face global list               green
 
 # builtin
 face global Default            bright-yellow,bright-white
-face global PrimarySelection   bright-white,blue
-face global SecondarySelection bright-cyan,bright-green
-face global PrimaryCursor      bright-white,bright-yellow
-face global SecondaryCursor    bright-white,bright-cyan
-face global PrimaryCursorEol   bright-white,yellow
-face global SecondaryCursorEol bright-white,bright-red
+face global PrimarySelection   bright-white,blue+fg
+face global SecondarySelection bright-cyan,bright-green+fg
+face global PrimaryCursor      bright-white,bright-yellow+fg
+face global SecondaryCursor    bright-white,bright-cyan+fg
+face global PrimaryCursorEol   bright-white,yellow+fg
+face global SecondaryCursorEol bright-white,bright-red+fg
 face global LineNumbers        bright-cyan,white
 face global LineNumberCursor   bright-green,white
 face global LineNumbersWrapped white,white
diff --git a/colors/solarized-light.kak b/colors/solarized-light.kak
index 831d5d32..ecbe1f59 100644
--- a/colors/solarized-light.kak
+++ b/colors/solarized-light.kak
@@ -46,12 +46,12 @@ evaluate-commands %sh{
 
         # builtin
         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 PrimarySelection   ${base3},${blue}+fg
+        face global SecondarySelection ${base1},${base01}+fg
+        face global PrimaryCursor      ${base3},${base00}+fg
+        face global SecondaryCursor    ${base3},${base1}+fg
+        face global PrimaryCursorEol   ${base3},${yellow}+fg
+        face global SecondaryCursorEol ${base3},${orange}+fg
         face global LineNumbers        ${base1},${base2}
         face global LineNumberCursor   ${base01},${base2}
         face global LineNumbersWrapped ${base2},${base2}
diff --git a/colors/tomorrow-night.kak b/colors/tomorrow-night.kak
index 5e8b7936..fa6999fb 100644
--- a/colors/tomorrow-night.kak
+++ b/colors/tomorrow-night.kak
@@ -53,12 +53,12 @@ evaluate-commands %sh{
     ## builtin
     echo "
         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 PrimarySelection default,${selection}+fg
+        face global SecondarySelection default,${selection}+fg
+        face global PrimaryCursor black,${aqua}+fg
+        face global SecondaryCursor black,${aqua}+fg
+        face global PrimaryCursorEol black,${green_dark}+fg
+        face global SecondaryCursorEol black,${green_dark}+fg
         face global LineNumbers ${text_light},${background}
         face global LineNumberCursor ${yellow},rgb:282828+b
         face global MenuForeground ${text_light},blue
diff --git a/colors/zenburn.kak b/colors/zenburn.kak
index c98828fa..c5e0f6ac 100644
--- a/colors/zenburn.kak
+++ b/colors/zenburn.kak
@@ -57,12 +57,12 @@ evaluate-commands %sh{
 
         # and built in faces
         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 PrimarySelection ${zentext},${zenselectionbg}+fg
+        face global SecondarySelection ${zensecondaryfg},${zenselectionbg}+fg
+        face global PrimaryCursor ${zencursor}+fg
+        face global SecondaryCursor ${zencursor}+fg
+        face global PrimaryCursorEol ${zencursoreol}+fg
+        face global SecondaryCursorEol ${zencursoreol}+fg
         face global LineNumbers ${zendefault}
         face global LineNumberCursor ${zenstatus}
         face global MenuForeground ${zenmenufg}