diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index eb4b5c087..a1cd008af 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -51,6 +51,7 @@ edc/xkbswitch.edc \
 edc/O/about.edc \
 edc/O/backlight.edc \
 edc/O/battery.edc \
+edc/O/border.edc \
 edc/O/border_icons.edc \
 edc/O/clock.edc \
 edc/O/colors.edc \
@@ -73,6 +74,7 @@ edc/O/spectrum.edc \
 edc/O/temperature.edc \
 edc/O/transitions.edc \
 edc/O/wallpaper.edc \
+edc/O/winlist.edc \
 edc/O/wizard.edc \
 img/ball_small_glow_intense.png \
 img/ball_small_glow.png \
@@ -207,6 +209,16 @@ img/wifi_sig_2.png \
 img/wifi_sig_3.png \
 img/win_glow.png \
 img/win_shadow.png \
+img/O/menu_sel_bg.png \
+img/O/menu_sel_fg.png \
+img/O/pager_window.png \
+img/O/pager_base2.png \
+img/O/pager_window_shaded.png \
+img/O/bd_top_hilight.png \
+img/O/bd_title_bg.png \
+img/O/menu_sep.png \
+img/O/bd_title_over.png \
+img/O/base_bg.png \
 img/O/ch-h1-2.png \
 img/O/ch-h1-3.png \
 img/O/ch-h1.png \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 906befd7b..c6ea30a5d 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -41,6 +41,7 @@ collections {
 #include "edc/O/about.edc"
 #include "edc/O/backlight.edc"
 #include "edc/O/battery.edc"
+#include "edc/O/border.edc"
 #include "edc/O/border_icons.edc"
 #include "edc/O/clock.edc"
 #include "edc/O/colors.edc"
@@ -63,5 +64,6 @@ collections {
 #include "edc/O/temperature.edc"
 #include "edc/O/transitions.edc"
 #include "edc/O/wallpaper.edc"
+#include "edc/O/winlist.edc"
 #include "edc/O/wizard.edc"
 }
diff --git a/data/themes/edc/O/border.edc b/data/themes/edc/O/border.edc
new file mode 100644
index 000000000..8f499592f
--- /dev/null
+++ b/data/themes/edc/O/border.edc
@@ -0,0 +1,119 @@
+   group {
+      name: "e/widgets/border/default/move";
+      images {
+         image: "O/base_bg.png" COMP;
+         image: "O/icon_win_move.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "O/base_bg.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "icon";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.5;
+               min: 21 21;
+               max: 21 21;
+               fixed: 1 1;
+               rel1.offset: 2 2;
+               rel2.relative: 0.0 1.0;
+               rel2.offset: 2 -3;
+               image.normal: "O/icon_win_move.png";
+            }
+         }
+         part {
+            name: "e.text.label";
+            type: TEXT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to_x: "icon";
+               rel1.offset: 2 4;
+               rel1.relative: 1.0 0.0;
+               rel2.offset: -5 -5;
+               color_class: "move_text";
+               color: 0 0 0 255;
+               text {
+                  text: "X Y";
+                  font: "Sans";
+                  size: 10;
+                  align: 0.5 0.5;
+                  min: 1 1;
+                  text_class: "move_text";
+               }
+            }
+         }
+      }
+   }
+   group {
+      name: "e/widgets/border/default/resize";
+      images {
+         image: "O/base_bg.png" COMP;
+         image: "O/icon_win_resize.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.0;
+               image {
+                  normal: "O/base_bg.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "icon";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.5;
+               min: 21 21;
+               max: 21 21;
+               fixed: 1 1;
+               rel1.offset: 2 2;
+               rel2.relative: 0.0 1.0;
+               rel2.offset: 2 -3;
+               image.normal: "O/icon_win_resize.png";
+            }
+         }
+         part {
+            name: "e.text.label";
+            type: TEXT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to_x: "icon";
+               rel1.offset: 2 4;
+               rel1.relative: 1.0 0.0;
+               rel2.offset: -5 -5;
+               color_class: "resize_text";
+               color: 0 0 0 255;
+               text {
+                  text: "WxH";
+                  font: "Sans";
+                  size: 10;
+                  align: 0.5 0.5;
+                  min: 1 1;
+                  text_class: "resize_text";
+               }
+            }
+         }
+      }
+   }
+
+
diff --git a/data/themes/img/O/base_bg.png b/data/themes/img/O/base_bg.png
new file mode 100644
index 000000000..5f3cb737c
Binary files /dev/null and b/data/themes/img/O/base_bg.png differ