diff --git a/colors/base16.kak b/colors/base16.kak
index da606720..e33373e1 100644
--- a/colors/base16.kak
+++ b/colors/base16.kak
@@ -61,6 +61,5 @@
         face StatusCursor ${black_lighterer},${cyan_light}
         face Prompt ${black_light},${cyan_light}
         face MatchingChar ${cyan_light},${black_light}+b
-        face Search default,default+u
     "
 }
diff --git a/colors/default.kak b/colors/default.kak
index f5041c12..3beb53ad 100644
--- a/colors/default.kak
+++ b/colors/default.kak
@@ -40,4 +40,3 @@ face StatusLine cyan,default
 face StatusCursor black,cyan
 face Prompt yellow,default
 face MatchingChar default,default+b
-face Search default,default+u
diff --git a/colors/solarized.kak b/colors/solarized.kak
index ca3cea41..ca5afac5 100644
--- a/colors/solarized.kak
+++ b/colors/solarized.kak
@@ -45,14 +45,21 @@
         face list       ${yellow}
 
         # and built in faces
-        face Default          ${base0},${base03}
-        face LineNumbers      ${base0},${base03}
-        face LineNumberCursor default,${base03}+b
-        face StatusLine       default,${base02}
-        face StatusCursor     ${base00},${base3}
-        face Information      ${base02},${base1}
-        face MenuBackground   ${base02},${base01}
-        face MenuForeground   ${cyan},${base01}
-        face MenuInfo         ${base03}
+        face Default            ${base0},${base03}
+        face PrimarySelection   white,blue
+        face SecondarySelection black,blue
+        face PrimaryCursor      black,white
+        face SecondaryCursor    black,white
+        face LineNumbers        ${base0},${base03}
+        face LineNumberCursor   default,${base03}+b
+        face MenuForeground     ${cyan},${base01}
+        face MenuBackground     ${base02},${base01}
+        face MenuInfo           ${base03}
+        face Information        ${base02},${base1}
+        face Error              default,red
+        face StatusLine         default,${base02}
+        face StatusCursor       ${base00},${base3}
+        face Prompt             yellow
+        face MatchingChar       default+b
     "
 }
diff --git a/colors/zenburn.kak b/colors/zenburn.kak
index 66664529..5c7e0180 100644
--- a/colors/zenburn.kak
+++ b/colors/zenburn.kak
@@ -1,55 +1,68 @@
 # zenburn theme
 
-# first we define the zenburn colors as faces
-face zenbackground   default,rgb:3f3f3f
-face zenstatus       rgb:efdcbc,rgb:2a2a2a
-face zencursor       default,rgb:7f9f7f
-face zeninfo         rgb:cc9393,rgb:2a2a2a
-face zenmenubg       rgb:7f9f7f,rgb:4a4a4a
-face zenmenufg       rgb:8cd0d3,rgb:5b5b5b
-face zentext         rgb:efefef
-face zenkeyword      rgb:f0dfaf+b
-face zenstorageClass rgb:c3bf9f+b
-face zennumber       rgb:8cd0d3
-face zencomment      rgb:7f9f7f
-face zenconstant     rgb:dca3a3+b
-face zenspecial      rgb:cfbfaf
-face zenfunction     rgb:efef8f
-face zenstatement    rgb:e3ceab
-face zenidentifier   rgb:efdcbc
-face zentype         rgb:dfdfbf
-face zenstring       rgb:cc9393
-face zenexception    rgb:c3bf9f+b
-face zenmatching     rgb:3f3f3f,rgb:8cd0d3
+%sh{
+    # define some named colors
+    zenbackground="default,rgb:3f3f3f"
+    zenstatus="rgb:efdcbc,rgb:2a2a2a"
+    zencursor="default,rgb:7f9f7f"
+    zeninfo="rgb:cc9393,rgb:2a2a2a"
+    zenmenubg="rgb:7f9f7f,rgb:4a4a4a"
+    zenmenufg="rgb:8cd0d3,rgb:5b5b5b"
+    zentext="rgb:efefef"
+    zenkeyword="rgb:f0dfaf+b"
+    zenstorageClass="rgb:c3bf9f+b"
+    zennumber="rgb:8cd0d3"
+    zencomment="rgb:7f9f7f"
+    zenconstant="rgb:dca3a3+b"
+    zenspecial="rgb:cfbfaf"
+    zenfunction="rgb:efef8f"
+    zenstatement="rgb:e3ceab"
+    zenidentifier="rgb:efdcbc"
+    zentype="rgb:dfdfbf"
+    zenstring="rgb:cc9393"
+    zenexception="rgb:c3bf9f+b"
+    zenmatching="rgb:3f3f3f,rgb:8cd0d3"
 
-# then we map them to code
-face value zenconstant
-face type zentype
-face identifier zenidentifier
-face string zenstring
-face error zenexception
-face keyword zenkeyword
-face operator zenfunction
-face attribute zenstatement
-face comment zencomment
-face meta zenspecial
+    echo "
+        # then we map them to code
+        face value ${zenconstant}
+        face type ${zentype}
+        face identifier ${zenidentifier}
+        face string ${zenstring}
+        face error ${zenexception}
+        face keyword ${zenkeyword}
+        face operator ${zenfunction}
+        face attribute ${zenstatement}
+        face comment ${zencomment}
+        face meta ${zenspecial}
 
-# 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 zenidentifier
-face list zentype
+        # 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 ${zenidentifier}
+        face list ${zentype}
 
-# and built in faces
-face Default zenbackground
-face StatusLine zenstatus
-face StatusCursor zencursor
-face Information zeninfo
-face MenuBackground zenmenubg
-face MenuForeground zenmenufg
-face MenuInfo rgb:cc9393
+        # and built in faces
+        face Default ${zenbackground}
+        face PrimarySelection white,blue
+        face SecondarySelection black,blue
+        face PrimaryCursor black,white
+        face SecondaryCursor black,white
+        face LineNumbers default
+        face LineNumberCursor ${zenstatus}
+        face MenuForeground ${zenmenufg}
+        face MenuBackground ${zenmenubg}
+        face MenuInfo rgb:cc9393
+        face Information ${zeninfo}
+        face Error default,red
+        face StatusLine ${zenstatus}
+        face StatusCursor ${zencursor}
+        face Prompt yellow
+        face MatchingChar default+b
+    "
+}