diff --git a/data/themes/meson.build b/data/themes/meson.build
index 6342b2b..9285b2e 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -5,7 +5,7 @@ cmd = [ edje_cc,
         '@INPUT@', '@OUTPUT@'
       ]
 
-theme_names = ['black', 'white']
+theme_names = ['black', 'white', 'solarized']
 
 foreach theme_name : theme_names
   custom_target('theme ' + theme_name,
diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc
new file mode 100644
index 0000000..6da9572
--- /dev/null
+++ b/data/themes/solarized.edc
@@ -0,0 +1,61 @@
+collections {
+
+/* simple layout to pack our scrolling content into an elm_layout */
+group { name: "elm/code/layout/default";
+   data {
+      item: "font.name" "Mono";
+      item: "font.size" "10";
+   }
+   parts {
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            fixed: 0 1;
+
+            rel2 {
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
+         }
+      }
+   }
+}
+
+color_classes {
+    color_class { name: "elm/code/status/default"; color: 0 43 54 255; }
+    color_class { name: "elm/code/status/current"; color: 7 54 66 255; }
+    color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; }
+    color_class { name: "elm/code/status/note"; color: 221 119 17 255;  }
+    color_class { name: "elm/code/status/warning"; color: 221 119 17 255; }
+    color_class { name: "elm/code/status/error"; color: 204 17 17 255; }
+    color_class { name: "elm/code/status/fatal"; color: 204 17 17 255; }
+    color_class { name: "elm/code/status/added"; color: 36 96 36 255; }
+    color_class { name: "elm/code/status/removed"; color: 96 36 36 255; }
+    color_class { name: "elm/code/status/changed"; color: 36 36 96 255; }
+    color_class { name: "elm/code/status/passed"; color: 54 96 54 255; }
+    color_class { name: "elm/code/status/failed"; color: 96 54 54 255; }
+    color_class { name: "elm/code/status/todo"; color: 211 54 130 255; }
+
+    color_class { name: "elm/code/token/default"; color: 147 161 161 255; }
+    color_class { name: "elm/code/token/comment"; color: 88 110 117 255; }
+    color_class { name: "elm/code/token/string"; color: 42 161 152 255; }
+    color_class { name: "elm/code/token/number"; color: 42 161 152 255; }
+    color_class { name: "elm/code/token/brace"; color: 131 148 150 255; }
+    color_class { name: "elm/code/token/type"; color: 181 137 0 255; }
+    color_class { name: "elm/code/token/class"; color: 255 255 255 255; }
+    color_class { name: "elm/code/token/function"; color: 255 255 255 255; }
+    color_class { name: "elm/code/token/param"; color: 181 137 0 255; }
+    color_class { name: "elm/code/token/keyword"; color: 181 137 0 255; }
+    color_class { name: "elm/code/token/preprocessor"; color: 203 75 22 255; }
+    color_class { name: "elm/code/token/added"; color: 54 255 54 255; }
+    color_class { name: "elm/code/token/removed"; color: 255 54 54 255; }
+    color_class { name: "elm/code/token/changed"; color: 54 54 255 255; }
+    color_class { name: "elm/code/token/match"; color: 187 187 51 255; }
+
+    color_class { name: "elm/code/widget/color/selection"; color: 38 139 210 255; }
+    color_class { name: "elm/code/widget/color/gutter/bg"; color: 7 54 66 255; }
+    color_class { name: "elm/code/widget/color/gutter/fg"; color: 88 110 117 255; }
+    color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; }
+    color_class { name: "elm/code/widget/color/whitespace"; color: 50 50 50 127; }
+}
+}