diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b18e4402..5516b82c 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -25,6 +25,7 @@ options_font.c options_font.h \
 options_helpers.c options_helpers.h \
 options_video.c options_video.h \
 options_theme.c options_theme.h \
+options_themepv.c options_themepv.h \
 options_wallpaper.c options_wallpaper.h \
 sel.c sel.h \
 termio.c termio.h \
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index 8903d2b5..81239dfd 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -5,6 +5,7 @@
 #include "termio.h"
 #include "options.h"
 #include "options_theme.h"
+#include "options_themepv.h"
 #include "utils.h"
 #include "main.h"
 
@@ -37,19 +38,21 @@ static Evas_Object *
 _cb_op_theme_content_get(void *data, Evas_Object *obj, const char *part)
 {
    Theme *t = data;
-   char buf[4096];
 
    if (!strcmp(part, "elm.swallow.icon"))
      {
         Evas_Object *o;
-	snprintf(buf, sizeof(buf), "%s/themes/%s", elm_app_data_dir_get(), t->name);
-        o = edje_object_add(evas_object_evas_get(obj));
-	if (!edje_object_file_set(o, buf, "terminology/background"))
-	    return NULL;
-
-        evas_object_size_hint_min_set(o,
-                                      96 * elm_config_scale_get(),
-                                      40 * elm_config_scale_get());
+        char buf[4096];
+        Config *config = termio_config_get(t->term);
+        
+        if (config)
+          {
+             snprintf(buf, sizeof(buf), "%s/themes/%s",
+                      elm_app_data_dir_get(), t->name);
+             o = options_theme_preview_add(obj, config, buf,
+                                           128 * elm_config_scale_get(),
+                                           64 * elm_config_scale_get());
+          }
         return o;
      }
 
diff --git a/src/bin/options_themepv.c b/src/bin/options_themepv.c
new file mode 100644
index 00000000..d5e7c8a9
--- /dev/null
+++ b/src/bin/options_themepv.c
@@ -0,0 +1,226 @@
+#include "private.h"
+
+#include <Elementary.h>
+#include "config.h"
+#include "termio.h"
+#include "termpty.h"
+#include "options.h"
+#include "options_themepv.h"
+#include "utils.h"
+#include "main.h"
+#include "col.h"
+
+static void
+_row_set(Evas_Object *o, int y, const char *txt)
+{
+   Evas_Textgrid_Cell *tc;
+   int x, tw, th;
+   const char *s;
+   int fg, bg;
+   
+   evas_object_textgrid_size_get(o, &tw, &th);
+   if (y >= th) return;
+   tc = evas_object_textgrid_cellrow_get(o, y);
+   if (!tc) return;
+   fg = COL_DEF;
+   bg = COL_INVIS;
+   for (s = txt, x = 0; x < tw; x++)
+     {
+        unsigned int codepoint = ' ';
+        
+        if ((s) && (*s == 0))
+          {
+             s = NULL;
+             codepoint = ' ';
+          }
+        else if (s)
+          {
+             while ((*s <= 0x02) && (*s != 0))
+               {
+                  if (*s == 0x01)
+                    {
+                       s++;
+                       if (((*s) >= 0x01) && (*s <= 0x0a))      fg = (*s - 0x01);
+                       else if (((*s) >= 0x11) && (*s <= 0x1a)) fg = 12 + (*s - 0x11);
+                    }
+                  else if (*s == 0x02)
+                    {
+                       s++;
+                       if (((*s) >= 0x01) && (*s <= 0x0a))      bg = (*s - 0x01);
+                       else if (((*s) >= 0x11) && (*s <= 0x1a)) bg = 12 + (*s - 0x11);
+                    }
+                  s++;
+               }
+             if (*s != 0) codepoint = *s;
+             else s = NULL;
+          }
+        
+        tc[x].fg_extended = 0;
+        tc[x].bg_extended = 0;
+        tc[x].underline = 0;
+        tc[x].strikethrough = 0;
+#if defined(SUPPORT_DBLWIDTH)
+        tc[x].double_width = 0;
+#endif
+        tc[x].fg_extended = 0;
+        tc[x].bg_extended = 0;
+        
+        tc[x].fg = fg;
+        tc[x].bg = bg;
+        tc[x].codepoint = codepoint;
+        if (s) s++;
+     }
+   evas_object_textgrid_cellrow_set(o, y, tc);
+   evas_object_textgrid_update_add(o, 0, y, tw, 1);
+}
+
+static void
+_cb_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
+{
+   Evas_Object *grid = obj;
+   Evas_Object *textgrid = evas_object_data_get(grid, "textgrid");
+   Evas_Object *cursor = evas_object_data_get(grid, "cursor");
+   Evas_Object *selection = evas_object_data_get(grid, "selection");
+   Evas_Coord w, h, ww, hh;
+   
+   evas_object_geometry_get(grid, NULL, NULL, &w, &h);
+   evas_object_textgrid_cell_size_get(textgrid, &ww, &hh);
+   elm_grid_size_set(grid, w, h);
+   elm_grid_pack(grid, textgrid, 0, 0, w, h);
+   elm_grid_pack(grid, cursor, 0, 0, ww, hh);
+   elm_grid_pack(grid, selection, ww * 5, hh * 1, ww * 8, hh * 1);
+}
+
+
+Evas_Object *
+options_theme_preview_add(Evas_Object *parent, Config *config, const char *file, Evas_Coord w, Evas_Coord h)
+{
+   Evas_Object *o, *oo, *obase, *oe, *obg;
+   Evas *evas;
+   int tw, th;
+   Evas_Coord ww, hh, y;
+
+   obase = elm_grid_add(parent);
+   evas = evas_object_evas_get(obase);
+   elm_grid_size_set(obase, w, h);
+
+   // make core frame
+   o = elm_layout_add(parent);
+   oe = elm_layout_edje_get(o);
+   obg = oe;
+   if (!edje_object_file_set(oe, file, "terminology/background"))
+     theme_apply(oe, config, "terminology/background");
+   if (config->translucent)
+     edje_object_signal_emit(oe, "translucent,on", "terminology");
+   else
+     edje_object_signal_emit(oe, "translucent,off", "terminology");
+   edje_object_signal_emit(oe, "focus,in", "terminology");
+   edje_object_signal_emit(oe, "tabcount,on", "terminology");
+   edje_object_signal_emit(oe, "tabmissed,on", "terminology");
+   edje_object_part_text_set(oe, "terminology.tabcount.label", "5/8");
+   edje_object_part_text_set(oe, "terminology.tabmissed.label", "2");
+   elm_grid_pack(obase, o, 0, 0, w, h);
+   evas_object_show(o);
+   
+   oo = o;
+   
+   // create a bg and swallow into core frame
+   o = elm_layout_add(parent);
+   oe = elm_layout_edje_get(o);
+   if (!edje_object_file_set(oe, file, "terminology/core"))
+     theme_apply(oe, config, "terminology/core");
+   if (config->translucent)
+     edje_object_signal_emit(oe, "translucent,on", "terminology");
+   else
+     edje_object_signal_emit(oe, "translucent,off", "terminology");
+   edje_object_signal_emit(oe, "focus,in", "terminology");
+   evas_object_show(o);
+   elm_layout_content_set(oo, "terminology.content", o);
+   
+   oo = o;
+
+   // create a grid proportional layout to hold selection, textgrid and cursor
+   o = elm_grid_add(parent);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _cb_resize, NULL);
+   elm_grid_size_set(o, 100, 100);
+   evas_object_show(o);
+   elm_layout_content_set(oo, "terminology.content", o);
+   
+   oo = o;
+   
+   // create a texgrid and swallow pack into grid
+   o = evas_object_textgrid_add(evas);
+   colors_term_init(o, obg);
+   evas_object_scale_set(o, elm_config_scale_get());
+   if (config->font.bitmap)
+     {
+        char buf[PATH_MAX];
+        
+        snprintf(buf, sizeof(buf), "%s/fonts/%s",
+                 elm_app_data_dir_get(), config->font.name);
+        evas_object_textgrid_font_set(o, buf, config->font.size);
+     }
+   else
+     evas_object_textgrid_font_set(o, config->font.name, config->font.size);
+   evas_object_textgrid_size_set(o, 80, 24);
+   
+   evas_object_textgrid_cell_size_get(o, &ww, &hh);
+   if (ww < 1) ww = 1;
+   if (hh < 1) hh = 1;
+
+   // cmds:
+   // \x01 = set fg
+   // \x02 = set bg
+   // 
+   // cols:
+   // 
+   // \x01 = def
+   // \x02 = black
+   // \x03 = red
+   // ...
+   // \x09 = white
+   // 
+   // \x11 = def BRIGHT
+   // \x12 = black BRIGHT
+   // \x13 = red BRIGHT
+   // ...
+   // \x19 = white BRIGHT
+   
+#define F(_x) "\x01"_x
+#define B(_x) "\x01"_x
+#define R "\x01\x01\x02\x10"
+   _row_set(o, 0, " "F("\x04")"$"R" "F("\x19")">"R" test");
+   _row_set(o, 1, F("\x02")"black"R" "F("\x03")"red"R" "F("\x04")"green"R" "F("\x05")"yellow");
+   _row_set(o, 2, F("\x06")"blue"R" "F("\x07")"magenta"R" "F("\x08")"cyan"R" "F("\x09")"white");
+   _row_set(o, 3, F("\x12")"black"R" "F("\x13")"red"R" "F("\x14")"green"R" "F("\x15")"yellow");
+   _row_set(o, 4, F("\x16")"blue"R" "F("\x17")"magenta"R" "F("\x18")"cyan"R" "F("\x19")"white");
+   for (y = 5; y < 24; y++) _row_set(o, y, "");
+   
+   evas_object_show(o);
+   evas_object_data_set(oo, "textgrid", o);
+   elm_grid_pack(oo, o, 0, 0, 100, 100);
+   
+   // create a cursor and put it in the grid
+   o = elm_layout_add(parent);
+   oe = elm_layout_edje_get(o);
+   if (!edje_object_file_set(oe, file, "terminology/cursor"))
+     theme_apply(oe, config, "terminology/cursor");
+   edje_object_signal_emit(oe, "focus,in", "terminology");
+   evas_object_show(o);
+   evas_object_data_set(oo, "cursor", o);
+   elm_grid_pack(oo, o, 0, 0, 10, 10);
+   
+   // create a selection and put it in the grid
+   o = edje_object_add(evas);
+   oe = o;
+   if (!edje_object_file_set(oe, file, "terminology/selection"))
+     theme_apply(oe, config, "terminology/selection");
+   edje_object_signal_emit(oe, "focus,in", "terminology");
+   edje_object_signal_emit(oe, "mode,oneline", "terminology");
+   evas_object_show(o);
+   evas_object_data_set(oo, "selection", o);
+   elm_grid_pack(oo, o, 0, 0, 10, 10);
+   
+   evas_object_size_hint_min_set(obase, w, h);
+   return obase;
+}
diff --git a/src/bin/options_themepv.h b/src/bin/options_themepv.h
new file mode 100644
index 00000000..18d24e83
--- /dev/null
+++ b/src/bin/options_themepv.h
@@ -0,0 +1 @@
+Evas_Object *options_theme_preview_add(Evas_Object *parent, Config *config, const char *file, Evas_Coord w, Evas_Coord h);