diff --git a/data/themes/default_ibar.edc b/data/themes/default_ibar.edc
index 94915442c..e35bddddd 100644
--- a/data/themes/default_ibar.edc
+++ b/data/themes/default_ibar.edc
@@ -1,596 +1,10 @@
 images {
-   image: "e17_ibar_bg_h.png" COMP;
-   image: "e17_ibar_bg_v.png" COMP;
-   image: "e17_ibar_lamp_d.png" COMP;
-   image: "e17_ibar_lamp_l.png" COMP;
-   image: "e17_ibar_lamp_r.png" COMP;
-   image: "e17_ibar_lamp_u.png" COMP;
-   image: "e17_ibar_over_h.png" COMP;
-   image: "e17_ibar_over_v.png" COMP;
    image: "e17_ibar_arrow_d.png" COMP;
    image: "e17_ibar_arrow_l.png" COMP;
    image: "e17_ibar_arrow_r.png" COMP;
    image: "e17_ibar_arrow_u.png" COMP;
-   image: "e17_ibar_lamp_exec_d.png" COMP;
-   image: "e17_ibar_lamp_exec_l.png" COMP;
-   image: "e17_ibar_lamp_exec_r.png" COMP;
-   image: "e17_ibar_lamp_exec_u.png" COMP;
    image: "e17_pager_desk.png" COMP;
 }
-group {
-   name: "modules/ibar/main";
-   data {
-      //	 item: "item_list", "item item2 item3";
-   }
-   script {
-      public orient;
-   }
-   parts {
-      part {
-	 name:          "background";
-	 mouse_events:  1;
-	 description {
-	    state:    "default" 0.0;
-	    rel1 {
-	       to:       "overlay";
-	    }
-	    rel2 {
-	       to:       "overlay";
-	    }
-	    image {
-	       normal: "e17_ibar_bg_h.png";
-	       border: 6 6 6 6;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-	 description {
-	    state:    "vert" 0.0;
-	    inherit:  "default" 0.0;
-	    image {
-	       normal: "e17_ibar_bg_v.png";
-	    }
-	 }
-      }
-      part {
-	 name:          "items_clip";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    rel1 {
-	       to:       "background";
-	       offset:   4    4;
-	    }
-	    rel2 {
-	       to:       "background";
-	       offset:   -5    -5;
-	    }
-	    color: 255 255 255 255;
-	 }
-      }
-      part {
-	 name:          "items";
-	 type:          SWALLOW;
-	 mouse_events:  0;
-	 clip_to:       "items_clip";
-	 description {
-	    state:    "default" 0.0;
-	    rel1 {
-	       offset:   4    4;
-	    }
-	    rel2 {
-	       offset:   -5    -5;
-	    }
-	    color: 0 0 0 0;
-	 }
-	 description {
-	    state:    "top" 0.0;
-	    inherit:  "default" 0.0;
-	 }
-	 description {
-	    state:    "left" 0.0;
-	    inherit:  "default" 0.0;
-	 }
-	 description {
-	    state:    "right" 0.0;
-	    inherit:  "default" 0.0;
-	 }
-      }
-      part {
-	 name:          "overlay";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    image {
-	       normal: "e17_ibar_over_h.png";
-	       border: 13 13 13 13;
-	       middle: 0;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-	 description {
-	    state:    "top" 0.0;
-	    inherit:  "default" 0.0;
-	 }
-	 description {
-	    state:    "left" 0.0;
-	    inherit:  "default" 0.0;
-	 }
-	 description {
-	    state:    "right" 0.0;
-	    inherit:  "default" 0.0;
-	 }
-      }
-      part {
-	 name:          "inn";
-	 type:          RECT;
-	 repeat_events: 1;
-	 description {
-	    state:    "default" 0.0;
-	    color: 0 0 0 0;
-	 }
-      }
-   }
-   programs {
-      program {
-	 name:    "orient";
-	 signal:  "set_orientation";
-	 source:  "*";
-	 script {
-	    // sig, src
-	    if (!strcmp(src, "left")) {
-	       set_int(orient, 0);
-	       set_state(PART:"background", "vert", 0.0);
-	       set_state(PART:"overlay", "left", 0.0);
-	       set_state(PART:"items", "left", 0.0);
-	    }
-	    else if (!strcmp(src, "right")) {
-	       set_int(orient, 1);
-	       set_state(PART:"background", "vert", 0.0);
-	       set_state(PART:"overlay", "right", 0.0);
-	       set_state(PART:"items", "right", 0.0);
-	    }
-	    else if (!strcmp(src, "top")) {
-	       set_int(orient, 2);
-	       set_state(PART:"background", "default", 0.0);
-	       set_state(PART:"overlay", "top", 0.0);
-	       set_state(PART:"items", "top", 0.0);
-	    }
-	    else if (!strcmp(src, "bottom")) {
-	       set_int(orient, 3);
-	       set_state(PART:"background", "default", 0.0);
-	       set_state(PART:"overlay", "default", 0.0);
-	       set_state(PART:"items", "default", 0.0);
-	    }
-	 }
-      }
-   }
-}
-
-group {
-   name: "modules/ibar/follower";
-   min: 56 56;
-   data {
-      //	 item: "item_list", "item item2 item3";
-   }
-   script {
-      public orient;
-   }
-   parts {
-      part {
-	 name:          "top";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    rel1 {
-	       relative: 0.0  0.0;
-	       offset:   0   -14;
-	    }
-	    rel2 {
-	       relative: 1.0  0.0;
-	       offset:   -1   26;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_d.png";
-	    }
-	 }
-	 description {
-	    state:    "top" 0.0;
-	    rel1 {
-	       relative: 0.0  1.0;
-	       offset:   0   -26;
-	    }
-	    rel2 {
-	       relative: 1.0  1.0;
-	       offset:   -1   14;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_u.png";
-	    }
-	 }
-	 description {
-	    state:    "right" 0.0;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset:   -14 0;
-	    }
-	    rel2 {
-	       relative: 0.0 1.0;
-	       offset:   26 -1;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_r.png";
-	    }
-	 }
-	 description {
-	    state:    "left" 0.0;
-	    rel1 {
-	       relative: 1.0 0.0;
-	       offset:   -26  0;
-	    }
-	    rel2 {
-	       relative: 1.0 1.0;
-	       offset:   14  -1;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_l.png";
-	    }
-	 }
-      }
-      part {
-	 name:          "glow";
-	 mouse_events:  0;
-	 /***/
-	 description {
-	    state:    "default" 0.0;
-	    visible:  0;
-	    align:    0.5 1.0;
-	    min:      115 64;
-	    rel1 {
-	       to: "top";
-	       relative: 0.0 1.0;
-	       offset:   0   -6;
-	    }
-	    rel2 {
-	       to: "top";
-	       relative: 1.0  1.0;
-	       offset:   -1   -6;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_exec_d.png";
-	    }
-	 }
-	 description {
-	    state:    "default2" 0.0;
-	    inherit:  "default" 0.0;
-	    visible:  1;
-	    color:    255 255 255 255;
-	 }
-	 description {
-	    state:    "default3" 0.0;
-	    inherit:  "default" 0.0;
-	    visible:  1;
-	    min:      230 128;
-	    color:    255 255 255 0;
-	 }
-	 /***/
-	 description {
-	    state:    "top" 0.0;
-	    visible:  0;
-	    align:    0.5 0.0;
-	    min:      115 64;
-	    rel1 {
-	       to: "top";
-	       relative: 0.0 0.0;
-	       offset:   0   5;
-	    }
-	    rel2 {
-	       to: "top";
-	       relative: 1.0  0.0;
-	       offset:   -1   5;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_exec_u.png";
-	    }
-	 }
-	 description {
-	    state:    "top2" 0.0;
-	    inherit:  "top" 0.0;
-	    visible:  1;
-	    color:    255 255 255 255;
-	 }
-	 description {
-	    state:    "top3" 0.0;
-	    inherit:  "top" 0.0;
-	    visible:  1;
-	    min:      230 128;
-	    color:    255 255 255 0;
-	 }
-	 /***/
-	 description {
-	    state:    "left" 0.0;
-	    visible:  0;
-	    align:    0.0 0.5;
-	    min:      64 115;
-	    rel1 {
-	       to: "top";
-	       relative: 0.0 0.0;
-	       offset:   5   0;
-	    }
-	    rel2 {
-	       to: "top";
-	       relative: 0.0  1.0;
-	       offset:   5   -1;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_exec_l.png";
-	    }
-	 }
-	 description {
-	    state:    "left2" 0.0;
-	    inherit:  "left" 0.0;
-	    visible:  1;
-	    color:    255 255 255 255;
-	 }
-	 description {
-	    state:    "left3" 0.0;
-	    inherit:  "left" 0.0;
-	    visible:  1;
-	    min:      128 230;
-	    color:    255 255 255 0;
-	 }
-	 /***/
-	 description {
-	    state:    "right" 0.0;
-	    visible:  0;
-	    align:    1.0 0.5;
-	    min:      64 115;
-	    rel1 {
-	       to: "top";
-	       relative: 1.0 0.0;
-	       offset:   -6  0;
-	    }
-	    rel2 {
-	       to: "top";
-	       relative: 1.0  1.0;
-	       offset:   -5   -1;
-	    }
-	    image {
-	       normal: "e17_ibar_lamp_exec_r.png";
-	    }
-	 }
-	 description {
-	    state:    "right2" 0.0;
-	    inherit:  "right" 0.0;
-	    visible:  1;
-	    color:    255 255 255 255;
-	 }
-	 description {
-	    state:    "right3" 0.0;
-	    inherit:  "right" 0.0;
-	    visible:  1;
-	    min:      128 230;
-	    color:    255 255 255 0;
-	 }
-      }
-
-/* generic signal handler s for exec feedback */      
-      program {
-	 name:    "exec_start";
-	 signal:  "start";
-	 source:  "";
-	 script {
-	    new ori = get_int(orient);
-	    if      (ori == 0) run_program(PROGRAM:"ord_exec_start");
-	    else if (ori == 1) run_program(PROGRAM:"oru_exec_start");
-	    else if (ori == 2) run_program(PROGRAM:"orr_exec_start");
-	    else if (ori == 3) run_program(PROGRAM:"orl_exec_start");
-	 }
-      }
-      program {
-	 name:    "exec_exec";
-	 signal:  "exec";
-	 source:  "";
-	 script {
-	    new ori = get_int(orient);
-	    if      (ori == 0) run_program(PROGRAM:"ord_exec_exec");
-	    else if (ori == 1) run_program(PROGRAM:"oru_exec_exec");
-	    else if (ori == 2) run_program(PROGRAM:"orr_exec_exec");
-	    else if (ori == 3) run_program(PROGRAM:"orl_exec_exec");
-	 }
-      }
-      program {
-	 name:    "exec_stop";
-	 signal:  "stop";
-	 source:  "";
-	 script {
-	    new ori = get_int(orient);
-	    stop_programs_on(PART:"glow");
-	    if      (ori == 0) set_state(PART:"glow", "default", 0.0);
-	    else if (ori == 1) set_state(PART:"glow", "top", 0.0);
-	    else if (ori == 2) set_state(PART:"glow", "right", 0.0);
-	    else if (ori == 3) set_state(PART:"glow", "left", 0.0);
-	 }
-      }
-/* bottom progs */      
-      program {
-	 name:    "ord_exec_start";
-	 action:  STATE_SET "default2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "ord_exec_start2";
-      }
-      program {
-	 name:    "ord_exec_start2";
-	 action:  STATE_SET "default3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "ord_exec_start3";
-      }
-      program {
-	 name:    "ord_exec_start3";
-	 action:  STATE_SET "default" 0.0;
-	 target:  "glow";
-	 after:   "ord_exec_start";
-      }
-      
-      program {
-	 name:    "ord_exec_exec";
-	 action:  STATE_SET "default2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "ord_exec_exec2";
-      }
-      program {
-	 name:    "ord_exec_exec2";
-	 action:  STATE_SET "default3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "exec_stop";
-      }
-
-      program {
-	 name:    "oru_exec_start";
-	 action:  STATE_SET "top2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "oru_exec_start2";
-      }
-      program {
-	 name:    "oru_exec_start2";
-	 action:  STATE_SET "top3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "oru_exec_start3";
-      }
-      program {
-	 name:    "oru_exec_start3";
-	 action:  STATE_SET "top" 0.0;
-	 target:  "glow";
-	 after:   "oru_exec_start";
-      }
-      
-      program {
-	 name:    "oru_exec_exec";
-	 action:  STATE_SET "top2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "oru_exec_exec2";
-      }
-      program {
-	 name:    "oru_exec_exec2";
-	 action:  STATE_SET "top3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "exec_stop";
-      }
-      
-      program {
-	 name:    "orr_exec_start";
-	 action:  STATE_SET "right2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "orr_exec_start2";
-      }
-      program {
-	 name:    "orr_exec_start2";
-	 action:  STATE_SET "right3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "orr_exec_start3";
-      }
-      program {
-	 name:    "orr_exec_start3";
-	 action:  STATE_SET "right" 0.0;
-	 target:  "glow";
-	 after:   "orr_exec_start";
-      }
-      
-      program {
-	 name:    "orr_exec_exec";
-	 action:  STATE_SET "right2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "orr_exec_exec2";
-      }
-      program {
-	 name:    "orr_exec_exec2";
-	 action:  STATE_SET "right3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "exec_stop";
-      }
-      
-      program {
-	 name:    "orl_exec_start";
-	 action:  STATE_SET "left2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "orl_exec_start2";
-      }
-      program {
-	 name:    "orl_exec_start2";
-	 action:  STATE_SET "left3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "orl_exec_start3";
-      }
-      program {
-	 name:    "orl_exec_start3";
-	 action:  STATE_SET "left" 0.0;
-	 target:  "glow";
-	 after:   "orl_exec_start";
-      }
-      
-      program {
-	 name:    "orl_exec_exec";
-	 action:  STATE_SET "left2" 0.0;
-         transition: DECELERATE 0.1;
-	 target:  "glow";
-	 after:   "orl_exec_exec2";
-      }
-      program {
-	 name:    "orl_exec_exec2";
-	 action:  STATE_SET "left3" 0.0;
-         transition: ACCELERATE 1.0;
-	 target:  "glow";
-	 after:   "exec_stop";
-      }
-      
-      program {
-	 name:    "orient";
-	 signal:  "set_orientation";
-	 source:  "*";
-	 script {
-	    // sig, src
-	    if (!strcmp(src, "left")) {
-	       set_int(orient, 3);
-	       set_state(PART:"top", "left", 0.0);
-	       set_state(PART:"glow", "left", 0.0);
-	    }
-	    else if (!strcmp(src, "right")) {
-	       set_int(orient, 2);
-	       set_state(PART:"top", "right", 0.0);
-	       set_state(PART:"glow", "right", 0.0);
-	    }
-	    else if (!strcmp(src, "top")) {
-	       set_int(orient, 1);
-	       set_state(PART:"top", "top", 0.0);
-	       set_state(PART:"glow", "top", 0.0);
-	    }
-	    else if (!strcmp(src, "bottom")) {
-	       set_int(orient, 0);
-	       set_state(PART:"top", "default", 0.0);
-	       set_state(PART:"glow", "default", 0.0);
-	    }
-	 }
-      }
-   }
-}
 
 group {
    name: "modules/ibar/icon";
diff --git a/data/themes/default_pager.edc b/data/themes/default_pager.edc
index aa6170830..5365d829a 100644
--- a/data/themes/default_pager.edc
+++ b/data/themes/default_pager.edc
@@ -232,159 +232,6 @@ group {
    }
 }
 
-group {
-   name: "modules/pager/main";
-//   data {
-//      item: "shaped" "1";
-//   }
-   parts {
-      part {
-	 name:          "background";
-	 mouse_events:  1;
-	 description {
-	    state:    "default" 0.0;
-	    rel1 {
-	       to:       "overlay";
-	    }
-	    rel2 {
-	       to:       "overlay";
-	    }
-	    image {
-	       normal: "e17_ibar_bg_h.png";
-	       border: 6 6 6 6;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-      }
-
-      part {
-	 name: "desktop_name";
-	 type: TEXT;
-	 effect: SOFT_SHADOW;
-	 description {
-	    state: "default" 0.0;
-	    visible: 0;
-	    color: 0 0 0 180;
-	    color3: 0 0 0 15;
-	    text {
-	       text: "Desktop Name";
-	       font: "Edje-Vera";
-	       size: 8;
-	       min: 1 1;
-	       align: 0.5 0.5;
-               text_class: "pager_desktop_name";	       
-	    }
-	 }
-	 description {
-	    state: "name_top" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 1;
-	    rel1 {
-	       to_x: "items";
-	       to_y: "background";
-	       relative: 0 0;
-	       offset: 0 8;
-	    }
-	    rel2 {
-	       to: "items";
-	       relative: 1 0;
-	       offset: -1 -1;
-	    }
-	 }
-	 description {
-	    state: "name_bottom" 0.0;
-	    inherit: "default" 0.0;
-	    visible: 1;
-	    rel1 {
-	       to: "items";
-	       relative: 0 1;
-	       offset: 0 2;
-	    }
-	    rel2 {
-	       to_x: "items";
-	       to_y: "background";
-	       offset: -1 -4;
-	    }
-	 }
-      }
-      
-      
-      part {
-	 name:          "items";
-	 mouse_events:  0;
-	 type:          SWALLOW;
-         description {
-	    state:    "default" 0.0;
-	    rel1 {
-	       offset:   5    5;
-	    }
-	    rel2 {
-	       offset:   -6    -6;
-	    }
-	    color: 0 0 0 0;
-	 }
-	 description {
-	    state:    "name_top" 0.0;
-	    inherit:    "default" 0.0;
-	    rel1.offset:   5   18;
-	 }
-	 description {
-	    state:    "name_bottom" 0.0;
-	    inherit:    "default" 0.0;
-	    rel2.offset:   -6  -19;
-	 }
-      }
-      part {
-	 name:          "overlay";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    image {
-	       normal: "e17_ibar_over_h.png";
-	       border: 13 13 13 13;
-	       middle: 0;
-	    }
-	    fill {
-	       smooth: 0;
-	    }
-	 }
-      }
-   }
-
-   programs {
-      program {
-        name: "name_top";
-        signal: "desktop_name,top";
-        source: "*";
-        action: STATE_SET "name_top" 0.0;
-        target: "items";
-        target: "desktop_name";
-        transition: DECELERATE 0.25;
-      }   
-      program {
-        name: "name_bottom";
-        signal: "desktop_name,bottom";
-        source: "*";
-        action: STATE_SET "name_bottom" 0.0;
-        target: "items";
-        target: "desktop_name";
-        transition: DECELERATE 0.25;
-      }   
-      program {
-        name: "name_none";
-        signal: "desktop_name,none";
-        source: "*";
-        action: STATE_SET "default" 0.0;
-        target: "items";
-        target: "desktop_name";
-        transition: DECELERATE 0.25;
-      }
-   }
-   
-}
-
 group {
    name: "modules/pager/desk";
    script {
@@ -438,8 +285,8 @@ group {
       }
       part {
 	 name:          "overlay";
-	 repeat_events: 1;
-//	 mouse_events:  0;
+//	 repeat_events: 1;
+	 mouse_events:  1;
 	 description {
 	    state:    "default" 0.0;
 	    rel1 {