TH - shelf/gadgets - add paddingh/spacing to be less crammed

7 files changed, 314 insertions, 316 deletions

diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc
index 941223f62c..1475d16d3a 100644
--- a/data/elementary/themes/edc/ibar-ibox.edc
+++ b/data/elementary/themes/edc/ibar-ibox.edc
@@ -51,11 +51,12 @@ group { name: "e/modules/ibox/icon";
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "item_clip";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "content";
-            rel2.to: "content";
+            rel.to: "content";
             rel1.offset: 3 3;
             rel2.offset: -4 -4;
+            offscale;
          }
          description { state: "bounce1" 0.0;
             inherit: "default" 0.0;
@@ -91,42 +92,58 @@ group { name: "e/modules/ibox/icon";
          }
       }
       part { name: "clip"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
+            rel1.offset: (0 - SHELFPAD) (0 - SHELFPAD);
+            rel2.offset: (SHELFPAD - 1) (SHELFPAD - 1);
+            offscale;
          }
       }
       part { name: "clip1"; type: RECT; mouse_events: 0;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
+            rel1.offset: (0 - SHELFPAD) (0 - SHELFPAD);
+            rel2.offset: (SHELFPAD - 1) (SHELFPAD - 1);
+            offscale;
             visible: 1;
          }
          description { state: "left" 0.0;
+            inherit: "default" 0.0;
             visible: 0;
          }
          description { state: "right" 0.0;
+            inherit: "default" 0.0;
             visible: 0;
          }
       }
       part { name: "clip2"; type: RECT; mouse_events: 0;
          clip_to: "clip";
          description { state: "default" 0.0;
+            rel.to: "clip1";
             visible: 0;
          }
          description { state: "left" 0.0;
+            inherit: "default" 0.0;
             visible: 1;
          }
          description { state: "right" 0.0;
+            inherit: "default" 0.0;
             visible: 0;
          }
       }
       part { name: "clip3"; type: RECT; mouse_events: 0;
          clip_to: "clip";
          description { state: "default" 0.0;
+            rel.to: "clip1";
             visible: 0;
          }
          description { state: "left" 0.0;
+            inherit: "default" 0.0;
             visible: 0;
          }
          description { state: "right" 0.0;
+            inherit: "default" 0.0;
             visible: 1;
          }
       }
@@ -139,6 +156,9 @@ group { name: "e/modules/ibox/icon";
             rel1.relative: 0.0 1.0;
             align: 0.5 1.0;
             max: 99999 5;
+            rel1.offset: 0 (SHELFPAD - 1);
+            rel2.offset: -1 (SHELFPAD - 1);
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -155,6 +175,9 @@ group { name: "e/modules/ibox/icon";
             rel2.relative: 0.0 1.0;
             align: 0.0 0.5;
             max: 5 99999;
+            rel1.offset: (0 - SHELFPAD) 0;
+            rel2.offset: (0 - SHELFPAD) -1;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -171,6 +194,9 @@ group { name: "e/modules/ibox/icon";
             rel1.relative: 1.0 0.0;
             align: 1.0 0.5;
             max: 5 99999;
+            rel1.offset: (SHELFPAD - 1) 0;
+            rel2.offset: (SHELFPAD - 1) -1;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -185,22 +211,19 @@ group { name: "e/modules/ibox/icon";
       }
    }
    programs {
-      program {
-         signal: "e,origin,center"; source: "e";
+      program { signal: "e,origin,center"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "clip1";
          target: "clip2";
          target: "clip3";
       }
-      program {
-         signal: "e,origin,left"; source: "e";
+      program { signal: "e,origin,left"; source: "e";
          action: STATE_SET "left" 0.0;
          target: "clip1";
          target: "clip2";
          target: "clip3";
       }
-      program {
-         signal: "e,origin,right"; source: "e";
+      program { signal: "e,origin,right"; source: "e";
          action: STATE_SET "right" 0.0;
          target: "clip1";
          target: "clip2";
@@ -225,29 +248,25 @@ group { name: "e/modules/ibox/icon";
 //      program {
 //         signal: "e,action,hide,label"; source: "e";
 //      }
-      program {
-         signal: "e,state,starting"; source: "e";
+      program { signal: "e,state,starting"; source: "e";
          action: STATE_SET "starting" 0.0;
          transition: DECELERATE 0.2;
          target: "content";
       }
-      program {
-         signal: "e,state,started"; source: "e";
+      program { signal: "e,state,started"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: ACCELERATE 0.2;
          target: "content";
       }
       /////////////////////////////////////////////////////////////
-      program {
-         signal: "e,state,on"; source: "e";
+      program { signal: "e,state,on"; source: "e";
          action: STATE_SET "visible" 0.0;
          target: "indicator1";
          target: "indicator2";
          target: "indicator3";
          transition: ACCELERATE 0.2;
       }
-      program {
-         signal: "e,state,off"; source: "e";
+      program { signal: "e,state,off"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "indicator1";
          target: "indicator2";
@@ -255,8 +274,7 @@ group { name: "e/modules/ibox/icon";
          transition: DECELERATE 0.2;
       }
       /////////////////////////////////////////////////////////////
-      program {
-         signal: "e,state,urgent"; source: "e";
+      program { signal: "e,state,urgent"; source: "e";
          action: STATE_SET "bounce1" 0.0;
          target: "e.swallow.content";
          target: "e.swallow.preview";
@@ -276,8 +294,7 @@ group { name: "e/modules/ibox/icon";
          target: "e.swallow.preview";
          after: "urg1";
       }
-      program {
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
          target: "e.swallow.preview";
@@ -327,8 +344,7 @@ group { name: "e/modules/ibox/icon_overlay";
          clip_to: "item_clip";
          description { state: "default" 0.0;
             visible: 0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             color: 255 255 255 0;
          }
          description { state: "visible" 0.0;
@@ -362,8 +378,7 @@ group { name: "e/modules/ibox/icon_overlay";
       BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e")
       part { name: "busy_area"; type: SPACER;
          description { state: "default" 0.0;
-            rel1.to: "content";
-            rel2.to: "content";
+            rel.to: "content";
             rel1.relative: -0.5 -0.5;
             rel2.relative:  1.5  1.5;
          }
@@ -406,9 +421,8 @@ group { name: "e/modules/ibox/icon_overlay";
       part { name: "bg"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.offset: -5 -5;
-            rel1.to: "e.text.label";
+            rel.to: "e.text.label";
             rel2.offset: 4 4;
-            rel2.to: "e.text.label";
             fixed: 1 1;
             color: 0 0 0 0;
             visible: 0;
@@ -451,21 +465,18 @@ group { name: "e/modules/ibox/icon_overlay";
 //      program {
 //         signal: "e,action,start"; source: "e";
 //      }
-      program {
-         signal: "e,state,starting"; source: "e";
+      program { signal: "e,state,starting"; source: "e";
          action: STATE_SET "starting" 0.0;
          transition: DECELERATE 0.2;
          target: "content";
       }
-      program {
-         signal: "e,state,started"; source: "e";
+      program { signal: "e,state,started"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: ACCELERATE 0.2;
          target: "content";
       }
       ///////////////////////////////////////////////////////////
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          script {
             set_int(urgent, 0);
          }
@@ -497,15 +508,13 @@ group { name: "e/modules/ibox/icon_overlay";
          }
          after: "go_passive2";
       }
-      program {
-         signal: "e,action,show,label"; source: "e";
+      program { signal: "e,action,show,label"; source: "e";
          action: STATE_SET "visible" 0.0;
          transition: SINUSOIDAL 0.5;
          target: "e.text.label";
          target: "bg";
       }
-      program {
-         signal: "e,action,hide,label"; source: "e";
+      program { signal: "e,action,hide,label"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 1.0;
          target: "e.text.label";
@@ -543,8 +552,7 @@ group { name: "e/modules/ibox/icon_overlay";
          action: STATE_SET "disabled" 0.0;
          target: "item_clip";
       }
-      program {
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          script {
             set_int(urgent, 0);
          }
@@ -554,8 +562,7 @@ group { name: "e/modules/ibox/icon_overlay";
          action: STATE_SET "default" 0.0;
          target: "item_clip";
       }
-      program {
-         signal: "e,action,exec"; source: "e";
+      program { signal: "e,action,exec"; source: "e";
          after: "exec_start";
       }
       program { name: "exec_start";
@@ -846,8 +853,7 @@ group { name: "e/modules/ibar/menu/item";
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          description { state: "default";
-            rel1.to: "icon";
-            rel2.to: "icon";
+            rel.to: "icon";
          }
       }
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
@@ -879,14 +885,12 @@ group { name: "e/modules/ibar/menu/item";
       }
    }
    programs {
-      program {
-         signal: "mouse,in"; source: "event";
+      program { signal: "mouse,in"; source: "event";
          action: STATE_SET "focus" 0.0;
          target: "e.text.title";
          transition: ACCELERATE 0.2;
       }
-      program {
-         signal: "mouse,out"; source: "event";
+      program { signal: "mouse,out"; source: "event";
          action: STATE_SET "default" 0.0;
          target: "e.text.title";
          transition: DECELERATE 0.2;
diff --git a/data/elementary/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc
index 41c8d33be5..b4a46b57ca 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -18,9 +18,8 @@ group { name: "e/modules/pager/popup";
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: 0 1;
-            rel2.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 1;
             align: 0.5 0.0;
@@ -50,34 +49,30 @@ group { name: "e/modules/pager/desk";
             ASPECT_FILL((7680/4320))
          }
       }
+      part { name: "clip"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel.to: "base";
+         }
+      }
       part { name: "e.background"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "clip"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-      }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          desc { "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
@@ -96,9 +91,7 @@ group { name: "e/modules/pager/desk";
          desc { "default";
             color: 51 153 255 255;
             visible: 0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            rel2.offset: -1 0;
+            rel.to: "e.swallow.content";
             rel1.relative: 0.0 1.0;
             align: 0.5 1.0;
             max: 99999 5;
@@ -112,10 +105,9 @@ group { name: "e/modules/pager/desk";
       part { name: "drop0"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_0.png";
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: -1 -1;
             rel1.relative: 0.0 0.0;
-            rel2.to: "base";
             rel2.relative: 0.0 0.0;
             rel2.offset: -1 -1;
             align: 0.0 0.0;
@@ -138,10 +130,9 @@ group { name: "e/modules/pager/desk";
       part { name: "drop1"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_1.png";
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: 0 -1;
             rel1.relative: 1.0 0.0;
-            rel2.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: 0 -1;
             align: 1.0 0.0;
@@ -164,10 +155,9 @@ group { name: "e/modules/pager/desk";
       part { name: "drop2"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_2.png";
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: 0 0;
             rel1.relative: 1.0 1.0;
-            rel2.to: "base";
             rel2.relative: 1.0 1.0;
             rel2.offset: 0 0;
             align: 1.0 1.0;
@@ -190,10 +180,9 @@ group { name: "e/modules/pager/desk";
       part { name: "drop3"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_3.png";
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: -1 0;
             rel1.relative: 0.0 1.0;
-            rel2.to: "base";
             rel2.relative: 0.0 1.0;
             rel2.offset: -1 0;
             align: 0.0 1.0;
@@ -227,24 +216,20 @@ group { name: "e/modules/pager/desk";
          transition: DECELERATE 0.2;
          target: "sel";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: ACTION_STOP;
          target: "sel";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
          target: "sel";
       }
-      program {
-         signal: "e,preview,on"; source: "e";
+      program { signal: "e,preview,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.background";
       }
-      program {
-         signal: "e,preview,off"; source: "e";
+      program { signal: "e,preview,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "e.background";
       }
@@ -266,21 +251,18 @@ group { name: "e/modules/pager/desk";
          target: "drop3";
          after: "drop1";
       }
-      program {
-         signal: "e,action,drag,out"; source: "e";
+      program { signal: "e,action,drag,out"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "drop0";
          target: "drop1";
          target: "drop2";
          target: "drop3";
       }
-      program {
-         signal: "e,name,show"; source: "e";
+      program { signal: "e,name,show"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "e.text.label";
       }
-      program {
-         signal: "e,name,hide"; source: "e";
+      program { signal: "e,name,hide"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
       }
@@ -304,8 +286,7 @@ group { name: "e/gadget/pager/plain/desk";
       part { name: "e.background"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -314,15 +295,13 @@ group { name: "e/gadget/pager/plain/desk";
       }
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
       }
       part { name: "e.swallow.drop"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             rel2.offset: -2 -1;
             link.base: "e,state,visible" "e";
          }
@@ -333,14 +312,12 @@ group { name: "e/gadget/pager/plain/desk";
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          desc { "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
@@ -359,8 +336,7 @@ group { name: "e/gadget/pager/plain/desk";
          desc { "default";
             color: 51 153 255 255;
             visible: 0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             align: 0.5 1.0;
             max: 99999 5;
          }
@@ -560,26 +536,22 @@ group { name: "e/gadget/pager/plain/desk";
          transition: DECELERATE 0.2;
          target: "sel";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: ACTION_STOP;
          target: "sel_left";
          target: "sel_top";
          target: "sel_right";
          target: "sel_bottom";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "sel";
       }
-      program {
-         signal: "e,preview,on"; source: "e";
+      program { signal: "e,preview,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.background";
       }
-      program {
-         signal: "e,preview,off"; source: "e";
+      program { signal: "e,preview,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "e.background";
       }
@@ -601,21 +573,18 @@ group { name: "e/gadget/pager/plain/desk";
          target: "drop3";
          after: "drop1";
       }
-      program {
-         signal: "e,action,drag,out"; source: "e";
+      program { signal: "e,action,drag,out"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "drop0";
          target: "drop1";
          target: "drop2";
          target: "drop3";
       }
-      program {
-         signal: "e,name,show"; source: "e";
+      program { signal: "e,name,show"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "e.text.label";
       }
-      program {
-         signal: "e,name,hide"; source: "e";
+      program { signal: "e,name,hide"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
       }
@@ -635,15 +604,13 @@ group { name: "e/gadget/pager/default/desk";
       }
       part { name: "clip"; type: RECT; mouse_events: 0;
          desc { "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
          }
       }
       part { name: "e.swallow.drop"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             rel2.offset: -2 -1;
             link.base: "e,state,visible" "e";
          }
@@ -663,8 +630,7 @@ group { name: "e/gadget/pager/default/desk";
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          desc { "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
@@ -683,8 +649,7 @@ group { name: "e/gadget/pager/default/desk";
          desc { "default";
             color: 51 153 255 255;
             visible: 0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             align: 0.5 1.0;
             max: 99999 5;
          }
@@ -884,16 +849,14 @@ group { name: "e/gadget/pager/default/desk";
          transition: DECELERATE 0.2;
          target: "sel";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: ACTION_STOP;
          target: "sel_left";
          target: "sel_top";
          target: "sel_right";
          target: "sel_bottom";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "sel";
       }
@@ -915,21 +878,18 @@ group { name: "e/gadget/pager/default/desk";
          target: "drop3";
          after: "drop1";
       }
-      program {
-         signal: "e,action,drag,out"; source: "e";
+      program { signal: "e,action,drag,out"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "drop0";
          target: "drop1";
          target: "drop2";
          target: "drop3";
       }
-      program {
-         signal: "e,name,show"; source: "e";
+      program { signal: "e,name,show"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "e.text.label";
       }
-      program {
-         signal: "e,name,hide"; source: "e";
+      program { signal: "e,name,hide"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
       }
@@ -972,9 +932,8 @@ group { name: "e/modules/pager/window";
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: 2 2;
-            rel2.to: "base";
             rel2.offset: -3 -3;
             align: 1.0 1.0;
             max: 24 24;
@@ -987,8 +946,7 @@ group { name: "e/modules/pager/window";
       }
       part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             visible: 0;
          }
          description { state: "preview" 0.0;
@@ -1003,24 +961,20 @@ group { name: "e/modules/pager/window";
       }
    }
    programs {
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "win";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "win";
       }
-      program {
-         signal: "e,preview,on"; source: "e";
+      program { signal: "e,preview,on"; source: "e";
          action: STATE_SET "preview" 0.0;
          target: "e.swallow.content";
          target: "e.swallow.icon";
       }
-      program {
-         signal: "e,preview,off"; source: "e";
+      program { signal: "e,preview,off"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
          target: "e.swallow.icon";
diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc
index 0835f57729..c4c15e348d 100644
--- a/data/elementary/themes/edc/pager16.edc
+++ b/data/elementary/themes/edc/pager16.edc
@@ -17,9 +17,8 @@ group { name: "e/modules/pager16/popup";
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: 0 1;
-            rel2.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 1;
             align: 0.5 0.0;
@@ -35,6 +34,82 @@ group { name: "e/modules/pager16/popup";
    }
 }
 
+group { name: "e/modules/pager16/base";
+   parts {
+      part { name: "e.swallow.content"; type: SWALLOW;
+         scale: 1;
+         desc { "default";
+            rel1.offset: 0 (0 - SHELFPAD);
+            rel2.offset: -1 (SHELFPAD - 1);
+            offscale;
+         }
+         desc { "vertical";
+            inherit: "default" 0.0;
+            rel1.offset: (0 - SHELFPAD) 0;
+            rel2.offset: (SHELFPAD - 1) -1;
+         }
+      }
+   }
+   programs {
+      program { signal: "e,state,orient,horiz"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,vert"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,left"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,right"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,top"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,bottom"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_tl"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_tr"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_bl"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_br"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_lt"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_rt"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_lb"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+      program { signal: "e,state,orient,corner_rb"; source: "e";
+         action: STATE_SET "vertical" 0.0;
+         target: "e.swallow.content";
+      }
+   }
+}
+
 group { name: "e/modules/pager16/desk";
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
@@ -48,16 +123,13 @@ group { name: "e/modules/pager16/desk";
       }
       part { name: "clip"; type: RECT; mouse_events: 0;
          desc { "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
          }
       }
       part { name: "e.swallow.drop"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            rel2.offset: -2 -1;
+            rel.to: "base";
             link.base: "e,state,visible" "e";
          }
          desc { "hid"; inherit; hid;
@@ -67,6 +139,7 @@ group { name: "e/modules/pager16/desk";
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clip";
          desc { "default";
+            rel.to: "base";
             link.base: "e,state,visible" "e";
          }
          desc { "hid"; inherit; hid;
@@ -76,8 +149,7 @@ group { name: "e/modules/pager16/desk";
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          desc { "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
@@ -96,12 +168,10 @@ group { name: "e/modules/pager16/desk";
          desc { "default";
             color: 51 153 255 255;
             visible: 0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            rel2.offset: -1 0;
+            rel.to: "e.swallow.content";
             rel1.relative: 0.0 1.0;
             align: 0.5 1.0;
-            max: 99999 6;
+            max: 99999 5;
          }
          desc { "active"; inherit;
             inherit: "default" 0.0;
@@ -112,10 +182,9 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop0"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_0.png";
-            rel1.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             rel1.offset: -1 -1;
             rel1.relative: 0.0 0.0;
-            rel2.to: "e.swallow.content";
             rel2.relative: 0.0 0.0;
             rel2.offset: -1 -1;
             align: 0.0 0.0;
@@ -138,10 +207,9 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop1"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_1.png";
-            rel1.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             rel1.offset: 0 -1;
             rel1.relative: 1.0 0.0;
-            rel2.to: "e.swallow.content";
             rel2.relative: 1.0 0.0;
             rel2.offset: 0 -1;
             align: 1.0 0.0;
@@ -164,10 +232,9 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop2"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_2.png";
-            rel1.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             rel1.offset: 0 0;
             rel1.relative: 1.0 1.0;
-            rel2.to: "e.swallow.content";
             rel2.relative: 1.0 1.0;
             rel2.offset: 0 0;
             align: 1.0 1.0;
@@ -190,10 +257,9 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop3"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_3.png";
-            rel1.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             rel1.offset: -1 0;
             rel1.relative: 0.0 1.0;
-            rel2.to: "e.swallow.content";
             rel2.relative: 0.0 1.0;
             rel2.offset: -1 0;
             align: 0.0 1.0;
@@ -227,13 +293,11 @@ group { name: "e/modules/pager16/desk";
          transition: DECELERATE 0.2;
          target: "sel";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: ACTION_STOP;
          target: "sel";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
          target: "sel";
@@ -256,21 +320,18 @@ group { name: "e/modules/pager16/desk";
          target: "drop3";
          after: "drop1";
       }
-      program {
-         signal: "e,action,drag,out"; source: "e";
+      program { signal: "e,action,drag,out"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "drop0";
          target: "drop1";
          target: "drop2";
          target: "drop3";
       }
-      program {
-         signal: "e,name,show"; source: "e";
+      program { signal: "e,name,show"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "e.text.label";
       }
-      program {
-         signal: "e,name,hide"; source: "e";
+      program { signal: "e,name,hide"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
       }
diff --git a/data/elementary/themes/edc/shelf.edc b/data/elementary/themes/edc/shelf.edc
index a51ca7e97e..2dbefd5f6d 100644
--- a/data/elementary/themes/edc/shelf.edc
+++ b/data/elementary/themes/edc/shelf.edc
@@ -106,13 +106,13 @@ group { name: "e/shelf/default/inset"; nomouse;
       spacer { "sizer";
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 3 0;
-            rel2.offset: -4 -1;
+            rel1.offset: (3 + SHELFPAD) SHELFPAD;
+            rel2.offset: (-4 - SHELFPAD) (-1 - SHELFPAD);
             offscale;
          }
          description { state: "vert" 0.0;
-            rel1.offset: 0 3;
-            rel2.offset: -1 -4;
+            rel1.offset: SHELFPAD (3 + SHELFPAD);
+            rel2.offset: (-1 - SHELFPAD) (-4 - SHELFPAD);
             offscale;
          }
       }
@@ -217,8 +217,7 @@ group { name: "e/shelf/default/inset"; nomouse;
    }
    programs {
 #define ORIENT_SATE(_ORIENT, _STATE) \
-program { \
-signal: "e,state,orientation,"_ORIENT; source: "e"; \
+program { signal: "e,state,orientation,"_ORIENT; source: "e"; \
 action: STATE_SET _STATE 0.0; \
 target: "sizer"; \
 target: "clip"; \
@@ -238,57 +237,49 @@ target: "sh_vert_clip"; \
       ORIENT_SATE("right_top", "vert")
       ORIENT_SATE("right_bottom", "vert")
 #undef ORIENT_SATE
-      program {
-         signal: "e,state,scroll,begin"; source: "e";
+      program { signal: "e,state,scroll,begin"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_l";
          target: "sh_t";
       }
-      program {
-         signal: "e,state,scroll,begin"; source: "e";
+      program { signal: "e,state,scroll,begin"; source: "e";
          action: STATE_SET "active" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_r";
          target: "sh_b";
       }
-      program {
-         signal: "e,state,scroll,middle"; source: "e";
+      program { signal: "e,state,scroll,middle"; source: "e";
          action: STATE_SET "active" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_l";
          target: "sh_t";
       }
-      program {
-         signal: "e,state,scroll,middle"; source: "e";
+      program { signal: "e,state,scroll,middle"; source: "e";
          action: STATE_SET "active" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_r";
          target: "sh_b";
       }
-      program {
-         signal: "e,state,scroll,end"; source: "e";
+      program { signal: "e,state,scroll,end"; source: "e";
          action: STATE_SET "active" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_l";
          target: "sh_t";
       }
-      program {
-         signal: "e,state,scroll,end"; source: "e";
+      program { signal: "e,state,scroll,end"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_r";
          target: "sh_b";
       }
-      program {
-         signal: "e,state,scroll,none"; source: "e";
+      program { signal: "e,state,scroll,none"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_l";
          target: "sh_t";
       }
-      program {
-         signal: "e,state,scroll,none"; source: "e";
+      program { signal: "e,state,scroll,none"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "sh_r";
@@ -297,6 +288,49 @@ target: "sh_vert_clip"; \
    }
 }
 
+group { name: "e/shelf/default/plain"; nomouse;
+   alias: "e/shelf/alternate/plain";
+   alias: "e/shelf/invisible/plain";
+   alias: "e/shelf/translucent/plain";
+   parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "clip"; type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      spacer { "sizer";
+         scale: 1;
+         desc {
+            rel1.offset: SHELFPAD SHELFPAD;
+            rel2.offset: (-1 - SHELFPAD) (-1 - SHELFPAD);
+            offscale;
+         }
+      }
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
+         clip_to: "clip";
+         desc {
+            rel.to: "sizer";
+            link.base: "e,state,visible" "e";
+         }
+         desc { "hidden"; hid;
+            rel.to: "sizer";
+            link.base: "e,state,hidden" "e";
+         }
+      }
+      rect { "events"; repeat; mouse;
+         desc { color: 0 0 0 0; }
+      }
+   }
+}
+
 group { name: "e/shelf/alternate/base"; nomouse;
    inherit: "e/shelf/default/base";
    parts {
@@ -326,11 +360,6 @@ group { name: "e/shelf/invisible/base"; nomouse;
             visible: 0;
          }
       }
-      part { name: "shine";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
    }
 }
 
@@ -343,52 +372,11 @@ group { name: "e/shelf/translucent/base"; nomouse;
    parts {
       part { name: "bg";
          description { state: "default" 0.0;
-            color: 32 32 32 128;
+            color: 64 64 64 128;
          }
          description { state: "vert" 0.0;
-            color: 32 32 32 128;
-         }
-      }
-   }
-}
-
-group { name: "e/shelf/default/plain"; nomouse;
-   alias: "e/shelf/alternate/plain";
-   alias: "e/shelf/invisible/plain";
-   alias: "e/shelf/translucent/plain";
-   parts {
-      rect { "mouse"; mouse;
-         desc { color: 0 0 0 0; }
-      }
-      part { name: "base"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "clip"; type: RECT;
-         description { state: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      spacer { "sizer";
-         desc {
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-         }
-      }
-      part { name: "e.swallow.content"; type: SWALLOW; mouse;
-         clip_to: "clip";
-         desc {
-            rel.to: "sizer";
-            link.base: "e,state,visible" "e";
+            color: 64 64 64 128;
          }
-         desc { "hidden"; hid;
-            rel.to: "sizer";
-            link.base: "e,state,hidden" "e";
-         }
-      }
-      rect { "events"; repeat; mouse;
-         desc { color: 0 0 0 0; }
       }
    }
 }
diff --git a/data/elementary/themes/edc/systray.edc b/data/elementary/themes/edc/systray.edc
index c994fd3904..19d20af3db 100644
--- a/data/elementary/themes/edc/systray.edc
+++ b/data/elementary/themes/edc/systray.edc
@@ -13,7 +13,7 @@ group { name: "e/modules/systray/main";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 0 0 128;
+            color: 255 255 255 128;
          }
       }
       part { name: "e.box"; type: BOX;
@@ -36,73 +36,59 @@ group { name: "e/modules/systray/main";
       }
    }
    programs {
-      program {
-         signal: "e,action,orient,horiz"; source: "e";
+      program { signal: "e,action,orient,horiz"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,vert"; source: "e";
+      program { signal: "e,action,orient,vert"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,left"; source: "e";
+      program { signal: "e,action,orient,left"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,right"; source: "e";
+      program { signal: "e,action,orient,right"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,top"; source: "e";
+      program { signal: "e,action,orient,top"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,bottom"; source: "e";
+      program { signal: "e,action,orient,bottom"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_tl"; source: "e";
+      program { signal: "e,action,orient,corner_tl"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_tr"; source: "e";
+      program { signal: "e,action,orient,corner_tr"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_bl"; source: "e";
+      program { signal: "e,action,orient,corner_bl"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_br"; source: "e";
+      program { signal: "e,action,orient,corner_br"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_lt"; source: "e";
+      program { signal: "e,action,orient,corner_lt"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_rt"; source: "e";
+      program { signal: "e,action,orient,corner_rt"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_lb"; source: "e";
+      program { signal: "e,action,orient,corner_lb"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
-      program {
-         signal: "e,action,orient,corner_rb"; source: "e";
+      program { signal: "e,action,orient,corner_rb"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "e.box";
       }
diff --git a/data/elementary/themes/edc/tasks.edc b/data/elementary/themes/edc/tasks.edc
index 777f2049b5..f977e62612 100644
--- a/data/elementary/themes/edc/tasks.edc
+++ b/data/elementary/themes/edc/tasks.edc
@@ -21,8 +21,12 @@ group { name:"e/modules/tasks/item";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             color: 64 64 64 255;
+            rel1.offset: 0 (0 - SHELFPAD);
+            rel2.offset: -1 (SHELFPAD - 1);
+            offscale;
          }
          description { state: "iconic" 0.0;
             inherit: "default" 0.0;
@@ -34,8 +38,12 @@ group { name:"e/modules/tasks/item";
       }
       part { name: "click"; type: RECT; mouse_events: 0;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             color: 32 32 32 0;
+            rel1.offset: 0 (0 - SHELFPAD);
+            rel2.offset: -1 (SHELFPAD - 1);
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
@@ -231,9 +239,9 @@ group { name:"e/modules/tasks/item";
          description { state: "default" 0.0;
             color: 51 153 255 255;
             align: 0.5 1.0;
-            rel1.offset: 0 -1;
+            rel1.offset: 0 (SHELFPAD - 1);
             rel1.relative: 0.0 1.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -1 (SHELFPAD - 1);
             fixed: 0 1;
             visible: 0;
             min: 0 0;
@@ -259,9 +267,11 @@ group { name:"e/modules/tasks/item";
          }
       }
       part { name: "clip"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -20 -20;
-            rel2.offset: 19 19;
+            rel1.offset: -80 -80;
+            rel2.offset: 79 79;
+            offscale;
             visible: 1;
          }
          description { state: "selected" 0.0;
@@ -275,8 +285,8 @@ group { name:"e/modules/tasks/item";
       }
       part { name: "sel_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.offset: -20 -20;
-            rel2.offset: 19 19;
+            rel1.offset: -80 -80;
+            rel2.offset: 79 79;
             visible: 0;
          }
          description { state: "selected" 0.0;
@@ -290,97 +300,82 @@ group { name:"e/modules/tasks/item";
       }
    }
    programs {
-      program {
-         signal: "mouse,down,1"; source: "event";
+      program { signal: "mouse,down,1"; source: "event";
          action: STATE_SET "clicked" 0.0;
          target: "click";
          target: "e.text.label";
          target: "label_focused";
          target: "label_iconic";
       }
-      program {
-         signal: "mouse,up,1"; source: "event";
+      program { signal: "mouse,up,1"; source: "event";
          action: STATE_SET "default" 0.0;
          target: "click";
          target: "e.text.label";
          target: "label_focused";
          target: "label_iconic";
       }
-      program {
-         signal: "mouse,up,clicked,1*"; source: "event";
+      program { signal: "mouse,up,clicked,1*"; source: "event";
          action: SIGNAL_EMIT "e,action,click" "";
       }
 
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          transition: ACCELERATE 0.2;
          target: "bar";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
          target: "bar";
       }
 
-      program {
-         signal: "state,default"; source: "int";
+      program { signal: "state,default"; source: "int";
          action: STATE_SET "default" 0.0;
          target: "normal_clip";
          target: "focused_clip";
          target: "iconic_clip";
          target: "base";
       }
-      program {
-         signal: "state,default"; source: "int";
+      program { signal: "state,default"; source: "int";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.2;
          target: "icon2";
       }
-      program {
-         signal: "state,focused"; source: "int";
+      program { signal: "state,focused"; source: "int";
          action: STATE_SET "focused" 0.0;
          target: "normal_clip";
          target: "focused_clip";
          target: "iconic_clip";
          target: "base";
       }
-      program {
-         signal: "state,focused"; source: "int";
+      program { signal: "state,focused"; source: "int";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.2;
          target: "icon2";
       }
-      program {
-         signal: "state,iconic"; source: "int";
+      program { signal: "state,iconic"; source: "int";
          action: STATE_SET "iconic" 0.0;
          target: "normal_clip";
          target: "focused_clip";
          target: "iconic_clip";
          target: "base";
       }
-      program {
-         signal: "state,iconic"; source: "int";
+      program { signal: "state,iconic"; source: "int";
          action: STATE_SET "iconic" 0.0;
          transition: SINUSOIDAL 0.2;
          target: "icon2";
       }
 
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          script { set_focused(1); }
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          script { set_focused(0); }
       }
-      program {
-         signal: "e,state,iconified"; source: "e";
+      program { signal: "e,state,iconified"; source: "e";
          script { set_iconic(1); }
       }
-      program {
-         signal: "e,state,uniconified"; source: "e";
+      program { signal: "e,state,uniconified"; source: "e";
          script { set_iconic(0); }
       }
 
@@ -398,8 +393,7 @@ group { name:"e/modules/tasks/item";
          target: "urgent";
          after: "urg1";
       }
-      program {
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          action: ACTION_STOP;
          target: "urg1";
          target: "urg2";
@@ -410,15 +404,13 @@ group { name:"e/modules/tasks/item";
          target: "urgent";
       }
 
-      program {
-         signal: "e,state,icon_only"; source: "e";
+      program { signal: "e,state,icon_only"; source: "e";
          action: STATE_SET "icon_only" 0.0;
          target: "icon";
          target: "icon_clip";
          target: "label_clip";
       }
-      program {
-         signal: "e,state,text_only"; source: "e";
+      program { signal: "e,state,text_only"; source: "e";
          action: STATE_SET "text_only" 0.0;
          target: "icon";
          target: "icon_clip";
@@ -449,6 +441,19 @@ group { name:"e/modules/tasks/item_vert";
       }
    }
    parts {
+      part { name: "base"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: (0 - SHELFPAD) 0;
+            rel2.offset: (SHELFPAD - 1) -1;
+         }
+         description { state: "iconic" 0.0;
+            inherit: "default" 0.0;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 40 40 40 255;
+         }
+      }
       part { name: "e.text.label";
          description { state: "default" 0.0;
             rel.to: "icon";
@@ -507,16 +512,15 @@ group { name:"e/modules/tasks/item_vert";
       part { name: "bar"; type: RECT;
          description { state: "default" 0.0;
             align: 1.0 0.5;
+            rel1.offset: 2 0;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -1 -1;
+            rel2.offset: 2 -1;
             fixed: 1 0;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             align: 1.0 0.5;
             rel1.relative: 1.0 0.0;
-            rel1.offset: -1 0;
-            rel2.offset: -1 -1;
             fixed: 1 0;
             min: 5 0;
             visible: 1;
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index c5f938982f..8fe990d451 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -7,6 +7,7 @@
 #define FIXED_SIZE(_WIDTH, _HEIGHT) \
    min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1;
 
+#define SHELFPAD 3
 #define ICMIN 15
 
 #define SPACER_TEXT "NN";