diff --git a/data/elementary/themes/edc/backlight.edc b/data/elementary/themes/edc/backlight.edc
index 9313602a48..a9b0626e50 100644
--- a/data/elementary/themes/edc/backlight.edc
+++ b/data/elementary/themes/edc/backlight.edc
@@ -1,5 +1,6 @@
 group { name: "e/modules/backlight/main";
-   alias: "e/modules/backlight/main_vert";
+   alias: "e/gadget/backlight/main";
+   alias: "e/gadget/backlight/main_vert";
    images.image: "bulb_glow.png" COMP;
    images.image: "bulb_off.png" COMP;
    images.image: "bulb_on.png" COMP;
diff --git a/data/elementary/themes/edc/batman.edc b/data/elementary/themes/edc/batman.edc
index 89f5962a0a..c4cdf793c1 100644
--- a/data/elementary/themes/edc/batman.edc
+++ b/data/elementary/themes/edc/batman.edc
@@ -1,5 +1,5 @@
-group { name: "e/modules/batman/main";
-   alias: "e/modules/batman/main_vert";
+group { name: "e/gadget/batman/main";
+   alias: "e/gadget/batman/main_vert";
    images.image: "bat_shadow.png" COMP;
    images.image: "bat_base.png" COMP;
    images.image: "bat_shine.png" COMP;
@@ -242,7 +242,7 @@ group { name: "e/modules/batman/main";
    }
 }
 
-group { name: "e/modules/batman/popup";
+group { name: "e/gadget/batman/popup";
    min: 240 60;
    parts {
       part { name: "e.swallow.batman"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc
index f6e06eae11..c8a581ac54 100644
--- a/data/elementary/themes/edc/cpufreq.edc
+++ b/data/elementary/themes/edc/cpufreq.edc
@@ -1,6 +1,6 @@
 group { name: "e/modules/cpufreq/main";
-   alias: "e/modules/cpuclock/main";
-   alias: "e/modules/cpuclock/main_vert";
+   alias: "e/gadget/cpuclock/main";
+   alias: "e/gadget/cpuclock/main_vert";
    images.image: "tacho_base.png" COMP;
    images.image: "inset_round_hilight.png" COMP;
    images.image: "inset_round_shadow.png" COMP;
diff --git a/data/elementary/themes/edc/cpumonitor.edc b/data/elementary/themes/edc/cpumonitor.edc
index e1eae961db..2ee4b1989b 100644
--- a/data/elementary/themes/edc/cpumonitor.edc
+++ b/data/elementary/themes/edc/cpumonitor.edc
@@ -1,4 +1,4 @@
-group { name: "e/modules/cpumonitor/main";
+group { name: "e/gadget/cpumonitor/main";
    image: "cpu_bar.png" COMP;
    image: "cpu_green_on.png" COMP;
    image: "cpu_yellow_on.png" COMP;
@@ -87,7 +87,7 @@ group { name: "e/modules/cpumonitor/main";
    }
 }
 
-group { name: "e/modules/cpumonitor/main_vert";
+group { name: "e/gadget/cpumonitor/main_vert";
    image: "cpu_bar_vert.png" COMP;
    image: "cpu_green_on_vert.png" COMP;
    image: "cpu_yellow_on_vert.png" COMP;
diff --git a/data/elementary/themes/edc/memusage.edc b/data/elementary/themes/edc/memusage.edc
index 5e4bcb6c2f..660df56672 100644
--- a/data/elementary/themes/edc/memusage.edc
+++ b/data/elementary/themes/edc/memusage.edc
@@ -1,4 +1,4 @@
-group { name: "e/modules/memusage/main";
+group { name: "e/gadget/memusage/main";
    image: "mem_bar.png" COMP;
    image: "mem_on.png" COMP;
    script {
@@ -111,7 +111,7 @@ group { name: "e/modules/memusage/main";
    }
 }
 
-group { name: "e/modules/memusage/main_vert";
+group { name: "e/gadget/memusage/main_vert";
    image: "mem_bar_vert.png" COMP;
    image: "mem_on_vert.png" COMP;
    script {
diff --git a/data/elementary/themes/edc/mixer.edc b/data/elementary/themes/edc/mixer.edc
index 802b1b8b3c..1dff799992 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -1,5 +1,6 @@
 group { name: "e/modules/mixer/main";
-   alias: "e/modules/mixer/main_vert";
+   alias: "e/gadget/mixer/main";
+   alias: "e/gadget/mixer/main_vert";
    images.image: "speaker.png" COMP;
    images.image: "inset_round_hilight.png" COMP;
    images.image: "inset_round_shadow.png" COMP;
diff --git a/data/elementary/themes/edc/netstatus.edc b/data/elementary/themes/edc/netstatus.edc
index b957c85883..88d8040bc7 100644
--- a/data/elementary/themes/edc/netstatus.edc
+++ b/data/elementary/themes/edc/netstatus.edc
@@ -1,5 +1,5 @@
-group { name: "e/modules/netstatus/main";
-   alias: "e/modules/netstatus/main_vert";
+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;
diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc
index 0ce7aedfa9..2af31833b6 100644
--- a/data/elementary/themes/edc/pager16.edc
+++ b/data/elementary/themes/edc/pager16.edc
@@ -1,4 +1,5 @@
 group { name: "e/modules/pager16/popup";
+   alias: "e/gadget/pager16/popup";
    images.image: "vgrad_tall.png" COMP;
    images.image: "bevel_out.png" COMP;
    images.image: "shine.png" COMP;
@@ -60,6 +61,7 @@ group { name: "e/modules/pager16/popup";
 }
 
 group { name: "e/modules/pager16/desk";
+   alias: "e/gadget/pager16/desk";
    images.image: "vgrad_med_darker.png" COMP;
    images.image: "bevel_out.png" COMP;
    images.image: "bevel_in.png" COMP;
diff --git a/data/elementary/themes/edc/temperature.edc b/data/elementary/themes/edc/temperature.edc
index 99536658fa..d21f3a7a97 100644
--- a/data/elementary/themes/edc/temperature.edc
+++ b/data/elementary/themes/edc/temperature.edc
@@ -1,6 +1,6 @@
 group { name: "e/modules/temperature/main";
-   alias: "e/modules/thermal/main";
-   alias: "e/modules/thermal/main_vert";
+   alias: "e/gadget/thermal/main";
+   alias: "e/gadget/thermal/main_vert";
    images.image: "therm_content.png" COMP;
    images.image: "therm_shadow.png" COMP;
    images.image: "therm_shine.png" COMP;
diff --git a/data/elementary/themes/edc/xkbswitch.edc b/data/elementary/themes/edc/xkbswitch.edc
index b6a58b8fb2..1bbfbc9641 100644
--- a/data/elementary/themes/edc/xkbswitch.edc
+++ b/data/elementary/themes/edc/xkbswitch.edc
@@ -1,5 +1,6 @@
 group { name: "e/modules/xkbswitch/main";
-   alias: "e/modules/xkbswitch/main_vert";
+   alias: "e/gadget/xkbswitch/main";
+   alias: "e/gadget/xkbswitch/main_vert";
    images.image: "shadow_square_tiny.png" COMP;
    images.image: "bevel_out.png" COMP;
    images.image: "shine.png" COMP;
@@ -92,7 +93,8 @@ group { name: "e/modules/xkbswitch/main";
 }
 
 group { name: "e/modules/xkbswitch/noflag";
-   alias: "e/modules/xkbswitch/noflag_vert";
+   alias: "e/gadget/xkbswitch/noflag";
+   alias: "e/gadget/xkbswitch/noflag_vert";
    images.image: "shadow_square_tiny.png" COMP;
    images.image: "bevel_out.png" COMP;
    images.image: "shine.png" COMP;