diff --git a/colors/solarized-dark.kak b/colors/solarized-dark.kak
new file mode 100644
index 000000000..6f0487c94
--- /dev/null
+++ b/colors/solarized-dark.kak
@@ -0,0 +1,70 @@
+# Solarized Dark
+
+%sh{
+	base03='rgb:002b36'
+	base02='rgb:073642'
+	base01='rgb:586e75'
+	base00='rgb:657b83'
+	base0='rgb:839496'
+	base1='rgb:93a1a1'
+	base2='rgb:eee8d5'
+	base3='rgb:fdf6e3'
+	yellow='rgb:b58900'
+	orange='rgb:cb4b16'
+	red='rgb:dc322f'
+	magenta='rgb:d33682'
+	violet='rgb:6c71c4'
+	blue='rgb:268bd2'
+	cyan='rgb:2aa198'
+	green='rgb:859900'
+
+   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
+
+        # 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}
+
+        # builtin
+        face Default            ${base0},${base03}
+        face PrimarySelection   ${base03},${blue}
+        face SecondarySelection ${base01},${base1}
+        face PrimaryCursor      ${base03},${base0}
+        face SecondaryCursor    ${base03},${base01}
+        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}
+    "
+}
diff --git a/colors/solarized-light.kak b/colors/solarized-light.kak
new file mode 100644
index 000000000..0cf51370a
--- /dev/null
+++ b/colors/solarized-light.kak
@@ -0,0 +1,70 @@
+# Solarized Light
+
+%sh{
+	base03='rgb:002b36'
+	base02='rgb:073642'
+	base01='rgb:586e75'
+	base00='rgb:657b83'
+	base0='rgb:839496'
+	base1='rgb:93a1a1'
+	base2='rgb:eee8d5'
+	base3='rgb:fdf6e3'
+	yellow='rgb:b58900'
+	orange='rgb:cb4b16'
+	red='rgb:dc322f'
+	magenta='rgb:d33682'
+	violet='rgb:6c71c4'
+	blue='rgb:268bd2'
+	cyan='rgb:2aa198'
+	green='rgb:859900'
+
+    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
+
+        # 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}
+
+        # builtin
+        face Default            ${base00},${base3}
+        face PrimarySelection   ${base3},${blue}
+        face SecondarySelection ${base1},${base01}
+        face PrimaryCursor      ${base3},${base00}
+        face SecondaryCursor    ${base3},${base1}
+        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}
+    "
+}
diff --git a/colors/solarized.kak b/colors/solarized.kak
deleted file mode 100644
index f616c093b..000000000
--- a/colors/solarized.kak
+++ /dev/null
@@ -1,71 +0,0 @@
-# solarized theme
-
-%sh{
-    # Base color definitions
-    base03="rgb:002b36"
-    base02="rgb:073642"
-    base01="rgb:586e75"
-    base00="rgb:657b83"
-    base0="rgb:839496"
-    base1="rgb:93a1a1"
-    base2="rgb:eee8d5"
-    base3="rgb:fdf6e3"
-
-    yellow="rgb:b58900"
-    orange="rgb:cb4b16"
-    red="rgb:dc322f"
-    magenta="rgb:d33682"
-    violet="rgb:6c71c4"
-    blue="rgb:268bd2"
-    cyan="rgb:2aa198"
-    green="rgb:859900"
-
-    echo "
-        # then we map them to code
-        face value      ${cyan}
-        face type       ${yellow}
-        face variable   ${blue}
-        face module     ${cyan}
-        face function   default
-        face string     ${cyan}
-        face keyword    ${green}
-        face operator   default
-        face attribute  ${violet}
-        face comment    ${base01}
-        face meta       ${orange}
-        face builtin   default+b
-
-        # and markup
-        face title      ${yellow}
-        face header     ${blue}
-        face bold       ${base1}
-        face italic     ${base2}
-        face mono       ${base3}
-        face block      ${violet}
-        face link       ${magenta}
-        face bullet     ${orange}
-        face list       ${yellow}
-
-        # and built in faces
-        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 StatusLineMode     ${orange}
-        face StatusLineInfo     ${cyan}
-        face StatusLineValue    ${green}
-        face StatusCursor       ${base00},${base3}
-        face Prompt             yellow
-        face MatchingChar       default+b
-        face BufferPadding      ${base01},${base03}
-    "
-}