diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index ae365488e..3baed7d6c 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -23,6 +23,7 @@ edc/border.edc \
 edc/button.edc \
 edc/check.edc \
 edc/clock.edc \
+edc/colors.edc \
 edc/colorwell.edc \
 edc/comp.edc \
 edc/conf.edc \
@@ -31,6 +32,7 @@ edc/cslider.edc \
 edc/desklock.edc \
 edc/deskpreview.edc \
 edc/dialog.edc \
+edc/edgebindings.edc \
 edc/entry.edc \
 edc/fileman.edc \
 edc/fontpreview.edc\
@@ -178,6 +180,9 @@ img/digit_nm.png \
 img/digit_pm.png \
 img/dot_pattern.png \
 img/downlight_glow.png \
+img/downlight_glow_left.png \
+img/downlight_glow_right.png \
+img/downlight_glow_up.png \
 img/eth.png \
 img/exlclam.png \
 img/glow_lock_double.png \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index bbfe4526e..b47c75cd6 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -48,15 +48,15 @@ collections {
 #include "edc/systray.edc"
 #include "edc/clock.edc"
 #include "edc/ibar-ibox.edc"
+#include "edc/colors.edc"
+#include "edc/edgebindings.edc"
 
 // port unchanged stuff so this can work as a replacement
 #include "edc/O/backlight.edc"
 #include "edc/O/battery.edc"
 #include "edc/O/border_icons.edc"
-#include "edc/O/colors.edc"
 #include "edc/O/conf_gad.edc"
 #include "edc/O/cpufreq.edc"
-#include "edc/O/edgebindings.edc"
 #include "edc/O/efm_icons.edc"
 #include "edc/O/evrything.edc"
 #include "edc/O/gadman.edc"
@@ -66,6 +66,8 @@ collections {
 #include "edc/O/randr.edc"
 #include "edc/O/temperature.edc"
 #include "edc/O/wallpaper.edc"
+//#include "edc/O/edgebindings.edc"
+//#include "edc/O/colors.edc"
 //#include "edc/O/spectrum.edc"
 //#include "edc/O/cslider.edc"
 //#include "edc/O/fontpreview.edc"
diff --git a/data/themes/edc/colors.edc b/data/themes/edc/colors.edc
new file mode 100644
index 000000000..15cbcec08
--- /dev/null
+++ b/data/themes/edc/colors.edc
@@ -0,0 +1,156 @@
+group { name: "e/modules/conf_colors/preview/solid";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
+   parts {
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            color: 48 48 48 255;
+            min: 18 18;
+         }
+      }
+      part { name: "pat";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
+         }
+      }
+      part { name: "e.rect"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "color_preview";
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
+         }
+      }
+   }
+}
+
+group { name: "e/modules/conf_colors/preview/text";
+   parts {
+      part { name: "shadow"; type: TEXT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 255 255 255 32;
+            text { font: "Sans"; size: 10;
+               text: "Text";
+               min: 1 1;
+            }
+         }
+      }
+      part { name: "e.text"; type: TEXT; mouse_events: 0;
+         effect: OUTLINE_SHADOW;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+            color2: 255 255 255 255;
+            color3: 255 255 255 255;
+            color_class: "color_preview";
+            text { font: "Sans:style=Bold"; size: 16;
+               text: "Ab";
+               min: 1 1;
+            }
+         }
+      }
+   }
+}
+
+group { name: "e/modules/conf_colors/preview/unknown";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
+   parts {
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            color: 48 48 48 255;
+            min: 18 18;
+         }
+      }
+      part { name: "pat";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
+         }
+      }
+      part { name: "c1"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 255 0 0 128;
+            color_class: "color_preview_c1";
+            rel1.to: "bg";
+            rel2.to: "bg";
+            rel2.relative: 0.333 1.0;
+         }
+      }
+      part { name: "c2"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 0 255 0 128;
+            color_class: "color_preview_c2";
+            rel1.to: "c1";
+            rel1.relative: 1.0 0.0;
+            rel2.to: "bg";
+            rel2.relative: 0.667 1.0;
+         }
+      }
+      part { name: "c3"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 0 0 255 128;
+            color_class: "color_preview_c3";
+            rel1.to: "c2";
+            rel1.relative: 1.0 0.0;
+            rel2.to: "bg";
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
+         }
+      }
+   }
+}
diff --git a/data/themes/edc/edgebindings.edc b/data/themes/edc/edgebindings.edc
new file mode 100644
index 000000000..7f66e6522
--- /dev/null
+++ b/data/themes/edc/edgebindings.edc
@@ -0,0 +1,219 @@
+group { name: "e/modules/conf_edgebindings/selection";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
+   images.image: "darken_rounded_square.png" COMP;
+   images.image: "downlight_glow.png" COMP;
+   images.image: "downlight_glow_left.png" COMP;
+   images.image: "downlight_glow_right.png" COMP;
+   images.image: "downlight_glow_up.png" COMP;
+   images.image: "mini_blue_glow_arrow_0.png" COMP;
+   images.image: "mini_blue_glow_arrow_1.png" COMP;
+   images.image: "mini_blue_glow_arrow_2.png" COMP;
+   images.image: "mini_blue_glow_arrow_3.png" COMP;
+   styles {
+      style { name: "edge_binding_style";
+         base: "font=Sans font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+         tag: "br" "\n";
+         tag: "hilight" "+ font=Sans:style=Bold text_class=tb_light";
+      }
+   }
+   parts {
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
+            color: 48 48 48 255;
+         }
+      }
+      part { name: "pat";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
+         }
+      }
+      part { name: "e.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            min: 160 120;
+            rel1.offset: 4 4;
+            rel2.relative: 0.5 1.0;
+            rel2.offset: -2 -5;
+         }
+      }
+      part { name: "e.text.selection"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
+         description { state: "default" 0.0;
+            rel1.relative: 1.0 1.0;
+            rel1.offset: 4 4;
+            rel1.to: "e.edge.top_left";
+            rel2.relative: 0.0 0.0;
+            rel2.offset: -5 -5;
+            rel2.to: "e.edge.bottom_right";
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
+            color_class: "label_text";
+            text { font: "Sans"; size: 10;
+               text_class: "label";
+            }
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "e.edge.left";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel1.offset: 0 10;
+            rel2.to: "e.swallow.background";
+            rel2.offset: -1 -11;
+            image.normal: "downlight_glow_right.png";
+            image.border: 3 0 0 0;
+            max: 24 99999;
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "e.edge.right";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel1.offset: 0 10;
+            rel2.to: "e.swallow.background";
+            rel2.offset: -1 -11;
+            image.normal: "downlight_glow_left.png";
+            image.border: 0 3 0 0;
+            max: 24 99999;
+            align: 1.0 0.5;
+         }
+      }
+      part { name: "e.edge.top";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel1.offset: 10 0;
+            rel2.to: "e.swallow.background";
+            rel2.offset: -11 -1;
+            image.normal: "downlight_glow.png";
+            image.border: 0 0 3 0;
+            max: 99999 24;
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "e.edge.bottom";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel1.offset: 10 0;
+            rel2.to: "e.swallow.background";
+            rel2.offset: -11 -1;
+            image.normal: "downlight_glow_up.png";
+            image.border: 0 0 0 3;
+            max: 99999 24;
+            align: 0.5 1.0;
+         }
+      }
+      
+      part { name: "e.edge.top_left";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
+            max: 10 10;
+            image.normal: "mini_blue_glow_arrow_2.png";
+            align: 0.0 0.0;
+         }
+      }
+      part { name: "e.edge.top_right";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
+            max: 10 10;
+            image.normal: "mini_blue_glow_arrow_3.png";
+            align: 1.0 0.0;
+         }
+      }
+      part { name: "e.edge.bottom_right";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
+            max: 10 10;
+            image.normal: "mini_blue_glow_arrow_0.png";
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "e.edge.bottom_left";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
+            max: 10 10;
+            image.normal: "mini_blue_glow_arrow_1.png";
+            align: 0.0 1.0;
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "e.swallow.check"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+relative: 1 1;
+offset: 5 4;
+to_x: "e.swallow.background";
+to_y: "e.text.description";
+            }
+            rel2 {
+relative: 1 1;
+offset: -5 24;
+to_y: "e.text.description";
+            }
+         }
+      }
+      part { name: "e.swallow.slider"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+relative: 1 1;
+offset: 5 1;
+to_x: "e.edge.bottom_right";
+to_y: "e.swallow.check";
+            }
+            rel2 {
+relative: 1 1;
+offset: -5 -1;
+            }
+         }
+      }
+      part { name: "e.text.description"; type: TEXTBLOCK; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1 {
+relative: 1 0;
+offset: 5 4;
+to_x: "e.swallow.background";
+            }
+            rel2 {
+relative: 1 1;
+offset: -5 -45;
+            }
+            text {
+               style: "edge_binding_style";
+               min: 1 1;
+            }
+         }
+      }
+   }
+}
diff --git a/data/themes/edc/spectrum.edc b/data/themes/edc/spectrum.edc
index ade8d79b7..0cf36e779 100644
--- a/data/themes/edc/spectrum.edc
+++ b/data/themes/edc/spectrum.edc
@@ -7,7 +7,7 @@ group { name: "e/widgets/spectrum";
    images.image: "col_sel_end_left.png" COMP;
    images.image: "col_sel_end_right.png" COMP;
    parts {
-      part {       name: "bg"; type: RECT;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "e.swallow.content";
             rel2.to: "e.swallow.content";
diff --git a/data/themes/img/downlight_glow_left.png b/data/themes/img/downlight_glow_left.png
new file mode 100644
index 000000000..d74def7c9
Binary files /dev/null and b/data/themes/img/downlight_glow_left.png differ
diff --git a/data/themes/img/downlight_glow_right.png b/data/themes/img/downlight_glow_right.png
new file mode 100644
index 000000000..8b20af068
Binary files /dev/null and b/data/themes/img/downlight_glow_right.png differ
diff --git a/data/themes/img/downlight_glow_up.png b/data/themes/img/downlight_glow_up.png
new file mode 100644
index 000000000..93c5e4ee2
Binary files /dev/null and b/data/themes/img/downlight_glow_up.png differ
diff --git a/data/themes/img/logo_blue_bottom.png b/data/themes/img/logo_blue_bottom.png
index ffdeedcca..a263ffddc 100644
Binary files a/data/themes/img/logo_blue_bottom.png and b/data/themes/img/logo_blue_bottom.png differ