Merge branch 'feature/themes/flat' into devs/hermet/lottiedevs/hermet/lottie

8 files changed, 1928 insertions, 2124 deletions

diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index eb28be4135..52193a8c16 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -154,7 +154,7 @@ group { name: "efl/button";
       text { "efl.text"; nomouse; required;
          scale: 1;
          desc { "default";
-            fixed: 1 1;
+//            fixed: 1 1;
             color: 192 192 192 255;
             rel1.offset: 0 6;
             rel1.relative: 1.0 0.0;
diff --git a/data/elementary/themes/edc/efl/panel.edc b/data/elementary/themes/edc/efl/panel.edc
index 6ad3afc727..4dfc85a5a8 100644
--- a/data/elementary/themes/edc/efl/panel.edc
+++ b/data/elementary/themes/edc/efl/panel.edc
@@ -1,19 +1,18 @@
-group { name: "efl/panel"; data.item: "version" "123";
-   data {
-      item: "handler_size" "30";
-   }
+group { name: "efl/panel";
+   data.item: "version" "123";
+   data.item: "handler_size" "30";
    parts {
-      part { name: "efl.content";
-         type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
          }
       }
    }
 }
-group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
+
+group { name: "efl/scroller/panel/left";
+   data.item: "version" "123";
    parts {
-      part { name: "efl.panel_area";
-         type: SWALLOW;
+      part { name: "efl.panel_area"; type: SWALLOW;
          description { state: "default" 0.0;
             rel2.relative: 0.0 1.0;
             align: 0.0 0.5;
@@ -25,17 +24,11 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.event_area";
-         type: SWALLOW;
+      part { name: "efl.event_area"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1 {
-               relative: 1.0 0.0;
-               to: "efl.panel_area";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to: "efl.panel_area";
-            }
+            rel.to: "efl.panel_area";
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
             align: 0.0 0.5;
             fixed: 1 1;
             visible: 0;
@@ -45,20 +38,16 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "access.outline";
-         type: RECT;
+      part { name: "access.outline"; type: RECT;
          repeat_events: 1;
          description { state: "default" 0.0;
-            rel1.to: "efl.panel_area";
-            rel2.to: "efl.panel_area";
+            rel.to: "efl.panel_area";
             color: 0 0 0 0;
          }
       }
-      part { name: "bg";
-         type: RECT;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "efl.panel_area";
-            rel2.to: "efl.panel_area";
+            rel.to: "efl.panel_area";
             color: 64 64 64 255;
             visible: 0;
          }
@@ -67,11 +56,9 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.content";
-         type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "efl.panel_area";
-            rel2.to: "efl.panel_area";
+            rel.to: "efl.panel_area";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -81,18 +68,14 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
       }
    }
    programs {
-      program { name: "active";
-         signal: "efl,state,content,visible";
-         source: "efl";
+      program { signal: "efl,state,content,visible"; source: "efl";
          action: STATE_SET "visible" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
          target: "bg";
          target: "efl.content";
       }
-      program { name: "inactive";
-         signal: "efl,state,content,hidden";
-         source: "efl";
+      program { signal: "efl,state,content,hidden"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
@@ -102,10 +85,10 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
+group { name: "efl/scroller/panel/right";
+   data.item: "version" "123";
    parts {
-      part { name: "efl.event_area";
-         type: SWALLOW;
+      part { name: "efl.event_area"; type: SWALLOW;
          description { state: "default" 0.0;
             rel2.relative: 0.0 1.0;
             align: 0.0 0.5;
@@ -117,8 +100,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.panel_area";
-         type: SWALLOW;
+      part { name: "efl.panel_area"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1 {
                relative: 1.0 0.0;
@@ -137,8 +119,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "access.outline";
-         type: RECT;
+      part { name: "access.outline"; type: RECT;
          repeat_events: 1;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
@@ -146,8 +127,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
             color: 0 0 0 0;
          }
       }
-      part { name: "bg";
-         type: RECT;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
@@ -159,8 +139,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.content";
-         type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
@@ -173,18 +152,14 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
       }
    }
    programs {
-      program { name: "active";
-         signal: "efl,state,content,visible";
-         source: "efl";
+      program { signal: "efl,state,content,visible"; source: "efl";
          action: STATE_SET "visible" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
          target: "bg";
          target: "efl.content";
       }
-      program { name: "inactive";
-         signal: "efl,state,content,hidden";
-         source: "efl";
+      program { signal: "efl,state,content,hidden"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
@@ -194,10 +169,10 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
+group { name: "efl/scroller/panel/top";
+   data.item: "version" "123";
    parts {
-      part { name: "efl.panel_area";
-         type: SWALLOW;
+      part { name: "efl.panel_area"; type: SWALLOW;
          description { state: "default" 0.0;
             rel2.relative: 1.0 0.0;
             align: 0.5 0.0;
@@ -209,8 +184,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.event_area";
-         type: SWALLOW;
+      part { name: "efl.event_area"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1 {
                relative: 0.0 1.0;
@@ -229,8 +203,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "access.outline";
-         type: RECT;
+      part { name: "access.outline"; type: RECT;
          repeat_events: 1;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
@@ -238,8 +211,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
             color: 0 0 0 0;
          }
       }
-      part { name: "bg";
-         type: RECT;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
@@ -251,8 +223,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.content";
-         type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
@@ -265,18 +236,14 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
       }
    }
    programs {
-      program { name: "active";
-         signal: "efl,state,content,visible";
-         source: "efl";
+      program { signal: "efl,state,content,visible"; source: "efl";
          action: STATE_SET "visible" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
          target: "bg";
          target: "efl.content";
       }
-      program { name: "inactive";
-         signal: "efl,state,content,hidden";
-         source: "efl";
+      program { signal: "efl,state,content,hidden"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
@@ -286,10 +253,10 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
+group { name: "efl/scroller/panel/bottom";
+   data.item: "version" "123";
    parts {
-      part { name: "efl.event_area";
-         type: SWALLOW;
+      part { name: "efl.event_area"; type: SWALLOW;
          description { state: "default" 0.0;
             rel2.relative: 1.0 0.0;
             align: 0.5 0.0;
@@ -301,17 +268,11 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.panel_area";
-         type: SWALLOW;
+      part { name: "efl.panel_area"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "efl.event_area";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to: "efl.event_area";
-            }
+            rel.to: "efl.event_area";
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
             align: 0.5 0.0;
             fixed: 1 1;
             visible: 0;
@@ -321,20 +282,15 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "access.outline";
-         type: RECT;
-         repeat_events: 1;
+      part { name: "access.outline"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
-            rel1.to: "efl.panel_area";
-            rel2.to: "efl.panel_area";
+            rel.to: "efl.panel_area";
             color: 0 0 0 0;
          }
       }
-      part { name: "bg";
-         type: RECT;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "efl.panel_area";
-            rel2.to: "efl.panel_area";
+            rel.to: "efl.panel_area";
             color: 64 64 64 255;
             visible: 0;
          }
@@ -343,11 +299,9 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
             visible: 1;
          }
       }
-      part { name: "efl.content";
-         type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "efl.panel_area";
-            rel2.to: "efl.panel_area";
+            rel.to: "efl.panel_area";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -357,18 +311,14 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
       }
    }
    programs {
-      program { name: "active";
-         signal: "efl,state,content,visible";
-         source: "efl";
+      program { signal: "efl,state,content,visible"; source: "efl";
          action: STATE_SET "visible" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
          target: "bg";
          target: "efl.content";
       }
-      program { name: "inactive";
-         signal: "efl,state,content,hidden";
-         source: "efl";
+      program { signal: "efl,state,content,hidden"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "efl.panel_area";
          target: "efl.event_area";
@@ -378,49 +328,32 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/panel/left"; data.item: "version" "123";
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "shadow_square_tiny.png" COMP;
-   images.image: "holes_tiny_glow_vert.png" COMP;
-   images.image: "holes_tiny_glow_horiz.png" COMP;
-   images.image: "win_glow.png" COMP;
-   images.image: "icon_arrow_right.png" COMP;
-   images.image: "icon_arrow_left.png" COMP;
-   images.image: "icon_arrow_up.png" COMP;
-   images.image: "icon_arrow_down.png" COMP;
+group { name: "efl/panel/left";
+   data.item: "version" "123";
    data.item: "focus_highlight" "on";
    script {
       public is_rtl = 0;
    }
    parts {
       part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "base";
-            rel2.offset: 2 4;
-            rel2.to: "base";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
          }
       }
-      part { name: "glow"; mouse_events: 0;
+      part { name: "glow"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel1.offset: -5  -5;
-            rel1.to: "base";
-            rel2.offset: 4 4;
-            rel2.to: "base";
-            fill.smooth: 0;
-            color: 255 255 255 0;
+            rel.to: "base";
+            color: 51 153 255 255;
             visible: 0;
+            offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            rel1.offset: -5 -5;
+            rel2.offset: 4 4;
             visible: 1;
          }
       }
@@ -433,44 +366,23 @@ group { name: "efl/panel/left"; data.item: "version" "123";
             rel1.to_x: "all";
             rel2.to_x: "efl.swallow.event";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -4 -1;
             color: 64 64 64 255;
          }
       }
       part { name: "efl.content"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
+            rel.to: "base";
             rel1.offset: 4 4;
-            rel1.to: "base";
             rel2.offset: -5 -5;
-            rel2.to: "base";
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "base";
-            FIXED_SIZE(69, 5)
+            offscale;
          }
       }
       part { name: "efl.swallow.event"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 20 20;
-            max: 20 20;
+            min: 30 30; max: 30 999999;
             align: 1.0 0.5;
             rel1.relative: 1.0 0.0;
             rel2.relative: 1.0 1.0;
@@ -485,54 +397,38 @@ group { name: "efl/panel/left"; data.item: "version" "123";
       }
       part { name: "btn"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "efl.swallow.event";
-            rel2.to: "efl.swallow.event";
+            rel.to: "efl.swallow.event";
             color: 0 0 0 0;
          }
          description { state: "hidden" 0.0;
-            rel1.to: "efl.swallow.event";
-            rel2.to: "efl.swallow.event";
-         }
-      }
-      part { name: "dots"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "icn";
-            rel2.to: "icn";
-            align: 0.0 0.5;
-            image.normal: "holes_tiny_glow_vert.png";
-            FIXED_SIZE(11, 17)
+            rel.to: "efl.swallow.event";
          }
       }
       part { name: "icn"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 20 20;
-            max: 20 20;
-            rel1.to: "btn";
-            rel2.to: "btn";
-            image.normal: "icon_arrow_left.png";
+            min: 30 30; max: 30 30;
+            rel.to: "btn";
+            image.normal: "i-arrow-l";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_right.png";
+            image.normal: "i-arrow-r";
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,clicked,1"; source: "btn";
+      program { signal: "mouse,clicked,1"; source: "btn";
          action: SIGNAL_EMIT "efl,action,panel,toggle" "efl";
       }
-      program {
-         signal: "efl,action,show"; source: "efl";
+      program { signal: "efl,action,show"; source: "efl";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.3;
+         transition: DECELERATE 0.2;
          target: "efl.swallow.event";
          target: "base";
       }
-      program {
-         signal: "efl,action,show"; source: "efl";
+      program { signal: "efl,action,show"; source: "efl";
          script {
             if (get_int(is_rtl) == 0)
               set_state(PART:"icn", "default", 0.0);
@@ -540,9 +436,7 @@ group { name: "efl/panel/left"; data.item: "version" "123";
               set_state(PART:"icn", "hidden", 0.0);
          }
       }
-      program {
-         signal: "edje,state,rtl";
-         source: "edje";
+      program { signal: "edje,state,rtl"; source: "edje";
          script {
             new st[31];
             new Float:vl;
@@ -554,9 +448,7 @@ group { name: "efl/panel/left"; data.item: "version" "123";
             set_int(is_rtl, 1);
          }
       }
-      program {
-         signal: "edje,state,ltr"; 
-         source: "edje";
+      program { signal: "edje,state,ltr"; source: "edje";
          script {
             new st[31];
             new Float:vl;
@@ -568,14 +460,12 @@ group { name: "efl/panel/left"; data.item: "version" "123";
             set_int(is_rtl, 0);
          }
       }
-      program {
-         signal: "efl,action,hide"; source: "efl";
+      program { signal: "efl,action,hide"; source: "efl";
          action: STATE_SET "hidden" 0.0;
-         transition: ACCELERATE 0.3;
+         transition: ACCELERATE 0.2;
          target: "efl.swallow.event";
       }
-      program {
-         signal: "efl,action,hide"; source: "efl";
+      program { signal: "efl,action,hide"; source: "efl";
          script {
             if (get_int(is_rtl) == 0)
               set_state(PART:"icn", "hidden", 0.0);
@@ -587,21 +477,18 @@ group { name: "efl/panel/left"; data.item: "version" "123";
          signal: "efl,action,hide"; source: "efl";
          script {
             new x, y, w, h;
-            if (get_int(is_rtl) == 0)
-              {
-                 custom_state(PART:"base", "default", 0.0);
-                 set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
-                 get_geometry(PART:"efl.swallow.event", x, y, w, h);
-                 set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
-               }
-            else
-              {
-                 custom_state(PART:"base", "default", 0.0);
-                 set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
-                 set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
-                 get_geometry(PART:"efl.swallow.event", x, y, w, h);
-                 set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
-              }
+            if (get_int(is_rtl) == 0) {
+               custom_state(PART:"base", "default", 0.0);
+               set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+               get_geometry(PART:"efl.swallow.event", x, y, w, h);
+               set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
+            } else {
+               custom_state(PART:"base", "default", 0.0);
+               set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+               set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
+               get_geometry(PART:"efl.swallow.event", x, y, w, h);
+               set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
+            }
          }
          after: "hide2";
       }
@@ -610,14 +497,12 @@ group { name: "efl/panel/left"; data.item: "version" "123";
          transition: ACCELERATE 0.3;
          target: "base";
       }
-      program {
-         signal: "efl,action,focus_highlight,show"; source: "efl";
+      program { signal: "efl,action,focus_highlight,show"; source: "efl";
          action: STATE_SET "focused" 0.0;
          transition: ACCELERATE 0.2;
          target: "glow";
       }
-      program {
-         signal: "efl,action,focus_highlight,hide"; source: "efl";
+      program { signal: "efl,action,focus_highlight,hide"; source: "efl";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow";
@@ -626,8 +511,8 @@ group { name: "efl/panel/left"; data.item: "version" "123";
 }
 
 group { name: "efl/panel/right";
-   inherit: "efl/panel/left";
    data.item: "version" "123";
+   inherit: "efl/panel/left";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
@@ -651,17 +536,12 @@ group { name: "efl/panel/right";
             rel2.relative: 1.0 1.0;
          }
       }
-      part { name: "dots";
-         description { state: "default" 0.0;
-            align: 1.0 0.5;
-         }
-      }
       part { name: "icn";
          description { state: "default" 0.0;
-            image.normal: "icon_arrow_right.png";
+            image.normal: "i-arrow-r";
          }
          description { state: "hidden" 0.0;
-            image.normal: "icon_arrow_left.png";
+            image.normal: "i-arrow-l";
          }
       }
    }
@@ -669,7 +549,7 @@ group { name: "efl/panel/right";
       program { name: "hide1";
          script {
             new x, y, w, h;
-    
+
             custom_state(PART:"base", "default", 0.0);
             set_state_val(PART:"base", STATE_REL1, 1.0, 0.0);
             set_state_val(PART:"base", STATE_REL2, 2.0, 1.0);
@@ -681,23 +561,22 @@ group { name: "efl/panel/right";
 }
 
 group { name: "efl/panel/top";
-   inherit: "efl/panel/left";
    data.item: "version" "123";
+   inherit: "efl/panel/left";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
             rel1.to_x: "all";
             rel1.to_y: "all";
-            rel1.offset: 0 0;
             rel2.relative: 1.0 0.0;
             rel2.to_x: "all";
             rel2.to_y: "efl.swallow.event";
-            rel2.offset: -1 -4;
          }
       }
       part { name: "efl.swallow.event";
          description { state: "default" 0.0;
+            min: 30 30; max: 999999 30;
             align: 0.5 1.0;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 1.0;
@@ -708,19 +587,12 @@ group { name: "efl/panel/top";
             rel2.relative: 1.0 0.0;
          }
       }
-      part { name: "dots";
-         description { state: "default" 0.0;
-            align: 0.5 0.0;
-            image.normal: "holes_tiny_glow_horiz.png";
-            FIXED_SIZE(17, 11)
-         }
-      }
       part { name: "icn";
          description { state: "default" 0.0;
-            image.normal: "icon_arrow_up.png";
+            image.normal: "i-arrow-u";
          }
          description { state: "hidden" 0.0;
-            image.normal: "icon_arrow_down.png";
+            image.normal: "i-arrow-d";
          }
       }
    }
@@ -728,7 +600,6 @@ group { name: "efl/panel/top";
       program { name: "hide1";
          script {
             new x, y, w, h;
-            
             custom_state(PART:"base", "default", 0.0);
             set_state_val(PART:"base", STATE_REL1, 0.0, -1.0);
             set_state_val(PART:"base", STATE_REL2, 1.0, 0.0);
@@ -736,14 +607,11 @@ group { name: "efl/panel/top";
             set_state_val(PART:"base", STATE_REL1_OFFSET, 0, h);
          }
       }
-      program {
-         signal: "efl,action,show"; source: "efl";
+      program { signal: "efl,action,show"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "icn";
       }
-      program {
-         signal: "edje,state,rtl";
-         source: "edje";
+      program { signal: "edje,state,rtl"; source: "edje";
          script {
             new st[31];
             new Float:vl;
@@ -754,9 +622,7 @@ group { name: "efl/panel/top";
               set_state(PART:"icn", "hidden", 0.0);
          }
       }
-      program {
-         signal: "edje,state,ltr";
-         source: "edje";
+      program { signal: "edje,state,ltr"; source: "edje";
          script {
             new st[31];
             new Float:vl;
@@ -767,8 +633,7 @@ group { name: "efl/panel/top";
               set_state(PART:"icn", "hidden", 0.0);
          }
       }
-      program {
-         signal: "efl,action,hide"; source: "efl";
+      program { signal: "efl,action,hide"; source: "efl";
          action: STATE_SET "hidden" 0.0;
          target: "icn";
       }
@@ -776,19 +641,17 @@ group { name: "efl/panel/top";
 }
 
 group { name: "efl/panel/bottom";
-   inherit: "efl/panel/top";
    data.item: "version" "123";
+   inherit: "efl/panel/top";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel1.to_x: "all";
             rel1.to_y: "efl.swallow.event";
-            rel1.offset: 0 3;
             rel2.relative: 1.0 1.0;
             rel2.to_x: "all";
             rel2.to_y: "all";
-            rel2.offset: -1 -1;
          }
       }
       part { name: "efl.swallow.event";
@@ -803,19 +666,12 @@ group { name: "efl/panel/bottom";
             rel2.relative: 1.0 1.0;
          }
       }
-      part { name: "dots";
-         description { state: "default" 0.0;
-            align: 0.5 0.0;
-            image.normal: "holes_tiny_glow_horiz.png";
-            FIXED_SIZE(17, 11)
-         }
-      }
       part { name: "icn";
          description { state: "default" 0.0;
-            image.normal: "icon_arrow_down.png";
+            image.normal: "i-arrow-d";
          }
          description { state: "hidden" 0.0;
-            image.normal: "icon_arrow_up.png";
+            image.normal: "i-arrow-u";
          }
       }
    }
@@ -832,3 +688,4 @@ group { name: "efl/panel/bottom";
       }
    }
 }
+
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 186c1491aa..e9834af6f6 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -9,12 +9,13 @@
       efl,action,unpress: Used for "unpress" smart callback.
 */
 
-#define PANEMIN  10
-#define PANEMIN2 16
-#define PANEWID  32
+#define PANEMIN  8
+#define PANEMIN2 24
+#define PANEWID  24
 
-group { name: "efl/panes/vertical"; data.item: "version" "123";
-   images.image: "holes_vert.png" COMP;
+group { name: "efl/panes/vertical";
+   data.item: "version" "123";
+   images.image: "pane_handle_v.png" COMP;
    parts {
       //TODO: remove left/right
       alias: "first" "efl.left";
@@ -55,31 +56,27 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
             rel2.to_x: "efl.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -4 -1;
+            rel2.relative: 0.0 1.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
             rel1.to_x: "efl.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 3 0;
+            rel1.relative: 1.0 0.0;
          }
       }
       part { name: "efl.left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
             rel2.to_x: "efl.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -4 -1;
+            rel2.relative: 0.0 1.0;
          }
       }
       part { name: "efl.right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
             rel1.to_x: "efl.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 3 0;
+            rel1.relative: 1.0 0.0;
          }
       }
       part { name: "efl.bar"; type: SPACER;
@@ -88,8 +85,8 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
             y: 0 0 0;
          }
          description { state: "default" 0.0;
-            max: 0 99999;
-            min: 0 14;
+            max: 8 99999;
+            min: 8 24;
             fixed: 1 1;
             rel1.relative: 0.0 0.5;
             rel2.relative: 1.0 0.5;
@@ -97,10 +94,11 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
       }
       part { name: "dots"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "holes_vert.png";
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
-            FIXED_SIZE(4, 14)
+            FIXED_SIZE(8, 24)
+            image.normal: "pane_handle_v.png";
+            fill.smooth: 0;
+            rel.to: "efl.bar";
+            color: 160 160 160 255;
          }
       }
       part { name: "efl.event"; type: SWALLOW;
@@ -108,8 +106,7 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
             visible: 0;
             min: PANEMIN PANEMIN2;
             fixed: 1 1;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "bar"; type: RECT;
@@ -130,12 +127,12 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
    }
    programs {
       EFL_UI_CLICKABLE_PART_BIND("bar")
-      program { // for elm_panes_fixed_set()
+      program { // for efl_panes_fixed_set()
          signal: "efl,panes,fixed"; source: "efl";
          action: STATE_SET "disabled" 0.0;
          target: "bar";
       }
-      program { // for elm_panes_fixed_set()
+      program { // for efl_panes_fixed_set()
          signal: "efl,panes,unfixed"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "bar";
@@ -143,8 +140,9 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/panes/horizontal"; data.item: "version" "123";
-   images.image: "holes_horiz.png" COMP;
+group { name: "efl/panes/horizontal";
+   data.item: "version" "123";
+   images.image: "pane_handle_h.png" COMP;
    parts {
       //TODO: remove left/right
       alias: "first" "efl.left";
@@ -185,31 +183,27 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
             rel2.to_y: "efl.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -4;
+            rel2.relative: 1.0 0.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
             rel1.to_y: "efl.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 0 3;
+            rel1.relative: 0.0 1.0;
          }
       }
       part { name: "efl.left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
             rel2.to_y: "efl.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -4;
+            rel2.relative: 1.0 0.0;
          }
       }
       part { name: "efl.right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
             rel1.to_y: "efl.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 0 3;
+            rel1.relative: 0.0 1.0;
          }
       }
       part { name: "efl.bar"; type: SPACER;
@@ -218,8 +212,8 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
             y: 1 1 1;
          }
          description { state: "default" 0.0;
-            max: 99999 0;
-            min: 14 0;
+            max: 99999 8;
+            min: 24 8;
             fixed: 1 1;
             rel1.relative: 0.5 0.0;
             rel2.relative: 0.5 1.0;
@@ -227,10 +221,11 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
       }
       part { name: "dots"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "holes_horiz.png";
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
-            FIXED_SIZE(14, 4)
+            FIXED_SIZE(24, 8)
+            image.normal: "pane_handle_h.png";
+            fill.smooth: 0;
+            rel.to: "efl.bar";
+            color: 160 160 160 255;
          }
       }
       part { name: "efl.event"; type: SWALLOW;
@@ -238,8 +233,7 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
             visible: 0;
             min: PANEMIN2 PANEMIN;
             fixed: 1 1;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "bar"; type: RECT;
@@ -260,12 +254,12 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
    }
    programs {
       EFL_UI_CLICKABLE_PART_BIND("bar")
-      program { // for elm_panes_fixed_set()
+      program { // for efl_panes_fixed_set()
          signal: "efl,panes,fixed"; source: "efl";
          action: STATE_SET "disabled" 0.0;
          target: "bar";
       }
-      program { // for elm_panes_fixed_set()
+      program { // for efl_panes_fixed_set()
          signal: "efl,panes,unfixed"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "bar";
@@ -273,9 +267,11 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
-   images.image: "downlight_glow_left.png" COMP;
-   images.image: "downlight_glow_right.png" COMP;
+////////////////////////////////////////////////////////////////////////////
+
+group { name: "efl/panes/vertical:flush";
+   data.item: "version" "123";
+   images.image: "shadow_circle_vert.png" COMP;
    parts {
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -353,8 +349,7 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
             visible: 0;
             min: PANEMIN PANEMIN2;
             fixed: 1 1;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "bar"; type: RECT;
@@ -375,64 +370,81 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
          }
       }
       part { name: "glow1a"; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_left.png";
-            image.border: 0 3 0 0;
-            max: 32 99999;
+            image.normal: "shadow_circle_vert.png";
+            rel1.to_x: "efl.bar";
             rel2.to_x: "efl.bar";
             color: 255 255 255 0;
-            align: 1.0 0.5;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: -16 0;
+            rel2.offset: 15 -1;
+            visible: 1;
          }
       }
-      part { name: "glow1b"; mouse_events: 0;
+      part { name: "glow2a"; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_right.png";
-            max: 4 99999;
+            image.normal: "shadow_circle_vert.png";
             rel1.to_x: "efl.bar";
+            rel2.to_x: "efl.bar";
             color: 255 255 255 0;
-            align: 0.0 0.5;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: -16 0;
+            rel2.offset: 15 -1;
+            visible: 1;
          }
       }
-      part { name: "glow2a"; mouse_events: 0;
+      part { name: "glowbar1a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_left.png";
-            max: 4 99999;
+            rel1.to_x: "efl.bar";
             rel2.to_x: "efl.bar";
-            color: 255 255 255 0;
-            align: 1.0 0.5;
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            rel1.offset: -5 0;
+            rel2.offset: 4 -1;
+            visible: 1;
          }
       }
-      part { name: "glow2b"; mouse_events: 0;
+      part { name: "glowbar2a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_right.png";
-            image.border: 3 0 0 0;
-            max: 32 99999;
             rel1.to_x: "efl.bar";
-            color: 255 255 255 0;
-            align: 0.0 0.5;
+            rel2.to_x: "efl.bar";
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            rel1.offset: -5 0;
+            rel2.offset: 4 -1;
+            visible: 1;
          }
       }
       part { name: "bar1"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
-            rel2.to: "bar";
+            rel.to: "bar";
             rel2.relative: 0.5 1.0;
             color: 0 0 0 0;
          }
@@ -440,21 +452,25 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
       part { name: "bar2"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
+            rel.to: "bar";
             rel1.relative: 0.5 0.0;
-            rel2.to: "bar";
             color: 0 0 0 0;
          }
       }
    }
    programs {
-      EFL_UI_CLICKABLE_PART_BIND("bar")
-      program { // for elm_panes_fixed_set()
+      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+         action: SIGNAL_EMIT "efl,action,press" "efl";
+      }
+      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+         action: SIGNAL_EMIT "efl,action,unpress" "efl";
+      }
+      program { // for efl_panes_fixed_set()
          signal: "efl,panes,fixed"; source: "efl";
          action: STATE_SET "disabled" 0.0;
          target: "bar";
       }
-      program { // for elm_panes_fixed_set()
+      program { // for efl_panes_fixed_set()
          signal: "efl,panes,unfixed"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "bar";
@@ -462,37 +478,37 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
       program {
          signal: "mouse,in"; source: "bar1";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: DECELERATE 0.2;
          target: "glow1a";
-         target: "glow1b";
+         target: "glowbar1a";
       }
       program {
          signal: "mouse,out"; source: "bar1";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow1a";
-         target: "glow1b";
+         target: "glowbar1a";
       }
       program {
          signal: "mouse,in"; source: "bar2";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: DECELERATE 0.2;
          target: "glow2a";
-         target: "glow2b";
+         target: "glowbar2a";
       }
       program {
          signal: "mouse,out"; source: "bar2";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow2a";
-         target: "glow2b";
+         target: "glowbar2a";
       }
    }
 }
 
-group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
-   images.image: "downlight_glow.png" COMP;
-   images.image: "downlight_glow_up.png" COMP;
+group { name: "efl/panes/horizontal:flush";
+   data.item: "version" "123";
+   images.image: "shadow_circle_horiz.png" COMP;
    parts {
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -570,8 +586,7 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
             visible: 0;
             min: PANEMIN2 PANEMIN;
             fixed: 1 1;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "bar"; type: RECT;
@@ -592,64 +607,81 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
          }
       }
       part { name: "glow1a"; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_up.png";
-            image.border: 0 0 0 3;
-            max: 99999 32;
+            image.normal: "shadow_circle_horiz.png";
+            rel1.to_y: "efl.bar";
             rel2.to_y: "efl.bar";
             color: 255 255 255 0;
-            align: 0.5 1.0;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: 0 -16;
+            rel2.offset: -1 15;
+            visible: 1;
          }
       }
-      part { name: "glow1b"; mouse_events: 0;
+      part { name: "glow2a"; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow.png";
-            max: 99999 4;
+            image.normal: "shadow_circle_horiz.png";
             rel1.to_y: "efl.bar";
+            rel2.to_y: "efl.bar";
             color: 255 255 255 0;
-            align: 0.5 0.0;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: 0 -16;
+            rel2.offset: -1 15;
+            visible: 1;
          }
       }
-      part { name: "glow2a"; mouse_events: 0;
+      part { name: "glowbar1a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_up.png";
-            max: 99999 4;
+            rel1.to_y: "efl.bar";
             rel2.to_y: "efl.bar";
-            color: 255 255 255 0;
-            align: 0.5 1.0;
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            rel1.offset: 0 -5;
+            rel2.offset: -1 4;
+            visible: 1;
          }
       }
-      part { name: "glow2b"; mouse_events: 0;
+      part { name: "glowbar2a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow.png";
-            image.border: 0 0 3 0;
-            max: 99999 32;
             rel1.to_y: "efl.bar";
-            color: 255 255 255 0;
-            align: 0.5 0.0;
+            rel2.to_y: "efl.bar";
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            rel1.offset: 0 -5;
+            rel2.offset: -1 4;
+            visible: 1;
          }
       }
       part { name: "bar1"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
-            rel2.to: "bar";
+            rel.to: "bar";
             rel2.relative: 1.0 0.5;
             color: 0 0 0 0;
          }
@@ -657,87 +689,85 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
       part { name: "bar2"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
+            rel.to: "bar";
             rel1.relative: 0.0 0.5;
-            rel2.to: "bar";
             color: 0 0 0 0;
          }
       }
    }
    programs {
+      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+         action: SIGNAL_EMIT "efl,action,press" "efl";
+      }
+      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+         action: SIGNAL_EMIT "efl,action,unpress" "efl";
+      }
+      program { // for efl_panes_fixed_set()
+         signal: "efl,panes,fixed"; source: "efl";
+         action: STATE_SET "disabled" 0.0;
+         target: "bar";
+      }
+      program { // for efl_panes_fixed_set()
+         signal: "efl,panes,unfixed"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         target: "bar";
+      }
       program {
          signal: "mouse,in"; source: "bar1";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: DECELERATE 0.2;
          target: "glow1a";
-         target: "glow1b";
+         target: "glowbar1a";
       }
       program {
          signal: "mouse,out"; source: "bar1";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow1a";
-         target: "glow1b";
+         target: "glowbar1a";
       }
       program {
          signal: "mouse,in"; source: "bar2";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: DECELERATE 0.2;
          target: "glow2a";
-         target: "glow2b";
+         target: "glowbar2a";
       }
       program {
          signal: "mouse,out"; source: "bar2";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow2a";
-         target: "glow2b";
-      }
-      EFL_UI_CLICKABLE_PART_BIND("bar")
-      program { // for elm_panes_fixed_set()
-         signal: "efl,panes,fixed"; source: "efl";
-         action: STATE_SET "disabled" 0.0;
-         target: "bar";
-      }
-      program { // for elm_panes_fixed_set()
-         signal: "efl,panes,unfixed"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         target: "bar";
+         target: "glowbar2a";
       }
    }
 }
 
 group { name: "efl/panes/vertical:left-fold";
-   inherit: "efl/panes/vertical";
    data.item: "version" "123";
-   images.image: "icon_arrow_left.png" COMP;
-   images.image: "icon_arrow_right.png" COMP;
+   inherit: "efl/panes/vertical";
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel1.offset: 3 0;
-         }
-      }
       image { "dots";
+         scale;
          desc { "default";
-            image.normal: "icon_arrow_left.png";
-            FIXED_SIZE(14, 14)
+            image.normal: "i-arrow-l";
+            FIXED_SIZE(15, 15)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_right.png";
+            image.normal: "i-arrow-r";
          }
       }
       rect { "event";
          repeat;
          desc { "default";
-            rel1.to: "dots";
-            rel2.to: "dots";
+            rel.to: "dots";
             color: 0 0 0 0;
          }
       }
@@ -750,8 +780,7 @@ group { name: "efl/panes/vertical:left-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -759,9 +788,7 @@ group { name: "efl/panes/vertical:left-fold";
                set_float(drag_x, dx);
                set_drag(PART:"efl.bar", 0.0, 0.5);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
                set_state(PART:"dots", "default", 0.0);
@@ -772,36 +799,29 @@ group { name: "efl/panes/vertical:left-fold";
 }
 
 group { name: "efl/panes/vertical:right-fold";
-   inherit: "efl/panes/vertical";
    data.item: "version" "123";
-   images.image: "icon_arrow_left.png" COMP;
-   images.image: "icon_arrow_right.png" COMP;
+   inherit: "efl/panes/vertical";
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel2.offset: -4 0;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_right.png";
-            FIXED_SIZE(14, 17)
+            image.normal: "i-arrow-r";
+            FIXED_SIZE(15, 15)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_left.png";
+            image.normal: "i-arrow-l";
          }
       }
       rect { "event";
          repeat;
          desc { "default";
-            rel1.to: "dots";
-            rel2.to: "dots";
+            rel.to: "dots";
             color: 0 0 0 0;
          }
       }
@@ -814,8 +834,7 @@ group { name: "efl/panes/vertical:right-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -823,9 +842,7 @@ group { name: "efl/panes/vertical:right-fold";
                set_float(drag_x, dx);
                set_drag(PART:"efl.bar", 1.0, 0.5);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
                set_state(PART:"dots", "default", 0.0);
@@ -836,36 +853,29 @@ group { name: "efl/panes/vertical:right-fold";
 }
 
 group { name: "efl/panes/horizontal:up-fold";
-   inherit: "efl/panes/horizontal";
    data.item: "version" "123";
-   images.image: "icon_arrow_up.png" COMP;
-   images.image: "icon_arrow_down.png" COMP;
+   inherit: "efl/panes/horizontal";
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel1.offset: 0 3;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_up.png";
-            FIXED_SIZE(17, 14)
+            image.normal: "i-arrow-u";
+            FIXED_SIZE(15, 15)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_down.png";
+            image.normal: "i-arrow-d";
          }
       }
       rect { "event";
          repeat;
          desc { "default";
-            rel1.to: "dots";
-            rel2.to: "dots";
+            rel.to: "dots";
             color: 0 0 0 0;
          }
       }
@@ -878,8 +888,7 @@ group { name: "efl/panes/horizontal:up-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -887,9 +896,7 @@ group { name: "efl/panes/horizontal:up-fold";
                set_float(drag_y, dy);
                set_drag(PART:"efl.bar", 0.5, 0.0);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
                set_state(PART:"dots", "default", 0.0);
@@ -900,36 +907,29 @@ group { name: "efl/panes/horizontal:up-fold";
 }
 
 group { name: "efl/panes/horizontal:down-fold";
-   inherit: "efl/panes/horizontal";
    data.item: "version" "123";
-   images.image: "icon_arrow_up.png" COMP;
-   images.image: "icon_arrow_down.png" COMP;
+   inherit: "efl/panes/horizontal";
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel2.offset: 0 -4;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_down.png";
-            FIXED_SIZE(17, 14)
+            image.normal: "i-arrow-d";
+            FIXED_SIZE(15, 15)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_up.png";
+            image.normal: "i-arrow-u";
          }
       }
       rect { "event";
          repeat;
          desc { "default";
-            rel1.to: "dots";
-            rel2.to: "dots";
+            rel.to: "dots";
             color: 0 0 0 0;
          }
       }
@@ -942,8 +942,7 @@ group { name: "efl/panes/horizontal:down-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -951,9 +950,7 @@ group { name: "efl/panes/horizontal:down-fold";
                set_float(drag_y, dy);
                set_drag(PART:"efl.bar", 0.5, 1.0);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
                set_state(PART:"dots", "default", 0.0);
diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc
index d720005b90..4a9100139d 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -1,14 +1,9 @@
-group { name: "efl/pointer"; data.item: "version" "123";
-   images {
-      image: "pointer.png" COMP;
-      image: "pointer_glow.png" COMP;
-   }
+group { name: "efl/pointer";
+   data.item: "version" "123";
+   images.image: "pointer.png" COMP;
    parts {
-      part {
-         name: "base";
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
+      part { name: "base"; mouse_events: 0;
+         description { state: "default" 0.0;
             aspect: 1.0 1.0;
             min: 32 32;
             /* force a specific aspect ratio so
@@ -18,87 +13,46 @@ group { name: "efl/pointer"; data.item: "version" "123";
             /* both axes control aspect - thus it
              * will be WITHIN the bounds the axes
              * of thre part describe */
-            image {
-               normal: "pointer.png";
-            }
-         }
-      }
-      part { name: "glow";
-         description { state: "default" 0.0;
-            image.normal: "pointer_glow.png";
-            color: 255 255 255 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
+            image.normal: "pointer.png";
          }
-         description { state: "faded" 0.0;
+         description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 51 153 255 255;
          }
       }
-      part {
-         name: "efl.hotspot";
+      part { name: "efl.hotspot"; type: SWALLOW;
          /* this is a "fake" swallow part
           * that is used by e to determine
           * the pointer hotspot - or where
           * the actual mouse events get
           * reported from on the cursor */
-         type: SWALLOW;
-         description {
-            state: "default" 0.0;
+         description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
             rel1 {
                /* the hotspot will scale with the cursor here */
                to: "base";
-               relative: 0.1875 0.1875;
+               relative: (5/32) (5/32);
                offset: 0 0;
             }
             rel2 {
                to: "base";
-               relative: 0.1875 0.1875;
+               relative: (5/32) (5/32);
                offset: 0 0;
             }
          }
       }
    }
    programs {
-      program {
-         signal: "efl,action,mouse,down"; source: "efl";
-         action: STATE_SET "visible" 0.0;
-         target: "glow";
+      program { signal: "efl,action,mouse,down"; source: "efl";
+         action: STATE_SET "clicked" 0.0;
+         target: "base";
          after: "fade";
       }
       program { name: "fade";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.5;
-         target: "glow";
-      }
-      program { name: "pulse";
-         signal: "e,state,mouse,idle"; source: "e";
-         in: 10.0 0.0;
-         action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 0.25;
-         target: "glow";
-         after: "pulse2";
-      }
-      program { name: "pulse2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "pulse";
-      }
-      program {
-         signal: "efl,action,mouse,move"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         target: "glow";
-         after: "stop2";
-      }
-      program { name: "stop2";
-         action: ACTION_STOP;
-         target: "pulse";
-         target: "pulse2";
+         target: "base";
       }
    }
 }
@@ -106,13 +60,11 @@ group { name: "efl/pointer"; data.item: "version" "123";
 group { name: "efl/pointer:bottom_right_corner";
    inherit: "efl/pointer";
    data.item: "version" "123";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
-         insert_after: "glow";
+      part { name: "box"; type: RECT;
+         insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.3 0.3;
             rel2.relative: 0.7 0.7;
          }
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 113fa52255..67641cf5ba 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -71,68 +71,93 @@ Group: efl/alert_popup/left_button (@since 1.23)
 */
 group { "efl/popup";
    data.item: "version" "123";
-   images.image: "rounded_square.png" COMP;
    parts {
-      spacer { "base";
+      image { "shadow";
+         scale;
          desc { "default";
-            rel1.offset: 10 10;
-            rel2.offset: -11 -11;
+            rel.to: "base";
+            WIN_SHADOW;
          }
       }
-      image { "bg";
+      rect { "base";
+         scale;
          desc { "default";
             min: 100 100;
-            image.border: 15 15 15 15;
-            image.normal: "rounded_square.png";
+            color: 0 0 0 192;
+            rel1.offset: 16 16;
+            rel2.offset: -17 -17;
+            offscale;
          }
       }
       swallow { "efl.background"; required;
          desc { "default";
-            rel.to: "bg";
+            rel.to: "base";
          }
       }
       swallow { "efl.content"; required;
+         scale;
          desc { "default";
             rel.to: "base";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
    }
 }
 
-group { "efl/alert_popup"; data.item: "version" "123";
-   images.image: "rounded_square.png" COMP;
+group { "efl/alert_popup";
+   data.item: "version" "123";
    parts {
-      image { "bg";
+      image { "shadow";
+         scale;
+         desc { "default";
+            rel.to: "base";
+            WIN_SHADOW;
+         }
+      }
+      rect { "base";
+         scale;
          desc { "default";
             min: 100 100;
-            image.border: 15 15 15 15;
-            image.normal: "rounded_square.png";
+            color: 0 0 0 192;
+            rel1.offset: 16 16;
+            rel2.offset: -17 -17;
+            offscale;
          }
       }
       swallow { "efl.background"; required;
          desc { "default";
-            rel.to: "bg";
+            rel.to: "base";
          }
       }
-      spacer { "base";
+      swallow { "efl.content"; required;
+         scale;
          desc { "default";
-            rel.to: "bg";
-            rel1.offset: 10 10;
-            rel2.offset: -11 -11;
+            rel1.to_x: "base";
+            rel1.to_y: "title_bg";
+            rel2.to_x: "base";
+            rel2.to_y: "efl.buttons";
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 0.0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
       rect { "title_bg";
+         scale;
          desc { "default";
             fixed: 0 1;
             min: 0 0;
             rel.to: "base";
             rel2.relative: 1.0 0.0;
-            align: 0.5 0.0;
-            color: 0 0 0 0;
+            align: 0.0 0.0;
+            color: 32 32 32 255;
          }
          desc { "title_visible";
             inherit: "default";
-            min: 0 20;
+            min: 0 24;
          }
       }
       textblock { "efl.text.title"; required;
@@ -143,6 +168,9 @@ group { "efl/alert_popup"; data.item: "version" "123";
               style: "popup_title_style_ellipsis";
             }
             rel.to: "title_bg";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
             hid;
          }
          desc { "title_visible";
@@ -151,51 +179,45 @@ group { "efl/alert_popup"; data.item: "version" "123";
          }
       }
       swallow { "efl.buttons"; required;
+         scale;
          desc { "default";
             fixed: 0 1;
             rel.to: "base";
             rel1.relative: 0.0 1.0;
+            rel1.offset:  4 0;
+            rel2.offset: -5 0;
             align: 0.5 1.0;
             min: 0 0;
+            offscale;
          }
          desc { "button_visible";
             inherit: "default";
-            min: 0 30;
-         }
-      }
-      swallow { "efl.content"; required;
-         desc { "default";
-            rel1.to_x: "base";
-            rel1.to_y: "title_bg";
-            rel2.to_x: "base";
-            rel2.to_y: "efl.buttons";
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 0.0;
+            min: 80 24;
+            rel1.offset:  4 -5;
+            rel2.offset: -5 -5;
          }
       }
    }
    programs {
-      program {
-         signal: "efl,title,visible,on"; source: "efl";
+      program { signal: "efl,title,visible,on"; source: "efl";
          action: STATE_SET "title_visible" 0.0;
          target: "title_bg";
          target: "efl.text.title";
       }
-      program {
-         signal: "efl,title,visible,off"; source: "efl";
+      program { signal: "efl,title,visible,off"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "title_bg";
          target: "efl.text.title";
       }
-      program {
-         signal: "efl,buttons,visible,on"; source: "efl";
+      program { signal: "efl,buttons,visible,on"; source: "efl";
          action: STATE_SET "button_visible" 0.0;
          target: "efl.buttons";
       }
    }
 }
 
-group { "efl/popup/backwall"; data.item: "version" "123";
+group { "efl/popup/backwall";
+   data.item: "version" "123";
    alias: "efl/alert_popup/backwall";
    parts {
       rect { "base";
@@ -208,9 +230,13 @@ group { "efl/popup/backwall"; data.item: "version" "123";
          }
       }
       swallow { "efl.content"; required;
+         scale;
          desc { "default";
             rel.to: "base";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             hid;
+            offscale;
          }
          desc { "content_visible";
             inherit: "default";
@@ -226,33 +252,32 @@ group { "efl/popup/backwall"; data.item: "version" "123";
    }
 
    programs {
-      program {
-         signal: "efl,content,set"; source: "efl";
+      program { signal: "efl,content,set"; source: "efl";
          action: STATE_SET "content_visible" 0.0;
          target: "base";
          target: "efl.content";
       }
-      program {
-         signal: "efl,content,unset"; source: "efl";
+      program { signal: "efl,content,unset"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "efl.content";
       }
-      program {
-         signal: "mouse,clicked,1"; source: "block";
+      program { signal: "mouse,clicked,1"; source: "block";
          action: SIGNAL_EMIT "efl,action,click" "efl";
       }
    }
 }
 
-group { "efl/alert_popup/button_layout1"; data.item: "version" "123";
+group { "efl/alert_popup/button_layout1";
+   data.item: "version" "123";
    parts {
       swallow { "efl.button1"; required;
       }
    }
 }
 
-group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
+group { "efl/alert_popup/button_layout2";
+   data.item: "version" "123";
    parts {
       spacer { "div1";
          desc { "default";
@@ -276,20 +301,23 @@ group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
    }
 }
 
-group { "efl/alert_popup/button_layout3"; data.item: "version" "123";
+group { "efl/alert_popup/button_layout3";
+   data.item: "version" "123";
    parts {
       spacer { "div1";
+         scale;
          desc { "default";
             rel1.relative: 0.333 0.5;
             rel2.relative: 0.333 0.5;
-            min: 5 5;
+            min: 4 4;
          }
       }
       spacer { "div2";
+         scale;
          desc { "default";
             rel1.relative: 0.666 0.5;
             rel2.relative: 0.666 0.5;
-            min: 5 5;
+            min: 4 4;
          }
       }
       swallow { "efl.button1"; required;
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index c3d044a0e2..fcd333622f 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -1,18 +1,8 @@
-group { "efl/progressbar/horizontal";
-   data.item: "version" "123";
-   images.image: "inset_bar_horiz_base.png" COMP;
-   images.image: "inset_bar_horiz_light.png" COMP;
-   images.image: "inset_bar_horiz_inside_base.png" COMP;
-   images.image: "inset_bar_horiz_inside_light.png" COMP;
-   images.image: "inset_bar_horiz_glow_base.png" COMP;
-   images.image: "inset_bar_horiz_glow_light.png" COMP;
-   images.image: "inset_bar_horiz_glow_inv_base.png" COMP;
-   images.image: "inset_bar_horiz_glow_inv_light.png" COMP;
-   images.image: "inset_bar_horiz_glow_mid_base.png" COMP;
-   images.image: "inset_bar_horiz_glow_mid_light.png" COMP;
+group { name: "efl/progressbar/horizontal";
 #define ICON    1
 #define LABEL   2
 #define DISABLE 4
+   data.item: "version" "123";
    script {
       public slmode;
       public eval_mode(m) {
@@ -31,9 +21,16 @@ group { "efl/progressbar/horizontal";
          if (ic) {
             set_state(PART:"efl.content", "visible", 0.0);
             set_state(PART:"sizer_content", "visible", 0.0);
+            set_state(PART:"bg", "iclabel", 0.0);
          } else {
             set_state(PART:"efl.content", "default", 0.0);
             set_state(PART:"sizer_content", "default", 0.0);
+            if (l) {
+              set_state(PART:"bg", "iclabel", 0.0);
+            }
+            else {
+              set_state(PART:"bg", "default", 0.0);
+            }
          }
          if (!d) {
             set_state(PART:"dis_clip", "default", 0.0);
@@ -45,8 +42,7 @@ group { "efl/progressbar/horizontal";
    parts {
       part { name: "dis_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "efl.content";
-            rel2.to: "efl.content";
+            rel.to: "efl.content";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -75,22 +71,23 @@ group { "efl/progressbar/horizontal";
          }
       }
       part { name: "efl.content"; type: SWALLOW;
+         scale: 1;
          clip_to: "dis_clip";
-         required;
          description { state: "default" 0.0;
             visible: 0;
             align: 0.0 0.5;
             fixed: 1 0;
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
+            rel1.offset: -1 4;
+            rel2.offset: -1 -5;
             rel2.relative: 0.0 1.0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: 2 2;
-            rel2.offset: 2 -3;
+//            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
          }
       }
       part { name: "sizer_content"; type: TEXT; mouse_events:  0;
@@ -105,224 +102,119 @@ group { "efl/progressbar/horizontal";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "efl.content";
-            rel2.to: "efl.content";
+            rel.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
       part { name: "efl.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
-         required;
          description { state: "default" 0.0;
             fixed: 1 1;
             align: 0.0 0.5;
             rel1.to_x: "efl.content";
             rel1.relative: 1.0 0.0;
-            rel1.offset: -1 2;
+            rel1.offset: -1 4;
             rel2.to_x: "efl.content";
             rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -3;
-            color: FN_COL_DEFAULT;
-            color_class: "progressbar_text";
+            rel2.offset: -1 -5;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                text_class: "progressbar";
                min: 0 0;
                align: 0.0 0.5;
             }
             visible: 0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             fixed: 1 0;
             visible: 1;
-            rel1.offset: 2 2;
-            rel2.offset: 2 -3;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
             text.min: 1 1;
             text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
-            color_class: "progressbar_text_disabled";
-            color: FN_COL_DISABLE_LIGHTER_SHADOW;
-         }
-      }
-      part { name: "bg-hi";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: 0 1;
-            rel2.to: "bg";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_horiz_light.png";
-            image.border: 32 32 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            color: 80 80 80 255;
          }
       }
-      part { name: "bg";
+      part { name: "bg"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             min: 16 16;
             max: -1 16;
-            rel1.to_x: "efl.text";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-            image.normal: "inset_bar_horiz_base.png";
-            image.border: 32 32 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: DARK_GREY_BG_COLOR;
+            offscale;
          }
-      }
-      part { name: "ins0"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            rel2.relative: 0.0 1.0;
-            min: 5 16;
-            align: 0.0 0.5;
-         }
-      }
-      part { name: "ins1"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            rel1.to: "bg";
+         description { state: "iclabel" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_x: "efl.text";
             rel1.relative: 1.0 0.0;
-            rel2.to: "bg";
-            min: 5 16;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "inside-hi";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "inside";
-            rel1.offset: 0 1;
-            rel2.to: "inside";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_horiz_inside_light.png";
-            image.border: 8 8 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
-      part { name: "inside";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 4 4;
-            rel1.to: "ins0";
-            rel1.relative: 1.0 (6/16);
-            rel2.to: "ins1";
-            rel2.relative: 0.0 (10/16);
-            image.normal: "inset_bar_horiz_inside_base.png";
-            image.border: 8 8 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
          }
       }
       part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "inside";
-            rel2.to: "inside";
+            rel.to: "bg";
          }
       }
       part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
-         scale: 1;
-         dragable.confine: "inside";
+         dragable.confine: "efl.bar";
          dragable.x: 1 1 1;
          dragable.y: 0 0 0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 8 4;
-            max: 8 4;
-            rel1.to: "inside";
-            rel2.to: "inside";
+            min: 1 1;
+            max: 1 9999;
+            rel.to: "efl.bar";
          }
       }
       part { name: "barend"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            min: 14 16;
+            max: 1 9999;
             rel1.to_x: "efl.cur.progressbar";
-            rel1.relative: 1.0 0.0;
             rel2.to_x: "efl.cur.progressbar";
-            rel2.relative: 1.0 1.0;
-            align: 0.0 0.5;
+            align: 1.0 0.5;
          }
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 1.0;
-            align: 1.0 0.5;
+            align: 0.0 0.5;
          }
       }
-      part { name: "bar";
-         clip_to: "fract_clip";
+      part { name: "bar"; type: RECT;
          scale: 1;
+         clip_to: "fract_clip";
          description { state: "default" 0.0;
-            rel1.to_x: "ins0";
-            rel1.to_y: "bg";
-            rel1.relative: (12/16) -0.25;
+            rel1.to: "bg";
             rel2.to_x: "barend";
             rel2.to_y: "bg";
-            rel2.relative: 1.0 1.25;
-            image.normal: "inset_bar_horiz_glow_base.png";
-            image.border: 0 72 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            color: 51 153 255 255;
+            offscale;
          }
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
             rel1.to_x: "barend";
-            rel1.relative: 0.0 -0.25;
-            rel2.to_x: "ins1";
-            rel2.relative: (4/16) 1.25;
-            image.normal: "inset_bar_horiz_glow_inv_base.png";
-            image.border: 72 0 0 0;
-         }
-      }
-      part { name: "insidep0"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            min: 20 16;
-            rel1.to_x: "inside";
-            rel1.relative: 0.0 0.0;
-            rel2.to_x: "inside";
-            rel2.relative: 0.0 1.0;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "insidep1"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            min: 20 16;
-            rel1.to_x: "inside";
-            rel1.relative: 1.0 0.0;
-            rel2.to_x: "inside";
-            rel2.relative: 1.0 1.0;
-            align: 0.0 0.5;
+            rel2.to_x: "bg";
          }
       }
-      part { name: "pulse";
+      part { name: "pulse"; type: RECT;
          clip_to: "pulse_clip";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 64 24;
-            max: 64 24;
-            rel1.to_x: "insidep0";
-            rel1.to_y: "bar";
-            rel1.relative: 0.0 0.0;
-            rel2.to_x: "insidep1";
-            rel2.to_y: "bar";
-            rel2.relative: 1.0 1.0;
-            image.normal: "inset_bar_horiz_glow_mid_base.png";
+            min: 16 8;
+            max: 16 9999;
+            rel.to: "efl.bar";
             align: 0.0 0.5;
+            color: 51 153 255 255;
          }
          description { state: "end" 0.0;
             inherit: "default" 0.0;
@@ -331,73 +223,25 @@ group { "efl/progressbar/horizontal";
       }
       part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: GLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "inside";
-            rel2.to: "inside";
-            color_class: "progress_status";
+            rel.to: "efl.bar";
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
             align: 1.0 0.5;
             text { font: FN; size: 10;
                min: 0 1;
                text_class: "progress_status";
                align: 1.0 0.5;
             }
-            color: FN_COL_HIGHLIGHT_CLICKED;
-            visible: 1;
+            color: 255 255 255 255;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "pulse2";
-         clip_to: "pulse_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 36 14;
-            max: 36 14;
-            rel1.to: "pulse";
-            rel2.to: "pulse";
-            image.normal: "inset_bar_horiz_glow_mid_light.png";
-            color: 255 255 255 0;
-         }
-         description { state: "glow" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "light";
-         clip_to: "fract_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: 36 11;
-            rel1.to_x: "bar";
-            rel1.to_y: "bar";
-            rel1.relative: 0.0 (26/96);
-            rel2.to_x: "barend";
-            rel2.to_y: "bar";
-            rel2.relative: 0.2 ((26+44)/96);
-            align: 1.0 0.0;
-            image.normal: "inset_bar_horiz_glow_light.png";
-            image.border: 0 20 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-            color: 255 255 255 0;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_x: "barend";
-            rel1.to_y: "bar";
-            rel1.relative: 0.8 (26/96);
-            rel2.to_x: "bar";
-            rel2.to_y: "bar";
-            rel2.relative: 1.0 ((26+44)/96);
-            align: 0.0 0.0;
-            image.normal: "inset_bar_horiz_glow_inv_light.png";
-            image.border: 20 0 0 0;
-         }
-      }
    }
    programs {
       program { name: "inverted-on";
@@ -405,33 +249,12 @@ group { "efl/progressbar/horizontal";
          action:  STATE_SET "inv" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
       }
       program { name: "inverted-off";
          signal: "efl,state,inverted,off"; source: "efl";
          action:  STATE_SET "default" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
-      }
-      program { name: "drag-set";
-         signal: "drag,set"; source: "efl.cur.progressbar";
-         script {
-            new a, Float:dx, Float:dy, Float:vl, st[20];
-
-            get_drag(PART:"efl.cur.progressbar", dx, dy);
-            get_state(PART:"bar", st, 19, vl);
-            if (!strcmp(st, "inv")) {
-               a = round(((1.0 - dx) * 255) / 0.2);
-               custom_state(PART:"light", "inv", 0.0);
-            } else {
-               a = round((dx * 255) / 0.2);
-               custom_state(PART:"light", "default", 0.0);
-            }
-            if (a > 255) { a = 255; }
-            set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
-            set_state(PART:"light", "custom", 0.0);
-         }
       }
       program { name: "pulse-mode0";
          signal: "efl,state,pulse"; source: "efl";
@@ -450,32 +273,18 @@ group { "efl/progressbar/horizontal";
          target: "pulse_clip";
          target: "fract_clip";
          after: "pulse0";
-         after: "pulse0.1";
-      }
-      program { name: "pulse0.1";
-         action:  STATE_SET "glow" 0.0;
-         transition: ACCELERATE 0.4;
-         target: "pulse2";
-         after: "pulse0.2";
-      }
-      program { name: "pulse0.2";
-         action:  STATE_SET "default" 0.0;
-         transition: DECELERATE 0.4;
-         target: "pulse2";
       }
       program { name: "pulse0";
          action:  STATE_SET "end" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse1";
-         after: "pulse0.1";
       }
       program { name: "pulse1";
          action:  STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse0";
-         after: "pulse0.1";
       }
       program { name: "fraction";
          signal: "efl,state,fraction"; source: "efl";
@@ -483,7 +292,7 @@ group { "efl/progressbar/horizontal";
          target: "efl.text.status";
          after: "pulse-stop";
       }
-      program { name: "elmpulse-stop";
+      program { name: "eflpulse-stop";
          signal: "efl,state,pulse,stop"; source: "efl";
          action: ACTION_STOP;
          target: "pulse0";
@@ -505,7 +314,7 @@ group { "efl/progressbar/horizontal";
          target: "efl.text.status";
       }
       program { name: "text-visible";
-         signal: "efl,text,set"; source: "efl";
+         signal: "efl,state,text,visible"; source: "efl";
          script {
             new m = get_int(slmode);
             m |= LABEL; set_int(slmode, m);
@@ -513,7 +322,7 @@ group { "efl/progressbar/horizontal";
          }
       }
       program { name: "text-hidden";
-         signal: "efl,text,unset"; source: "efl";
+         signal: "efl,state,text,hidden"; source: "efl";
          script {
             new m = get_int(slmode);
             m &= ~LABEL; set_int(slmode, m);
@@ -521,7 +330,7 @@ group { "efl/progressbar/horizontal";
          }
       }
       program { name: "icon-visible";
-         signal: "efl,content,set"; source: "efl";
+         signal: "efl,state,icon,visible"; source: "efl";
          script {
             new m = get_int(slmode);
             m |= ICON; set_int(slmode, m);
@@ -529,7 +338,7 @@ group { "efl/progressbar/horizontal";
          }
       }
       program { name: "icon-hidden";
-         signal: "efl,content,unset"; source: "efl";
+         signal: "efl,state,icon,hidden"; source: "efl";
          script {
             new m = get_int(slmode);
             m &= ~ICON; set_int(slmode, m);
@@ -555,25 +364,14 @@ group { "efl/progressbar/horizontal";
    }
 #undef ICON
 #undef LABEL
-#undef UNITS
 #undef DISABLE
 }
 
-group { "efl/progressbar/vertical";
-   data.item: "version" "123";
-   images.image: "inset_bar_vert_base.png" COMP;
-   images.image: "inset_bar_vert_light.png" COMP;
-   images.image: "inset_bar_vert_inside_base.png" COMP;
-   images.image: "inset_bar_vert_inside_light.png" COMP;
-   images.image: "inset_bar_vert_glow_base.png" COMP;
-   images.image: "inset_bar_vert_glow_light.png" COMP;
-   images.image: "inset_bar_vert_glow_inv_base.png" COMP;
-   images.image: "inset_bar_vert_glow_inv_light.png" COMP;
-   images.image: "inset_bar_vert_glow_mid_base.png" COMP;
-   images.image: "inset_bar_vert_glow_mid_light.png" COMP;
+group { name: "efl/progressbar/vertical";
 #define ICON    1
 #define LABEL   2
 #define DISABLE 4
+   data.item: "version" "123";
    script {
       public slmode;
       public eval_mode(m) {
@@ -592,9 +390,16 @@ group { "efl/progressbar/vertical";
          if (ic) {
             set_state(PART:"efl.content", "visible", 0.0);
             set_state(PART:"sizer_content", "visible", 0.0);
+            set_state(PART:"bg", "iclabel", 0.0);
          } else {
             set_state(PART:"efl.content", "default", 0.0);
             set_state(PART:"sizer_content", "default", 0.0);
+            if (l) {
+               set_state(PART:"bg", "iclabel", 0.0);
+            }
+            else {
+               set_state(PART:"bg", "default", 0.0);
+            }
          }
          if (!d) {
             set_state(PART:"dis_clip", "default", 0.0);
@@ -636,28 +441,29 @@ group { "efl/progressbar/vertical";
          }
       }
       part { name: "efl.content"; type: SWALLOW;
+         scale: 1;
          clip_to: "dis_clip";
-         required;
          description { state: "default" 0.0;
             visible: 0;
             align: 0.5 0.0;
-            fixed: 0 1;
-            rel1.offset: 2 0;
-            rel2.offset: -3 -1;
+            fixed: 1 1;
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
             rel2.relative: 1.0 0.0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
-            rel1.offset: 2 2;
-            rel2.offset: -3 2;
+//            aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
+            rel1.offset: 4 4;
+            rel2.offset: -5 4;
          }
       }
       part { name: "sizer_content"; type: TEXT; mouse_events:  0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
+            fixed: 0 0;
             visible: 0;
             text { font: FN; size: 10;
                min: 0 0;
@@ -666,224 +472,123 @@ group { "efl/progressbar/vertical";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
+            fixed: 1 1;
             rel1.to: "efl.content";
             rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
       part { name: "efl.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
-         required;
          description { state: "default" 0.0;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1.to_y: "efl.content";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 2 -1;
+            rel1.offset: 4 -1;
             rel2.to_y: "efl.content";
             rel2.relative: 1.0 1.0;
-            rel2.offset: -3 -1;
-            color: FN_COL_DEFAULT;
-            color_class: "progressbar_text";
+            rel2.offset: -5 -1;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                text_class: "progressbar";
                min: 0 0;
                align: 0.5 0.0;
             }
             visible: 0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            fixed: 0 1;
             visible: 1;
-            rel1.offset: 2 2;
-            rel2.offset: -3 2;
+            rel1.offset: 4 4;
+            rel2.offset: -5 4;
             text.min: 1 1;
             text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
-            color_class: "progressbar_text_disabled";
-            color: FN_COL_DISABLE_LIGHTER_SHADOW;
+            color: 80 80 80 255;
          }
       }
-      part { name: "bg-hi";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: 0 1;
-            rel2.to: "bg";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_vert_light.png";
-            image.border: 0 0 32 32;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
-      part { name: "bg";
+      part { name: "bg"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             min: 16 16;
             max: 16 -1;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: DARK_GREY_BG_COLOR;
+            offscale;
+         }
+         description { state: "iclabel" 0.0;
+            inherit: "default" 0.0;
             rel1.to_y: "efl.text";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-            image.normal: "inset_bar_vert_base.png";
-            image.border: 0 0 32 32;
-            image.border_scale_by: 0.25; image.border_scale: 1;
          }
       }
-      part { name: "ins0"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            rel2.relative: 1.0 0.0;
-            min: 16 5;
-            align: 0.5 0.0;
-         }
-      }
-      part { name: "ins1"; type: SPACER;
-         scale: 1;
+      part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            fixed: 0 1;
             rel1.to: "bg";
-            rel1.relative: 0.0 1.0;
             rel2.to: "bg";
-            min: 16 5;
-            align: 0.5 1.0;
-         }
-      }
-      part { name: "inside-hi";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "inside";
-            rel1.offset: 0 1;
-            rel2.to: "inside";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_vert_inside_light.png";
-            image.border: 0 0 8 8;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
-      part { name: "inside";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 4 4;
-            rel1.to: "ins0";
-            rel1.relative: (6/16) 1.0;
-            rel2.to: "ins1";
-            rel2.relative: (10/16) 0.0;
-            image.normal: "inset_bar_vert_inside_base.png";
-            image.border: 0 0 8 8;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
-      part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "inside";
-            rel2.to: "inside";
          }
       }
       part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
-         scale: 1;
-         dragable.confine: "inside";
+         dragable.confine: "efl.bar";
          dragable.x: 0 0 0;
          dragable.y: 1 1 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 4 8;
-            max: 4 8;
-            rel1.to: "inside";
-            rel2.to: "inside";
+            min: 1 1;
+            max: 9999 1;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
          }
       }
       part { name: "barend"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
-            min: 16 14;
+            max: 9999 1;
             rel1.to_y: "efl.cur.progressbar";
-            rel1.relative: 0.0 1.0;
             rel2.to_y: "efl.cur.progressbar";
-            rel2.relative: 1.0 1.0;
-            align: 0.5 0.0;
+            align: 0.5 1.0;
          }
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 1.0;
+            align: 0.5 0.0;
          }
       }
-      part { name: "bar";
-         clip_to: "fract_clip";
+      part { name: "bar"; type: RECT;
          scale: 1;
+         clip_to: "fract_clip";
          description { state: "default" 0.0;
-            rel1.to_y: "ins0";
-            rel1.to_x: "bg";
-            rel1.relative: -0.25 (12/16);
+            rel1.to: "bg";
             rel2.to_y: "barend";
             rel2.to_x: "bg";
-            rel2.relative: 1.25 1.0;
-            image.normal: "inset_bar_vert_glow_base.png";
-            image.border: 0 0 0 72;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            color: 51 153 255 255;
+            offscale;
          }
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
             rel1.to_y: "barend";
-            rel1.relative: -0.25 0.0;
-            rel2.to_y: "ins1";
-            rel2.relative: 1.25 (4/16);
-            image.normal: "inset_bar_vert_glow_inv_base.png";
-            image.border: 0 0 72 0;
-         }
-      }
-      part { name: "insidep0"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            min: 16 20;
-            rel1.to_y: "inside";
-            rel1.relative: 0.0 0.0;
-            rel2.to_y: "inside";
-            rel2.relative: 1.0 0.0;
-            align: 0.5 1.0;
-         }
-      }
-      part { name: "insidep1"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            min: 16 20;
-            rel1.to_y: "inside";
-            rel1.relative: 0.0 1.0;
-            rel2.to_y: "inside";
-            rel2.relative: 1.0 1.0;
-            align: 0.5 0.0;
+            rel2.to_y: "bg";
          }
       }
-      part { name: "pulse";
+      part { name: "pulse"; type: RECT;
          clip_to: "pulse_clip";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 24 64;
-            max: 24 64;
-            rel1.to_y: "insidep0";
-            rel1.to_x: "bar";
-            rel1.relative: 0.0 0.0;
-            rel2.to_y: "insidep1";
-            rel2.to_x: "bar";
-            rel2.relative: 1.0 1.0;
-            image.normal: "inset_bar_vert_glow_mid_base.png";
+            min: 8 16;
+            max: 9999 16;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
             align: 0.5 0.0;
+            color: 51 153 255 255;
          }
          description { state: "end" 0.0;
             inherit: "default" 0.0;
@@ -894,30 +599,28 @@ group { "efl/progressbar/vertical";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "inside";
-            rel2.to: "inside";
+            rel1.to: "bg";
+            rel2.to: "bg";
             aspect: 1.0 1.0; aspect_preference: NONE;
          }
       }
       part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: GLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
             rel1.to: "statbox";
             rel2.to: "statbox";
-            color_class: "progress_status";
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
             align: 1.0 0.5;
             text { font: FN; size: 10;
                min: 0 1;
                text_class: "progress_status";
                align: 1.0 0.5;
             }
-            color: FN_COL_HIGHLIGHT_CLICKED;
-            visible: 1;
             map.on: 1;
             map.smooth: 0;
-            map.rotation.center: "statbox";
+            map.rotation.center: "efl.bar";
             map.rotation.z: 90;
          }
          description { state: "hidden" 0.0;
@@ -925,53 +628,6 @@ group { "efl/progressbar/vertical";
             visible: 0;
          }
       }
-      part { name: "pulse2";
-         clip_to: "pulse_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 14 36;
-            max: 14 36;
-            rel1.to: "pulse";
-            rel2.to: "pulse";
-            image.normal: "inset_bar_vert_glow_mid_light.png";
-            color: 255 255 255 0;
-         }
-         description { state: "glow" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "light";
-         clip_to: "fract_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: 11 36;
-            rel1.to_y: "bar";
-            rel1.to_x: "bar";
-            rel1.relative: (26/96) 0.0;
-            rel2.to_y: "barend";
-            rel2.to_x: "bar";
-            rel2.relative: ((26+44)/96) 0.2;
-            align: 0.0 1.0;
-            image.normal: "inset_bar_vert_glow_light.png";
-            image.border: 0 0 0 20;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-            color: 255 255 255 0;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_y: "barend";
-            rel1.to_x: "bar";
-            rel1.relative: (26/96) 0.8;
-            rel2.to_y: "bar";
-            rel2.to_x: "bar";
-            rel2.relative: ((26+44)/96) 1.0;
-            align: 0.0 0.0;
-            image.normal: "inset_bar_vert_glow_inv_light.png";
-            image.border: 0 0 20 0;
-         }
-      }
    }
    programs {
       program { name: "inverted-on";
@@ -979,33 +635,12 @@ group { "efl/progressbar/vertical";
          action:  STATE_SET "inv" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
       }
       program { name: "inverted-off";
          signal: "efl,state,inverted,off"; source: "efl";
          action:  STATE_SET "default" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
-      }
-      program { name: "drag-set";
-         signal: "drag,set"; source: "efl.cur.progressbar";
-         script {
-            new a, Float:dx, Float:dy, Float:vl, st[20];
-
-            get_drag(PART:"efl.cur.progressbar", dx, dy);
-            get_state(PART:"bar", st, 19, vl);
-            if (!strcmp(st, "inv")) {
-               a = round(((1.0 - dy) * 255) / 0.2);
-               custom_state(PART:"light", "inv", 0.0);
-            } else {
-               a = round((dy * 255) / 0.2);
-               custom_state(PART:"light", "default", 0.0);
-            }
-            if (a > 255) { a = 255; }
-            set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
-            set_state(PART:"light", "custom", 0.0);
-         }
       }
       program { name: "pulse-mode0";
          signal: "efl,state,pulse"; source: "efl";
@@ -1024,32 +659,18 @@ group { "efl/progressbar/vertical";
          target: "pulse_clip";
          target: "fract_clip";
          after: "pulse0";
-         after: "pulse0.1";
-      }
-      program { name: "pulse0.1";
-         action:  STATE_SET "glow" 0.0;
-         transition: ACCELERATE 0.4;
-         target: "pulse2";
-         after: "pulse0.2";
-      }
-      program { name: "pulse0.2";
-         action:  STATE_SET "default" 0.0;
-         transition: DECELERATE 0.4;
-         target: "pulse2";
       }
       program { name: "pulse0";
          action:  STATE_SET "end" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse1";
-         after: "pulse0.1";
       }
       program { name: "pulse1";
          action:  STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse0";
-         after: "pulse0.1";
       }
       program { name: "fraction";
          signal: "efl,state,fraction"; source: "efl";
@@ -1057,7 +678,7 @@ group { "efl/progressbar/vertical";
          target: "efl.text.status";
          after: "pulse-stop";
       }
-      program { name: "elmpulsestop";
+      program { name: "eflpulse-stop";
          signal: "efl,state,pulse,stop"; source: "efl";
          action: ACTION_STOP;
          target: "pulse0";
@@ -1068,18 +689,18 @@ group { "efl/progressbar/vertical";
          action:  STATE_SET "default" 0.0;
          target: "pulse_clip";
       }
-      program { name: "unit-visible";
+      program { name: "units-visible";
          signal: "efl,state,units,visible"; source: "efl";
          action:  STATE_SET "default" 0.0;
          target: "efl.text.status";
       }
-      program { name: "unit-hidden";
+      program { name: "units-hidden";
          signal: "efl,state,units,hidden"; source: "efl";
          action:  STATE_SET "hidden" 0.0;
          target: "efl.text.status";
       }
       program { name: "text-visible";
-         signal: "efl,text,set"; source: "efl";
+         signal: "efl,state,text,visible"; source: "efl";
          script {
             new m = get_int(slmode);
             m |= LABEL; set_int(slmode, m);
@@ -1087,7 +708,7 @@ group { "efl/progressbar/vertical";
          }
       }
       program { name: "text-hidden";
-         signal: "efl,text,unset"; source: "efl";
+         signal: "efl,state,text,hidden"; source: "efl";
          script {
             new m = get_int(slmode);
             m &= ~LABEL; set_int(slmode, m);
@@ -1095,7 +716,7 @@ group { "efl/progressbar/vertical";
          }
       }
       program { name: "icon-visible";
-         signal: "efl,content,set"; source: "efl";
+         signal: "efl,state,icon,visible"; source: "efl";
          script {
             new m = get_int(slmode);
             m |= ICON; set_int(slmode, m);
@@ -1103,14 +724,14 @@ group { "efl/progressbar/vertical";
          }
       }
       program { name: "icon-hidden";
-         signal: "efl,content,unset"; source: "efl";
+         signal: "efl,state,icon,hidden"; source: "efl";
          script {
             new m = get_int(slmode);
             m &= ~ICON; set_int(slmode, m);
             eval_mode(m);
          }
       }
-      program { name: "elmdisabled";
+      program { name: "state-disabled";
          signal: "efl,state,disabled"; source: "efl";
          script {
             new m = get_int(slmode);
@@ -1118,7 +739,7 @@ group { "efl/progressbar/vertical";
             eval_mode(m);
          }
       }
-      program { name: "elmenabled";
+      program { name: "state-enabled";
          signal: "efl,state,enabled"; source: "efl";
          script {
             new m = get_int(slmode);
@@ -1129,100 +750,864 @@ group { "efl/progressbar/vertical";
    }
 #undef ICON
 #undef LABEL
-#undef UNITS
 #undef DISABLE
 }
 
-group { "efl/progressbar/horizontal:wheel";
+group { name: "efl/progressbar/horizontal:bare";
    data.item: "version" "123";
-   alias: "efl/progressbar/vertical:wheel";
-   images.image: "knob_round_busy.png" COMP;
-   images.image: "glow_round_corners.png" COMP;
    parts {
-      part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
+            fixed: 1 1;
             min: 0 0;
             max: 0 0;
             visible: 0;
          }
       }
+      part { name: "pulse_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.relative: -2.0 -2.0;
+            rel2.relative: 3.0 3.0;
+            visible: 0;
+         }
+         description { state: "pulse" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "fract_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.relative: -2.0 -2.0;
+            rel2.relative: 3.0 3.0;
+         }
+         description { state: "pulse" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "bg"; type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 10 5;
+            max: -1 5;
+            color: DARK_GREY_BG_COLOR;
+         }
+      }
+      part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
+         dragable.confine: "efl.bar";
+         dragable.x: 1 1 1;
+         dragable.y: 0 0 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 1 1;
+            max: 1 9999;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
+         }
+      }
+      part { name: "barend"; type: SPACER;
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            max: 1 9999;
+            rel1.to_x: "efl.cur.progressbar";
+            rel2.to_x: "efl.cur.progressbar";
+            align: 1.0 0.5;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "bar"; type: RECT;
+         clip_to: "fract_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to_x: "barend";
+            rel2.to_y: "bg";
+            color: 51 153 255 255;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_x: "barend";
+            rel2.to_x: "bg";
+         }
+      }
+      part { name: "pulse"; type: RECT;
+         clip_to: "pulse_clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 5 5;
+            max: 5 9999;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
+            align: 0.0 0.5;
+            color: 51 153 255 255;
+         }
+         description { state: "end" 0.0;
+            inherit: "default" 0.0;
+            align: 1.0 0.5;
+         }
+      }
+   }
+   programs {
+      program { name: "inverted-on";
+         signal: "efl,state,inverted,on"; source: "efl";
+         action:  STATE_SET "inv" 0.0;
+         target: "bar";
+         target: "barend";
+      }
+      program { name: "inverted-off";
+         signal: "efl,state,inverted,off"; source: "efl";
+         action:  STATE_SET "default" 0.0;
+         target: "bar";
+         target: "barend";
+      }
+      program { name: "pulse-mode1";
+         signal: "efl,state,pulse,start"; source: "efl";
+         action:  STATE_SET "pulse" 0.0;
+         target: "fract_clip";
+      }
+      program { name: "pulse-start";
+         signal: "efl,state,pulse,start"; source: "efl";
+         action:  STATE_SET "pulse" 0.0;
+         target: "pulse_clip";
+         target: "fract_clip";
+         after: "pulse0";
+      }
+      program { name: "pulse0";
+         action:  STATE_SET "end" 0.0;
+         transition: SINUSOIDAL 0.8;
+         target: "pulse";
+         after: "pulse1";
+      }
+      program { name: "pulse1";
+         action:  STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.8;
+         target: "pulse";
+         after: "pulse0";
+      }
+      program { name: "eflpulse-stop";
+         signal: "efl,state,pulse,stop"; source: "efl";
+         action: ACTION_STOP;
+         target: "pulse0";
+         target: "pulse1";
+         after: "pulse-stop";
+      }
+      program { name: "pulse-stop";
+         action:  STATE_SET "default" 0.0;
+         target: "pulse_clip";
+      }
+   }
+}
+
+group { name: "efl/progressbar/horizontal:hidden_bare";
+   inherit: "efl/progressbar/horizontal:bare";
+   data.item: "version" "123";
+   parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+}
+
+group { name: "efl/progressbar/vertical:bare";
+   data.item: "version" "123";
+   parts {
       part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
+            fixed: 1 1;
             min: 0 0;
             max: 0 0;
             visible: 0;
          }
       }
-      part { name: "busy_clip"; type: RECT;
+      part { name: "pulse_clip"; type: RECT;
          description { state: "default" 0.0;
+            rel1.relative: -2.0 -2.0;
+            rel2.relative: 3.0 3.0;
             visible: 0;
-            color: 255 255 255 0;
          }
-         description { state: "active" 0.0;
+         description { state: "pulse" 0.0;
+            inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
          }
       }
-      part { name: "knob"; mouse_events: 0;
+      part { name: "fract_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.relative: -2.0 -2.0;
+            rel2.relative: 3.0 3.0;
+         }
+         description { state: "pulse" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "bg"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            image.normal: "knob_round_busy.png";
+            min: 5 10;
+            max: 5 -1;
+            color: DARK_GREY_BG_COLOR;
+         }
+      }
+      part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
+         dragable.confine: "efl.bar";
+         dragable.x: 0 0 0;
+         dragable.y: 1 1 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 1 1;
+            max: 9999 1;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
+         }
+      }
+      part { name: "barend"; type: SPACER;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            max: 9999 1;
+            rel1.to_y: "efl.cur.progressbar";
+            rel2.to_y: "efl.cur.progressbar";
+            align: 0.5 1.0;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bar"; type: RECT;
+         scale: 1;
+         clip_to: "fract_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to_y: "barend";
+            rel2.to_x: "bg";
+            color: 51 153 255 255;
+            offscale;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_y: "barend";
+            rel2.to_y: "bg";
+         }
+      }
+      part { name: "pulse"; type: RECT;
+         clip_to: "pulse_clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 5 10;
+            max: 9999 10;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
+            align: 0.5 0.0;
+            color: 51 153 255 255;
+         }
+         description { state: "end" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 1.0;
+         }
+      }
+   }
+   programs {
+      program { name: "inverted-on";
+         signal: "efl,state,inverted,on"; source: "efl";
+         action:  STATE_SET "inv" 0.0;
+         target: "bar";
+         target: "barend";
+      }
+      program { name: "inverted-off";
+         signal: "efl,state,inverted,off"; source: "efl";
+         action:  STATE_SET "default" 0.0;
+         target: "bar";
+         target: "barend";
+      }
+      program { name: "pulse-mode1";
+         signal: "efl,state,pulse,start"; source: "efl";
+         action:  STATE_SET "pulse" 0.0;
+         target: "fract_clip";
+      }
+      program { name: "pulse-start";
+         signal: "efl,state,pulse,start"; source: "efl";
+         action:  STATE_SET "pulse" 0.0;
+         target: "pulse_clip";
+         target: "fract_clip";
+         after: "pulse0";
+      }
+      program { name: "pulse0";
+         action:  STATE_SET "end" 0.0;
+         transition: SINUSOIDAL 0.8;
+         target: "pulse";
+         after: "pulse1";
+      }
+      program { name: "pulse1";
+         action:  STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.8;
+         target: "pulse";
+         after: "pulse0";
+      }
+      program { name: "eflpulse-stop";
+         signal: "efl,state,pulse,stop"; source: "efl";
+         action: ACTION_STOP;
+         target: "pulse0";
+         target: "pulse1";
+         after: "pulse-stop";
+      }
+      program { name: "pulse-stop";
+         action:  STATE_SET "default" 0.0;
+         target: "pulse_clip";
+      }
+   }
+}
+
+group { name: "efl/progressbar/vertical:hidden_bare";
+   inherit: "efl/progressbar/vertical:bare";
+   data.item: "version" "123";
+   parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+}
+
+group { name: "efl/progressbar/horizontal:hidden_wheel";
+   alias: "efl/progressbar/vertical:hidden_wheel";
+   data.item: "version" "123";
+   IMAGE_RING("ringa", 160)
+   IMAGE_RING("ringb", 160)
+   IMAGE_RING("ringc", 160)
+   parts {
+      part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+      }
+      part { name: "efl.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+      }
+      BUSY("base", "efl,state,pulse,start", "efl", "efl,state,pulse,stop", "efl")
+      part { name: "base"; type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             min: 40 40;
             max: 40 40;
+            offscale;
          }
       }
-      part { name: "knob_spinner"; mouse_events: 0;
-         clip_to: "busy_clip";
+   }
+}
+
+group { name: "efl/progressbar/horizontal:wheel";
+   inherit: "efl/progressbar/horizontal:hidden_wheel";
+   alias: "efl/progressbar/vertical:wheel";
+   data.item: "version" "123";
+   images.image: "speaker_vol.png" COMP;
+   parts {
+      part { name: "bg"; nomouse;
+         insert_before: "base";
+         description { state: "default" 0.0;
+            image.normal: "speaker_vol.png";
+            rel.to:"base";
+            color: 48 48 48 255;
+         }
+         description { state: "hidden" 0.0;
+            inherit;
+            color: 48 48 48 0;
+            visible: 0;
+         }
+      }
+      program {
+         signal: "efl,state,pulse,start"; source: "efl";
+         action: STATE_SET "hidden" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "bg";
+      }
+      program {
+         signal: "efl,state,pulse,stop"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "bg";
+      }
+   }
+}
+
+group { name: "efl/progressbar/horizontal:bar";
+   alias: "efl/progressbar/horizontal:fileselector";
+   data.item: "version" "123";
+   set { name: "spinner";
+      image { image: "spinner-32.png" COMP; size: 17 45 9999 9999; }
+      image { image: "spinner-16.png" COMP; size:  9 23   16   44; }
+      image { image: "spinner-8.png"  COMP; size:  0  0    8   22; }
+   }
+   parts {
+      part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+      }
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "knob";
-            rel2.to: "knob";
-            image.normal: "glow_round_corners.png";
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+      }
+      part { name: "spin1"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "spinner";
+            color: 160 160 160 255;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.2 1.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            min: 8 22;
+            max: 8 22;
             map.on: 1;
             map.smooth: 1;
-            map.rotation.center: "knob";
+            map.rotation.center: "spin1";
          }
-         description { state: "spin" 0.0;
-            inherit: "default" 0.0;
+         description { state: "end" 0.0;
+            inherit;
             map.rotation.z: 360;
          }
       }
+      part { name: "spin2"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "spinner";
+            color: 160 160 160 255;
+            rel1.relative: 0.2 0.0;
+            rel2.relative: 0.4 1.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            min: 8 22;
+            max: 8 22;
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "spin2";
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 360;
+         }
+      }
+      part { name: "spin3"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "spinner";
+            color: 160 160 160 255;
+            rel1.relative: 0.4 0.0;
+            rel2.relative: 0.6 1.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            min: 8 22;
+            max: 8 22;
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "spin3";
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 360;
+         }
+      }
+      part { name: "spin4"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "spinner";
+            color: 160 160 160 255;
+            rel1.relative: 0.6 0.0;
+            rel2.relative: 0.8 1.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            min: 8 22;
+            max: 8 22;
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "spin4";
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 360;
+         }
+      }
+      part { name: "spin5"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "spinner";
+            color: 160 160 160 255;
+            rel1.relative: 0.8 0.0;
+            rel2.relative: 1.0 1.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            min: 8 22;
+            max: 8 22;
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "spin5";
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 360;
+         }
+      }
+      part { name: "base"; type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            min: 100 20;
+            max: 100 20;
+            offscale;
+         }
+      }
    }
    programs {
-      program { name: "spin";
+      program { name: "spin-1";
+         in: 0.0 0.0;
          signal: "efl,state,pulse,start"; source: "efl";
-         action: STATE_SET "spin" 0.0;
-         transition: LINEAR 1.0;
-         target: "knob_spinner";
-         after: "spin2";
+         action: SIGNAL_EMIT "spin1" "";
+         after: "spin-2";
+      }
+      program { name: "spin-2";
+         in: 0.2 0.0;
+         action: SIGNAL_EMIT "spin2" "";
+         after: "spin-3";
+      }
+      program { name: "spin-3";
+         in: 0.2 0.0;
+         action: SIGNAL_EMIT "spin3" "";
+         after: "spin-4";
+      }
+      program { name: "spin-4";
+         in: 0.2 0.0;
+         action: SIGNAL_EMIT "spin4" "";
+         after: "spin-5";
+      }
+      program { name: "spin-5";
+         in: 0.2 0.0;
+         action: SIGNAL_EMIT "spin5" "";
+      }
+      program { name: "spin1.1";
+         signal: "spin1"; source: "";
+         action: STATE_SET "end" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "spin1";
+         after: "spin1.2";
       }
-      program { name: "spin2";
+      program { name: "spin1.2";
          action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-         after: "spin";
+         target: "spin1";
+         after: "spin1.1";
       }
-      program {
-         signal: "efl,state,pulse,start"; source: "efl";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.25;
-         target: "busy_clip";
+      program { name: "spin2.1";
+         signal: "spin2"; source: "";
+         action: STATE_SET "end" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "spin2";
+         after: "spin2.2";
       }
-      program {
-         signal: "efl,state,pulse,stop"; source: "efl";
+      program { name: "spin2.2";
+         action: STATE_SET "default" 0.0;
+         target: "spin2";
+         after: "spin2.1";
+      }
+      program { name: "spin3.1";
+         signal: "spin3"; source: "";
+         action: STATE_SET "end" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "spin3";
+         after: "spin3.2";
+      }
+      program { name: "spin3.2";
          action: STATE_SET "default" 0.0;
+         target: "spin3";
+         after: "spin3.1";
+      }
+      program { name: "spin4.1";
+         signal: "spin4"; source: "";
+         action: STATE_SET "end" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "spin4";
+         after: "spin4.2";
+      }
+      program { name: "spin4.2";
+         action: STATE_SET "default" 0.0;
+         target: "spin4";
+         after: "spin4.1";
+      }
+      program { name: "spin5.1";
+         signal: "spin5"; source: "";
+         action: STATE_SET "end" 0.0;
          transition: SINUSOIDAL 1.0;
-         target: "busy_clip";
-         after: "spin3";
+         target: "spin5";
+         after: "spin5.2";
       }
-      program { name: "spin3";
+      program { name: "spin5.2";
+         action: STATE_SET "default" 0.0;
+         target: "spin5";
+         after: "spin5.1";
+      }
+      program {
+         signal: "efl,state,pulse,stop"; source: "efl";
          action: ACTION_STOP;
-         target: "spin";
+         target: "spin-1";
+         target: "spin-2";
+         target: "spin-3";
+         target: "spin-4";
+         target: "spin-5";
+         after: "stop2";
+      }
+      program { name: "stop2";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 1.0 CURRENT;
+         target: "spin1";
          target: "spin2";
-         after: "spin4";
+         target: "spin3";
+         target: "spin4";
+         target: "spin5";
       }
-      program { name: "spin4";
-         action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
+   }
+}
+
+group { name: "efl/progressbar/vertical:bar";
+   inherit: "efl/progressbar/horizontal:bar";
+   data.item: "version" "123";
+   parts {
+      part { name: "spin1";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.2;
+            map.rotation.z: 90;
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 450;
+         }
+      }
+      part { name: "spin2";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.2;
+            rel2.relative: 1.0 0.4;
+            map.rotation.z: 90;
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 450;
+         }
+      }
+      part { name: "spin3";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.4;
+            rel2.relative: 1.0 0.6;
+            map.rotation.z: 90;
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 450;
+         }
+      }
+      part { name: "spin4";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.6;
+            rel2.relative: 1.0 0.8;
+            map.rotation.z: 90;
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 450;
+         }
+      }
+      part { name: "spin5";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.8;
+            rel2.relative: 1.0 1.0;
+            map.rotation.z: 90;
+         }
+         description { state: "end" 0.0;
+            inherit;
+            map.rotation.z: 450;
+         }
+      }
+      part { name: "base";
+         description { state: "default" 0.0;
+            min: 20 100;
+            max: 20 100;
+         }
+      }
+   }
+}
+
+group { name: "efl/progressbar/horizontal:double";
+   inherit: "efl/progressbar/horizontal";
+   data.item: "version" "123";
+   parts {
+      part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
+         insert_after: "bg";
+         scale: 1;
+         dragable.confine: "efl.bar";
+         dragable.x: 1 1 1;
+         dragable.y: 0 0 0;
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            min: 1 1;
+            max: 1 9999;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
+         }
+      }
+      part { name: "barend1"; type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            max: 1 9999;
+            rel1.to_x: "efl.cur.progressbar1";
+            rel2.to_x: "efl.cur.progressbar1";
+            align: 1.0 0.5;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "bar1"; type: RECT;
+         scale: 1;
+         insert_before: "bar";
+         clip_to: "fract_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to_x: "barend1";
+            rel2.to_y: "bg";
+            color: 80 80 80 255;
+            offscale;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_x: "barend1";
+            rel2.to_x: "bg";
+         }
+      }
+   }
+   programs {
+      program { name: "inverted-on";
+         signal: "efl,state,inverted,on"; source: "efl";
+         action:  STATE_SET "inv" 0.0;
+         target: "bar";
+         target: "bar1";
+         target: "barend";
+         target: "barend1";
+      }
+      program
+       { name: "inverted-off";
+         signal: "efl,state,inverted,off"; source: "efl";
+         action:  STATE_SET "default" 0.0;
+         target: "bar";
+         target: "bar1";
+         target: "barend";
+         target: "barend1";
+      }
+   }
+}
+
+group { name: "efl/progressbar/vertical:double";
+   inherit: "efl/progressbar/vertical";
+   data.item: "version" "123";
+   parts {
+      part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
+         insert_after: "bg";
+         scale: 1;
+         dragable.confine: "efl.bar";
+         dragable.x: 0 0 0;
+         dragable.y: 1 1 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            max: 1 9999;
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
+         }
+      }
+      part { name: "barend1"; type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            max: 1 9999;
+            rel1.to_y: "efl.cur.progressbar1";
+            rel2.to_y: "efl.cur.progressbar1";
+            align: 0.5 1.0;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bar1"; type: RECT;
+         scale: 1;
+         insert_after: "barend";
+         clip_to: "fract_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to_y: "barend1";
+            rel2.to_x: "bg";
+            color: 80 80 80 255;
+            offscale;
+         }
+         description { state: "inv" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_y: "barend1";
+            rel2.to_y: "bg";
+         }
+      }
+   }
+   programs {
+      program { name: "inverted-on";
+         signal: "efl,state,inverted,on"; source: "efl";
+         action:  STATE_SET "inv" 0.0;
+         target: "bar";
+         target: "bar1";
+         target: "barend";
+         target: "barend1";
+      }
+      program { name: "inverted-off";
+         signal: "efl,state,inverted,off"; source: "efl";
+         action:  STATE_SET "default" 0.0;
+         target: "bar";
+         target: "bar1";
+         target: "barend";
+         target: "barend1";
       }
    }
 }
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index 0efb52ca69..8f714d4c14 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -11,293 +11,262 @@ Group: efl/radio (@since 1.23)
 	 Signal: efl,text,set
 	 Signal: efl,text,unset
 */
-group { "efl/radio";
+group { name: "efl/radio";
    data.item: "version" "123";
-   images.image: "inset_shadow_circle_tiny.png" COMP;
-   images.image: "inset_circle_tiny.png" COMP;
-   images.image: "sym_radio_alum.png" COMP;
 #define ICON     1
 #define LABEL    2
 #define MASK     3
 #define DISABLE  4
+#define SELECTED 8
    script {
-      public btmode;
-      public eval_mode(m) {
-         new m1 = m & MASK;
-         new d = m & DISABLE;
-         if (m1 == (ICON | LABEL)) {
-            if (!d) {
-               set_state(PART:"efl.content", "visible", 0.0);
-               set_state(PART:"sizer_content", "visible", 0.0);
-               set_state(PART:"efl.text", "visible", 0.0);
-               set_state(PART:"inset", "default", 0.0);
-               set_state(PART:"clip", "default", 0.0);
-               set_state(PART:"event", "default", 0.0);
-            } else {
-               set_state(PART:"efl.content", "visible", 0.0);
-               set_state(PART:"sizer_content", "visible", 0.0);
-               set_state(PART:"efl.text", "disabled_visible", 0.0);
-               set_state(PART:"inset", "disabled", 0.0);
-               set_state(PART:"clip", "disabled", 0.0);
-               set_state(PART:"event", "disabled", 0.0);
-            }
-         } else if (m1 == (ICON)) {
-            if (!d) {
-               set_state(PART:"efl.content", "visible", 0.0);
-               set_state(PART:"sizer_content", "icononly", 0.0);
-               set_state(PART:"efl.text", "default", 0.0);
-               set_state(PART:"inset", "default", 0.0);
-               set_state(PART:"clip", "default", 0.0);
-               set_state(PART:"event", "default", 0.0);
-            } else {
-               set_state(PART:"efl.content", "visible", 0.0);
-               set_state(PART:"sizer_content", "icononly", 0.0);
-               set_state(PART:"efl.text", "disabled", 0.0);
-               set_state(PART:"inset", "disabled", 0.0);
-               set_state(PART:"clip", "disabled", 0.0);
-               set_state(PART:"event", "disabled", 0.0);
-            }
-         } else if (m1 == (LABEL)) {
-            if (!d) {
-               set_state(PART:"efl.content", "default", 0.0);
-               set_state(PART:"sizer_content", "default", 0.0);
-               set_state(PART:"efl.text", "visible", 0.0);
-               set_state(PART:"inset", "default", 0.0);
-               set_state(PART:"clip", "default", 0.0);
-               set_state(PART:"event", "default", 0.0);
-            } else {
-               set_state(PART:"efl.content", "default", 0.0);
-               set_state(PART:"sizer_content", "default", 0.0);
-               set_state(PART:"efl.text", "disabled_visible", 0.0);
-               set_state(PART:"inset", "disabled", 0.0);
-               set_state(PART:"clip", "disabled", 0.0);
-               set_state(PART:"event", "disabled", 0.0);
-            }
+      BUTTONMODE_SCRIPT2
+      public sel;
+      public eval_sel(m) {
+         if (m) {
+            set_state(PART:"ck_check", "selected", 0.0);
          } else {
-            if (!d) {
-               set_state(PART:"efl.content", "default", 0.0);
-               set_state(PART:"sizer_content", "default", 0.0);
-               set_state(PART:"efl.text", "default", 0.0);
-               set_state(PART:"inset", "default", 0.0);
-               set_state(PART:"clip", "default", 0.0);
-               set_state(PART:"event", "default", 0.0);
-            } else {
-               set_state(PART:"efl.content", "default", 0.0);
-               set_state(PART:"sizer_content", "default", 0.0);
-               set_state(PART:"efl.text", "default", 0.0);
-               set_state(PART:"inset", "disabled", 0.0);
-               set_state(PART:"clip", "disabled", 0.0);
-               set_state(PART:"event", "disabled", 0.0);
-            }
+            set_state(PART:"ck_check", "default", 0.0);
          }
       }
    }
    parts {
-      part { name: "inset"; mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
-            image.normal: "inset_shadow_circle_tiny.png";
-            align: 0.0 0.5;
-            min: 13 13;
-            max: 13 13;
-            fixed: 1 0;
+      part { name: "shadow"; type: SPACER;
+         description { state: "default";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "inset_circle_tiny.png";
+         desc { "pressed"; inherit;
+         }
+         desc { "disabled"; inherit;
          }
       }
-      part { name: "indicator"; mouse_events: 0;
-         scale: 1;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel2.to: "inset";
-            image.normal: "sym_radio_alum.png";
-            min: 11 11;
-            max: 11 11;
+      swallow { "efl.background"; nomouse;
+         desc { "default";
             visible: 0;
          }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
+         desc { "visible"; inherit;
             visible: 1;
          }
       }
-      part { name: "clip"; type: RECT;
-         description { state: "default" 0.0;
+      rect { "icon_clip";
+         desc { "default";
+            color_class: "button_icon";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 64;
+         desc { "pressed"; inherit;
+            color_class: "button_icon_pressed";
+         }
+         desc { "disabled"; inherit;
+            color_class: "button_icon_disabled";
          }
       }
-      part { name: "efl.content"; type: SWALLOW;
+      swallow { "efl.content"; nomouse;
          required;
+         clip_to: "icon_clip";
          scale: 1;
-         clip_to: "clip";
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
-            visible: 0;
             align: 0.0 0.5;
-            max: 0 0;
-            rel1.to_x: "inset";
+            rel1.to_x: "base";
+            rel2.to_x: "base";
+            rel1.offset: 4 4;
             rel1.relative: 1.0 0.0;
-            rel1.offset: 1 1;
-            rel2.to_x: "inset";
-            rel2.offset: 1 -2;
-            rel2.relative: 1.0 1.0;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 4 -5;
+            visible: 0;
+            offscale;
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible"; inherit;
+            fixed: 1 0;
             aspect: 1.0 1.0;
-            min: 16 16;
+            min: ICMIN ICMIN;
+            visible: 1;
+         }
+         desc { "icononly"; inherit;
+            fixed: 0 0;
+            align: 0.5 0.5;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -5 -5;
+            rel2.to_x: "";
+            visible: 1;
          }
       }
-      part { name: "sizer_content"; type: TEXT; mouse_events:  0;
+      text { "sizer_content"; nomouse;
          scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
+         desc { "default";
             visible: 0;
             text { font: FN; size: 10;
                min: 0 0;
-               text_class: "radio_text";
+               text_class: "button_text";
             }
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "efl.content";
-            rel2.to: "efl.content";
+         desc { "visible"; inherit;
+            rel.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "efl.content";
-            rel2.to: "efl.content";
+         desc { "icononly"; inherit;
+            rel.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
-      part { name: "efl.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
+      part { name: "base"; type: RECT;
+         scale: 1;
+         description { state: "default";
+            align: 0.0 0.5;
+            min: 13 13;
+            max: 13 13;
+            rel1.offset: 4 4;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 4 -5;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            offscale;
+            visible: 0;
+            offscale;
+         }
+         desc { "pressed"; inherit;
+         }
+         desc { "disabled"; inherit;
+         }
+      }
+      part { name: "ck_check";
          scale: 1;
-         required;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.to_x: "efl.content";
+            fixed: 1 1;
+            rel.to: "base";
+            image.normal: "i-radio";
+            min: 15 15;
+            max: 15 15;
+            color: 0 0 0 64;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            color: 160 160 160 255;
+         }
+         desc { "disabled"; inherit;
+            color: 0 0 0 16;
+         }
+      }
+      text { "efl.text"; nomouse;
+         required;
+         scale: 1;
+         desc { "default";
+            fixed: 0 1;
+            color: 160 160 160 255;
+            rel1.offset: 0 4;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
-            color_class: "radio_text";
+            rel1.to_x: "efl.content";
+            rel2.offset: -5 -5;
             text { font: FN; size: 10;
-              min: 0 0;
-              align: 0.0 0.5;
-              text_class: "radio";
+               align: 0.0 0.5;
+               min: 0 0;
             }
+            visible: 0;
+            offscale;
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class: "radio_text_disabled";
-            color3: 255 255 255 255;
+         desc { "visible"; inherit;
+            fixed: 0 0;
+            rel1.offset: 4 4;
+            text.min: 1 1;
+            text.ellipsis: -1;
+            visible: 1;
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
+         desc { "pressed_visible"; inherit;
+            fixed: 0 0;
+            color: 255 255 255 255;
+            rel1.offset: 4 4;
+            text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
+         }
+         desc { "textonly"; inherit;
+            fixed: 0 0;
             text.min: 1 1;
             text.ellipsis: -1;
+            visible: 1;
          }
-         description { state: "disabled_visible" 0.0;
-            inherit: "default" 0.0;
-            color_class: "radio_text_disabled";
-            color3: 255 255 255 255;
+         desc { "pressed_textonly"; inherit;
+            fixed: 0 0;
+            color: 255 255 255 255;
+            text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
+         }
+         desc { "disabled_visible"; inherit;
+            fixed: 0 0;
+            color: 96 96 96 255;
+            rel1.offset: 4 4;
+            text.min: 1 1;
+            text.ellipsis: -1;
+            visible: 1;
+         }
+         desc { "disabled_textonly"; inherit;
+            fixed: 0 0;
+            color: 96 96 96 255;
             text.min: 1 1;
             text.ellipsis: -1;
+            visible: 1;
          }
       }
-      part { name: "event"; type: RECT;
-         description { state: "default" 0.0;
+      rect { "event";
+         ignore_flags: ON_HOLD;
+         desc { "default";
             color: 0 0 0 0;
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled"; inherit;
             visible: 0;
          }
       }
    }
    programs {
       EFL_UI_CLICKABLE_PART_BIND(event)
-      program {
-         signal: "efl,state,selected"; source: "efl";
-         action:  STATE_SET "selected" 0.0;
-         target: "indicator";
-      }
-      program {
-         signal: "efl,state,unselected"; source: "efl";
-         action:  STATE_SET "default" 0.0;
-         target: "indicator";
-      }
-      program {
-         signal: "efl,text,set"; source: "efl";
+      program { signal: "efl,state,selected"; source: "efl";
          script {
-            new m = get_int(btmode);
-            m |= LABEL; set_int(btmode, m);
-            eval_mode(m);
+            new m = get_int(sel) | SELECTED;
+            set_int(sel, m);
+            eval_sel(m);
          }
       }
-      program {
-         signal: "efl,text,unset"; source: "efl";
+      program { signal: "efl,state,unselected"; source: "efl";
          script {
-            new m = get_int(btmode);
-            m &= ~LABEL; set_int(btmode, m);
-            eval_mode(m);
+            new m = get_int(sel) & ~SELECTED;
+            set_int(sel, m);
+            eval_sel(m);
          }
       }
-      program {
-         signal: "efl,content,set"; source: "efl";
-         script {
-            new m = get_int(btmode);
-            m |= ICON; set_int(btmode, m);
-            eval_mode(m);
-         }
+      program { signal: "efl,text,set"; source: "efl";
+         script { flag_set(LABEL); }
       }
-      program {
-         signal: "efl,content,unset"; source: "efl";
-         script {
-            new m = get_int(btmode);
-            m &= ~ICON; set_int(btmode, m);
-            eval_mode(m);
-         }
+      program { signal: "efl,text,unset"; source: "efl";
+         script { flag_unset(LABEL); }
       }
-      program {
-         signal: "efl,state,disabled"; source: "efl";
-         script {
-            new m = get_int(btmode);
-            m |= DISABLE; set_int(btmode, m);
-            eval_mode(m);
-         }
+      program { signal: "efl,content,set"; source: "efl";
+         script { flag_set(ICON); }
       }
-      program {
-         signal: "efl,state,enabled"; source: "efl";
-         script {
-            new m = get_int(btmode);
-            m &= ~DISABLE; set_int(btmode, m);
-            eval_mode(m);
-         }
+      program { signal: "efl,content,unset"; source: "efl";
+         script { flag_unset(ICON); }
+      }
+      program { signal: "efl,state,disabled"; source: "efl";
+         script { flag_set(DISABLE); }
+      }
+      program { signal: "efl,state,enabled"; source: "efl";
+         script { flag_unset(DISABLE); }
+      }
+      program { signal: "efl,state,disabled"; source: "efl";
+         action:  STATE_SET "disabled" 0.0;
+         target: "ck_check";
+      }
+      program { signal: "efl,state,enabled"; source: "efl";
+         action:  STATE_SET "default" 0.0;
+         target: "ck_check";
       }
    }
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
 }
diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc
index 688a1aec49..e90a54273b 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -35,118 +35,189 @@ Group: efl/scroller:popup/no_inset_shadow (@since 1.23)
 */
 group { name: "efl/scroller";
    data.item: "version" "123";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "runner_horiz.png" COMP;
-   images.image: "runner_vert.png" COMP;
-   images.image: "runner_glow_horiz.png" COMP;
-   images.image: "runner_glow_vert.png" COMP;
-   images.image: "holes_tiny_horiz.png" COMP;
-   images.image: "holes_tiny_vert.png" COMP;
-   images.image: "holes_tiny_glow_horiz.png" COMP;
-   images.image: "holes_tiny_glow_vert.png" COMP;
-   images.image: "vgrad_med_lighter.png" COMP;
-   images.image: "shadow_square_tiny.png" COMP;
-   images.image: "glow_small.png" COMP;
-   images.image: "sym_left_light_normal.png" COMP;
-   images.image: "sym_right_light_normal.png" COMP;
-   images.image: "sym_up_light_normal.png" COMP;
-   images.image: "sym_down_light_normal.png" COMP;
-   images.image: "sym_left_glow_normal.png" COMP;
-   images.image: "sym_right_glow_normal.png" COMP;
-   images.image: "sym_up_glow_normal.png" COMP;
-   images.image: "sym_down_glow_normal.png" COMP;
-   images.image: "sym_up_dark_normal.png" COMP;
-   images.image: "sym_down_dark_normal.png" COMP;
-   images.image: "sym_left_dark_normal.png" COMP;
-   images.image: "sym_right_dark_normal.png" COMP;
 
+   images.image: "shadow_circle_horiz.png" COMP;
+   images.image: "shadow_circle_vert.png" COMP;
 
    data.item: "focus_highlight" "on";
 
-   script {
-      public loop_x, loop_y;
-      public action_on_pos_vbar(val) {
-         new x, y , w, h, x1, y1 , w1, h1;
-
-         get_geometry(PART:"y_vbar_up", x,y,w, h);
-         get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
+   parts {
+      program { signal: "load"; source: "";
+         script {
+            emit("reload", "efl");
+         }
+      }
 
-         if(((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y)))
-         {
-            set_state(PART:"arrow1_vbar", "hidden", 0.0);
-            set_state(PART:"sb_vbar_a1", "hidden", 0.0);
+      //////////////////////////////////////////////////////////////////////
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "efl.background";
+            color: 0 0 0 0;
+            color_class: "scroller_bg";
          }
-         else
-         {
-            set_state(PART:"arrow1_vbar", "default", 0.0);
-            set_state(PART:"sb_vbar_a1", "default", 0.0);
+      }
+      part { name: "clipper"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "efl.background";
          }
-
-         get_geometry(PART:"y_vbar_down", x,y,w, h);
-         get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
-
-         if(((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y)))
-         {
-            set_state(PART:"arrow2_vbar", "hidden", 0.0);
-            set_state(PART:"sb_vbar_a2", "hidden", 0.0);
+      }
+      part { name: "efl.background"; type: SWALLOW;
+//         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+//            rel1.offset: 2 2;
+//            rel2.offset: -3 -3;
+//            offscale;
          }
-         else
-         {
-            set_state(PART:"arrow2_vbar", "default", 0.0);
-            set_state(PART:"sb_vbar_a2", "default", 0.0);
+      }
+      part { name: "efl.content"; type: SWALLOW;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            rel.to: "efl.background";
+         }
+      }
+      part { name: "efl.overlay"; type: SWALLOW;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            rel.to: "efl.content";
          }
-
-         if(val < 10)
-            timer(0.1,"action_on_pos_vbar", val+1);
       }
 
-      public action_on_pos_hbar(val) {
-         new x, y , w, h, x1, y1 , w1, h1;
-
-         get_geometry(PART:"x_hbar_left", x,y,w, h);
-         get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
-
-         if(((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x)))
-         {
-            set_state(PART:"arrow1_hbar", "hidden", 0.0);
-            set_state(PART:"sb_hbar_a1", "hidden", 0.0);
+      part { name: "sh_top"; mouse_events: 0;
+         scale: 1;
+         clip_to: "sh_clip";
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+            rel.to: "efl.content";
+            rel1.offset: 0 -1;
+            rel2.offset: -1 -1;
+            rel2.relative: 1.0 0.0;
+            image.normal: "shadow_circle_horiz.png";
+            visible: 0;
+            offscale;
          }
-         else
-         {
-            set_state(PART:"arrow1_hbar", "default", 0.0);
-            set_state(PART:"sb_hbar_a1", "default", 0.0);
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: 0 -16;
+            rel2.offset: -1 15;
+            visible: 1;
          }
+      }
+      program { signal: "efl,action,show,up"; source: "efl";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_top";
+      }
+      program { signal: "efl,action,hide,up"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_top";
+      }
 
-         get_geometry(PART:"x_hbar_right", x,y,w, h);
-         get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
+      part { name: "sh_bottom"; mouse_events: 0;
+         scale: 1;
+         clip_to: "sh_clip";
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+            rel.to: "efl.content";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 0 0;
+            rel2.offset: -1 0;
+            image.normal: "shadow_circle_horiz.png";
+            visible: 0;
+            offscale;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: 0 -16;
+            rel2.offset: -1 15;
+            visible: 1;
+         }
+      }
+      program { signal: "efl,action,show,down"; source: "efl";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_bottom";
+      }
+      program { signal: "efl,action,hide,down"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_bottom";
+      }
 
-         if(((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x)))
-         {
-            set_state(PART:"arrow2_hbar", "hidden", 0.0);
-            set_state(PART:"sb_hbar_a2", "hidden", 0.0);
+      part { name: "sh_left"; mouse_events: 0;
+         scale: 1;
+         clip_to: "sh_clip";
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+            rel.to: "efl.content";
+            rel1.offset: -1 0;
+            rel2.offset: -1 -1;
+            rel2.relative: 0.0 1.0;
+            image.normal: "shadow_circle_vert.png";
+            visible: 0;
+            offscale;
          }
-         else
-         {
-            set_state(PART:"arrow2_hbar", "default", 0.0);
-            set_state(PART:"sb_hbar_a2", "default", 0.0);
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: -16 0;
+            rel2.offset: 15 -1;
+            visible: 1;
          }
+      }
+      program { signal: "efl,action,show,left"; source: "efl";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_left";
+      }
+      program { signal: "efl,action,hide,left"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_left";
+      }
 
-         if(val < 10)
-            timer(0.1,"action_on_pos_hbar", val+1);
+      part { name: "sh_right"; mouse_events: 0;
+         scale: 1;
+         clip_to: "sh_clip";
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+            rel.to: "efl.content";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: 0 -1;
+            image.normal: "shadow_circle_vert.png";
+            visible: 0;
+            offscale;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: -16 0;
+            rel2.offset: 15 -1;
+            visible: 1;
+         }
+      }
+      program { signal: "efl,action,show,right"; source: "efl";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_right";
+      }
+      program { signal: "efl,action,hide,right"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.3;
+         target: "sh_right";
       }
-   }
 
-   parts {
-      program {
-         signal: "load"; source: "";
-         script {
-            emit("reload", "efl");
-            action_on_pos_vbar(0);
-            action_on_pos_hbar(0);
+      part { name: "sh_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "efl.background";
          }
       }
+      //////////////////////////////////////////////////////////////////////
+
 // vert bar ////////////////////////////////////////////////////////////////
       part { name: "sb_vbar_show"; type: RECT;
          description { state: "default" 0.0;
@@ -170,26 +241,14 @@ group { name: "efl/scroller";
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             min: 0 0;
-            max: 0 99999;
-         }
-      }
-      part { name: "sb_vbar_base"; type: RECT;
-         clip_to: "sb_vbar";
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 1.0;
-            rel1.to: "sb_vbar_a1";
-            rel2.relative: 1.0 0.0;
-            rel2.to: "sb_vbar_a2";
-            fixed: 1 1;
+            max: 0 999999;
          }
       }
       part { name: "sb_vbar_p1"; type: RECT;
          clip_to: "sb_vbar";
          description { state: "default" 0.0;
             color: 0 0 0 0;
-            rel1.relative: 0.0 1.0;
-            rel1.to: "sb_vbar_a1";
+            rel1.to: "sb_vbar";
             rel2.relative: 1.0 0.0;
             rel2.to: "efl.draggable.vertical_bar";
             fixed: 1 1;
@@ -201,24 +260,23 @@ group { name: "efl/scroller";
             color: 0 0 0 0;
             rel1.relative: 0.0 1.0;
             rel1.to: "efl.draggable.vertical_bar";
-            rel2.relative: 1.0 0.0;
-            rel2.to: "sb_vbar_a2";
+            rel2.to: "sb_vbar";
             fixed: 1 1;
          }
       }
-      part { name: "efl.draggable.vertical_bar"; type: RECT; required;
+      part { name: "efl.draggable.vertical_bar"; type: RECT;
          clip_to: "sb_vbar";
          scale: 1;
          dragable.x: 0 0 0;
          dragable.y: 1 1 0;
-         dragable.confine: "sb_vbar_base";
+         dragable.confine: "sb_vbar";
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 15 13;
+            min: 15 15;
             rel1.relative: 0.5  0.5;
-            rel1.to: "sb_vbar_base";
+            rel1.to: "sb_vbar";
             rel2.relative: 0.5  0.5;
-            rel2.to: "sb_vbar_base";
+            rel2.to: "sb_vbar";
             color: 0 0 0 0;
          }
          description { state: "hidden" 0.0;
@@ -229,6 +287,28 @@ group { name: "efl/scroller";
             inherit: "default" 0.0;
          }
       }
+      part { name: "sb_vbar_over"; type: RECT;
+         repeat_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.to: "sb_vbar";
+            rel1.offset: -45 0;
+            rel2.to: "sb_vbar";
+            fixed: 1 1;
+            offscale;
+         }
+      }
+      program { signal: "mouse,in"; source: "sb_vbar_over";
+         action: STATE_SET "over" 0.0;
+         transition: DECELERATE 0.2;
+         target: "base_vbar";
+      }
+      program { signal: "mouse,out"; source: "sb_vbar_over";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.2;
+         target: "base_vbar";
+      }
       part { name: "y_vbar_up_mapper"; type: SPACER;
          scale: 1;
          repeat_events: 1;
@@ -237,8 +317,8 @@ group { name: "efl/scroller";
             max: 4 2;
             fixed: 1 1;
             align: 0.0 0.0;
-            rel1.to: "sb_vbar_base";
-            rel2.to: "sb_vbar_base";
+            rel1.to: "sb_vbar";
+            rel2.to: "sb_vbar";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -271,8 +351,8 @@ group { name: "efl/scroller";
             max: 4 2;
             fixed: 1 1;
             align: 0.0 1.0;
-            rel1.to: "sb_vbar_base";
-            rel2.to: "sb_vbar_base";
+            rel1.to: "sb_vbar";
+            rel2.to: "sb_vbar";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -297,122 +377,48 @@ group { name: "efl/scroller";
             max: 0 0;
          }
       }
-      part { name: "sb_vbar_a1"; type: RECT;
-         clip_to: "sb_vbar";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 15 15;
-            align: 0.5 0.0;
-            aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
-            color: 0 0 0 0;
-            rel1.to: "sb_vbar";
-            rel2.to: "sb_vbar";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-            visible: 0;
-         }
-      }
-      part { name: "sb_vbar_a2"; type: RECT;
-         clip_to: "sb_vbar";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 15 15;
-            align: 0.5 1.0;
-            aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
-            color: 0 0 0 0;
-            rel1.to: "sb_vbar";
-            rel1.offset: 0 -1;
-            rel1.relative: 0.0 1.0;
-            rel2.to: "sb_vbar";
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-            visible: 0;
-         }
-      }
-      program {
-         signal: "efl,vertical_bar,visible,on"; source: "efl";
+      program { signal: "efl,vertical_bar,visible,on"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "sb_vbar";
          target: "sb_vbar_show";
          target: "efl.draggable.vertical_bar";
-         target: "sb_vbar_a1";
-         target: "sb_vbar_a2";
          target: "y_vbar_up_mapper";
          target: "y_vbar_up";
          target: "y_vbar_down_mapper";
          target: "y_vbar_down";
-         target: "arrow1_vbar_indent";
-         target: "arrow2_vbar_indent";
       }
-      program {
-         signal: "efl,vertical_bar,visible,off"; source: "efl";
+      program { signal: "efl,vertical_bar,visible,off"; source: "efl";
          action: STATE_SET "hidden" 0.0;
          target: "sb_vbar";
          target: "sb_vbar_show";
          target: "efl.draggable.vertical_bar";
-         target: "sb_vbar_a1";
-         target: "sb_vbar_a2";
          target: "y_vbar_up_mapper";
          target: "y_vbar_up";
          target: "y_vbar_down_mapper";
          target: "y_vbar_down";
-         target: "arrow1_vbar_indent";
-         target: "arrow2_vbar_indent";
       }
-      program {
-         signal: "mouse,down,1*"; source: "sb_vbar_a1";//ok
-         action: STATE_SET "clicked" 0.0;
-         target: "arrow1_vbar";
-         after: "anim1_up";
-      }
-      program { name: "anim1_up";
-         action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.1;
-         target: "arrow1_vbar";
-         after: "drag_up";
-      }
-      program { name: "drag_up";
-         action: DRAG_VAL_STEP 0.0 -1.0;
-         target: "efl.draggable.vertical_bar";
-      }
-      program {
-         signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
-         action: STATE_SET "clicked" 0.0;
-         target: "arrow2_vbar";
-         after: "anim1_down";
-      }
-      program { name: "anim1_down";
-         action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.1;
-         target: "arrow2_vbar";
-         after: "drag_down";
-      }
-      program { name: "drag_down";
-         action: DRAG_VAL_STEP 0.0 1.0;
-         target: "efl.draggable.vertical_bar";
-      }
-      program {
-         signal: "mouse,down,1*"; source: "sb_vbar_p1";
+      program { signal: "mouse,down,1*"; source: "sb_vbar_p1";
          action: DRAG_VAL_PAGE 0.0 -1.0;
          target: "efl.draggable.vertical_bar";
       }
-      program {
-         signal: "mouse,down,1*"; source: "sb_vbar_p2";
+      program { signal: "mouse,down,1*"; source: "sb_vbar_p2";
          action: DRAG_VAL_PAGE  0.0 1.0;
          target: "efl.draggable.vertical_bar";
       }
-      program {
-         signal: "efl,action,scroll"; source: "efl";
-         script {
-            action_on_pos_vbar(10);
-         }
-      }
+//      program { signal: "efl,action,show,up"; source: "efl";
+//      }
+//      program { signal: "efl,action,show,down"; source: "efl";
+//      }
+//      program { signal: "efl,action,hide,up"; source: "efl";
+//      }
+//      program { signal: "efl,action,hide,down"; source: "efl";
+//      }
+//      program { signal: "efl,action,scroll"; source: "efl";
+//      }
+//      program { signal: "efl,loop_y,set"; source: "efl";
+//      }
+//      program { signal: "efl,loop_y,unset"; source: "efl";
+//      }
 
 // horiz bar /////////////////////////////////////////////////////////////
       part { name: "sb_hbar_show"; type: RECT;
@@ -437,26 +443,14 @@ group { name: "efl/scroller";
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             min: 0 0;
-            max: 99999 0;
-         }
-      }
-      part { name: "sb_hbar_base"; type: RECT;
-         clip_to: "sb_hbar";
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: 1.0 0.0;
-            rel1.to: "sb_hbar_a1";
-            rel2.relative: 0.0 1.0;
-            rel2.to: "sb_hbar_a2";
-            fixed: 1 1;
+            max: 999999 0;
          }
       }
       part { name: "sb_hbar_p1"; type: RECT;
          clip_to: "sb_hbar";
          description { state: "default" 0.0;
             color: 0 0 0 0;
-            rel1.relative: 1.0 0.0;
-            rel1.to: "sb_hbar_a1";
+            rel1.to: "sb_hbar";
             rel2.relative: 0.0 1.0;
             rel2.to: "efl.draggable.horizontal_bar";
             fixed: 1 1;
@@ -468,24 +462,23 @@ group { name: "efl/scroller";
             color: 0 0 0 0;
             rel1.relative: 1.0 0.0;
             rel1.to: "efl.draggable.horizontal_bar";
-            rel2.relative: 0.0 1.0;
-            rel2.to: "sb_hbar_a2";
+            rel2.to: "sb_hbar";
             fixed: 1 1;
          }
       }
-      part { name: "efl.draggable.horizontal_bar"; type: RECT; required;
-         clip_to: "sb_hbar";
+      part { name: "efl.draggable.horizontal_bar"; type: RECT;
          scale: 1;
+         clip_to: "sb_hbar";
          dragable.x: 1 1 0;
          dragable.y: 0 0 0;
-         dragable.confine: "sb_hbar_base";
+         dragable.confine: "sb_hbar";
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 13 15;
+            min: 15 15;
             rel1.relative: 0.5  0.5;
-            rel1.to: "sb_hbar_base";
+            rel1.to: "sb_hbar";
             rel2.relative: 0.5  0.5;
-            rel2.to: "sb_hbar_base";
+            rel2.to: "sb_hbar";
             color: 0 0 0 0;
          }
          description { state: "hidden" 0.0;
@@ -496,6 +489,28 @@ group { name: "efl/scroller";
             inherit: "default" 0.0;
          }
       }
+      part { name: "sb_hbar_over"; type: RECT;
+         repeat_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.to: "sb_hbar";
+            rel1.offset: 0 -45;
+            rel2.to: "sb_hbar";
+            fixed: 1 1;
+            offscale;
+         }
+      }
+      program { signal: "mouse,in"; source: "sb_hbar_over";
+         action: STATE_SET "over" 0.0;
+         transition: DECELERATE 0.2;
+         target: "base_hbar";
+      }
+      program { signal: "mouse,out"; source: "sb_hbar_over";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.2;
+         target: "base_hbar";
+      }
       part { name: "x_hbar_left_mapper"; type: SPACER;
          scale: 1;
          repeat_events: 1;
@@ -504,8 +519,8 @@ group { name: "efl/scroller";
             max: 2 4;
             fixed: 1 1;
             align: 0.0 1.0;
-            rel1.to: "sb_hbar_base";
-            rel2.to: "sb_hbar_base";
+            rel1.to: "sb_hbar";
+            rel2.to: "sb_hbar";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -538,8 +553,8 @@ group { name: "efl/scroller";
             max: 2 4;
             fixed: 1 1;
             align: 1.0 1.0;
-            rel1.to: "sb_hbar_base";
-            rel2.to: "sb_hbar_base";
+            rel1.to: "sb_hbar";
+            rel2.to: "sb_hbar";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -564,622 +579,233 @@ group { name: "efl/scroller";
             max: 0 0;
          }
       }
-      part { name: "sb_hbar_a1"; type: RECT;
-         clip_to: "sb_hbar";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 15 15;
-            align: 0.0 0.5;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
-            rel1.to: "sb_hbar";
-            rel2.to: "sb_hbar";
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 0 -1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-            visible: 0;
-         }
-      }
-      part { name: "sb_hbar_a2"; type: RECT;
-         clip_to: "sb_hbar";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 15 15;
-            align: 1.0 0.5;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
-            rel1.to: "sb_hbar";
-            rel1.offset: -1 0;
-            rel1.relative: 1.0 0.0;
-            rel2.to: "sb_hbar";
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-            visible: 0;
-         }
-      }
-      program {
-         signal: "efl,horizontal_bar,visible,on"; source: "efl";
+      program { signal: "efl,horizontal_bar,visible,on"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "sb_hbar";
          target: "sb_hbar_show";
          target: "efl.draggable.horizontal_bar";
-         target: "sb_hbar_a1";
-         target: "sb_hbar_a2";
          target: "x_hbar_left_mapper";
          target: "x_hbar_left";
          target: "x_hbar_right_mapper";
          target: "x_hbar_right";
-         target: "arrow1_hbar_indent";
-         target: "arrow2_hbar_indent";
       }
-      program {
-         signal: "efl,horizontal_bar,visible,off"; source: "efl";
+      program { signal: "efl,horizontal_bar,visible,off"; source: "efl";
          action: STATE_SET "hidden" 0.0;
          target: "sb_hbar";
          target: "sb_hbar_show";
          target: "efl.draggable.horizontal_bar";
-         target: "sb_hbar_a1";
-         target: "sb_hbar_a2";
          target: "x_hbar_left_mapper";
          target: "x_hbar_left";
          target: "x_hbar_right_mapper";
          target: "x_hbar_right";
-         target: "arrow1_hbar_indent";
-         target: "arrow2_hbar_indent";
-      }
-      program {
-         signal: "mouse,down,1*"; source: "sb_hbar_a1";
-         action: STATE_SET "clicked" 0.0;
-         target: "arrow1_hbar";
-         after: "anim1_left";
-      }
-      program { name: "anim1_left";
-         action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.1;
-         target: "arrow1_hbar";
-         after: "drag_left";
-      }
-      program { name: "drag_left";
-         action: DRAG_VAL_STEP -1.0 0.0;
-         target: "efl.draggable.horizontal_bar";
-      }
-      program {
-         signal: "mouse,down,1*"; source: "sb_hbar_a2";
-         action: STATE_SET "clicked" 0.0;
-         target: "arrow2_hbar";
-         after: "anim2_left";
-      }
-      program { name: "anim2_left";
-         action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.1;
-         target: "arrow2_hbar";
-         after: "drag_right";
       }
-      program { name: "drag_right";
-         action: DRAG_VAL_STEP 1.0 0.0;
-         target: "efl.draggable.horizontal_bar";
-      }
-      program {
-         signal: "mouse,down,1*"; source: "sb_hbar_p1";
+      program { signal: "mouse,down,1*"; source: "sb_hbar_p1";
          action: DRAG_VAL_PAGE -1.0 0.0;
          target: "efl.draggable.horizontal_bar";
       }
-      program {
-         signal: "mouse,down,1*"; source: "sb_hbar_p2";
+      program { signal: "mouse,down,1*"; source: "sb_hbar_p2";
          action: DRAG_VAL_PAGE  1.0 0.0;
          target: "efl.draggable.horizontal_bar";
       }
-      program {
-         signal: "efl,action,scroll"; source: "efl";
-         script {
-            action_on_pos_hbar(10);
-         }
-      }
-      part { name: "bg"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "efl.background";
-            rel2.to: "efl.background";
-//            color: 64 64 64 200;
-            color: 0 0 0 0;
-            color_class: "scroller_bg";
-         }
-      }
-      part { name: "clipper"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "efl.background";
-            rel2.to: "efl.background";
-         }
-      }
-      part { name: "efl.background"; type: SWALLOW; required;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.relative: 0.0 0.0;
-            rel2.offset: -2 -2;
-            rel2.to_x: "sb_vbar";
-            rel2.to_y: "sb_hbar";
-         }
-      }
-      part { name: "efl.content"; type: SWALLOW; required;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.relative: 0.0 0.0;
-            rel2.offset: -2 -2;
-            rel2.to_x: "sb_vbar";
-            rel2.to_y: "sb_hbar";
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         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: "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: "efl.overlay"; type: SWALLOW; required;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            rel1.to: "efl.content";
-            rel2.to: "efl.content";
-         }
-      }
-      part { name: "runner_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            image.normal: "runner_vert.png";
-            image.border: 0 0 2 2;
-            rel1.to: "sb_vbar_base";
-            rel2.to: "sb_vbar_base";
-            fill.smooth: 0;
-            min: 3 4;
-            max: 3 99999;
-            fixed: 1 1;
-         }
-      }
-      part { name: "runner_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            image.normal: "runner_horiz.png";
-            image.border: 2 2 0 0;
-            rel1.to: "sb_hbar_base";
-            rel2.to: "sb_hbar_base";
-            fill.smooth: 0;
-            min: 4 3;
-            max: 99999 3;
-            fixed: 1 1;
-         }
-      }
-      part { name: "runner_vbar_clip"; type: RECT;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            min: 1 1;
-            max: 1 99999;
-            rel1.to: "runner_vbar";
-            rel1.offset: 0 1;
-            rel2.to: "runner_vbar";
-            rel2.offset: -1 -2;
-            fixed: 1 1;
-         }
-      }
-      part { name: "runner_hbar_clip"; type: RECT;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            min: 1 1;
-            max: 99999 1;
-            rel1.to: "runner_hbar";
-            rel1.offset: 1 0;
-            rel2.to: "runner_hbar";
-            rel2.offset: -2 -1;
-            fixed: 1 1;
-         }
-      }
-      part { name: "arrow1_vbar_indent"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "sb_vbar_a1";
-            rel2.to: "sb_vbar_a1";
-            image.normal: "sym_up_dark_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "arrow1_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "sb_vbar_a1";
-            rel2.to: "sb_vbar_a1";
-            image.normal: "sym_up_light_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "sym_up_glow_normal.png";
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "arrow2_vbar_indent"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "sb_vbar_a2";
-            rel2.to: "sb_vbar_a2";
-            image.normal: "sym_down_dark_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "arrow2_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "sb_vbar_a2";
-            rel2.to: "sb_vbar_a2";
-            image.normal: "sym_down_light_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "sym_down_glow_normal.png";
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "shadow_vbar"; mouse_events: 0;
+//      program { signal: "efl,action,show,left"; source: "efl";
+//      }
+//      program { signal: "efl,action,show,right"; source: "efl";
+//      }
+//      program { signal: "efl,action,hide,left"; source: "efl";
+//      }
+//      program { signal: "efl,action,hide,right"; source: "efl";
+//      }
+//      program { signal: "efl,action,scroll"; source: "efl";
+//      }
+//      program { signal: "efl,loop_x,set"; source: "efl";
+//      }
+//      program { signal: "efl,loop_x,unset"; source: "efl";
+//      }
+
+      //////////////////////////////////////////////////////////////////////
+      part { name: "color_vbar"; type: RECT; mouse_events: 0;
          clip_to: "sb_vbar_show";
          description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "base_vbar";
-            rel2.offset: 2 4;
-            rel2.to: "base_vbar";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
             fixed: 1 1;
+            color: 51 153 255 255;
          }
-         description { state: "clicked" 0.0;
+         description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -2 -2;
-            rel2.offset: 1 1;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "glow_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            rel1.offset: -3 -3;
-            rel1.to: "base_vbar";
-            rel2.offset: 2 2;
-            rel2.to: "base_vbar";
-            image.normal: "glow_small.png";
-            image.border: 7 7 7 7;
-            fill.smooth: 0;
-            visible: 0;
-            fixed: 1 1;
+            color: 80 80 80 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "runner_glow_vbar"; mouse_events: 0;
-         clip_to: "runner_vbar_clip";
-         description { state: "default" 0.0;
-            rel1.offset: 0 -30;
-            rel1.to_x: "runner_vbar_clip";
-            rel1.to_y: "base_vbar";
-            rel2.offset: -1 29;
-            rel2.to_x: "runner_vbar_clip";
-            rel2.to_y: "base_vbar";
-            image.normal: "runner_glow_vert.png";
-            image.border: 0 0 33 33;
-            fixed: 1 1;
+            color: 255 255 255 255;
          }
       }
-      part { name: "base_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.offset: 2 0;
-            rel1.to: "efl.draggable.vertical_bar";
-            rel2.offset: -3 -1;
-            rel2.to: "efl.draggable.vertical_bar";
-            image.normal: "vgrad_med_lighter.png";
-            fill.smooth: 0;
-            min: 3 13;
-            TILED_HORIZ(120)
-            fixed: 1 1;
-            color_class: "scroller_bar";
-         }
-      }
-      part { name: "bevel_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
+
+      part { name: "base_vbar"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "color_vbar";
          description { state: "default" 0.0;
-            rel1.to: "base_vbar";
-            rel2.to: "base_vbar";
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-            min: 3 3;
             fixed: 1 1;
+            rel.to: "efl.draggable.vertical_bar";
+            min: 5 15;
+            max: 5 999999;
+            align: 1.0 0.5;
          }
-      }
-      part { name: "center_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "base_vbar";
-            rel2.to: "base_vbar";
-            image.normal: "holes_tiny_vert.png";
-            FIXED_SIZE(3, 11)
-         }
-      }
-      part { name: "center_glow_vbar"; mouse_events: 0;
-         clip_to: "sb_vbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "center_vbar";
-            rel2.to: "center_vbar";
-            image.normal: "holes_tiny_glow_vert.png";
-            FIXED_SIZE(11, 17)
-            visible: 0;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "arrow1_hbar_indent"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "sb_hbar_a1";
-            rel2.to: "sb_hbar_a1";
-            image.normal: "sym_left_dark_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "arrow1_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "sb_hbar_a1";
-            rel2.to: "sb_hbar_a1";
-            image.normal: "sym_left_light_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "sym_left_glow_normal.png";
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "arrow2_hbar_indent"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "sb_hbar_a2";
-            rel2.to: "sb_hbar_a2";
-            image.normal: "sym_right_dark_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "arrow2_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "sb_hbar_a2";
-            rel2.to: "sb_hbar_a2";
-            image.normal: "sym_right_light_normal.png";
-            FIXED_SIZE(15, 15)
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "sym_right_glow_normal.png";
-         }
-         description { state: "hidden" 0.0;
+         description { state: "over" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            min: 15 15;
+            max: 15 999999;
          }
       }
-      part { name: "shadow_hbar"; mouse_events: 0;
+
+      //////////////////////////////////////////////////////////////////////
+      part { name: "color_hbar"; type: RECT; mouse_events: 0;
          clip_to: "sb_hbar_show";
          description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "base_hbar";
-            rel2.offset: 2 4;
-            rel2.to: "base_hbar";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
             fixed: 1 1;
+            color: 51 153 255 255;
          }
-         description { state: "clicked" 0.0;
+         description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -2 -2;
-            rel2.offset: 1 1;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "glow_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            rel1.offset: -3 -3;
-            rel1.to: "base_hbar";
-            rel2.offset: 2 2;
-            rel2.to: "base_hbar";
-            image.normal: "glow_small.png";
-            image.border: 7 7 7 7;
-            fill.smooth: 0;
-            visible: 0;
-            fixed: 1 1;
+            color: 80 80 80 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
+            color: 255 255 255 255;
          }
       }
-      part { name: "runner_glow_hbar"; mouse_events: 0;
-         clip_to: "runner_hbar_clip";
-         description { state: "default" 0.0;
-            rel1.offset: -30 0;
-            rel1.to_x: "base_hbar";
-            rel1.to_y: "runner_hbar_clip";
-            rel2.offset: 29 -1;
-            rel2.to_x: "base_hbar";
-            rel2.to_y: "runner_hbar_clip";
-            image.normal: "runner_glow_horiz.png";
-            image.border: 33 33 0 0;
-            fixed: 1 1;
-         }
-      }
-      part { name: "base_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.offset: 0 2;
-            rel1.to: "efl.draggable.horizontal_bar";
-            rel2.offset: -1 -3;
-            rel2.to: "efl.draggable.horizontal_bar";
-            image.normal: "vgrad_med_lighter.png";
-            fill.smooth: 0;
-            min: 13 3;
-            TILED_HORIZ(120)
-         }
-      }
-      part { name: "bevel_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "base_hbar";
-            rel2.to: "base_hbar";
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-            min: 3 3;
-            fixed: 1 1;
-         }
-      }
-      part { name: "center_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
+
+      part { name: "base_hbar"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "color_hbar";
          description { state: "default" 0.0;
-            rel1.to: "base_hbar";
-            rel2.to: "base_hbar";
-            image.normal: "holes_tiny_horiz.png";
-            FIXED_SIZE(11, 3)
             fixed: 1 1;
+            rel.to: "efl.draggable.horizontal_bar";
+            min: 15 5;
+            max: 999999 5;
+            align: 0.5 1.0;
          }
-      }
-      part { name: "center_glow_hbar"; mouse_events: 0;
-         clip_to: "sb_hbar_show";
-         description { state: "default" 0.0;
-            rel1.to: "center_hbar";
-            rel2.to: "center_hbar";
-            image.normal: "holes_tiny_glow_horiz.png";
-            FIXED_SIZE(17, 11)
-            visible: 0;
-         }
-         description { state: "clicked" 0.0;
+         description { state: "over" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
+            min: 15 15;
+            max: 999999 15;
          }
       }
+
+      //////////////////////////////////////////////////////////////////////
+
       part { name: "dim_effect"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }
          description { state: "effect" 0.0;
-            color: 50 50 50 255;
+            color: 32 32 32 255;
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
+      program { signal: "efl,state,disabled"; source: "efl";
+         action: STATE_SET "disabled" 0.0;
+         target: "color_hbar";
+         target: "color_vbar";
+      }
+      program { signal: "efl,state,enabled"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         target: "color_hbar";
+         target: "color_vbar";
+      }
+      program { signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
          action: STATE_SET "clicked" 0.0;
          target: "efl.draggable.vertical_bar";
-         target: "shadow_vbar";
-         target: "glow_vbar";
-         target: "center_glow_vbar";
+         target: "color_vbar";
       }
-      program {
-         signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
+      program { signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
          action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
       }
-      program {
-         signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
+      program { signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
          action: STATE_SET "default" 0.0;
          target: "efl.draggable.vertical_bar";
-         target: "shadow_vbar";
-         target: "glow_vbar";
-         target: "center_glow_vbar";
+         target: "color_vbar";
       }
-      program {
-         signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
-         action: SIGNAL_EMIT "efl,vbar,unpress" "efl";
+      program { signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
+         action: SIGNAL_EMIT "efl,vertical_bar,unpress" "efl";
       }
-      program {
-         signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
+
+      program { signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
          action: STATE_SET "clicked" 0.0;
          target: "efl.draggable.horizontal_bar";
-         target: "shadow_hbar";
-         target: "glow_hbar";
-         target: "center_glow_hbar";
+         target: "color_hbar";
       }
-      program {
-         signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
+      program { signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
          action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
       }
-      program {
-         signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
+      program { signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
          action: STATE_SET "default" 0.0;
          target: "efl.draggable.horizontal_bar";
-         target: "shadow_hbar";
-         target: "glow_hbar";
-         target: "center_glow_hbar";
+         target: "color_hbar";
       }
-      program {
-         signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
+      program { signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
          action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
       }
+      program { signal: "efl,action,looping,left"; source: "efl";
+         action: STATE_SET "effect" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+         after: "looping,left,done";
+      }
+      program { name: "looping,left,done";
+         action: SIGNAL_EMIT "efl,looping,left,done" "efl";
+      }
+      program { signal: "efl,action,looping,left,end"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+      }
+      program { signal: "efl,action,looping,right"; source: "efl";
+         action: STATE_SET "effect" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+         after: "looping,right,done";
+      }
+      program { name: "looping,right,done";
+         action: SIGNAL_EMIT "efl,looping,right,done" "efl";
+      }
+      program { signal: "efl,action,looping,right,end"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+      }
+      program { signal: "efl,action,looping,up"; source: "efl";
+         action: STATE_SET "effect" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+         after: "looping,up,done";
+      }
+      program { name: "looping,up,done";
+         action: SIGNAL_EMIT "efl,looping,up,done" "efl";
+      }
+      program { signal: "efl,action,looping,up,end"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+      }
+      program { signal: "efl,action,looping,down"; source: "efl";
+         action: STATE_SET "effect" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+         after: "looping,down,done";
+      }
+      program { name: "looping,down,done";
+         action: SIGNAL_EMIT "efl,looping,down,done" "efl";
+      }
+      program { signal: "efl,action,looping,down,end"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.3;
+         target: "dim_effect";
+      }
    }
 }
 
 group { name: "efl/scroller:noclip";
    inherit: "efl/scroller";
-   data.item: "version" "123";
    parts {
       part { name: "clipper";
          description { state: "default" 0.0;
@@ -1199,12 +825,7 @@ group { name: "efl/scroller:noclip";
             rel2.offset: -1 -1;
          }
       }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "shadow";
+      part { name: "sh_clip"; type: RECT;
          description { state: "default" 0.0;
             visible: 0;
          }
@@ -1214,16 +835,11 @@ group { name: "efl/scroller:noclip";
 
 group { name: "efl/scroller:popup/no_inset_shadow";
    inherit: "efl/scroller";
-   data.item: "version" "123";
    parts {
-      part { name: "inset";
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "shadow";
-         description { state: "default" 0.0;
-            visible: 0;
+            rel1.offset: 0 0;
+            rel2.offset: 0 0;
          }
       }
    }