diff --git a/data/elementary/themes/edc/elm/frame.edc b/data/elementary/themes/edc/elm/frame.edc
index 1564f5b09b..66d3a79358 100644
--- a/data/elementary/themes/edc/elm/frame.edc
+++ b/data/elementary/themes/edc/elm/frame.edc
@@ -41,7 +41,6 @@ group { name: "elm/frame/base/default";
             rel2.offset: -5 4;
             align: 0.0 0.0;
             color_class: "/fg/normal/frame/title";
-            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                align: 0.0 0.5;
                min: 0 1;
@@ -62,8 +61,7 @@ group { name: "elm/frame/base/default";
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/fontpreview.edc b/data/elementary/themes/edc/fontpreview.edc
index 8c407535e6..74dedf8eb5 100644
--- a/data/elementary/themes/edc/fontpreview.edc
+++ b/data/elementary/themes/edc/fontpreview.edc
@@ -3,7 +3,7 @@ group { name: "e/widgets/fontpreview";
       part { name: "e.fontpreview.text"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_DEFAULT;
+            color_class: "/fg/normal/text/fontpreview";
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
             text { font: FN; size: 10;
diff --git a/data/elementary/themes/edc/frame.edc b/data/elementary/themes/edc/frame.edc
index 4423ad51df..7ee29880a4 100644
--- a/data/elementary/themes/edc/frame.edc
+++ b/data/elementary/themes/edc/frame.edc
@@ -1,26 +1,27 @@
 group { name: "e/widgets/frame";
-   images.image: "win_shadow.png" COMP;
+   images.image: "win_shad_flat.png" COMP;
    parts {
-      part { name: "shadow"; mouse_events: 0;
-         scale: 1;
+      part { name: "shadow"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "base";
-            WIN_SHADOW_SMALL;
-         }
-         description { state: "hidden" 0.0;
-            inherit;
-            visible: 0;
+            rel.to: "_sh1";
+            color_class: "/shadow/normal/frame";
          }
       }
-      part { name: "base"; type: RECT;
+      WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
+      part { name: "base"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 6 6;
             rel2.offset: -7 -7;
-            color: 80 80 80 255;
             offscale;
          }
       }
+      part { name: "top_bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "top";
+            color_class: "/bg/normal/frame/title";
+         }
+      }
       part { name: "top"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
@@ -34,15 +35,14 @@ group { name: "e/widgets/frame";
       part { name: "e.text.label"; type: TEXT;
          scale: 1;
          description { state: "default" 0.0;
+            rel.to: "base";
             rel1.offset: 4 4;
-            rel1.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -5 4;
-            rel2.to: "base";
             align: 0.0 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/frame/title";
             text { font: FNBD; size: 10;
-               align: 0.0 0.0;
+               align: 0.0 0.5;
                min: 0 1;
             }
             fixed: 0 1;
@@ -56,13 +56,12 @@ group { name: "e/widgets/frame";
             rel1.to_y: "top";
             rel1.relative: 0.0 1.0;
             rel2.to: "base";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/frame";
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -70,12 +69,17 @@ group { name: "e/widgets/frame";
          scale: 1;
          description { state: "default" 0.0;
             align: 0.0 1.0;
-            rel1.to: "bg";
+            rel.to: "bg";
             rel1.offset: 4 4;
-            rel2.to: "bg";
             rel2.offset: -5 -5;
             offscale;
          }
+         description { state: "collapsed" 0.0;
+            inherit: "default" 0.0;
+            minmul: 1.0 0.0;
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
+         }
       }
    }
 }