raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=41407f2516fbadfb8cf7fcd24b624cdc06345698

commit 41407f2516fbadfb8cf7fcd24b624cdc06345698
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sun Mar 28 00:44:41 2021 +0000

    elm theme - remove unused groups and edc files
    
    bryce is no more and it was experimental so... remove. less stuff to
    work on.
---
 data/elementary/themes/default.edc             |  11 -
 data/elementary/themes/edc/backlight.edc       |   2 -
 data/elementary/themes/edc/batman.edc          | 158 -----
 data/elementary/themes/edc/bryce.edc           | 267 --------
 data/elementary/themes/edc/bryce_editor.edc    | 404 ------------
 data/elementary/themes/edc/clock.edc           |   5 -
 data/elementary/themes/edc/cpuclock.edc        | 241 -------
 data/elementary/themes/edc/cpumonitor.edc      | 186 ------
 data/elementary/themes/edc/luncher.edc         | 872 -------------------------
 data/elementary/themes/edc/memusage.edc        | 218 -------
 data/elementary/themes/edc/mixer.edc           |   2 -
 data/elementary/themes/edc/netstatus.edc       |  86 ---
 data/elementary/themes/edc/pager.edc           | 629 ------------------
 data/elementary/themes/edc/start.edc           |   1 -
 data/elementary/themes/edc/thermal.edc         | 101 ---
 data/elementary/themes/edc/time.edc            |  97 ---
 data/elementary/themes/edc/wireless.edc        | 613 -----------------
 data/elementary/themes/edc/xkbswitch.edc       |   4 -
 data/elementary/themes/img/horiz_bar_inset.png | Bin 278 -> 0 bytes
 data/elementary/themes/img/vert_bar_inset.png  | Bin 363 -> 0 bytes
 20 files changed, 3897 deletions(-)

diff --git a/data/elementary/themes/default.edc 
b/data/elementary/themes/default.edc
index 669f30ff26..e9afbe7ac3 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -107,8 +107,6 @@ collections {
 #include "edc/comp_compat.edc"
 #include "edc/comp_effects.edc"
 #include "edc/background.edc"
-#include "edc/bryce.edc"
-#include "edc/bryce_editor.edc"
 #include "edc/shelf.edc"
 #include "edc/border.edc"
 #include "edc/dialog.edc"
@@ -142,24 +140,15 @@ collections {
 #include "edc/randr.edc"
 #include "edc/notification.edc"
 #include "edc/cpufreq.edc"
-#include "edc/cpuclock.edc"
 #include "edc/temperature.edc"
-#include "edc/thermal.edc"
 #include "edc/backlight.edc"
 #include "edc/mixer.edc"
 #include "edc/battery.edc"
-#include "edc/batman.edc"
 #include "edc/evrything.edc"
 #include "edc/illume.edc"
 #include "edc/bluez4.edc"
 #include "edc/bluez5.edc"
 #include "edc/packagekit.edc"
-#include "edc/wireless.edc"
-#include "edc/time.edc"
-#include "edc/luncher.edc"
-#include "edc/memusage.edc"
-#include "edc/cpumonitor.edc"
-#include "edc/netstatus.edc"
 #include "edc/tiling.edc"
 
 // icons
diff --git a/data/elementary/themes/edc/backlight.edc 
b/data/elementary/themes/edc/backlight.edc
index c364c0f0f7..c97f042371 100644
--- a/data/elementary/themes/edc/backlight.edc
+++ b/data/elementary/themes/edc/backlight.edc
@@ -1,6 +1,4 @@
 group { name: "e/modules/backlight/main";
-   alias: "e/gadget/backlight/main";
-   alias: "e/gadget/backlight/main_vert";
    alias: "e/modules/backlight/main_vert";
    images.image: "bulb_middle.png" COMP;
    images.image: "bulb_over.png" COMP;
diff --git a/data/elementary/themes/edc/batman.edc 
b/data/elementary/themes/edc/batman.edc
deleted file mode 100644
index e13c586e5e..0000000000
--- a/data/elementary/themes/edc/batman.edc
+++ /dev/null
@@ -1,158 +0,0 @@
-group { name: "e/gadget/batman/main";
-   alias: "e/gadget/batman/main_vert";
-   images.image: "bat_base.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_FLOAT) && (id == 1)) {
-            new Float:val = getfarg(2);
-            val = 0.05 + (0.9 * (1.0 - val));
-            custom_state(PART:"fill_clip", "default", 0.0);
-            set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val);
-            set_state(PART:"fill_clip", "custom", 0.0);
-         }
-      }
-   }
-   parts {
-      part { name: "pulse_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-         description { state: "faded" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "fill_clip_dim"; type: RECT;
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 128 128 128 255;
-         }
-      }
-      part { name: "fill_clip"; type: RECT;
-         clip_to: "fill_clip_dim";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-      }
-      part { name: "bg";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "bat_base.png";
-            color: 0 0 0 64;
-         }
-      }
-      part { name: "fill";
-         clip_to: "fill_clip";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "bat_base.png";
-            color: 160 160 160 255;
-         }
-         description { state: "charging" 0.0;
-            inherit: "default" 0.0;
-            color: 51 153 255 255;
-         }
-      }
-      part { name: "over"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { signal: "e,state,charging"; source: "e";
-         action: STATE_SET "charging" 0.0;
-         target: "fill";
-      }
-      program { signal: "e,state,discharging"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "fill";
-      }
-      program { name: "pulse";
-         signal: "e,action,pulse,start"; source: "e";
-         action: STATE_SET "faded" 0.0;
-         transition: ACCELERATE 0.3;
-         after: "pulse2";
-         target: "pulse_clip";
-      }
-      program { name: "pulse2";
-         action: STATE_SET "default" 0.0;
-         transition: ACCELERATE 0.1;
-         target: "pulse_clip";
-         after: "pulse";
-      }
-      program { signal: "e,action,pulse,stop"; source: "e";
-         action: ACTION_STOP;
-         target: "pulse";
-         target: "pulse2";
-         after: "pulse3";
-      }
-      program { name: "pulse3";
-         signal: "e,action,pulse,stop"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "pulse_clip";
-      }
-      program { signal: "mouse,in"; source: "over";
-         action: STATE_SET "visible" 0.0;
-         transition: SINUSOIDAL 0.3;
-         target: "fill_clip_dim";
-      }
-      program { signal: "mouse,out"; source: "over";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.3;
-         target: "fill_clip_dim";
-      }
-   }
-}
-
-group { name: "e/gadget/batman/popup";
-   min: 320 60;
-   parts {
-      part { name: "e.swallow.batman"; type: SWALLOW;
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            min: 1 1;
-            max: 240 160;
-            align: 0.0 0.5;
-         }
-      }
-      part { name: "e.text.title"; type: TEXT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.relative: 1.0 0.0;
-            rel1.to_x: "e.swallow.batman";
-            rel2.relative: 1.0 0.5;
-            color: 160 160 160 255;
-            text { font: "Sans:style=Bold"; size: 10;
-               text: "Your battery is low!";
-               min: 1 1;
-               ellipsis: -1;
-               text_class: "module_large";
-            }
-         }
-      }
-      part { name: "e.text.label"; type: TEXT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "e.swallow.batman";
-            color: 160 160 160 255;
-            text { font: "Sans"; size: 10;
-               text: "AC power is recommended.";
-               min: 1 1;
-               ellipsis: -1;
-               text_class: "module_normal";
-            }
-         }
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/bryce.edc 
b/data/elementary/themes/edc/bryce.edc
deleted file mode 100644
index d0c946b8bf..0000000000
--- a/data/elementary/themes/edc/bryce.edc
+++ /dev/null
@@ -1,267 +0,0 @@
-group { name: "e/bryce/default/base"; nomouse;
-   data {
-      /* this tells e the number of pixels of the bryce to leave "exposed"
-       * when auto-hiding the bryce */
-      item: "hidden_state_size" "2";
-   }
-   parts {
-      rect { "mouse"; mouse;
-         desc { color: 0 0 0 0; }
-      }
-      part { name: "bg"; type: RECT;
-         description { state: "default" 0.0;
-            color: 64 64 64 255;
-         }
-         description { state: "vert" 0.0;
-            color: 64 64 64 255;
-         }
-      }
-      spacer { "sizer";
-         description { state: "default" 0.0;
-            rel1.offset: 4 0;
-            rel2.offset: -5 -1;
-         }
-         description { state: "vert" 0.0;
-            rel1.offset: 0 4;
-            rel2.offset: -1 -5;
-         }
-      }
-      part { name: "e.swallow.content"; type: SWALLOW; mouse;
-         desc {
-            rel.to: "sizer";
-            link.base: "e,state,visible" "e";
-         }
-         desc { "hidden"; hid;
-            rel.to: "sizer";
-            link.base: "e,state,hidden" "e";
-         }
-      }
-      rect { "text_fader"; mouse;
-         desc { hid;
-            color: 0 0 0 0;
-         }
-         desc { "active";
-            color: 0 0 0 192;
-         }
-      }
-      text { "e.text"; scale;
-         effect: SHADOW BOTTOM;
-         desc { hid;
-            color: 255 255 255 0;
-            text { font: "Sans:style=Bold"; size: 14;
-               ellipsis: -1;
-            }
-         }
-         desc { "active"; inherit; vis;
-            color: 255 255 255 255;
-         }
-      }
-      program { signal: "e,action,resize"; source: "e";
-         action: STATE_SET "active";
-         transition: LINEAR 0.1;
-         targets: "e.text" "text_fader";
-         sequence {
-            action: ACTION_STOP;
-            target: "text_hide";
-            action: STATE_SET "default";
-            name: "text_hide";
-            in: 1.0 0;
-            transition: LINEAR 0.2;
-            targets: "e.text" "text_fader";
-         }
-      }
-      programs  {
-#define ORIENT_SATE(_ORIENT, _STATE) \
-         program { \
-            signal: "e,state,orient,"_ORIENT; source: "e"; \
-            action: STATE_SET _STATE 0.0; \
-            target: "bg"; \
-            target: "sizer"; \
-         }
-      }
-      ORIENT_SATE("horizontal", "default")
-      ORIENT_SATE("vertical", "vert")
-#undef ORIENT_SATE
-   }
-}
-
-group { name: "e/bryce/alternate/base"; nomouse;
-   inherit: "e/bryce/default/base";
-   parts {
-      part { name: "bg"; type: RECT;
-         description { state: "default" 0.0;
-            color: 32 32 32 255;
-         }
-         description { state: "vert" 0.0;
-            color: 32 32 32 255;
-         }
-      }
-   }
-}
-
-group { name: "e/bryce/invisible/base"; nomouse;
-   inherit: "e/bryce/default/base";
-   data.item: "noshadow" "1";
-   parts {
-      part { name: "bg";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "vert" 0.0;
-            visible: 0;
-         }
-      }
-   }
-}
-
-group { name: "e/bryce/translucent/base"; nomouse;
-   inherit: "e/bryce/default/base";
-   data.item: "noshadow" "1";
-   parts {
-      part { name: "bg";
-         description { state: "default" 0.0;
-            color: 32 32 32 128;
-         }
-         description { state: "vert" 0.0;
-            color: 32 32 32 128;
-         }
-      }
-   }
-}
-
-group { name: "e/bryce/default/inset"; nomouse;
-   alias: "e/bryce/invisible/inset";
-   alias: "e/bryce/translucent/inset";
-   images.image: "horiz_bar_inset.png" COMP;
-   images.image: "vert_bar_inset.png" COMP;
-   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;
-         }
-      }
-      spacer { "sizer";
-         description { state: "default" 0.0;
-            rel1.offset: 3 0;
-            rel2.offset: -4 -1;
-         }
-         description { state: "vert" 0.0;
-            rel1.offset: 0 3;
-            rel2.offset: -1 -4;
-         }
-      }
-      part { name: "e.swallow.content"; type: SWALLOW; mouse;
-         desc {
-            rel.to: "sizer";
-            link.base: "e,state,visible" "e";
-         }
-         desc { "hidden"; hid;
-            rel.to: "sizer";
-            link.base: "e,state,hidden" "e";
-         }
-      }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            rel1.offset: 2 0;
-            rel2.offset: -3 -1;
-            image.normal: "horiz_bar_inset.png";
-            image.border: 7 7 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-         description { state: "vert" 0.0;
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
-            image.normal: "vert_bar_inset.png";
-            image.border: 1 1 8 6;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      rect { "events"; repeat; mouse;
-         desc { color: 0 0 0 0; }
-      }
-   }
-   programs {
-#define ORIENT_SATE(_ORIENT, _STATE) \
-         program { \
-            signal: "e,state,orient,"_ORIENT; source: "e"; \
-            action: STATE_SET _STATE 0.0; \
-            target: "sizer"; \
-            target: "inset"; \
-         }
-      ORIENT_SATE("horizontal", "default")
-      ORIENT_SATE("vertical", "vert")
-#undef ORIENT_SATE
-   }
-}
-
-group { name: "e/bryce/default/plain"; nomouse;
-   alias: "e/bryce/invisible/plain";
-   alias: "e/bryce/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;
-         }
-      }
-      spacer { "sizer";
-         description { state: "default" 0.0;
-            rel1.offset: 3 1;
-            rel2.offset: -4 -2;
-         }
-         description { state: "vert" 0.0;
-            rel1.offset: 1 3;
-            rel2.offset: -2 -4;
-         }
-      }
-      part { name: "e.swallow.content"; type: SWALLOW; mouse;
-         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; }
-      }
-   }
-   programs {
-#define ORIENT_SATE(_ORIENT, _STATE) \
-   program { \
-signal: "e,state,orient,"_ORIENT; source: "e"; \
-action: STATE_SET _STATE 0.0; \
-target: "sizer"; \
-   }
-      ORIENT_SATE("horiontal", "default")
-      ORIENT_SATE("vertical", "vert")
-#undef ORIENT_SATE
-   }
-}
-
-group { "elm/scroller/base/bryce";
-   parts {
-      rect { "clip";
-         desc {
-            rel1.offset: 0 -99999;
-            rel2.offset: -1 99999;
-            link.base: "e,state,orient,horizontal" "e";
-         }
-         desc { "vert";
-            rel1.offset: -99999 0;
-            rel2.offset: 99999 -1;
-            link.base: "e,state,orient,vertical" "e";
-         }
-      }
-      swallow { "elm.swallow.content" clip: "clip"; description {rel1.offset: 
-1 -1; rel2.offset: 0 0; }}
-   }
-}
diff --git a/data/elementary/themes/edc/bryce_editor.edc 
b/data/elementary/themes/edc/bryce_editor.edc
deleted file mode 100644
index 32a81cc381..0000000000
--- a/data/elementary/themes/edc/bryce_editor.edc
+++ /dev/null
@@ -1,404 +0,0 @@
-group { "bryce_editor_text"; inherit_only: 1;
-   parts {
-      text { "e.text"; scale; nomouse;
-         effect: SHADOW BOTTOM;
-         desc {
-            color: 255 255 255 255;
-            text { font: "Sans:style=Bold"; size: 18;
-               min: 1 1;
-               ellipsis: -1;
-            }
-         }
-      }
-   }
-}
-
-group { "e/bryce/editor/side";
-   parts {
-      rect { "base"; desc { color: 0 0 0 192; } }
-      program { signal: "mouse,down,*"; source: "base";
-         action: SIGNAL_EMIT "e,action,dismiss" "e";
-      }
-      rect { "bottom"; scale;
-         desc {
-            min: 33 32;
-            align: 0 1;
-            rel1.relative: 0.3 1;
-            rel2.relative: 0.7 1;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "bottom";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "bottom";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,bottom" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "bottom";
-         action: SIGNAL_EMIT "e,bryce,add,bottom" "e";
-      }
-      rect { "top"; scale;
-         desc {
-            min: 33 32;
-            align: 0 0;
-            rel1.relative: 0.3 0;
-            rel2.relative: 0.7 0;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "top";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "top";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,top" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "top";
-         action: SIGNAL_EMIT "e,bryce,add,top" "e";
-      }
-      rect { "left"; scale;
-         desc {
-            min: 32 33;
-            align: 0 0;
-            rel1.relative: 0 0.3;
-            rel2.relative: 0 0.7;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "left";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "left";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,left" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "left";
-         action: SIGNAL_EMIT "e,bryce,add,left" "e";
-      }
-      rect { "right"; scale;
-         desc {
-            min: 32 33;
-            align: 1 0;
-            rel1.relative: 1 0.3;
-            rel2.relative: 1 0.7;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "right";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "right";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,right" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "right";
-         action: SIGNAL_EMIT "e,bryce,add,right" "e";
-      }
-   }
-   inherit: "bryce_editor_text";
-}
-
-group { "e/bryce/editor/side/horizontal";
-   parts {
-      rect { "base"; desc { color: 0 0 0 192; } }
-      program { signal: "mouse,down,*"; source: "base";
-         action: SIGNAL_EMIT "e,action,dismiss" "e";
-      }
-      spacer { "pos";
-         desc { align: 0 0;
-            min: 0 32;
-            rel2.relative: 1 0;
-         }
-         desc { "bottom";
-            align: 0 1;
-            min: 0 32;
-            rel1.relative: 0 1;
-            link.base: "e,state,bottom" "e";
-         }
-      }
-      rect { "center"; scale;
-         desc {
-            min: 33 32;
-            align: 0 0;
-            rel.to_y: "pos";
-            rel1.relative: 0.4 0;
-            rel2.relative: 0.6 1;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "center";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "center";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,center" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "center";
-         action: SIGNAL_EMIT "e,bryce,add,center" "e";
-      }
-      rect { "left"; scale;
-         desc {
-            min: 33 32;
-            align: 0 0;
-            rel.to_y: "pos";
-            rel1.relative: 0 0;
-            rel2.relative: 0.2 1;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "left";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "left";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,left" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "left";
-         action: SIGNAL_EMIT "e,bryce,add,left" "e";
-      }
-      rect { "right"; scale;
-         desc {
-            min: 33 32;
-            align: 1 0;
-            rel.to_y: "pos";
-            rel1.relative: 0.8 0;
-            rel2.relative: 1 1;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "right";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "right";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,right" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "right";
-         action: SIGNAL_EMIT "e,bryce,add,right" "e";
-      }
-   }
-   inherit: "bryce_editor_text";
-}
-
-group { "e/bryce/editor/side/vertical";
-   parts {
-      rect { "base"; desc { color: 0 0 0 192; } }
-      program { signal: "mouse,down,*"; source: "base";
-         action: SIGNAL_EMIT "e,action,dismiss" "e";
-      }
-      spacer { "pos";
-         desc { align: 0 0;
-            min: 32 0;
-            rel2.relative: 0 1;
-         }
-         desc { "right";
-            align: 1 0;
-            min: 32 0;
-            rel1.relative: 1 0;
-            link.base: "e,state,right" "e";
-         }
-      }
-      rect { "center"; scale;
-         desc {
-            min: 32 33;
-            align: 0 0;
-            rel.to_x: "pos";
-            rel1.relative: 0 0.4;
-            rel2.relative: 1 0.6;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "center";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "center";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,center" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "center";
-         action: SIGNAL_EMIT "e,bryce,add,center" "e";
-      }
-      rect { "top"; scale;
-         desc {
-            min: 32 33;
-            align: 0 0;
-            rel.to_x: "pos";
-            rel1.relative: 0 0;
-            rel2.relative: 1 0.2;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "top";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "top";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,top" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "top";
-         action: SIGNAL_EMIT "e,bryce,add,top" "e";
-      }
-      rect { "bottom"; scale;
-         desc {
-            min: 32 33;
-            align: 0 1;
-            rel.to_x: "pos";
-            rel1.relative: 0 0.8;
-            rel2.relative: 1 1;
-            color: 52 153 255 90;
-            link.base: "mouse,out" "bottom";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "active"; inherit;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "bottom";
-            link.transition: LINEAR 0.2;
-         }
-         desc { "hid"; hid;
-            link.base: "e,bryce,exists,bottom" "e";
-         }
-      }
-      program { signal: "mouse,down,1"; source: "bottom";
-         action: SIGNAL_EMIT "e,bryce,add,bottom" "e";
-      }
-   }
-   inherit: "bryce_editor_text";
-}
-
-group { "e/bryce/editor/style/item"; nomouse;
-   parts {
-      rect { "highlight_t"; scale;
-         desc {
-            align: 0.5 0;
-            max: -1 1;
-            color: 255 255 255 150;
-            link.base: "mouse,out" "events";
-         }
-         desc { "active"; max: -1 1;
-            align: 0.5 0;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "events";
-         }
-      }
-      rect { "highlight_l"; scale;
-         desc { align: 0 0.5;
-            max: 1 -1;
-            color: 255 255 255 150;
-            link.base: "mouse,out" "events";
-         }
-         desc { "active"; max: 1 -1;
-            align: 0 0.5;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "events";
-         }
-      }
-      rect { "highlight_r"; scale;
-         desc {
-            align: 1 0.5;
-            max: 1 -1;
-            color: 255 255 255 150;
-            link.base: "mouse,out" "events";
-         }
-         desc { "active"; align: 1 0.5;
-            max: 1 -1;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "events";
-         }
-      }
-      rect { "highlight_b"; scale;
-         desc {
-            align: 0.5 1;
-            max: -1 1;
-            color: 255 255 255 150;
-            link.base: "mouse,out" "events";
-         }
-         desc { "active"; align: 0.5 1;
-            max: -1 1;
-            color: 52 153 255 230;
-            link.base: "mouse,in" "events";
-         }
-      }
-      swallow { "e.swallow.content";
-         desc {
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
-         }
-      }
-      text { "e.text"; scale;
-         effect: SHADOW BOTTOM;
-         desc {
-            color: 255 255 255 255;
-            text { font: "Sans:style=Bold"; size: 14;
-               min: 1 1;
-               ellipsis: -1;
-            }
-         }
-      }
-      rect { "events"; mouse;
-         desc { color: 0 0 0 0; }
-      }
-   }
-}
-
-group { "e/bryce/editor/style";
-   parts {
-      rect { "base"; desc { color: 0 0 0 192; } }
-      program { signal: "mouse,down,*"; source: "base";
-         action: SIGNAL_EMIT "e,action,dismiss" "e";
-      }
-      swallow { "e.swallow.content";
-         desc { align: 0.5 0;
-            rel1.to_y: "e.text";
-            rel1.relative: 0 1;
-         }
-      }
-   }
-   inherit: "bryce_editor_text";
-   parts {
-      text { "e.text";
-         desc { "default";
-           align: 0.5 0;
-           rel2.relative: 1 0;
-         }
-      }
-   }
-}
-
-group { "e/bryce/editor/finish"; inherit: "e/bryce/editor/style";
-   parts {
-      swallow { "e.swallow.content";
-         desc { "default";
-            rel1.relative: 1 1;
-            rel2.relative: 0 1;
-         }
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/clock.edc 
b/data/elementary/themes/edc/clock.edc
index 8e75d6c61a..4639fe0d2a 100644
--- a/data/elementary/themes/edc/clock.edc
+++ b/data/elementary/themes/edc/clock.edc
@@ -1,5 +1,4 @@
 group { name: "e/modules/clock/digital";
-   alias: "e/gadget/clock/digital";
    min: 64 16;
    max: 512 128;
    images.image: "digit_0.png" COMP;
@@ -497,7 +496,6 @@ group { name: "e/modules/clock/digital";
 }
 
 group { name: "e/modules/clock/main";
-   alias: "e/gadget/clock/analog";
    images.image: "clock_base.png" COMP;
    set { name: "tacho_hand_big";
       image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
@@ -655,7 +653,6 @@ group { name: "e/modules/clock/main";
 }
 
 group { name: "e/modules/clock/calendar/dayname";
-   alias: "e/gadget/clock/calendar/dayname";
    parts {
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
@@ -690,7 +687,6 @@ group { name: "e/modules/clock/calendar/dayname";
 }
 
 group { name: "e/modules/clock/calendar/day";
-   alias: "e/gadget/clock/calendar/day";
    script {
       public day_state = 0;
       evalstate() {
@@ -835,7 +831,6 @@ group { name: "e/modules/clock/calendar/day";
 }
 
 group { name: "e/modules/clock/calendar";
-   alias: "e/gadget/clock/calendar";
    parts {
       part { name: "e.text.month"; type: TEXT;
          mouse_events: 1;
diff --git a/data/elementary/themes/edc/cpuclock.edc 
b/data/elementary/themes/edc/cpuclock.edc
deleted file mode 100644
index f4fcea9605..0000000000
--- a/data/elementary/themes/edc/cpuclock.edc
+++ /dev/null
@@ -1,241 +0,0 @@
-group { name: "e/gadget/cpuclock/main";
-   alias: "e/gadget/cpuclock/main_vert";
-   images.image: "cpu_base.png" COMP;
-   images.image: "cpu_clip1.png" COMP;
-   images.image: "cpu_clip2.png" COMP;
-   images.image: "cpu_clip3.png" COMP;
-   set { name: "marker";
-      image { image: "cpu_marker.png"  COMP; size: 72 72 99999 99999; }
-      image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
-      image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
-      image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
-   }
-   script {
-      public available_frequencies;
-      public available_governors;
-
-      public cur_freq_old;
-      public cur_freq_new;
-      public cur_freq_now;
-      public cur_freq_anim;
-
-      public min_freq_old;
-      public min_freq_new;
-      public min_freq_now;
-
-      public max_freq_old;
-      public max_freq_new;
-      public max_freq_now;
-
-      public slide_cur_freq(val, Float:v) {
-         new Float:freq, Float:min_freq, Float:max_freq, Float:tf;
-         new f, f0, f1;
-
-         v = (1.0 - cos(v * 3.141592654)) / 2.0;
-
-         min_freq = fetch_int(available_frequencies, 0);
-         max_freq = fetch_int(available_frequencies,
-                              count(available_frequencies) - 1);
-
-         f0 = get_int(cur_freq_old);
-         f1 = get_int(cur_freq_new);
-         f = f1 - f0;
-         freq = float(f) * v;
-         f = round(freq);
-         f = f + f0;
-         set_int(cur_freq_now, f);
-
-         freq = (float(f) - min_freq) / (max_freq - min_freq);
-         tf = (freq * 225.0) - 135.0;
-         custom_state(PART:"meter", "default", 0.0);
-         set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
-         set_state(PART:"meter", "custom", 0.0);
-
-         f0 = get_int(min_freq_old);
-         f1 = get_int(min_freq_new);
-         f = f1 - f0;
-         freq = float(f) * v;
-         f = round(freq);
-         f = f + f0;
-         set_int(min_freq_now, f);
-
-         freq = (float(f) - min_freq) / (max_freq - min_freq);
-         tf = (freq * 225.0) - 135.0;
-         custom_state(PART:"meter_min", "default", 0.0);
-         set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
-         set_state(PART:"meter_min", "custom", 0.0);
-
-         f0 = get_int(max_freq_old);
-         f1 = get_int(max_freq_new);
-         f = f1 - f0;
-         freq = float(f) * v;
-         f = round(freq);
-         f = f + f0;
-         set_int(max_freq_now, f);
-
-         freq = (float(f) - min_freq) / (max_freq - min_freq);
-         tf = (freq * 225.0) - 135.0;
-         custom_state(PART:"meter_max", "default", 0.0);
-         set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
-         set_state(PART:"meter_max", "custom", 0.0);
-
-         if (v >= 1.0) {
-            set_int(cur_freq_anim, 0);
-            return 0;
-         }
-         return 1;
-      }
-
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq
-            while (count(available_frequencies) > 0) {
-               remove(available_frequencies, 0);
-            }
-            for (new i = 2; i < numargs(); i++) {
-               append_int(available_frequencies, getarg(i));
-            }
-         }
-         else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor
-            new text[100];
-            while (count(available_governors) > 0) {
-               remove(available_governors, 0);
-            }
-            for (new i = 2; i < numargs(); i++) {
-               snprintf(text, 100, "%s", getarg(i));
-               append_str(available_governors, text);
-            }
-         } else if ((type == MSG_INT_SET) && (id == 3)) { // avg freq
-            new f;
-            new ani, curf, minf, maxf;
-            new text[100];
-
-            f = getarg(2);
-            if (f < 1000000) {
-               f += 500;
-               snprintf(text, 100, "%i", f / 1000);
-            } else {
-               f += 50000;
-               snprintf(text, 100, "%i.%i", f / 1000000,
-                        (f % 1000000) / 100000);
-            }
-
-            ani = get_int(cur_freq_anim);
-            if (ani > 0) cancel_anim(ani);
-            ani = anim(0.25, "slide_cur_freq", 0);
-            set_int(cur_freq_anim, ani);
-
-            f = getarg(2);
-            curf = get_int(cur_freq_now);
-            set_int(cur_freq_old, curf);
-            set_int(cur_freq_new, f);
-
-            f = getarg(4);
-            minf = get_int(min_freq_now);
-            set_int(min_freq_old, minf);
-            set_int(min_freq_new, f);
-
-            f = getarg(5);
-            maxf = get_int(max_freq_now);
-            set_int(max_freq_old, maxf);
-            set_int(max_freq_new, f);
-         } else if ((type == MSG_STRING) && (id == 4)) {
-            new text[100];
-            snprintf(text, 100, "%s", getarg(2));
-         }
-      }
-   }
-   parts {
-      part { name: "fade_clip"; type: RECT;
-         description { state: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 0.0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "clip1";
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "cpu_clip1.png";
-         }
-      }
-      part { name: "clip2";
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "cpu_clip2.png";
-         }
-      }
-      part { name: "clip3";
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "cpu_clip3.png";
-         }
-      }
-      part { name: "base";
-         description { state: "default" 0.0;
-            rel1.relative: (25/380) (25/380);
-            rel2.relative: (365/380) (365/380);
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "cpu_base.png";
-         }
-      }
-      part { name: "meter_min"; mouse_events: 0;
-         clip_to: "clip3";
-         description { state: "default" 0.0;
-            image.normal: "marker";
-            color: 51 153 255 255;
-            rel1.to: "base";
-            rel2.to: "base";
-            map {
-               on: 1;
-               rotation.center: "base";
-            }
-         }
-      }
-      part { name: "meter_max"; mouse_events: 0;
-         clip_to: "clip1";
-         description { state: "default" 0.0;
-            image.normal: "marker";
-            color: 255 0 0 255;
-            rel1.to: "base";
-            rel2.to: "base";
-            map {
-               on: 1;
-               rotation.center: "base";
-            }
-         }
-      }
-      part { name: "meter"; mouse_events: 0;
-         clip_to: "clip2";
-         description { state: "default" 0.0000;
-            color: 255 153 51 255;
-            image.normal: "marker";
-            rel1.to: "base";
-            rel2.to: "base";
-            map {
-               on: 1;
-               rotation.center: "base";
-            }
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "e,state,enabled"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "fade_clip";
-      }
-      program {
-         signal: "e,state,disabled"; source: "e";
-         action: STATE_SET "faded" 0.0;
-         target: "fade_clip";
-      }
-   }
-}
-
diff --git a/data/elementary/themes/edc/cpumonitor.edc 
b/data/elementary/themes/edc/cpumonitor.edc
deleted file mode 100644
index dfc17dcb63..0000000000
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ /dev/null
@@ -1,186 +0,0 @@
-group { name: "e/gadget/cpumonitor/main";
-   alias: "e/gadget/cpumonitor/main_vert";
-   parts {
-      part { name: "e.swallow.content"; type: SWALLOW;
-         description { state: "default" 0.0;
-         }
-      }
-   }
-}
-group { name: "e/gadget/cpumonitor/core/main";
-   image: "cpu_bar.png" COMP;
-   image: "cpu_green_on.png" COMP;
-   image: "cpu_yellow_on.png" COMP;
-   image: "cpu_red_on.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            new val = getarg(2);
-            if (val > (100 / 7 * 1)) set_state(PART:"led1", "on",  0.0);
-            else                     set_state(PART:"led1", "off", 0.0);
-            if (val > (100 / 7 * 2)) set_state(PART:"led2", "on",  0.0);
-            else                     set_state(PART:"led2", "off", 0.0);
-            if (val > (100 / 7 * 3)) set_state(PART:"led3", "on",  0.0);
-            else                     set_state(PART:"led3", "off", 0.0);
-            if (val > (100 / 7 * 4)) set_state(PART:"led4", "on",  0.0);
-            else                     set_state(PART:"led4", "off", 0.0);
-            if (val > (100 / 7 * 5)) set_state(PART:"led5", "on",  0.0);
-            else                     set_state(PART:"led5", "off", 0.0);
-            if (val > (100 / 7 * 6)) set_state(PART:"led6", "on",  0.0);
-            else                     set_state(PART:"led6", "off", 0.0);
-         }
-      }
-   }
-   parts {
-      part { name: "bg";
-         desc { "default";
-            aspect: (10 / 54) (10 / 54);
-            aspect_preference: VERTICAL;
-            image.normal: "cpu_bar.png";
-         }
-         part { name: "led1";
-            desc { "default"; hid;
-               rel1.relative: 0.0 (1.0 / 6 * 5);
-               rel2.relative: 1.0 (1.0 / 6 * 6);
-               image.normal: "cpu_green_on.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led2";
-            desc { "default"; hid;
-               rel1.relative: 0.0 (1.0 / 6 * 4);
-               rel2.relative: 1.0 (1.0 / 6 * 5);
-               image.normal: "cpu_green_on.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led3";
-            desc { "default"; hid;
-               rel1.relative: 0.0 (1.0 / 6 * 3);
-               rel2.relative: 1.0 (1.0 / 6 * 4);
-               image.normal: "cpu_green_on.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led4";
-            desc { "default"; hid;
-               rel1.relative: 0.0 (1.0 / 6 * 2);
-               rel2.relative: 1.0 (1.0 / 6 * 3);
-               image.normal: "cpu_yellow_on.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led5";
-            desc { "default"; hid;
-               rel1.relative: 0.0 (1.0 / 6 * 1);
-               rel2.relative: 1.0 (1.0 / 6 * 2);
-               image.normal: "cpu_yellow_on.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led6";
-            desc { "default"; hid;
-               rel1.relative: 0.0 (1.0 / 6 * 0);
-               rel2.relative: 1.0 (1.0 / 6 * 1);
-               image.normal: "cpu_red_on.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-      }
-   }
-}
-
-group { name: "e/gadget/cpumonitor/core/main_vert";
-   image: "cpu_bar_vert.png" COMP;
-   image: "cpu_green_on_vert.png" COMP;
-   image: "cpu_yellow_on_vert.png" COMP;
-   image: "cpu_red_on_vert.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            new val = getarg(2);
-            if (val > (100 / 7 * 1)) set_state(PART:"led1", "on",  0.0);
-            else                     set_state(PART:"led1", "off", 0.0);
-            if (val > (100 / 7 * 2)) set_state(PART:"led2", "on",  0.0);
-            else                     set_state(PART:"led2", "off", 0.0);
-            if (val > (100 / 7 * 3)) set_state(PART:"led3", "on",  0.0);
-            else                     set_state(PART:"led3", "off", 0.0);
-            if (val > (100 / 7 * 4)) set_state(PART:"led4", "on",  0.0);
-            else                     set_state(PART:"led4", "off", 0.0);
-            if (val > (100 / 7 * 5)) set_state(PART:"led5", "on",  0.0);
-            else                     set_state(PART:"led5", "off", 0.0);
-            if (val > (100 / 7 * 6)) set_state(PART:"led6", "on",  0.0);
-            else                     set_state(PART:"led6", "off", 0.0);
-         }
-      }
-   }
-   parts {
-      part { name: "bg";
-         desc { "default";
-            aspect: (54 / 10) (54 / 10);
-            aspect_preference: HORIZONTAL;
-            image.normal: "cpu_bar_vert.png";
-         }
-         part { name: "led1";
-            desc { "default"; hid;
-               rel1.relative: (1.0 / 6 * 0) 0.0;
-               rel2.relative: (1.0 / 6 * 1) 1.0;
-               image.normal: "cpu_green_on_vert.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led2";
-            desc { "default"; hid;
-               rel1.relative: (1.0 / 6 * 1) 0.0;
-               rel2.relative: (1.0 / 6 * 2) 1.0;
-               image.normal: "cpu_green_on_vert.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led3";
-            desc { "default"; hid;
-               rel1.relative: (1.0 / 6 * 2) 0.0;
-               rel2.relative: (1.0 / 6 * 3) 1.0;
-               image.normal: "cpu_green_on_vert.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led4";
-            desc { "default"; hid;
-               rel1.relative: (1.0 / 6 * 3) 0.0;
-               rel2.relative: (1.0 / 6 * 4) 1.0;
-               image.normal: "cpu_yellow_on_vert.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led5";
-            desc { "default"; hid;
-               rel1.relative: (1.0 / 6 * 4) 0.0;
-               rel2.relative: (1.0 / 6 * 5) 1.0;
-               image.normal: "cpu_yellow_on_vert.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-         part { name: "led6";
-            desc { "default"; hid;
-               rel1.relative: (1.0 / 6 * 5) 0.0;
-               rel2.relative: (1.0 / 6 * 6) 1.0;
-               image.normal: "cpu_red_on_vert.png";
-            }
-            desc { "on";  inherit: "default"; vis; }
-            desc { "off"; inherit: "default"; hid; }
-         }
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/luncher.edc 
b/data/elementary/themes/edc/luncher.edc
deleted file mode 100644
index e9ee605a00..0000000000
--- a/data/elementary/themes/edc/luncher.edc
+++ /dev/null
@@ -1,872 +0,0 @@
-group { name: "e/gadget/luncher/bar";
-   data {
-      item: styles "default engage";
-   }
-   parts {
-      part { name: "e.swallow.drop"; type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.to: "e.swallow.bar";
-            rel2.to: "e.swallow.bar";
-         }
-      }
-      part { name: "e.swallow.bar"; type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 1 1;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -2 -2;
-         }
-      }
-   }
-}
-
-group { name: "e/gadget/luncher/grid";
-   parts {
-      part { name: "e.swallow.drop"; type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.to: "e.swallow.grid";
-            rel2.to: "e.swallow.grid";
-         }
-      }
-      part { name: "e.swallow.grid"; type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 1 1;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -2 -2;
-         }
-      }
-   }
-}
-
-group { name: "e/gadget/luncher/icon";
-   script {
-      public urgent;
-   }
-   parts {
-      part { name: "item_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "sizer";
-            rel2.to: "sizer";
-            rel1.offset: -100 -100;
-            rel2.offset: 99 99;
-            color: 255 255 255 255;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 64;
-         }
-      }
-      part { name: "sizer"; type: RECT;
-         clip_to: "item_clip";
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "background"; type: RECT;
-         clip_to: "item_clip";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 0;
-            rel1.to: "sizer";
-            rel2.to: "sizer";
-            color: 255 255 255 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            color: 255 255 255 50;
-         }
-      }
-      part { name: "e.swallow.icon"; type: SWALLOW;
-         clip_to: "item_clip";
-         mouse_events: 1;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            rel1.to: "sizer";
-            rel1.offset: 3 3;
-            rel2.to: "sizer";
-            rel2.offset: -4 -4;
-         }
-      }
-      part { name: "indicator"; type: RECT;
-         clip_to: "item_clip";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 51 153 255 255;
-            align: 0.5 1.0;
-            max: 99999 5;
-         }
-         description { state: "left" 0.0;
-            inherit: "default" 0.0;
-            align: 0.0 0.5;
-            max: 5 99999;
-            rel2.relative: 0.5 1.0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 0.0;
-            rel2.relative: 1.0 0.5;
-         }
-         description { state: "right" 0.0;
-            inherit: "default" 0.0;
-            align: 1.0 0.5;
-            max: 5 99999;
-            rel1.relative: 0.5 0.0;
-         }
-         description { state: "bottom" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 1.0;
-            rel1.relative: 0.0 0.5;
-
-         }
-         description { state: "on_left" 0.0;
-            inherit: "left" 0.0;
-            visible: 1;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "top" 0.0;
-            visible: 1;
-         }
-         description { state: "on_right" 0.0;
-            inherit: "right" 0.0;
-            visible: 1;
-         }
-         description { state: "on_bottom" 0.0;
-            inherit: "bottom" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "obackground"; type: RECT;
-         repeat_events: 1;
-         clip_to: "item_clip";
-         description { state: "default" 0.0;
-            visible: 0;
-            rel1.to: "sizer";
-            rel2.to: "sizer";
-            color: 255 255 255 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            color: 255 255 255 255;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: -0.5 -0.5;
-            rel2.relative: 1.5 1.5;
-         }
-         description { state: "huge" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: -2.0  -2.0;
-            rel2.relative: 3.0  3.0;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "e.swallow.overlay"; type: PROXY;
-         clip_to: "obackground";
-         repeat_events: 1;
-         description {
-            state: "default" 0.0;
-            source: "e.swallow.icon";
-            proxy.source_clip: 0;
-            rel1.to: "obackground";
-            rel2.to: "obackground";
-         }
-      }
-   }
-   programs {
-      program { name: "set_default";
-         signal: "e,state,default"; source: "e";
-         action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.2;
-         target: "sizer";
-      }
-      program { name: "focused";
-         signal: "e,state,focused"; source: "e";
-         action: STATE_SET "visible" 0.0;
-         transition: LINEAR 0.5;
-         target: background;
-      }
-      program { name: "unfocused";
-         signal: "e,state,unfocused"; source: "e";
-         action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.5;
-         target: background;
-      }
-      program { name: "starting";
-         signal: "e,state,starting"; source: "e";
-         after: "exec_start";
-         after: "tracking";
-      }
-      program { name: "tracking";
-         action: STATE_SET "disabled" 0.0;
-         target: "item_clip";
-         transition: ACCELERATE 0.1;
-      }
-      program { name: "started";
-         signal: "e,state,started"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "item_clip";
-         transition: DECELERATE 0.1;
-      }
-      program { name: "sel_left";
-         signal: "e,state,on,left"; source: "e";
-         action: STATE_SET "left" 0.0;
-         target: "indicator";
-         after: "on_left";
-      }
-      program { name: "sel_top";
-         signal: "e,state,on,top"; source: "e";
-         action: STATE_SET "top" 0.0;
-         target: "indicator";
-         after: "on_top";
-      }
-      program { name: "sel_right";
-         signal: "e,state,on,right"; source: "e";
-         action: STATE_SET "right" 0.0;
-         target: "indicator";
-         after: "on_right";
-      }
-      program { name: "sel_bottom";
-         signal: "e,state,on,bottom"; source: "e";
-         action: STATE_SET "bottom" 0.0;
-         target: "indicator";
-         after: "on_bottom";
-      }
-      program { name: "on_left";
-         action: STATE_SET "on_left" 0.0;
-         transition: DECELERATE 0.2;
-         target: "indicator";
-      }
-      program { name: "on_top";
-         action: STATE_SET "on_top" 0.0;
-         transition: DECELERATE 0.2;
-         target: "indicator";
-      }
-      program { name: "on_right";
-         action: STATE_SET "on_right" 0.0;
-         transition: DECELERATE 0.2;
-         target: "indicator";
-      }
-      program { name: "on_bottom";
-         action: STATE_SET "on_bottom" 0.0;
-         transition: DECELERATE 0.2;
-         target: "indicator";
-      }
-      program {
-         signal: "e,state,off,*"; source: "e";
-         action: ACTION_STOP;
-         target: "sel_left";
-         target: "sel_top";
-         target: "sel_right";
-         target: "sel_bottom";
-      }
-      program {
-         signal: "e,state,off,*"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "indicator";
-      }
-      program { name: "urgent";
-         signal: "e,state,urgent"; source: "e";
-         after: "go_urgent";
-      }
-      program { name: "normal";
-         signal: "e,state,normal"; source: "e";
-         after: "go_normal";
-      }
-      program { name: "go_urgent";
-         script {
-           set_state(PART:"obackground", "visible", 0.0);
-           set_int(urgent, 1);
-         }
-         after: "go_urgent2";
-      }
-      program { name: "go_urgent2";
-         action: STATE_SET "hidden" 0.0;
-         transition: LINEAR 0.5;
-         target: "obackground";
-         sequence {
-            script {
-               if (get_int(urgent) == 1)
-                 run_program(get_program_id("go_urgent"));
-            }
-         }
-      }
-      program { name: "go_normal";
-         script {
-            stop_program(get_program_id("go_normal2"));
-            set_int(urgent, 0);
-         }
-         after: "go_normal2";
-      }
-      program { name: "go_normal2";
-         action: STATE_SET "default" 0.0;
-         target: "obackground";
-      }
-      program { name: "exec_start";
-         signal: "e,action,start"; source: "e";
-         action: ACTION_STOP;
-         target: "go_urgent";
-         target: "go_urgent2";
-         target: "go_normal";
-         target: "go_normal2";
-         target: "go_big";
-         target: "go_big2";
-         after: "go_big";
-      }
-      program { name: "go_big";
-         action: STATE_SET "visible" 0.0;
-         target: "obackground";
-         after: "go_big2";
-      }
-      program { name: "go_big2";
-         action: STATE_SET "huge" 0.0;
-         transition: LINEAR 0.5;
-         target: "obackground";
-      }
-   }
-}
-
-group { name: "e/gadget/luncher/preview"; 
-   parts {
-      part { name: "base"; type: RECT;
-         description { state: "default";
-            color: 255 255 255 0;
-            rel1.offset: -1 -1;
-            rel2.offset: 0 0;
-            link.base: "e,state,unfocused" "e";
-            link.transition: DECEL 0.1;
-         }
-         description { state: "focused";
-            inherit: "default" 0.0;
-            color: 51 153 255 255;
-            link.base: "e,state,focused" "e";
-            link.transition: ACCEL 0.1;
-         }
-      }
-      part { name: "clip"; type: RECT;
-         description { state: "default";
-            link.base: "e,state,visible" "e";
-            link.transition: ACCEL 0.1;
-         }
-         description { state: "invisible";
-            inherit: "default" 0.0;
-            color: 255 255 255 75;
-            link.base: "e,state,invisible" "e";
-            link.transition: DECEL 0.1;
-         }
-      }
-      part { name: "e.swallow.title"; type: SWALLOW; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            align: 0.5 0.0;
-            rel1.to_x: "e.swallow.icon";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 1 1;
-            rel2.to_x: "e.swallow.icon";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-         }
-         description { state: "menu" 0.0;
-            min: 120 0;
-            align: 0.5 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 2 0;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -3 -1;
-         }
-      }
-      part { name: "border"; type: RECT; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default";
-            rel1.to: "e.swallow.icon";
-            rel2.to: "e.swallow.icon";
-            rel1.offset: -1 -1;
-            rel2.offset: 0 0;
-            visible: 1;
-            color: 255 255 255 255;
-         }
-         description { state: "menu";
-            inherit: "default" 0.0;
-            visible: 0;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; 
-         clip_to: "clip";
-         description { state: "default";
-            align: 0.5 0.5;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            rel1.to_y: "e.swallow.title";
-            rel1.relative: 0.0 1.0;
-            rel2.offset: 0 -3;
-         }
-         description { state: "menu";
-            inherit: "default" 0.0;
-            min: 48 48;
-         }
-      }
-      part { name: "event"; type: RECT;
-         description { state: "default";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { name: "go_menu";
-         signal: "e,state,icon,menu"; source: "e";
-         action: STATE_SET "menu" 0.0;
-         target: "border";
-         target: "e.swallow.title";
-         target: "e.swallow.icon";
-      }
-      program { name: "go_alpha";
-         signal: "e,state,icon,alpha"; source: "e";
-         action: STATE_SET "menu" 0.0;
-         target: "border";
-      }
-   }
-}
-
-group { "elm/label/base/luncher_preview";
-   mouse_events: 0;
-   parts {
-      part { name: "elm.text"; type: TEXT;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default";
-            color_class: "menu_item"; 
-            text { font: FNBD; size: 10;
-               min: 0 1;
-               align: 0.5 0.5;
-               text_class: "menu_item";
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/tooltip/base/luncher";
-   min: 30 30;
-   data.item: "pad_x" "10";
-   data.item: "pad_y" "10";
-   data.item: "pad_border_x" "1";
-   data.item: "pad_border_y" "1";
-   /* tooltip is hidden after this amount.
-    Keep in sync with hide animations */
-   data.item: "hide_timeout" "0.35";
-   // if in a window... it's transparent!
-   data.item: "transparent" "enabled";
-   images.image: "tooltip-corner-top-left-tip.png" COMP;
-   images.image: "tooltip-corner-top-right-tip.png" COMP;
-   images.image: "tooltip-corner-bottom-left-tip.png" COMP;
-   images.image: "tooltip-corner-bottom-right-tip.png" COMP;
-   images.image: "tooltip-edge-left-tip.png" COMP;
-   images.image: "tooltip-edge-right-tip.png" COMP;
-   images.image: "tooltip-edge-bottom-tip.png" COMP;
-   images.image: "tooltip-edge-top-tip.png" COMP;
-   script {
-      hide_corners() {
-         set_state(PART:"corner-top-left", "default", 0.0);
-         set_state(PART:"corner-top-right", "default", 0.0);
-         set_state(PART:"corner-bottom-left", "default", 0.0);
-         set_state(PART:"corner-bottom-right", "default", 0.0);
-      }
-      hide_edges() {
-         set_state(PART:"clipper-edge-left", "default", 0.0);
-         set_state(PART:"clipper-edge-right", "default", 0.0);
-         set_state(PART:"clipper-edge-top", "default", 0.0);
-         set_state(PART:"clipper-edge-bottom", "default", 0.0);
-      }
-      show_corner_top_left() {
-         set_state(PART:"corner-top-left", "visible", 0.0);
-         set_state(PART:"corner-top-right", "default", 0.0);
-         set_state(PART:"corner-bottom-left", "default", 0.0);
-         set_state(PART:"corner-bottom-right", "default", 0.0);
-         hide_edges();
-      }
-      show_corner_top_right() {
-         set_state(PART:"corner-top-right", "visible", 0.0);
-         set_state(PART:"corner-top-left", "default", 0.0);
-         set_state(PART:"corner-bottom-left", "default", 0.0);
-         set_state(PART:"corner-bottom-right", "default", 0.0);
-         hide_edges();
-      }
-      show_corner_bottom_left() {
-         set_state(PART:"corner-bottom-left", "visible", 0.0);
-         set_state(PART:"corner-bottom-right", "default", 0.0);
-         set_state(PART:"corner-top-left", "default", 0.0);
-         set_state(PART:"corner-top-right", "default", 0.0);
-         hide_edges();
-      }
-      show_corner_bottom_right() {
-         set_state(PART:"corner-bottom-right", "visible", 0.0);
-         set_state(PART:"corner-bottom-left", "default", 0.0);
-         set_state(PART:"corner-top-left", "default", 0.0);
-         set_state(PART:"corner-top-right", "default", 0.0);
-         hide_edges();
-      }
-      show_edge_left(Float:val) {
-         set_state(PART:"clipper-edge-left", "visible", 0.0);
-         set_drag(PART:"edge-drag-left", 0.0, val);
-         set_state(PART:"clipper-edge-right", "default", 0.0);
-         set_state(PART:"clipper-edge-top", "default", 0.0);
-         set_state(PART:"clipper-edge-bottom", "default", 0.0);
-         hide_corners();
-      }
-      show_edge_right(Float:val) {
-         set_state(PART:"clipper-edge-right", "visible", 0.0);
-         set_drag(PART:"edge-drag-right", 0.0, val);
-         set_state(PART:"clipper-edge-left", "default", 0.0);
-         set_state(PART:"clipper-edge-top", "default", 0.0);
-         set_state(PART:"clipper-edge-bottom", "default", 0.0);
-         hide_corners();
-      }
-      show_edge_top(Float:val) {
-         set_state(PART:"clipper-edge-top", "visible", 0.0);
-         set_drag(PART:"edge-drag-top", val, 0.0);
-         set_state(PART:"clipper-edge-bottom", "default", 0.0);
-         set_state(PART:"clipper-edge-left", "default", 0.0);
-         set_state(PART:"clipper-edge-right", "default", 0.0);
-         hide_corners();
-      }
-      show_edge_bottom(Float:val) {
-         set_state(PART:"clipper-edge-bottom", "visible", 0.0);
-         set_drag(PART:"edge-drag-bottom", val, 0.0);
-         set_state(PART:"clipper-edge-top", "default", 0.0);
-         set_state(PART:"clipper-edge-left", "default", 0.0);
-         set_state(PART:"clipper-edge-right", "default", 0.0);
-         hide_corners();
-      }
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_FLOAT_SET) && (id == 1)) {
-            new Float:x, Float:y;
-
-            x = getfarg(2);
-            y = getfarg(3);
-
-            if (x < 0.0) {
-               if (y < 0.0) show_corner_top_left();
-               else if (y > 1.0) show_corner_bottom_left();
-               else show_edge_left(y);
-            } else if (x > 1.0) {
-               if (y < 0.0) show_corner_top_right();
-               else if (y > 1.0) show_corner_bottom_right();
-               else show_edge_right(y);
-            } else {
-               if (y < 0.0) show_edge_top(x);
-               else if (y > 1.0) show_edge_bottom(x);
-               else {
-                  hide_corners();
-                  hide_edges();
-               }
-            }
-         }
-      }
-   }
-   parts {
-      part { name: "clipper"; type: RECT;
-         description { state: "default" 0.0;
-            color: 255 255 255 0;
-            rel1 { to: "pop"; offset: 0 0; }
-            rel2 { to: "pop"; offset: -1 -1; }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "pop"; mouse_events: 0;
-         clip_to: "clipper";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: -3 7;
-            }
-            rel2 {
-               to: "elm.swallow.content";
-               offset: 3 -6;
-            }
-            color: 15 15 15 175;
-         }
-      }
-      #define TT_CORNER(name_, rx, ry, ax, ay, ox, oy)             \
-      part { name: "corner-"name_; mouse_events: 0;                \
-         clip_to: "clipper";                                       \
-         scale: 1;                                                 \
-         description { state: "default" 0.0;                       \
-            visible: 0;                                            \
-            align: ax ay;                                          \
-            FIXED_SIZE(12, 12)                                     \
-            rel1 {                                                 \
-               relative: rx ry;                                    \
-               offset: ox oy;                                      \
-               to: "pop";                                          \
-            }                                                      \
-            rel2 {                                                 \
-               relative: rx ry;                                    \
-               offset: ox oy;                                      \
-               to: "pop";                                          \
-            }                                                      \
-            image.normal: "tooltip-corner-"name_"-tip.png";        \
-         }                                                         \
-         description { state: "visible" 0.0;                       \
-            inherit: "default" 0.0;                                \
-            visible: 1;                                            \
-         }                                                         \
-      }
-      TT_CORNER("top-left", 0, 0, 0, 0, -4, -5);
-      TT_CORNER("top-right", 1, 0, 1, 0, 3, -5);
-      TT_CORNER("bottom-left", 0, 1, 0, 1, -4, 2);
-      TT_CORNER("bottom-right", 1, 1, 1, 1, 3, 2);
-      #undef TT_CORNER
-
-      #define TT_EDGE_VERT(name_, rx, ax, ox)                      \
-      part { name: "clipper-edge-"name_; type: RECT;               \
-         clip_to: "clipper";                                       \
-         description { state: "default" 0.0;                       \
-            visible: 0;                                            \
-            min: 9 13;                                             \
-            align: ax 0.5;                                         \
-            fixed: 1 1;                                            \
-            rel1 {                                                 \
-               relative: rx 0.0;                                   \
-               offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
-            }                                                      \
-            rel2 {                                                 \
-               relative: rx 1.0;                                   \
-               offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
-            }                                                      \
-         }                                                         \
-         description { state: "visible" 0.0;                       \
-            inherit: "default" 0.0;                                \
-            visible: 1;                                            \
-         }                                                         \
-      }                                                            \
-      part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
-         clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
-         description { state: "default" 0.0;                       \
-            color: 0 0 0 0;                                        \
-            min: 9 13;                                             \
-            align: ax 0.5;                                         \
-            fixed: 1 1;                                            \
-            rel1 {                                                 \
-               relative: rx 0.0;                                   \
-               offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
-            }                                                      \
-            rel2 {                                                 \
-               relative: rx 1.0;                                   \
-               offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
-            }                                                      \
-         }                                                         \
-      }                                                            \
-      part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
-         clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
-         dragable {                                                \
-            x: 0 0 0;                                              \
-            y: 1 1 0;                                              \
-            confine: "edge-area-"name_;                            \
-         }                                                         \
-         description { state: "default" 0.0;                       \
-            color: 0 0 0 0;                                        \
-            min: 9 13;                                             \
-            rel1.to: "edge-area-"name_;                            \
-            rel2.to: "edge-area-"name_;                            \
-         }                                                         \
-      }                                                            \
-      part { name: "edge-img-"name_; mouse_events: 0;              \
-         clip_to: "clipper-edge-"name_;                            \
-         description { state: "default" 0.0;                       \
-            FIXED_SIZE(9, 13)                                      \
-            align: ax 0.5;                                         \
-            rel1.to: "edge-drag-"name_;                            \
-            rel2.to: "edge-drag-"name_;                            \
-            image.normal: "tooltip-edge-"name_"-tip.png";          \
-         }                                                         \
-      }
-      TT_EDGE_VERT("left", 0, 1, -3);
-      TT_EDGE_VERT("right", 1, 0, 2);
-      #undef TT_EDGE_VERT
-
-      #define TT_EDGE_HORIZ(name_, ry, ay, oy)                     \
-      part { name: "clipper-edge-"name_; type: RECT;               \
-         clip_to: "clipper";                                       \
-         scale: 1;                                                 \
-         description { state: "default" 0.0;                       \
-            visible: 0;                                            \
-            min: 11 9;                                             \
-            align: 0.5 ay;                                         \
-            fixed: 1 1;                                            \
-            rel1 {                                                 \
-               relative: 0.0 ry;                                   \
-               offset: 0 oy;                                       \
-               to: "elm.swallow.content";                          \
-            }                                                      \
-            rel2 {                                                 \
-               relative: 1.0 ry;                                   \
-               offset: 0 oy;                                       \
-               to: "elm.swallow.content";                          \
-            }                                                      \
-         }                                                         \
-         description { state: "visible" 0.0;                       \
-            inherit: "default" 0.0;                                \
-            visible: 1;                                            \
-         }                                                         \
-      }                                                            \
-      part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
-         clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
-         description { state: "default" 0.0;                       \
-            color: 0 0 0 0;                                        \
-            min: 11 9;                                             \
-            align: 0.5 ay;                                         \
-            fixed: 1 1;                                            \
-            rel1.to: "clipper-edge-"name_;                         \
-            rel2.to: "clipper-edge-"name_;                         \
-         }                                                         \
-      }                                                            \
-      part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
-         clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
-         dragable {                                                \
-            x: 1 1 0;                                              \
-            y: 0 0 0;                                              \
-            confine: "edge-area-"name_;                            \
-         }                                                         \
-         description { state: "default" 0.0;                       \
-            color: 0 0 0 0;                                        \
-            min: 11 9;                                             \
-            rel1.to: "edge-area-"name_;                            \
-            rel2.to: "edge-area-"name_;                            \
-         }                                                         \
-      }                                                            \
-      part { name: "edge-img-"name_; mouse_events: 0;              \
-         clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
-         description { state: "default" 0.0;                       \
-            FIXED_SIZE(11, 9)                                      \
-            align: 0.5 ay;                                         \
-            rel1.to: "edge-drag-"name_;                            \
-            rel2.to: "edge-drag-"name_;                            \
-            image.normal: "tooltip-edge-"name_"-tip.png";          \
-         }                                                         \
-      }
-      TT_EDGE_HORIZ("top", 0, 1, -1);
-      TT_EDGE_HORIZ("bottom", 1, 0, 1);
-      #undef TT_EDGE_HORIZ
-      part { name: "clipper_content"; type: RECT;
-         description { state: "default" 0.0;
-            color: 255 255 255 0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "elm.swallow.content"; type: SWALLOW;
-         clip_to: "clipper_content";
-         description { state: "default" 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-         }
-      }
-      programs {
-         program { name: "show0";
-            signal: "elm,action,show"; source: "elm";
-            action: ACTION_STOP;
-            target: "hide0";
-            target: "hide1";
-            target: "hide2";
-            target: "hide3";
-            after: "show1";
-            after: "show2";
-         }
-         program { name: "show1";
-            action: STATE_SET "visible" 0.0;
-            transition: LINEAR 0.0;
-            target: "clipper";
-         }
-         program { name: "show2";
-            in: 0.0 0.0;
-            action: STATE_SET "visible" 0.0;
-            transition: LINEAR 0.0;
-            target: "clipper_content";
-         }
-         program { name: "hide0";
-            signal: "elm,action,hide"; source: "elm";
-            action: ACTION_STOP;
-            target: "show0";
-            target: "show1";
-            target: "show2";
-            after: "hide1";
-            after: "hide2";
-            after: "hide3";
-         }
-         program { name: "hide1";
-            script {
-               hide_corners();
-               hide_edges();
-            }
-         }
-         program { name: "hide2";
-            action: STATE_SET "default" 0.0;
-            transition: LINEAR 0.0;
-            target: "clipper_content";
-         }
-         program { name: "hide3";
-            in: 0.0 0.0;
-            action: STATE_SET "default" 0.0;
-            transition: LINEAR 0.0;
-            target: "clipper";
-         }
-      }
-   }
-}
-
-group { name: "elm/gengrid/item/luncher/default";
-   data.item: "contents" "elm.swallow.icon";
-   parts {
-      part { name: "base"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "icon_area";
-            rel1.offset: 0 0;
-            rel2.to: "icon_area";
-            rel2.offset: 0 0;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "icon_area"; type: RECT;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            rel1.offset: 0 0;
-            rel2.offset: 0 0;
-         }
-      }
-      part { name: "elm.swallow.icon"; type: SWALLOW;
-         clip_to: "icon_area";
-         description { state: "default" 0.0;
-            rel1.to: "icon_area";
-            rel2.to: "icon_area";
-         }
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/memusage.edc 
b/data/elementary/themes/edc/memusage.edc
deleted file mode 100644
index 660df56672..0000000000
--- a/data/elementary/themes/edc/memusage.edc
+++ /dev/null
@@ -1,218 +0,0 @@
-group { name: "e/gadget/memusage/main";
-   image: "mem_bar.png" COMP;
-   image: "mem_on.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-
-            new val = getarg(2); // mem usage (percentage)
-            if (val > (100 / 9 * 1)) set_state(PART:"mem_led1", "on",  0.0);
-            else                     set_state(PART:"mem_led1", "off", 0.0);
-            if (val > (100 / 9 * 2)) set_state(PART:"mem_led2", "on",  0.0);
-            else                     set_state(PART:"mem_led2", "off", 0.0);
-            if (val > (100 / 9 * 3)) set_state(PART:"mem_led3", "on",  0.0);
-            else                     set_state(PART:"mem_led3", "off", 0.0);
-            if (val > (100 / 9 * 4)) set_state(PART:"mem_led4", "on",  0.0);
-            else                     set_state(PART:"mem_led4", "off", 0.0);
-            if (val > (100 / 9 * 5)) set_state(PART:"mem_led5", "on",  0.0);
-            else                     set_state(PART:"mem_led5", "off", 0.0);
-            if (val > (100 / 9 * 6)) set_state(PART:"mem_led6", "on",  0.0);
-            else                     set_state(PART:"mem_led6", "off", 0.0);
-            if (val > (100 / 9 * 7)) set_state(PART:"mem_led7", "on",  0.0);
-            else                     set_state(PART:"mem_led7", "off", 0.0);
-            if (val > (100 / 9 * 8)) set_state(PART:"mem_led8", "on",  0.0);
-            else                     set_state(PART:"mem_led8", "off", 0.0);
-
-            val = getarg(3); // swap usage (percentage)
-            if (val > (100 / 9 * 1)) set_state(PART:"swp_led1", "on",  0.0);
-            else                     set_state(PART:"swp_led1", "off", 0.0);
-            if (val > (100 / 9 * 2)) set_state(PART:"swp_led2", "on",  0.0);
-            else                     set_state(PART:"swp_led2", "off", 0.0);
-            if (val > (100 / 9 * 3)) set_state(PART:"swp_led3", "on",  0.0);
-            else                     set_state(PART:"swp_led3", "off", 0.0);
-            if (val > (100 / 9 * 4)) set_state(PART:"swp_led4", "on",  0.0);
-            else                     set_state(PART:"swp_led4", "off", 0.0);
-            if (val > (100 / 9 * 5)) set_state(PART:"swp_led5", "on",  0.0);
-            else                     set_state(PART:"swp_led5", "off", 0.0);
-            if (val > (100 / 9 * 6)) set_state(PART:"swp_led6", "on",  0.0);
-            else                     set_state(PART:"swp_led6", "off", 0.0);
-            if (val > (100 / 9 * 7)) set_state(PART:"swp_led7", "on",  0.0);
-            else                     set_state(PART:"swp_led7", "off", 0.0);
-            if (val > (100 / 9 * 8)) set_state(PART:"swp_led8", "on",  0.0);
-            else                     set_state(PART:"swp_led8", "off", 0.0);
-
-            // other values received but not used in the default theme:
-            // val = getarg(4);   // mem_total (kb)
-            // val = getarg(5);   // mem_used (kb)
-            // val = getarg(6);   // mem_cached (kb)
-            // val = getarg(7);   // mem_buffers (kb)
-            // val = getarg(8);   // mem_shared (kb)
-            // val = getarg(9);   // swp_total (kb)
-            // val = getarg(10);  // swp_used (kb)
-         }
-      }
-   }
-   parts {
-      part { name: "base"; type: SPACER;
-         description { state: "default" 0.0;
-            aspect: (28 / 56) (28 / 56);
-            aspect_preference: BOTH;
-         }
-      }
-
-      #define LED(_name_, _pos_)                            \
-         part { name: _name_;                               \
-            desc { "default"; hid;                          \
-               rel1.relative: 0.0 (1.0 / 8 * (_pos_ - 1));  \
-               rel2.relative: 1.0 (1.0 / 8 * _pos_);        \
-               image.normal: "mem_on.png";                  \
-            }                                               \
-            desc { "on";  inherit: "default"; vis; }        \
-            desc { "off"; inherit: "default"; hid; }        \
-         }                                                  \
-
-      part { name: "mem";
-         desc { "default";
-            rel1.to: "base";
-            rel2.to: "base";
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.5 1.0;
-            image.normal: "mem_bar.png";
-         }
-         LED("mem_led1", 8)
-         LED("mem_led2", 7)
-         LED("mem_led3", 6)
-         LED("mem_led4", 5)
-         LED("mem_led5", 4)
-         LED("mem_led6", 3)
-         LED("mem_led7", 2)
-         LED("mem_led8", 1)
-      }
-
-      part { name: "swp";
-         desc { "default";
-            rel1.to: "base";
-            rel2.to: "base";
-            rel1.relative: 0.5 0.0;
-            rel2.relative: 1.0 1.0;
-            image.normal: "mem_bar.png";
-         }
-         LED("swp_led1", 8)
-         LED("swp_led2", 7)
-         LED("swp_led3", 6)
-         LED("swp_led4", 5)
-         LED("swp_led5", 4)
-         LED("swp_led6", 3)
-         LED("swp_led7", 2)
-         LED("swp_led8", 1)
-      }
-
-      #undef LED
-   }
-}
-
-group { name: "e/gadget/memusage/main_vert";
-   image: "mem_bar_vert.png" COMP;
-   image: "mem_on_vert.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            // mem
-            new val = getarg(2);
-            if (val > (100 / 9 * 1)) set_state(PART:"mem_led1", "on",  0.0);
-            else                     set_state(PART:"mem_led1", "off", 0.0);
-            if (val > (100 / 9 * 2)) set_state(PART:"mem_led2", "on",  0.0);
-            else                     set_state(PART:"mem_led2", "off", 0.0);
-            if (val > (100 / 9 * 3)) set_state(PART:"mem_led3", "on",  0.0);
-            else                     set_state(PART:"mem_led3", "off", 0.0);
-            if (val > (100 / 9 * 4)) set_state(PART:"mem_led4", "on",  0.0);
-            else                     set_state(PART:"mem_led4", "off", 0.0);
-            if (val > (100 / 9 * 5)) set_state(PART:"mem_led5", "on",  0.0);
-            else                     set_state(PART:"mem_led5", "off", 0.0);
-            if (val > (100 / 9 * 6)) set_state(PART:"mem_led6", "on",  0.0);
-            else                     set_state(PART:"mem_led6", "off", 0.0);
-            if (val > (100 / 9 * 7)) set_state(PART:"mem_led7", "on",  0.0);
-            else                     set_state(PART:"mem_led7", "off", 0.0);
-            if (val > (100 / 9 * 8)) set_state(PART:"mem_led8", "on",  0.0);
-            else                     set_state(PART:"mem_led8", "off", 0.0);
-
-            // swap
-            val = getarg(3);
-            if (val > (100 / 9 * 1)) set_state(PART:"swp_led1", "on",  0.0);
-            else                     set_state(PART:"swp_led1", "off", 0.0);
-            if (val > (100 / 9 * 2)) set_state(PART:"swp_led2", "on",  0.0);
-            else                     set_state(PART:"swp_led2", "off", 0.0);
-            if (val > (100 / 9 * 3)) set_state(PART:"swp_led3", "on",  0.0);
-            else                     set_state(PART:"swp_led3", "off", 0.0);
-            if (val > (100 / 9 * 4)) set_state(PART:"swp_led4", "on",  0.0);
-            else                     set_state(PART:"swp_led4", "off", 0.0);
-            if (val > (100 / 9 * 5)) set_state(PART:"swp_led5", "on",  0.0);
-            else                     set_state(PART:"swp_led5", "off", 0.0);
-            if (val > (100 / 9 * 6)) set_state(PART:"swp_led6", "on",  0.0);
-            else                     set_state(PART:"swp_led6", "off", 0.0);
-            if (val > (100 / 9 * 7)) set_state(PART:"swp_led7", "on",  0.0);
-            else                     set_state(PART:"swp_led7", "off", 0.0);
-            if (val > (100 / 9 * 8)) set_state(PART:"swp_led8", "on",  0.0);
-            else                     set_state(PART:"swp_led8", "off", 0.0);
-         }
-      }
-   }
-   parts {
-      part { name: "base"; type: SPACER;
-         description { state: "default" 0.0;
-            aspect: (56 / 28) (56 / 28);
-            aspect_preference: BOTH;
-         }
-      }
-
-      #define LED(_name_, _pos_)                            \
-         part { name: _name_;                               \
-            desc { "default"; hid;                          \
-               rel1.relative: (1.0 / 8 * (_pos_ - 1)) 0.0;  \
-               rel2.relative: (1.0 / 8 * _pos_) 1.0;        \
-               image.normal: "mem_on_vert.png";             \
-            }                                               \
-            desc { "on";  inherit: "default"; vis; }        \
-            desc { "off"; inherit: "default"; hid; }        \
-         }                                                  \
-
-      part { name: "mem";
-         desc { "default";
-            rel1.to: "base";
-            rel2.to: "base";
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.5;
-            image.normal: "mem_bar_vert.png";
-         }
-         LED("mem_led1", 1)
-         LED("mem_led2", 2)
-         LED("mem_led3", 3)
-         LED("mem_led4", 4)
-         LED("mem_led5", 5)
-         LED("mem_led6", 6)
-         LED("mem_led7", 7)
-         LED("mem_led8", 8)
-      }
-
-      part { name: "swp";
-         desc { "default";
-            rel1.to: "base";
-            rel2.to: "base";
-            rel1.relative: 0.0 0.5;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -2;
-            image.normal: "mem_bar_vert.png";
-         }
-         LED("swp_led1", 1)
-         LED("swp_led2", 2)
-         LED("swp_led3", 3)
-         LED("swp_led4", 4)
-         LED("swp_led5", 5)
-         LED("swp_led6", 6)
-         LED("swp_led7", 7)
-         LED("swp_led8", 8)
-      }
-
-      #undef LED
-   }
-}
diff --git a/data/elementary/themes/edc/mixer.edc 
b/data/elementary/themes/edc/mixer.edc
index c950907dd6..1a2251bf6f 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -1,6 +1,4 @@
 group { name: "e/modules/mixer/main";
-   alias: "e/gadget/mixer/main";
-   alias: "e/gadget/mixer/main_vert";
    images.image: "speaker.png" COMP;
    images.image: "speaker_clip.png" COMP;
    images.image: "speaker_vol.png" COMP;
diff --git a/data/elementary/themes/edc/netstatus.edc 
b/data/elementary/themes/edc/netstatus.edc
deleted file mode 100644
index c4157d4ba8..0000000000
--- a/data/elementary/themes/edc/netstatus.edc
+++ /dev/null
@@ -1,86 +0,0 @@
-group { name: "e/gadget/netstatus/main";
-   alias: "e/gadget/netstatus/main_vert";
-   image: "netstatus_rx.png" COMP;
-   image: "netstatus_tx.png" COMP;
-   image: "netstatus_base.png" COMP;
-   image: "netstatus_over.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            // new rxcur = getarg(2);
-            new rxper = getarg(3);
-            // new rxmax = getarg(4);
-            // new txcur = getarg(5);
-            new txper = getarg(6);
-            // new txmax = getarg(7);
-
-            new Float:val = rxper / 100.0;
-            custom_state(PART:"rx_clip", "default", 0.0);
-            set_state_val(PART:"rx_clip", STATE_REL2, 1.0, val);
-            set_state(PART:"rx_clip", "custom", 0.0);
-
-            val = txper / 100.0;
-            custom_state(PART:"tx_clip", "default", 0.0);
-            set_state_val(PART:"tx_clip", STATE_REL1, 0.0, 1.0 - val);
-            set_state(PART:"tx_clip", "custom", 0.0);
-         }
-      }
-   }
-   parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
-            image.normal: "netstatus_base.png";
-         }
-      }
-      part { name: "rx_spacer"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.09;
-            rel2.relative: 1.0 0.91;
-         }
-      }
-      part { name: "rx_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "rx_spacer";
-            rel2.to: "rx_spacer";
-         }
-      }
-      part { name: "rx"; type: IMAGE;
-         clip_to: "rx_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "netstatus_rx.png";
-         }
-      }
-      part { name: "tx_spacer"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.09;
-            rel2.relative: 1.0 0.91;
-         }
-      }
-      part { name: "tx_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "tx_spacer";
-            rel2.to: "tx_spacer";
-         }
-      }
-      part { name: "tx"; type: IMAGE;
-         clip_to: "tx_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "netstatus_tx.png";
-         }
-      }
-      part { name: "over";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "netstatus_over.png";
-         }
-      }
-   }
-}
-
diff --git a/data/elementary/themes/edc/pager.edc 
b/data/elementary/themes/edc/pager.edc
index f9e89dee88..3de905185e 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -1,5 +1,4 @@
 group { name: "e/modules/pager/popup";
-   alias: "e/gadget/pager/popup";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -269,635 +268,7 @@ group { name: "e/modules/pager/desk";
    }
 }
 
-group { name: "e/gadget/pager/plain/desk";
-   BACKGROUND_IMG
-   images.image: "mini_blue_glow_arrow_0.png" COMP;
-   images.image: "mini_blue_glow_arrow_1.png" COMP;
-   images.image: "mini_blue_glow_arrow_2.png" COMP;
-   images.image: "mini_blue_glow_arrow_3.png" COMP;
-   parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            image.normal: "background";
-            image.scale_hint: STATIC;
-            ASPECT_FILL((7680/4320))
-         }
-      }
-      part { name: "e.background"; type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            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;
-            rel.to: "base";
-         }
-      }
-      part { name: "e.swallow.drop"; type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            rel2.offset: -2 -1;
-            link.base: "e,state,visible" "e";
-         }
-         desc { "hid"; inherit; hid;
-            link.base: "e,state,hidden" "e";
-         }
-      }
-      part { name: "e.swallow.content"; type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel.to: "base";
-         }
-      }
-      part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         desc { "default";
-            rel.to: "e.swallow.content";
-            color3: 255 255 255 255;
-            text { font: "Sans"; size: 10;
-               text_class: "module_small";
-               align: 0.5 0.5;
-            }
-            visible: 0;
-         }
-         desc { "active"; inherit;
-            color_class: "module_label";
-            visible: 1;
-         }
-      }
-      part { name: "sel"; type: RECT; mouse_events: 0;
-         scale: 1;
-         clip_to: "clip";
-         desc { "default";
-            color: 51 153 255 255;
-            visible: 0;
-            rel.to: "e.swallow.content";
-            align: 0.5 1.0;
-            max: 99999 5;
-         }
-         description { state: "left" 0.0;
-            inherit: "default" 0.0;
-            align: 0.0 0.5;
-            max: 5 99999;
-            rel2.relative: 0.5 1.0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 0.0;
-            rel2.relative: 1.0 0.5;
-         }
-         description { state: "right" 0.0;
-            inherit: "default" 0.0;
-            align: 1.0 0.5;
-            max: 5 99999;
-            rel1.relative: 0.5 0.0;
-         }
-         description { state: "bottom" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 1.0;
-            rel1.relative: 0.0 0.5;
-
-         }
-         description { state: "on_left" 0.0;
-            inherit: "left" 0.0;
-            visible: 1;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "top" 0.0;
-            visible: 1;
-         }
-         description { state: "on_right" 0.0;
-            inherit: "right" 0.0;
-            visible: 1;
-         }
-         description { state: "on_bottom" 0.0;
-            inherit: "bottom" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "drop0"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_0.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: 11 11;
-            rel2.offset: 11 11;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "drop1"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_1.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: -12 11;
-            rel2.offset: -12 11;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "drop2"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_2.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: -12 -12;
-            rel2.offset: -12 -12;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "drop3"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_3.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: 11 -12;
-            rel2.offset: 11 -12;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "e.eventarea"; type: RECT; mouse_events: 1;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            color: 255 255 255 0;
-         }
-      }
-   }
-   programs {
-      program { name: "sel_left";
-         signal: "e,state,selected,left"; source: "e";
-         action: STATE_SET "left" 0.0;
-         target: "sel";
-         after: "on_left";
-      }
-      program { name: "sel_top";
-         signal: "e,state,selected,top"; source: "e";
-         action: STATE_SET "top" 0.0;
-         target: "sel";
-         after: "on_top";
-      }
-      program { name: "sel_right";
-         signal: "e,state,selected,right"; source: "e";
-         action: STATE_SET "right" 0.0; 
-         target: "sel";
-         after: "on_right";
-      }
-      program { name: "sel_bottom";
-         signal: "e,state,selected,bottom"; source: "e";
-         action: STATE_SET "bottom" 0.0;
-         target: "sel";
-         after: "on_bottom";
-      }
-      program { name: "on_left";
-         action: STATE_SET "on_left" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      program { name: "on_top";
-         action: STATE_SET "on_top" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      program { name: "on_right";
-         action: STATE_SET "on_right" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      program { name: "on_bottom";
-         action: STATE_SET "on_bottom" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      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";
-         action: STATE_SET "default" 0.0;
-         target: "sel";
-      }
-      program { signal: "e,preview,on"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "e.background";
-      }
-      program { signal: "e,preview,off"; source: "e";
-         action: STATE_SET "hidden" 0.0;
-         target: "e.background";
-      }
-      program { name: "drop1";
-         signal: "e,action,drag,in"; source: "e";
-         action: STATE_SET "active" 0.0;
-         target: "drop0";
-         target: "drop1";
-         target: "drop2";
-         target: "drop3";
-         after: "drop2";
-      }
-      program { name: "drop2";
-         action: STATE_SET "hidden" 0.0;
-         transition: LINEAR 0.5;
-         target: "drop0";
-         target: "drop1";
-         target: "drop2";
-         target: "drop3";
-         after: "drop1";
-      }
-      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";
-         action: STATE_SET "active" 0.0;
-         target: "e.text.label";
-      }
-      program { signal: "e,name,hide"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "e.text.label";
-      }
-   }
-}
-
-group { name: "e/gadget/pager/default/desk";
-   images.image: "mini_blue_glow_arrow_0.png" COMP;
-   images.image: "mini_blue_glow_arrow_1.png" COMP;
-   images.image: "mini_blue_glow_arrow_2.png" COMP;
-   images.image: "mini_blue_glow_arrow_3.png" COMP;
-   parts {
-      part { name: "base"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "clip"; type: RECT; mouse_events: 0;
-         desc { "default";
-            rel.to: "e.swallow.content";
-         }
-      }
-      part { name: "e.swallow.drop"; type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            rel2.offset: -2 -1;
-            link.base: "e,state,visible" "e";
-         }
-         desc { "hid"; inherit; hid;
-            link.base: "e,state,hidden" "e";
-         }
-      }
-      part { name: "e.swallow.content"; type: SWALLOW;
-         clip_to: "clip";
-         desc { "default";
-            link.base: "e,state,visible" "e";
-         }
-         desc { "hid"; inherit; hid;
-            link.base: "e,state,hidden" "e";
-         }
-      }
-      part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         scale: 1;
-         desc { "default";
-            rel.to: "e.swallow.content";
-            color3: 255 255 255 255;
-            text { font: "Sans"; size: 10;
-               text_class: "module_small";
-               align: 0.5 0.5;
-            }
-            visible: 0;
-         }
-         desc { "active"; inherit;
-            color_class: "module_label";
-            visible: 1;
-         }
-      }
-      part { name: "sel"; type: RECT; mouse_events: 0;
-         scale: 1;
-         clip_to: "clip";
-         desc { "default";
-            color: 51 153 255 255;
-            visible: 0;
-            rel.to: "e.swallow.content";
-            align: 0.5 1.0;
-            max: 99999 5;
-         }
-         description { state: "left" 0.0;
-            inherit: "default" 0.0;
-            align: 0.0 0.5;
-            max: 5 99999;
-            rel2.relative: 0.5 1.0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 0.0;
-            rel2.relative: 1.0 0.5;
-         }
-         description { state: "right" 0.0;
-            inherit: "default" 0.0;
-            align: 1.0 0.5;
-            max: 5 99999;
-            rel1.relative: 0.5 0.0;
-         }
-         description { state: "bottom" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 1.0;
-            rel1.relative: 0.0 0.5;
-
-         }
-         description { state: "on_left" 0.0;
-            inherit: "left" 0.0;
-            visible: 1;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "top" 0.0;
-            visible: 1;
-         }
-         description { state: "on_right" 0.0;
-            inherit: "right" 0.0;
-            visible: 1;
-         }
-         description { state: "on_bottom" 0.0;
-            inherit: "bottom" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "drop0"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_0.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: 11 11;
-            rel2.offset: 11 11;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "drop1"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_1.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: -12 11;
-            rel2.offset: -12 11;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "drop2"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_2.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: -12 -12;
-            rel2.offset: -12 -12;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "drop3"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "mini_blue_glow_arrow_3.png";
-            rel1.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;
-            min: 10 10;
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: 11 -12;
-            rel2.offset: 11 -12;
-            min: 1 1;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "e.eventarea"; type: RECT; mouse_events: 1;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            color: 255 255 255 0;
-         }
-      }
-   }
-   programs {
-      program { name: "sel_left";
-         signal: "e,state,selected,left"; source: "e";
-         action: STATE_SET "left" 0.0;
-         target: "sel";
-         after: "on_left";
-      }
-      program { name: "sel_top";
-         signal: "e,state,selected,top"; source: "e";
-         action: STATE_SET "top" 0.0;
-         target: "sel";
-         after: "on_top";
-      }
-      program { name: "sel_right";
-         signal: "e,state,selected,right"; source: "e";
-         action: STATE_SET "right" 0.0;
-         target: "sel";
-         after: "on_right";
-      }
-      program { name: "sel_bottom";
-         signal: "e,state,selected,bottom"; source: "e";
-         action: STATE_SET "bottom" 0.0;
-         target: "sel";
-         after: "on_bottom";
-      }
-      program { name: "on_left";
-         action: STATE_SET "on_left" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      program { name: "on_top";
-         action: STATE_SET "on_top" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      program { name: "on_right";
-         action: STATE_SET "on_right" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      program { name: "on_bottom";
-         action: STATE_SET "on_bottom" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
-         target: "sel";
-      }
-      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";
-         action: STATE_SET "default" 0.0;
-         target: "sel";
-      }
-      program { name: "drop1";
-         signal: "e,action,drag,in"; source: "e";
-         action: STATE_SET "active" 0.0;
-         target: "drop0";
-         target: "drop1";
-         target: "drop2";
-         target: "drop3";
-         after: "drop2";
-      }
-      program { name: "drop2";
-         action: STATE_SET "hidden" 0.0;
-         transition: LINEAR 0.5;
-         target: "drop0";
-         target: "drop1";
-         target: "drop2";
-         target: "drop3";
-         after: "drop1";
-      }
-      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";
-         action: STATE_SET "active" 0.0;
-         target: "e.text.label";
-      }
-      program { signal: "e,name,hide"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "e.text.label";
-      }
-   }
-}
-
 group { name: "e/modules/pager/window";
-   alias: "e/gadget/pager/plain/window";
    images.image: "mini_box_bevel_shadow.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
diff --git a/data/elementary/themes/edc/start.edc 
b/data/elementary/themes/edc/start.edc
index e8d1316756..899dee81a5 100644
--- a/data/elementary/themes/edc/start.edc
+++ b/data/elementary/themes/edc/start.edc
@@ -1,5 +1,4 @@
 group { name: "e/modules/start/main";
-   alias: "e/gadget/start/main";
    parts {
       part { name: "arrow_base"; type: RECT;
          description { state: "default" 0.0;
diff --git a/data/elementary/themes/edc/thermal.edc 
b/data/elementary/themes/edc/thermal.edc
deleted file mode 100644
index bea2d57d5f..0000000000
--- a/data/elementary/themes/edc/thermal.edc
+++ /dev/null
@@ -1,101 +0,0 @@
-group { name: "e/gadget/thermal/main";
-   alias: "e/gadget/thermal/main_vert";
-   images.image: "therm_content.png" COMP;
-   script {
-    public message(Msg_Type:type, id, ...) {
-       if ((type == MSG_FLOAT) && (id == 1)) {
-          new Float:val;
-          val = getfarg(2);
-          set_drag(PART:"temp_top", 0.0, val);
-          if (val <= 0.6) set_state(PART:"temp", "default", 0.0);
-          else if (val <= 0.8) set_state(PART:"temp", "warm", 0.0);
-          else if (val <= 1.0) set_state(PART:"temp", "hot", 0.0);
-       }
-    }
-   }
-   parts {
-      part { name: "base"; type: SPACER;
-         description { state: "default" 0.0;
-            aspect: (80 / 160) (80 / 160);
-            aspect_preference: BOTH;
-         }
-      }
-      part { name: "bg";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "therm_content.png";
-            color: 32 32 32 255;
-         }
-      }
-       part { name: "temp";
-         clip_to: "temp_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "therm_content.png";
-            color: 51 153 255 255;
-         }
-         description { state: "warm" 0.0;
-            inherit: "default" 0.0;
-            color: 255 153 51 255;
-         }
-         description { state: "hot" 0.0;
-            inherit: "default" 0.0;
-            color: 255 0 0 255;
-         }
-      }
-      part { name: "fade_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to_x: "base";
-            rel2.to_x: "base";
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 0.0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "temp_clip"; type: RECT;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            rel1.to_x: "base";
-            rel2.to_x: "base";
-            rel1.to_y: "temp_top";
-         }
-      }
-      part { name: "temp_top"; type: SPACER;
-         dragable.x: 0 0 0;
-         dragable.y: -1 1 0;
-         dragable.confine: "temp_limit";
-         description { state: "default" 0.0;
-         }
-      }
-      part { name: "temp_limit"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.to_x: "base";
-            rel2.to_x: "base";
-            rel1.relative: 0.0 0.1;
-            rel2.relative: 1.0 0.9;
-         }
-      }
-      part { name: "over"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to_x: "base";
-            rel2.to_x: "base";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "e,state,known"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "fade_clip";
-      }
-      program {
-         signal: "e,state,unknown"; source: "e";
-         action: STATE_SET "faded" 0.0;
-         target: "fade_clip";
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/time.edc 
b/data/elementary/themes/edc/time.edc
deleted file mode 100644
index 04800387e1..0000000000
--- a/data/elementary/themes/edc/time.edc
+++ /dev/null
@@ -1,97 +0,0 @@
-group { "e/gadget/clock/digital/advanced"; nomouse;
-   script {
-      public message(Msg_Type:type, id, ...) {
-#define CUSTOM(NAME) \
-                custom_state(PART:NAME, "default", 0.0); \
-                set_state_val(PART:NAME, STATE_COLOR_CLASS, str); \
-                set_state(PART:NAME, "custom", 0.0)
-
-         if ((type == MSG_STRING_INT) && (id == 3)) {
-            new str[128];
-            new on;
-
-            getsarg(2, str, sizeof(str));
-            on = getarg(3);
-            if (on) {
-                CUSTOM("clip");
-            } else {
-                set_state(PART:"clip", "default", 0.0);
-            }
-#undef CUSTOM
-         }
-      }
-   }
-   parts {
-      rect { "clip";
-         desc {
-         }
-      }
-      text { "e.text"; scale; clip: "clip";
-          desc { "default";
-              align: 0.5 0;
-              rel1.offset: 2 0;
-              rel2.relative: 1 0;
-              rel2.offset: -3 -1;
-              color: 160 160 160 255;
-              text {
-                  font: FN;
-                  size: 12;
-                  min: 1 1;
-                  text_class: "module_normal";
-                  ellipsis: -1;
-              }
-          }
-          desc { "only"; inherit;
-             align: 0.5 0.5;
-             rel2.relative: 1 1;
-             text.fit: 0 1;
-             text.font: FNBD;
-             text.text_class: "module_large";
-          }
-      }
-      text { "e.text.sub"; scale; clip: "clip";
-          desc { "default";
-              align: 0.5 0;
-              rel1.relative: 0 1;
-              rel1.offset: 2 0;
-              rel1.to_y: "e.text";
-              rel2.offset: -3 -1;
-              color: 160 160 160 255;
-              text {
-                  font: FN;
-                  size: 9;
-                  min: 1 1;
-                  text_class: "module_small";
-                  ellipsis: -1;
-              }
-          }
-          desc { "only"; hid;
-             max: 0 0;
-          }
-      }
-      spacer { "e.sizer";
-         desc {
-            rel1.to: "e.text";
-            rel2.to: "e.text.sub";
-            rel2.offset: 3 0;
-         }
-         desc { "only";
-            rel.to: "e.text";
-         }
-      }
-      rect { "eventarea"; mouse;
-         desc { color: 0 0 0 0; }
-      }
-      program { signal: "e,state,date,on"; source: "e";
-         action: STATE_SET "default";
-         targets: "e.text" "e.text.sub" "e.sizer";
-      }
-      program { signal: "e,state,date,off"; source: "e";
-         action: STATE_SET "only";
-         targets: "e.text" "e.text.sub" "e.sizer";
-      }
-      program { signal: "resize";
-        action: SIGNAL_EMIT "e,state,sizing,changed" "e";
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/wireless.edc 
b/data/elementary/themes/edc/wireless.edc
deleted file mode 100644
index d812e3e069..0000000000
--- a/data/elementary/themes/edc/wireless.edc
+++ /dev/null
@@ -1,613 +0,0 @@
-group { name: "e/gadget/wireless/ethernet"; nomouse;
-   images.image: "cloud-conn.png" COMP;
-   images.image: "eth-base.png" COMP;
-   images.image: "eth-top.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            new state = getarg(2);
-            if ((state <= 1)) {
-               set_state(PART:"eth-base", "default", 0.0);
-               set_state(PART:"eth", "default", 0.0);
-            }
-            else if ((state == 1)) {
-               set_state(PART:"eth-base", "default", 0.0);
-               set_state(PART:"eth", "default", 0.0);
-               run_program(PROGRAM:"connecting");
-               return;
-            }
-            if ((state == 2)) {
-               set_state(PART:"eth-base", "connected", 0.0);
-               set_state(PART:"eth", "connected", 0.0);
-            }
-            else if ((state == 3)) {
-               set_state(PART:"eth-base", "online", 0.0);
-               set_state(PART:"eth", "online", 0.0);
-            }
-            else {
-               set_state(PART:"eth-base", "default", 0.0);
-               set_state(PART:"eth", "default", 0.0);
-            }
-         }
-      }
-   }
-   parts {
-       part { name: "exclam_base";
-         clip_to: "clip_exclam";
-         description { state: "default" 0.0;
-            min: 11 10;
-            rel1.relative: (20/160) (50/160);
-            rel2.relative: (135/160) (150/160);
-            aspect: (115/105) (115/105); aspect_preference: BOTH;
-            image.normal: "cloud-conn.png";
-         }
-      }
-///////////////////////
-      part { name: "eth-base";
-         clip_to: "clip_eth";
-         description { state: "default" 0.0;
-            min: 6 13;
-            aspect: (60/130) (60/130); aspect_preference: BOTH;
-            rel1.relative: (50/160) (15/160);
-            rel2.relative: (110/160) (145/160);
-            image.normal: "eth-base.png";
-            color: 160 160 160 128;
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            color: 160 160 160 255;
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            color: 51 153 255 255;
-         }
-      }
-      part { name: "eth"; mouse_events: 0;
-         scale: 1;
-         clip_to: "clip_eth";
-         description { state: "default" 0.0;
-            rel1.to: "eth-base";
-            rel2.to: "eth-base";
-            image.normal: "eth-top.png";
-            color: 160 160 160 128;
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            color: 160 160 160 255;
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            color: 160 160 160 255;
-         }
-      }
-      part { name: "clip_exclam"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "eth" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_eth"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "eth" 0.0;
-            visible: 1;
-         }
-      }
-   }
-   
-   programs {
-      target_group: "eths" "eth-base" "eth";
-      program { name: "connecting";
-         action: STATE_SET "connected" 0.0;
-         groups: "eths";
-         in: 0.3 0.0;
-         after:  "connecting2";
-      }
-      program { name: "connecting2";
-         action: STATE_SET "default" 0.0;
-         groups: "eths";
-         in: 0.3 0.0;
-         after:  "connecting";
-      }
-      target_group: "clips" "clip_exclam" "clip_eth";
-      program {
-         signal: "e,state,error"; source: "e";
-         action: STATE_SET "default" 0.0;
-         groups: "clips";
-      }
-      program {
-         signal: "e,state,default"; source: "e";
-         action: STATE_SET "eth" 0.0;
-         groups: "clips";
-      }
-   }
-}
-
-group { name: "e/gadget/wireless/wifi"; nomouse;
-   images.image: "cloud-conn.png" COMP;
-   images.image: "wifi-1.png" COMP;
-   images.image: "wifi-2.png" COMP;
-   images.image: "wifi-3.png" COMP;
-   images.image: "wifi-4.png" COMP;
-   images.image: "wifi-5.png" COMP;
-
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            new state = getarg(2), signl = getarg(3);
-            if (state == 0 && signl == 0) {
-               set_state(PART:"clip_wifi", "default", 0.0);
-               set_state(PART:"clip_exclam", "default", 0.0);
-            }
-            else {
-               set_state(PART:"clip_wifi", "wifi", 0.0);
-               set_state(PART:"clip_exclam", "wifi", 0.0);
-            }
-            if (state == 1) {
-               set_state(PART:"wifi-base", "default", 0.0);
-               set_state(PART:"wifi", "default", 0.0);
-               run_program(PROGRAM:"connecting");
-               run_program(PROGRAM:"connecting_wifi");
-               return;
-            }
-            set_state(PART:"wifi", "default", float(signl) / 100.0);
-
-            if ((state == 2)) {
-               set_state(PART:"wifi-base", "connected", 0.0);
-            }
-            else if ((state == 3)) {
-               set_state(PART:"wifi-base", "online", 0.0);
-            }
-            else {
-               set_state(PART:"wifi-base", "default", 0.0);
-            }
-         }
-      }
-   }
-   parts {
-      part { name: "exclam_base";
-         clip_to: "clip_exclam";
-         description { state: "default" 0.0;
-            min: 11 10;
-            rel1.relative: (20/160) (50/160);
-            rel2.relative: (135/160) (150/160);
-            aspect: (115/105) (115/105); aspect_preference: BOTH;
-            image.normal: "cloud-conn.png";
-         }
-      }
-///////////////////////
-      part { name: "wifi-base";
-         clip_to: "clip_wifi";
-         description { state: "default" 0.0;
-            min: 14 10;
-            aspect: (140/100) (140/100); aspect_preference: BOTH;
-            rel1.relative: (10/160) (30/160);
-            rel2.relative: (150/160) (130/160);
-            image.normal: "wifi-1.png";
-            color: 160 160 160 255;
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            color: 160 160 160 255;
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            color: 51 153 255 255;
-         }
-      }
-      part { name: "wifi"; mouse_events: 0;
-         clip_to: "clip_wifi";
-         description { state: "default" 0.0;
-            rel1.to: "wifi-base";
-            rel2.to: "wifi-base";
-            image.normal: "wifi-1.png";
-            color: 0 0 0 0;
-         }
-         description { state: "default" 0.25;
-            inherit: "default" 0.0;
-            image.normal: "wifi-2.png";
-            color: 160 160 160 255;
-         }
-         description { state: "default" 0.5;
-            inherit: "default" 0.0;
-            image.normal: "wifi-3.png";
-            color: 160 160 160 255;
-         }
-         description { state: "default" 0.75;
-            inherit: "default" 0.0;
-            image.normal: "wifi-4.png";
-            color: 160 160 160 255;
-         }
-         description { state: "default" 1.0;
-            inherit: "default" 0.0;
-            image.normal: "wifi-5.png";
-            color: 160 160 160 255;
-         }
-      }
-      part { name: "clip_exclam"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "wifi" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_wifi"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "wifi" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "event"; type: RECT; mouse;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { "connecting_wifi";
-         sequence {
-            action: STATE_SET "default" 0.0;
-            target: "wifi";
-            transition: LINEAR 0.085;
-            action: STATE_SET "default" 0.25;
-            target: "wifi";
-            transition: LINEAR 0.085;
-            action: STATE_SET "default" 0.50;
-            target: "wifi";
-            transition: LINEAR 0.085;
-            action: STATE_SET "default" 0.75;
-            target: "wifi";
-            transition: LINEAR 0.085;
-            action: STATE_SET "default" 1.0;
-            target: "wifi";
-            transition: LINEAR 0.085;
-            after: "connecting_wifi";
-         }
-      }
-      program { "connecting";
-         action: STATE_SET "connected" 0.0;
-         target: "wifi-base";
-         in: 0.3 0.0;
-         sequence {
-             action: STATE_SET "default" 0.0;
-             target: "wifi-base";
-             in: 0.3 0.0;
-             after:  "connecting";
-         }
-      }
-   }
-}
-
-group { name: "e/gadget/wireless/bluetooth"; nomouse;
-   images.image: "cloud-conn.png" COMP;
-   images.image: "bt_base.png" COMP;
-   images.image: "bt_sig_1.png" COMP;
-   images.image: "bt_sig_2.png" COMP;
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            new signl = getarg(3);
-            if (signl <= 20) {
-               set_state(PART:"bt_1", "default", 0.0);
-               set_state(PART:"bt_2", "default", 0.0);
-            }
-            else if (signl <= 40) {
-               set_state(PART:"bt_1", "partly", 0.0);
-               set_state(PART:"bt_2", "default", 0.0);
-            }
-            else if (signl <= 60) {
-               set_state(PART:"bt_1", "visible", 0.0);
-               set_state(PART:"bt_2", "default", 0.0);
-            }
-            else if (signl <= 80) {
-               set_state(PART:"bt_1", "visible", 0.0);
-               set_state(PART:"bt_2", "partly", 0.0);
-            }
-            else {
-               set_state(PART:"bt_1", "visible", 0.0);
-               set_state(PART:"bt_2", "visible", 0.0);
-            }
-         }
-      }
-   }
-   parts {
-      ///////////////////////
-      part { name: "exclam_base";
-         clip_to: "clip_exclam";
-         description { state: "default" 0.0;
-            min: 11 10;
-            rel1.relative: (20/160) (50/160);
-            rel2.relative: (135/160) (150/160);
-            aspect: (115/105) (115/105); aspect_preference: BOTH;
-            image.normal: "cloud-conn.png";
-         }
-      }
-///////////////////////
-      part { name: "bt_base";
-         clip_to: "clip_bt";
-         description { state: "default" 0.0;
-            aspect: (160/144) (160/144); aspect_preference: BOTH;
-            image.normal: "bt_base.png";
-         }
-      }
-      part { name: "bt_1";
-         clip_to: "clip_bt";
-         description { state: "default" 0.0;
-            rel1.to: "bt_base";
-            rel2.to: "bt_base";
-            image.normal: "bt_sig_1.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "bt_2";
-         clip_to: "clip_bt";
-         description { state: "default" 0.0;
-            rel1.to: "bt_base";
-            rel2.to: "bt_base";
-            image.normal: "bt_sig_2.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-///////////////////////
-      part { name: "clip_exclam"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "bt" 0.0;
-            visible: 0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_bt"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "bt" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "event"; type: RECT; mouse;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "e,state,error"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "clip_exclam";
-         target: "clip_bt";
-      }
-      program {
-         signal: "e,state,default"; source: "e";
-         action: STATE_SET "bt" 0.0;
-         target: "clip_exclam";
-         target: "clip_bt";
-      }
-   }
-}
-
-group { name: "e/gadget/wireless/cellular";
-   images.image: "cloud-conn.png" COMP;
-   images.image: "cell_base.png" COMP;
-   images.image: "cell_sig_1.png" COMP;
-   images.image: "cell_sig_2.png" COMP;
-   images.image: "cell_sig_3.png" COMP;
-   images.image: "cell_sig_4.png" COMP;
-
-   script {
-      public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT_SET) && (id == 1)) {
-            new signl = getarg(3);
-            if (signl <= 11) {
-               set_state(PART:"cell_1", "default", 0.0);
-               set_state(PART:"cell_2", "default", 0.0);
-               set_state(PART:"cell_3", "default", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 22) {
-               set_state(PART:"cell_1", "partly", 0.0);
-               set_state(PART:"cell_2", "default", 0.0);
-               set_state(PART:"cell_3", "default", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 33) {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "default", 0.0);
-               set_state(PART:"cell_3", "default", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 44) {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "partly", 0.0);
-               set_state(PART:"cell_3", "default", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 55) {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "visible", 0.0);
-               set_state(PART:"cell_3", "default", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 66) {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "visible", 0.0);
-               set_state(PART:"cell_3", "partly", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 77) {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "visible", 0.0);
-               set_state(PART:"cell_3", "visible", 0.0);
-               set_state(PART:"cell_4", "default", 0.0);
-            }
-            else if (signl <= 88) {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "visible", 0.0);
-               set_state(PART:"cell_3", "visible", 0.0);
-               set_state(PART:"cell_4", "partly", 0.0);
-            }
-            else {
-               set_state(PART:"cell_1", "visible", 0.0);
-               set_state(PART:"cell_2", "visible", 0.0);
-               set_state(PART:"cell_3", "visible", 0.0);
-               set_state(PART:"cell_4", "visible", 0.0);
-            }
-         }
-      }
-   }
-   parts {
-///////////////////////
-      part { name: "exclam_base";
-         clip_to: "clip_exclam";
-         description { state: "default" 0.0;
-            min: 11 10;
-            rel1.relative: (20/160) (50/160);
-            rel2.relative: (135/160) (150/160);
-            aspect: (115/105) (115/105); aspect_preference: BOTH;
-            image.normal: "cloud-conn.png";
-         }
-      }
-///////////////////////
-      part { name: "cell_base"; mouse_events: 0;
-         clip_to: "clip_cell";
-         description { state: "default" 0.0;
-            aspect: (160/144) (160/144); aspect_preference: BOTH;
-            image.normal: "cell_base.png";
-         }
-      }
-      part { name: "cell_1"; mouse_events: 0;
-         clip_to: "clip_cell";
-         description { state: "default" 0.0;
-            rel1.to: "cell_base";
-            rel2.to: "cell_base";
-            image.normal: "cell_sig_1.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "cell_2"; mouse_events: 0;
-         clip_to: "clip_cell";
-         description { state: "default" 0.0;
-            rel1.to: "cell_base";
-            rel2.to: "cell_base";
-            image.normal: "cell_sig_2.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-                     color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "cell_3"; mouse_events: 0;
-         clip_to: "clip_cell";
-         description { state: "default" 0.0;
-            rel1.to: "cell_base";
-            rel2.to: "cell_base";
-            image.normal: "cell_sig_3.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "cell_4"; mouse_events: 0;
-         clip_to: "clip_cell";
-         description { state: "default" 0.0;
-            rel1.to: "cell_base";
-            rel2.to: "cell_base";
-            image.normal: "cell_sig_4.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-///////////////////////
-      part { name: "clip_exclam"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "cell" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_cell"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "cell" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "event"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "e,state,error"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "clip_exclam";
-         target: "clip_cell";
-      }
-      program {
-         signal: "e,state,default"; source: "e";
-         action: STATE_SET "cell" 0.0;
-         target: "clip_exclam";
-         target: "clip_cell";
-      }
-   }
-}
diff --git a/data/elementary/themes/edc/xkbswitch.edc 
b/data/elementary/themes/edc/xkbswitch.edc
index 19edf75ffd..f352dc3261 100644
--- a/data/elementary/themes/edc/xkbswitch.edc
+++ b/data/elementary/themes/edc/xkbswitch.edc
@@ -1,6 +1,4 @@
 group { name: "e/modules/xkbswitch/main";
-   alias: "e/gadget/xkbswitch/main";
-   alias: "e/gadget/xkbswitch/main_vert";
    alias: "e/modules/xkbswitch/main_vert";
    max: 128 128;
    parts {
@@ -68,8 +66,6 @@ group { name: "e/modules/xkbswitch/main";
 }
 
 group { name: "e/modules/xkbswitch/noflag";
-   alias: "e/gadget/xkbswitch/noflag";
-   alias: "e/gadget/xkbswitch/noflag_vert";
    max: 128 128;
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
diff --git a/data/elementary/themes/img/horiz_bar_inset.png 
b/data/elementary/themes/img/horiz_bar_inset.png
deleted file mode 100644
index aca19ecebc..0000000000
Binary files a/data/elementary/themes/img/horiz_bar_inset.png and /dev/null 
differ
diff --git a/data/elementary/themes/img/vert_bar_inset.png 
b/data/elementary/themes/img/vert_bar_inset.png
deleted file mode 100644
index 3da939f82d..0000000000
Binary files a/data/elementary/themes/img/vert_bar_inset.png and /dev/null 
differ

-- 


Reply via email to