diff --git a/data/meson.build b/data/meson.build
index 31d0bbc..881b3c2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,3 +2,4 @@ subdir('desktop')
 subdir('images')
 subdir('extra/templates')
 subdir('extra/examples')
+subdir('themes')
diff --git a/data/themes/meson.build b/data/themes/meson.build
new file mode 100644
index 0000000..fedc214
--- /dev/null
+++ b/data/themes/meson.build
@@ -0,0 +1,23 @@
+edje_cc = find_program('edje_cc')
+
+cmd = [ edje_cc,
+        '-id', join_paths(meson.source_root(), 'data' , 'themes'),
+        '@INPUT@', '@OUTPUT@'
+      ]
+
+theme_names = ['white', 'solarized', 'solarized_dark']
+
+foreach theme_name : theme_names
+  custom_target('theme ' + theme_name,
+     input : theme_name + '.edc',
+     output : theme_name + '.edj',
+     command: cmd,
+     install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'themes'),
+     install: true,
+  )
+
+   out = join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'themes', theme_name + '.edj')
+   meson.add_install_script('../../scripts/world_read.sh', out)
+endforeach
+
+
diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc
new file mode 100644
index 0000000..cfcf9e5
--- /dev/null
+++ b/data/themes/solarized.edc
@@ -0,0 +1,64 @@
+data {
+    item: "title" "Solarized";
+}
+
+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: 253 246 227 255; }
+    color_class { name: "elm/code/status/current"; color: 238 232 213 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: 88 110 117 255; }
+    color_class { name: "elm/code/token/comment"; color: 147 161 161 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: 101 123 131 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: 133 153 0 255; }
+    color_class { name: "elm/code/token/keyword"; color: 133 153 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: 133 153 0 255; }
+    color_class { name: "elm/code/widget/color/gutter/bg"; color: 238 232 213 255; }
+    color_class { name: "elm/code/widget/color/gutter/fg"; color: 147 161 161 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; }
+}
+}
diff --git a/data/themes/solarized_dark.edc b/data/themes/solarized_dark.edc
new file mode 100644
index 0000000..a3b728c
--- /dev/null
+++ b/data/themes/solarized_dark.edc
@@ -0,0 +1,65 @@
+data {
+    item: "title" "Solarized Dark";
+}
+
+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; }
+}
+}
diff --git a/data/themes/white.edc b/data/themes/white.edc
new file mode 100644
index 0000000..a8c4389
--- /dev/null
+++ b/data/themes/white.edc
@@ -0,0 +1,64 @@
+data {
+    item: "title" "Black on White";
+}
+
+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: 255 255 255 255; }
+    color_class { name: "elm/code/status/current"; color: 211 211 211 255; }
+    color_class { name: "elm/code/status/ignored"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/note"; color: 0 0 0 255;  }
+    color_class { name: "elm/code/status/warning"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/error"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/fatal"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/added"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/removed"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/changed"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/passed"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/failed"; color: 0 0 0 255; }
+    color_class { name: "elm/code/status/todo"; color: 0 0 0 255; }
+
+    color_class { name: "elm/code/token/default"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/comment"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/string"; color:  0 0 0 255; }
+    color_class { name: "elm/code/token/number"; color:  0 0 0 255; }
+    color_class { name: "elm/code/token/brace"; color:  0 0 0 255; }
+    color_class { name: "elm/code/token/type"; color:  0 0 0 255; }
+    color_class { name: "elm/code/token/class"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/function"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/param"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/keyword"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/preprocessor"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/added"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/removed"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/changed"; color: 0 0 0 255; }
+    color_class { name: "elm/code/token/match"; color: 0 0 0 255; }
+
+    color_class { name: "elm/code/widget/color/selection"; color: 169 169 169 255; }
+    color_class { name: "elm/code/widget/color/gutter/bg"; color: 211 211 211 255; }
+    color_class { name: "elm/code/widget/color/gutter/fg"; color: 21 21 21 255; }
+    color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 255 255 255 255; }
+    color_class { name: "elm/code/widget/color/whitespace"; color: 255 255 255 255; }
+}
+}