Elementary theme format. Using the same technique as listed in the top of the E17...
authortoma <toma>
Mon, 19 Apr 2010 01:56:41 +0000 (01:56 +0000)
committertoma <toma@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 19 Apr 2010 01:56:41 +0000 (01:56 +0000)
SVN revision: 48115

data/themes/default.edc

index 8b34593..273f3ef 100644 (file)
 collections {
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/bg/base/default";
+   group {
+      name: "elm/bg/base/default";
       images {
          image: "dia_grad.png" COMP;
-        image: "dia_topshad.png" COMP;
-        image: "dia_botshad.png" COMP;
+         image: "dia_topshad.png" COMP;
+         image: "dia_botshad.png" COMP;
       }
       parts {
-         part { name: "base";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "dia_grad.png";
-              fill {
-                 smooth: 0;
-                 size {
-                    relative: 0.0 1.0;
-                    offset: 64 0;
-                 }
-              }
-           }
-        }
-        part { name: "elm.swallow.background";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-           }
-        }
-        part { name: "shadow";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              rel2.relative: 1.0 0.0;
-              rel2.offset: -1 31;
-              image.normal: "dia_topshad.png";
-              fill {
-                 smooth: 0;
-                 size {
-                    relative: 0.0 1.0;
-                    offset: 64 0;
-                 }
-              }
-           }
-        }
-        part { name: "shadow2";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              rel1.relative: 0.0 1.0;
-              rel1.offset: 0 -4;
-              image.normal: "dia_botshad.png";
-              fill {
-                 smooth: 0;
-                 size {
-                    relative: 0.0 1.0;
-                    offset: 64 0;
-                 }
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.offset:  4 4;
-              rel2.offset: -5 -5;
-           }
-        }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "dia_grad.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.background";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "shadow";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2.relative: 1.0 0.0;
+               rel2.offset: -1 31;
+               image.normal: "dia_topshad.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
+               }
+            }
+         }
+         part {
+            name: "shadow2";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 -4;
+               image.normal: "dia_botshad.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/scroller/base/default";
-
+   group {
+      name: "elm/scroller/base/default";
       alias: "elm/list/base/default";
       alias: "elm/genlist/base/default";
       alias: "elm/carousel/base/default";
       alias: "elm/grid/base/default";
 
       script {
-        public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
-        public timer0(val) {
-           new v;
-           v = get_int(sbvis_v);
-           if (v) {
+         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
+         public timer0(val) {
+            new v;
+            v = get_int(sbvis_v);
+            if (v) {
                v = get_int(sbalways_v);
                if (!v) {
                   emit("do-hide-vbar", "");
                   set_int(sbvis_v, 0);
                }
-           }
-           v = get_int(sbvis_h);
-           if (v) {
+            }
+            v = get_int(sbvis_h);
+            if (v) {
                v = get_int(sbalways_h);
                if (!v) {
                   emit("do-hide-hbar", "");
                   set_int(sbvis_h, 0);
                }
-           }
-           set_int(sbvis_timer, 0);
-           return 0;
-        }
+            }
+            set_int(sbvis_timer, 0);
+            return 0;
+         }
       }
       images {
-        image: "shelf_inset.png" COMP;
-        image: "bt_sm_base2.png" COMP;
-        image: "bt_sm_shine.png" COMP;
-        image: "bt_sm_hilight.png" COMP;
-        image: "sb_runnerh.png" COMP;
-        image: "sb_runnerv.png" COMP;
+         image: "shelf_inset.png" COMP;
+         image: "bt_sm_base2.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "sb_runnerh.png" COMP;
+         image: "sb_runnerv.png" COMP;
       }
       parts {
-         part { name: "bg";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel1.offset: 1 1;
-              rel2.offset: -2 -2;
-              color: 255 255 255 0;
-           }
-        }
-        part { name: "clipper";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "bg";
-              rel2.to: "bg";
-           }
-        }
-        part { name: "elm.swallow.content";
-           clip_to: "clipper";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.offset: 1 1;
-              rel2.offset: -2 -2;
-           }
-        }
-        part { name: "conf_over";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              rel1.offset: 0 0;
-              rel2.offset: -1 -1;
-              image {
-                 normal: "shelf_inset.png";
-                 border: 7 7 7 7;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-        }
-        part { name: "sb_vbar_clip_master";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-           }
-           description { state: "hidden" 0.0;
-              visible: 0;
-              color: 255 255 255 0;
-           }
-        }
-        part { name: "sb_vbar_clip";
-            clip_to: "sb_vbar_clip_master";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-           }
-           description { state: "hidden" 0.0;
-              visible: 0;
-              color: 255 255 255 0;
-           }
-        }
-        part { name: "sb_vbar";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              visible: 0;
-              min: 17 17;
-              align: 1.0 0.0;
-              rel1 {
-                 relative: 1.0 0.0;
-                 offset:   -2 0;
-              }
-              rel2 {
-                 relative: 1.0 0.0;
-                 offset:   -2 -1;
-                 to_y:     "sb_hbar";
-              }
-           }
-        }
-        part { name: "sb_vbar_runner";
-           clip_to: "sb_vbar_clip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              min: 3 3;
-              max: 3 99999;
-              rel1.to:       "sb_vbar";
-              rel2.to:       "sb_vbar";
-              image {
-                 normal: "sb_runnerv.png";
-                 border: 0 0 4 4;
-              }
-              fill.smooth: 0;
-           }
-        }
-        part { name: "elm.dragable.vbar";
-           clip_to: "sb_vbar_clip";
-           mouse_events: 0;
-           dragable {
-              x: 0 0 0;
-              y: 1 1 0;
-              confine: "sb_vbar";
-           }
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              min: 17 17;
-              rel1 {
-                 relative: 0.5  0.5;
-                 offset:   0    0;
-                 to: "sb_vbar";
-              }
-              rel2 {
-                 relative: 0.5  0.5;
-                 offset:   0    0;
-                 to: "sb_vbar";
-              }
-              image {
-                 normal: "bt_sm_base2.png";
-                 border: 6 6 6 6;
-              }
-               image.middle: SOLID;
-           }
-        }
-        part { name: "sb_vbar_over1";
-           clip_to: "sb_vbar_clip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "elm.dragable.vbar";
-              rel2.relative: 1.0 0.5;
-              rel2.to: "elm.dragable.vbar";
-              image {
-                 normal: "bt_sm_hilight.png";
-                 border: 6 6 6 0;
-              }
-           }
-        }
-        part { name: "sb_vbar_over2";
-           clip_to: "sb_vbar_clip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "elm.dragable.vbar";
-              rel2.to: "elm.dragable.vbar";
-              image {
-                 normal: "bt_sm_shine.png";
-                 border: 6 6 6 0;
-              }
-           }
-        }
-
-        part { name: "sb_hbar_clip_master";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-           }
-           description { state: "hidden" 0.0;
-              visible: 0;
-              color: 255 255 255 0;
-           }
-        }
-        part { name: "sb_hbar_clip";
-            clip_to: "sb_hbar_clip_master";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-           }
-           description { state: "hidden" 0.0;
-              visible: 0;
-              color: 255 255 255 0;
-           }
-        }
-        part { name: "sb_hbar";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              visible: 0;
-              min: 17 17;
-              align: 0.0 1.0;
-              rel1 {
-                 relative: 0.0 1.0;
-                 offset:   0 -2;
-              }
-              rel2 {
-                 relative: 0.0 1.0;
-                 offset:   -1 -2;
-                 to_x:     "sb_vbar";
-              }
-           }
-        }
-        part { name: "sb_hbar_runner";
-           clip_to: "sb_hbar_clip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              min: 3 3;
-              max: 99999 3;
-              rel1.to:       "sb_hbar";
-              rel2.to:       "sb_hbar";
-              image {
-                 normal: "sb_runnerh.png";
-                 border: 4 4 0 0;
-              }
-              fill.smooth: 0;
-           }
-        }
-        part { name: "elm.dragable.hbar";
-           clip_to: "sb_hbar_clip";
-           mouse_events: 0;
-           dragable {
-              x: 1 1 0;
-              y: 0 0 0;
-              confine: "sb_hbar";
-           }
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              min: 17 17;
-              rel1 {
-                 relative: 0.5  0.5;
-                 offset:   0    0;
-                 to: "sb_hbar";
-              }
-              rel2 {
-                 relative: 0.5  0.5;
-                 offset:   0    0;
-                 to: "sb_hbar";
-              }
-              image {
-                 normal: "bt_sm_base2.png";
-                 border: 6 6 6 6;
-              }
-               image.middle: SOLID;
-           }
-        }
-        part { name: "sb_hbar_over1";
-           clip_to: "sb_hbar_clip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "elm.dragable.hbar";
-              rel2.relative: 1.0 0.5;
-              rel2.to: "elm.dragable.hbar";
-              image {
-                 normal: "bt_sm_hilight.png";
-                 border: 6 6 6 0;
-              }
-           }
-        }
-        part { name: "sb_hbar_over2";
-           clip_to: "sb_hbar_clip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "elm.dragable.hbar";
-              rel2.to: "elm.dragable.hbar";
-              image {
-                 normal: "bt_sm_shine.png";
-                 border: 6 6 6 0;
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "load";
-           signal: "load";
-           source: "";
-           script {
-              set_state(PART:"sb_hbar_clip", "hidden", 0.0);
-              set_state(PART:"sb_vbar_clip", "hidden", 0.0);
-              set_int(sbvis_h, 0);
-              set_int(sbvis_v, 0);
-              set_int(sbalways_v, 0);
-              set_int(sbalways_h, 0);
-              set_int(sbvis_timer, 0);
-           }
-        }
-
-        program { name: "vbar_show";
-           signal: "elm,action,show,vbar";
-           source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "sb_vbar_clip_master";
-        }
-        program { name: "vbar_hide";
-           signal: "elm,action,hide,vbar";
-           source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "sb_vbar_clip_master";
-        }
-        program { name: "vbar_show_always";
-           signal: "elm,action,show_always,vbar";
-           source: "elm";
-            script {
-               new v;
-               v = get_int(sbvis_v);
-               v |= get_int(sbalways_v);
-               if (!v) {
-                  set_int(sbalways_v, 1);
-                  emit("do-show-vbar", "");
-                  set_int(sbvis_v, 1);
-               }
+         part {
+            name: "bg";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color: 255 255 255 0;
             }
-        }
-        program { name: "vbar_show_notalways";
-           signal: "elm,action,show_notalways,vbar";
-           source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_v);
-               if (v) {
-                  set_int(sbalways_v, 0);
-                  v = get_int(sbvis_v);
-                  if (!v) {
-                     emit("do-hide-vbar", "");
-                     set_int(sbvis_v, 0);
-                  }
-               }
+         }
+         part {
+            name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
             }
-        }
-        program { name: "sb_vbar_show";
-           signal: "do-show-vbar";
-           source: "";
-           action:  STATE_SET "default" 0.0;
-           transition: LINEAR 1.0;
-           target: "sb_vbar_clip";
-        }
-        program { name: "sb_vbar_hide";
-           signal: "do-hide-vbar";
-           source: "";
-           action:  STATE_SET "hidden" 0.0;
-           transition: LINEAR 1.0;
-           target: "sb_vbar_clip";
-        }
-
-        program { name: "hbar_show";
-           signal: "elm,action,show,hbar";
-           source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "sb_hbar_clip_master";
-        }
-        program { name: "hbar_hide";
-           signal: "elm,action,hide,hbar";
-           source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "sb_hbar_clip_master";
-        }
-        program { name: "hbar_show_always";
-           signal: "elm,action,show_always,hbar";
-           source: "elm";
-            script {
-               new v;
-               v = get_int(sbvis_h);
-               v |= get_int(sbalways_h);
-               if (!v) {
-                  set_int(sbalways_h, 1);
-                  emit("do-show-hbar", "");
-                  set_int(sbvis_h, 1);
+         }
+         part {
+            name: "elm.swallow.content";
+            clip_to: "clipper";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+            }
+         }
+         part {
+            name: "conf_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 0 0;
+               rel2.offset: -1 -1;
+               image {
+                  normal: "shelf_inset.png";
+                  border: 7 7 7 7;
+                  middle: 0;
                }
+               fill.smooth : 0;
             }
-        }
-        program { name: "hbar_show_notalways";
-           signal: "elm,action,show_notalways,hbar";
-           source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_h);
-               if (v) {
-                  set_int(sbalways_h, 0);
-                  v = get_int(sbvis_h);
-                  if (!v) {
-                     emit("do-hide-hbar", "");
-                     set_int(sbvis_h, 0);
-                  }
-               }
-            }
-        }
-        program { name: "sb_hbar_show";
-           signal: "do-show-hbar";
-           source: "";
-           action:  STATE_SET "default" 0.0;
-           transition: LINEAR 1.0;
-           target: "sb_hbar_clip";
-        }
-        program { name: "sb_hbar_hide";
-           signal: "do-hide-hbar";
-           source: "";
-           action:  STATE_SET "hidden" 0.0;
-           transition: LINEAR 1.0;
-           target: "sb_hbar_clip";
-        }
-
-        program { name: "scroll";
-           signal: "elm,action,scroll";
-           source: "elm";
-           script {
-              new v;
-              v = get_int(sbvis_v);
-               v |= get_int(sbalways_v);
-              if (!v) {
-                  emit("do-show-vbar", "");
-                  set_int(sbvis_v, 1);
-              }
-              v = get_int(sbvis_h);
-               v |= get_int(sbalways_h);
-              if (!v) {
-                  emit("do-show-hbar", "");
-                  set_int(sbvis_h, 1);
-              }
-              v = get_int(sbvis_timer);
-              if (v > 0) cancel_timer(v);
-              v = timer(2.0, "timer0", 0);
-              set_int(sbvis_timer, v);
-           }
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/label/base/default";
-      styles
-       {
-          style { name: "textblock_style";
-             base: "font=Sans font_size=10 align=left color=#000 wrap=word";
-
-             tag:  "br" "\n";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "tab" "\t";
-          }
-       }
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              text {
-                 style: "textblock_style";
-                 min: 1 1;
-              }
-           }
-        }
-      }
-   }
-
-   group { name: "elm/label/base_wrap/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              text {
-                 style: "textblock_style";
-                 min: 0 1;
-              }
-           }
-        }
-      }
-   }
-
-   group { name: "elm/label/base/marker";
-      styles
-       {
-          style { name: "textblock_style2";
-             base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word";
-
-             tag:  "br" "\n";
-             tag:  "hilight" "+ color=#ffff";
-             tag:  "b" "+ color=#ffff";
-             tag:  "tab" "\t";
-          }
-       }
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              text {
-                 style: "textblock_style2";
-                 min: 1 1;
-              }
-           }
-        }
-      }
-   }
-
-   group { name: "elm/label/base_wrap/marker";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              text {
-                 style: "textblock_style2";
-                 min: 0 1;
-              }
-           }
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-
-   group { name: "elm/button/base/default";
-      images {
-        image: "bt_base1.png" COMP;
-        image: "bt_base2.png" COMP;
-        image: "bt_hilight.png" COMP;
-        image: "bt_shine.png" COMP;
-        image: "bt_glow.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
-      }
-      parts {
-        part { name: "button_image";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "clicked" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "bt_base1.png";
-               image.middle: SOLID;
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1.offset: 4 4;
-              rel2.offset: 3 -5;
-              rel2.relative: 0.0 1.0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 0;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              rel2.offset: 4 -5;
-           }
-           description { state: "icononly" 0.0;
-              inherit: "default" 0.0;
-               fixed: 0 0;
-              visible: 1;
-              align: 0.5 0.5;
-              aspect: 1.0 1.0;
-              rel2.offset: -5 -5;
-              rel2.relative: 1.0 1.0;
-              aspect_preference: VERTICAL;
-           }
-        }
+         }
          part {
-           name:          "elm.text";
-           type:          TEXT;
-           effect:        SOFT_SHADOW;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 0 4;
-              rel2.offset: -5 -5;
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 0;
-                 align:    0.5 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-              visible: 1;
-              text.min: 1 1;
-           }
-        }
-        part {   name: "over1";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_hilight.png";
-                 border: 7 7 7 0;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "over2";
-           mouse_events: 1;
-           repeat_events: 1;
-            ignore_flags: ON_HOLD;
-           description { state: "default" 0.0;
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              visible: 0;
-           }
-        }
-         part { name: "over3";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
-               image {
-                  normal: "bt_glow.png";
-                  border: 12 12 12 12;
-               }
-              fill.smooth : 0;
+            name: "sb_vbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
             }
          }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-      }
-      programs {
-        program {
-           name:   "button_click";
-           signal: "mouse,down,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,press" "";
-           after: "button_click_anim";
-        }
-        program {
-           name:   "button_click_anim";
-           action: STATE_SET "clicked" 0.0;
-           target: "button_image";
-        }
-        program {
-           name:   "button_unclick";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,unpress" "";
-           after: "button_unclick_anim";
-        }
-        program {
-           name:   "button_unclick_anim";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-        }
-        program {
-           name:   "button_click2";
-           signal: "mouse,down,1";
-           source: "over3";
-           action: STATE_SET "clicked" 0.0;
-           target: "over3";
-        }
-        program {
-           name:   "button_unclick2";
-           signal: "mouse,up,1";
-           source: "over3";
-           action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5;
-           target: "over3";
-        }
-        program {
-           name:   "button_unclick3";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,click" "";
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "icononly"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              set_state(PART:"elm.text", "visible", 0.0);
-           }
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-              set_state(PART:"elm.text", "default", 0.0);
-           }
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-           }
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "button_image";
-           target: "over1";
-           target: "over2";
-           target: "disabler";
-            after: "disable_text";
-        }
-         program { name: "disable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.text", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.text", "disabled", 0.0);
-           }
-         }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-           target: "over1";
-           target: "over2";
-           target: "disabler";
-            after: "enable_text";
-        }
-         program { name: "enable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"elm.text", "visible", 0.0);
-              else
-                set_state(PART:"elm.text", "default", 0.0);
-           }
+         part {
+            name: "sb_vbar_clip";
+            clip_to: "sb_vbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
          }
-      }
-   }
-
-   group { name: "elm/button/base/hoversel_vertical/default";
-      alias: "elm/button/base/hoversel_vertical/entry";
-      alias: "elm/button/base/hoversel_horizontal/default";
-      alias: "elm/button/base/hoversel_horizontal/entry";
-      images {
-        image: "bt_base1.png" COMP;
-        image: "bt_base2.png" COMP;
-        image: "bt_hilight.png" COMP;
-        image: "bt_shine.png" COMP;
-        image: "bt_glow.png" COMP;
-        image: "updown.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
-      }
-      parts {
-        part { name: "button_image";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "clicked" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "bt_base1.png";
-               image.middle: SOLID;
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-           }
-        }
-        part { name: "arrow";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              image.normal: "updown.png";
-               aspect: 0.6666666666 0.6666666666;
-               aspect_preference: VERTICAL;
-               rel1.offset: 6 7;
-               rel2.offset: 6 -7;
-               rel2.relative: 0.0 1.0;
-               align: 0.0 0.5;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1 {
-                  to_x: "arrow";
-                  offset: 2 4;
+         part {
+            name: "sb_vbar";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 17 17;
+               align: 1.0 0.0;
+               rel1 {
                   relative: 1.0 0.0;
+                  offset: -2 0;
                }
-              rel2 {
-                  to_x: "arrow";
-                  offset: 1 -5;
-                  relative: 1.0 1.0;
-               }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 0 0;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              rel2.offset: 2 -5;
-           }
-           description { state: "icononly" 0.0;
-              inherit: "default" 0.0;
-               fixed: 0 0;
-              visible: 1;
-              align: 0.5 0.5;
-              aspect: 1.0 1.0;
-               rel1 {
-                  to_x: "button_image";
-                  offset: -5 -5;
-                  relative: 1.0 1.0;
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: -2 -1;
+                  to_y: "sb_hbar";
                }
-              aspect_preference: VERTICAL;
-           }
-        }
+            }
+         }
          part {
-           name:          "elm.text";
-           type:          TEXT;
-           effect:        SOFT_SHADOW;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 0 4;
-              rel2.offset: -5 -5;
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 0;
-                 align:    0.5 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-              visible: 1;
-              text.min: 1 1;
-           }
-        }
-        part {   name: "over1";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_hilight.png";
-                 border: 7 7 7 0;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "over2";
-           mouse_events: 1;
-           repeat_events: 1;
-            ignore_flags: ON_HOLD;
-           description { state: "default" 0.0;
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              visible: 0;
-           }
-        }
-         part { name: "over3";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
+            name: "sb_vbar_runner";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 3 3;
+               max: 3 99999;
+               rel1.to: "sb_vbar";
+               rel2.to: "sb_vbar";
                image {
-                  normal: "bt_glow.png";
-                  border: 12 12 12 12;
+                  normal: "sb_runnerv.png";
+                  border: 0 0 4 4;
                }
-              fill.smooth : 0;
+               fill.smooth: 0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+         }
+         part {
+            name: "elm.dragable.vbar";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 0 0 0;
+               y: 1 1 0;
+               confine: "sb_vbar";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 17 17;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_vbar";
+               }
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_vbar";
+               }
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
+               }
+               image.middle: SOLID;
             }
          }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-      }
-      programs {
-        program {
-           name:   "button_click";
-           signal: "mouse,down,1";
-           source: "over2";
-           action: STATE_SET "clicked" 0.0;
-           target: "button_image";
-        }
-        program {
-           name:   "button_unclick";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-        }
-        program {
-           name:   "button_click2";
-           signal: "mouse,down,1";
-           source: "over3";
-           action: STATE_SET "clicked" 0.0;
-           target: "over3";
-        }
-        program {
-           name:   "button_unclick2";
-           signal: "mouse,up,1";
-           source: "over3";
-           action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5;
-           target: "over3";
-        }
-        program {
-           name:   "button_unclick3";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,click" "";
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "icononly"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              set_state(PART:"elm.text", "visible", 0.0);
-           }
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-              set_state(PART:"elm.text", "default", 0.0);
-           }
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-           }
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "button_image";
-           target: "over1";
-           target: "over2";
-           target: "disabler";
-            after: "disable_text";
-        }
-         program { name: "disable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.text", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.text", "disabled", 0.0);
-           }
+         part {
+            name: "sb_vbar_over1";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.vbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.vbar";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
+               }
+            }
          }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-           target: "over1";
-           target: "over2";
-           target: "disabler";
-            after: "enable_text";
-        }
-         program { name: "enable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"elm.text", "visible", 0.0);
-              else
-                set_state(PART:"elm.text", "default", 0.0);
-           }
+         part {
+            name: "sb_vbar_over2";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.vbar";
+               rel2.to: "elm.dragable.vbar";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
          }
-      }
-   }
-
-   group { name: "elm/button/base/hoversel_vertical_entry/default";
-      alias: "elm/button/base/hoversel_vertical_entry/entry";
-      alias: "elm/button/base/hoversel_horizontal_entry/default";
-      alias: "elm/button/base/hoversel_horizontal_entry/entry";
-      images {
-         image: "hoversel_entry_bg.png" COMP;
-      }
-      parts {
-        part { name: "button_image";
-           mouse_events: 1;
-           description { state: "default" 0.0;
+         part {
+            name: "sb_hbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
                color: 255 255 255 0;
-               image.normal: "hoversel_entry_bg.png";
-               image.border: 0 0 2 2;
-               fill.smooth: 0;
-           }
-           description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1.offset: 4 4;
-              rel2.offset: 3 -5;
-              rel2.relative: 0.0 1.0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              rel2.offset: 4 -5;
-           }
-           description { state: "icononly" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              align: 0.5 0.5;
-              aspect: 1.0 1.0;
-              rel2.offset: -5 -5;
-              rel2.relative: 1.0 1.0;
-              aspect_preference: VERTICAL;
-           }
-        }
-        part { name: "textvis";
+            }
+         }
+         part {
+            name: "sb_hbar_clip";
+            clip_to: "sb_hbar_clip_master";
             type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
                visible: 0;
-           }
-           description { state: "visible" 0.0;
-               visible: 1;
-           }
-        }
+               color: 255 255 255 0;
+            }
+         }
          part {
-           name:          "elm.text";
-           type:          TEXT;
-           effect:        SOFT_SHADOW;
-           mouse_events:  0;
-           scale: 1;
-            clip_to:       "textvis";
-           description { state: "default" 0.0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 0 4;
-              rel2.offset: -5 -5;
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 0;
-                 align:    0.5 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              text.min: 1 1;
-           }
-           description { state: "clicked" 0.0;
-              inherit: "default" 0.0;
-              text.min: 1 1;
-              color: 0 0 0 255;
-              color3: 0 0 0 0;
-           }
-        }
-        part { name: "over2";
+            name: "sb_hbar";
             type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-               color: 0 0 0 0;
-           }
-        }
-      }
-      programs {
-        program {
-           name:   "button_click";
-           signal: "mouse,down,1";
-           source: "over2";
-           action: STATE_SET "clicked" 0.0;
-           target: "button_image";
-           target: "elm.text";
-        }
-        program {
-           name:   "button_unclick";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-           target: "elm.text";
-        }
-        program {
-           name:   "button_unclick3";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,click" "";
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "icononly"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              set_state(PART:"textvis", "visible", 0.0);
-              set_state(PART:"elm.text", "visible", 0.0);
-           }
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-              set_state(PART:"textvis", "default", 0.0);
-              set_state(PART:"elm.text", "default", 0.0);
-           }
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"textvis", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-           }
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-      }
-   }
-
-   group { name: "elm/button/base/anchor";
-      images {
-        image: "bt_base1.png" COMP;
-        image: "bt_base2.png" COMP;
-        image: "bt_hilight.png" COMP;
-        image: "bt_shine.png" COMP;
-        image: "bt_glow.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
-      }
-      parts {
-        part { name: "button_image";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-           color: 255 255 255 0;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
-               image.middle: SOLID;
-           }
-       description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-          color: 255 255 255 255;
-           }
-           description { state: "clicked" 0.0;
-              inherit: "default" 0.0;
-          inherit: "visible" 0.0;
-              image.normal: "bt_base1.png";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 17 17;
+               align: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 -2;
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: -1 -2;
+                  to_x: "sb_vbar";
+               }
+            }
+         }
+         part {
+            name: "sb_hbar_runner";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 3 3;
+               max: 99999 3;
+               rel1.to: "sb_hbar";
+               rel2.to: "sb_hbar";
+               image {
+                  normal: "sb_runnerh.png";
+                  border: 4 4 0 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.dragable.hbar";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+               confine: "sb_hbar";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 17 17;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_hbar";
+               }
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_hbar";
+               }
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
+               }
                image.middle: SOLID;
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-          inherit: "visible" 0.0;
-              image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1.offset: 4 4;
-              rel2.offset: 3 -5;
-              rel2.relative: 0.0 1.0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 0;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              rel2.offset: 4 -5;
-           }
-           description { state: "icononly" 0.0;
-              inherit: "default" 0.0;
-               fixed: 0 0;
-              visible: 1;
-              align: 0.5 0.5;
-              aspect: 1.0 1.0;
-              rel2.offset: -5 -5;
-              rel2.relative: 1.0 1.0;
-              aspect_preference: VERTICAL;
-           }
-        }
+            }
+         }
          part {
-           name:          "elm.text";
-           type:          TEXT;
-           effect:        SOFT_SHADOW;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 0 4;
-              rel2.offset: -5 -5;
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 0;
-                 align:    0.5 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-              visible: 1;
-              text.min: 1 1;
-           }
-        }
-        part {   name: "over1";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-           color: 255 255 255 0;
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_hilight.png";
-                 border: 7 7 7 0;
-              }
-           }
-       description { state: "visible" 0.0;
-              inherit:  "default" 0.0;
-          color: 255 255 255 255;
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-          inherit:  "visible" 0.0;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "over2";
-           mouse_events: 1;
-           repeat_events: 1;
-            ignore_flags: ON_HOLD;
-           description { state: "default" 0.0;
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              visible: 0;
-           }
-        }
-         part { name: "over3";
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 255 255 255 0;
+            name: "sb_hbar_over1";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.hbar";
                image {
-                  normal: "bt_glow.png";
-                  border: 12 12 12 12;
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-              fill.smooth : 0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+         }
+         part {
+            name: "sb_hbar_over2";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.to: "elm.dragable.hbar";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
             }
          }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
       }
       programs {
-    program {
-           name:   "button_mouse_in";
-           signal: "mouse,in";
-           source: "over2";
-           action: STATE_SET "visible" 0.0;
-           target: "button_image";
-       target: "over1";
-       transition: DECELERATE 0.5;
-        }
-        program {
-           name:   "button_mouse_out";
-           signal: "mouse,out";
-           source: "over2";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-       target: "over1";
-       transition: DECELERATE 0.5;
-        }
-        program {
-           name:   "button_unclick";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: STATE_SET "visible" 0.0;
-           target: "button_image";
-        }
-        program {
-           name:   "button_click2";
-           signal: "mouse,down,1";
-           source: "over3";
-           action: STATE_SET "clicked" 0.0;
-           target: "over3";
-        }
-        program {
-           name:   "button_unclick2";
-           signal: "mouse,up,1";
-           source: "over3";
-           action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5;
-           target: "over3";
-        }
-        program {
-           name:   "button_unclick3";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,click" "";
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "icononly"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              set_state(PART:"elm.text", "visible", 0.0);
-           }
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-              set_state(PART:"elm.text", "default", 0.0);
-           }
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
-           }
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "button_image";
-           target: "over1";
-           target: "over2";
-           target: "disabler";
-            after: "disable_text";
-        }
-         program { name: "disable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.text", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.text", "disabled", 0.0);
-           }
+         program {
+            name: "load";
+            signal: "load";
+            source: "";
+            script {
+               set_state(PART:"sb_hbar_clip", "hidden", 0.0);
+               set_state(PART:"sb_vbar_clip", "hidden", 0.0);
+               set_int(sbvis_h, 0);
+               set_int(sbvis_v, 0);
+               set_int(sbalways_v, 0);
+               set_int(sbalways_h, 0);
+               set_int(sbvis_timer, 0);
+            }
          }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-           target: "over1";
-           target: "over2";
-           target: "disabler";
-            after: "enable_text";
-        }
-         program { name: "enable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"elm.text", "visible", 0.0);
-              else
-                set_state(PART:"elm.text", "default", 0.0);
-           }
+         program {
+            name: "vbar_show";
+            signal: "elm,action,show,vbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sb_vbar_clip_master";
+         }
+         program {
+            name: "vbar_hide";
+            signal: "elm,action,hide,vbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "sb_vbar_clip_master";
+         }
+         program {
+            name: "vbar_show_always";
+            signal: "elm,action,show_always,vbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_v);
+               v |= get_int(sbalways_v);
+               if (!v) {
+                  set_int(sbalways_v, 1);
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
+               }
+            }
+         }
+         program {
+            name: "vbar_show_notalways";
+            signal: "elm,action,show_notalways,vbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbalways_v);
+               if (v) {
+                  set_int(sbalways_v, 0);
+                  v = get_int(sbvis_v);
+                  if (!v) {
+                     emit("do-hide-vbar", "");
+                     set_int(sbvis_v, 0);
+                  }
+               }
+            }
+         }
+         program {
+            name: "sb_vbar_show";
+            signal: "do-show-vbar";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_vbar_clip";
+         }
+         program {
+            name: "sb_vbar_hide";
+            signal: "do-hide-vbar";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_vbar_clip";
+         }
+         program {
+            name: "hbar_show";
+            signal: "elm,action,show,hbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sb_hbar_clip_master";
+         }
+         program {
+            name: "hbar_hide";
+            signal: "elm,action,hide,hbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "sb_hbar_clip_master";
+         }
+         program {
+            name: "hbar_show_always";
+            signal: "elm,action,show_always,hbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_h);
+               v |= get_int(sbalways_h);
+               if (!v) {
+                  set_int(sbalways_h, 1);
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
+               }
+            }
+         }
+         program {
+            name: "hbar_show_notalways";
+            signal: "elm,action,show_notalways,hbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbalways_h);
+               if (v) {
+                  set_int(sbalways_h, 0);
+                  v = get_int(sbvis_h);
+                  if (!v) {
+                     emit("do-hide-hbar", "");
+                     set_int(sbvis_h, 0);
+                  }
+               }
+            }
+         }
+         program {
+            name: "sb_hbar_show";
+            signal: "do-show-hbar";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_hbar_clip";
+         }
+         program {
+            name: "sb_hbar_hide";
+            signal: "do-hide-hbar";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_hbar_clip";
+         }
+         program {
+            name: "scroll";
+            signal: "elm,action,scroll";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_v);
+               v |= get_int(sbalways_v);
+               if (!v) {
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
+               }
+               v = get_int(sbvis_h);
+               v |= get_int(sbalways_h);
+               if (!v) {
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
+               }
+               v = get_int(sbvis_timer);
+               if (v > 0) cancel_timer(v);
+               v = timer(2.0, "timer0", 0);
+               set_int(sbvis_timer, v);
+            }
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/toggle/base/default";
-      images {
-         image: "shelf_inset.png" COMP;
-        image: "bt_basew.png" COMP;
-        image: "bt_bases.png" COMP;
-        image: "bt_hilightw.png" COMP;
-        image: "tog_base.png" COMP;
-        image: "tog_dis_base.png" COMP;
+   group {
+      name: "elm/label/base/default";
+      styles {
+         style {
+            name: "textblock_style";
+            base: "font=Sans font_size=10 align=left color=#000 wrap=word";
+            tag: "br" "\n";
+            tag: "hilight" "+ font=Sans:style=Bold";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "tab" "\t";
+         }
       }
       parts {
-         part { name: "bg";
-           type: RECT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 1.0 0.0;
-              rel1.offset: -4 3;
-              rel2.offset: -4 -4;
-              align: 1.0 0.5;
-              min: 96 16;
-              max: 96 16;
-              aspect: 4.0 4.0;
-              aspect_preference: VERTICAL;
-              color: 255 255 255 255;
-           }
-        }
-         part { name: "clipper";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "bg";
-              rel2.to: "bg";
-              color: 255 255 255 255;
-           }
-        }
-         part { name: "button";
-           type: RECT;
-           scale: 1;
-           clip_to: "clipper";
-           mouse_events: 1;
-           dragable {
-              x: 1 1 0;
-              y: 0 0 0;
-              confine: "bg";
-           }
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              rel1.to: "bg";
-              rel2.to: "bg";
-              min: 16 16;
-              max: 16 16;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              color: 0 0 0 0;
-           }
-        }
-         part { name: "button_events";
-           type: RECT;
-           dragable {
-              events: "button";
-           }
-           description { state: "default" 0.0;
-              rel1.to_x: "bg";
-              rel1.offset: 0 0;
-              rel1.relative: 0.0 0.0;
-              rel2.to_x: "bg";
-              rel2.offset: -1 -1;
-              rel2.relative: 1.0 1.0;
-              color: 0 0 0 0;
-           }
-        }
-         part { name: "onrect";
-           type: RECT;
-           scale: 1;
-           clip_to: "clipper";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "button";
-              rel1.relative: -5.0 0.0;
-              rel2.to: "button";
-              rel2.relative: 0.0 1.0;
-              color: 0 0 0 0;
-           }
-        }
-         part { name: "offrect";
-           type: RECT;
-           scale: 1;
-           clip_to: "clipper";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "button";
-              rel1.relative: 1.0 0.0;
-              rel2.to: "button";
-              rel2.relative: 6.0 1.0;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "togbase";
-           mouse_events:  0;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              rel1.to: "onrect";
-              rel2.to: "offrect";
-              image.normal: "tog_base.png";
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "tog_dis_base.png";
-           }
-        }
-         part { name: "elm.offtext";
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-               fixed: 1 1;
-              rel1.to_x: "offrect";
-              rel2.to_x: "offrect";
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 1;
-                 align:    0.5 0.5;
-                 text:     "OFF";
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-           }
-        }
-         part { name: "elm.ontext";
-           type: TEXT;
-           effect: SOFT_SHADOW;
-           mouse_events:  0;
-           scale: 1;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-               fixed: 1 1;
-              rel1.to_x: "onrect";
-              rel1.offset: 1 1;
-              rel2.to_x: "onrect";
-              rel2.offset: 0 0;
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 1;
-                 align:    0.5 0.5;
-                 text:     "ON";
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-              color3: 0 0 0 24;
-           }
-        }
-        part { name: "conf_over";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              rel1.offset: -1 -1;
-              rel1.to: "bg";
-              rel2.offset: 0 0;
-              rel2.to: "bg";
-              image {
-                 normal: "shelf_inset.png";
-                 border: 7 7 7 7;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-        }
-        part { name: "button0";
-           mouse_events:  0;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              rel1.to: "button2";
-              rel1.offset: -4 -4;
-              rel2.to: "button2";
-              rel2.offset: 3 3;
-              image {
-                 normal: "bt_bases.png";
-                 border: 11 11 11 11;
-              }
-               image.middle: SOLID;
-              color: 255 255 255 128;
-           }
-        }
-        part { name: "button2";
-           mouse_events:  0;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              rel1.to: "button";
-              rel1.offset: -2 -2;
-              rel2.to: "button";
-              rel2.offset: 1 1;
-              image {
-                 normal: "bt_basew.png";
-                 border: 7 7 7 7;
-              }
-               image.middle: SOLID;
-           }
-        }
-        part { name: "button3";
-           mouse_events:  0;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              rel1.to: "button2";
-              rel2.to: "button2";
-               rel2.relative: 1.0 0.5;
-              image {
-                  normal: "bt_hilightw.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1.offset: 4 4;
-              rel2.relative: 0.0 1.0;
-              rel2.offset: 3 -5;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 1;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              rel2.offset: 4 -5;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-               fixed: 1 1;
-              visible: 1;
-              aspect: 1.0 1.0;
-           }
-        }
-         part { name: "elm.text";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 0 4;
-              rel2.to_x: "bg";
-              rel2.relative: 0.0 1.0;
-              rel2.offset: -5 -5;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.0 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-              visible: 1;
-           }
-        }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-      }
-      programs {
-        program { name:   "drag_end";
-           signal: "mouse,up,1";
-           source: "button";
-           script {
-              new Float:dx, Float:dy;
-              get_drag(PART:"button", dx, dy);
-              if (dx > 0.5)
-                {
-                   set_drag(PART:"button", 1.0, 0.0);
-                   emit("elm,action,toggle,on", "");
-                }
-              else
-                {
-                   set_drag(PART:"button", 0.0, 0.0);
-                   emit("elm,action,toggle,off", "");
-                }
-           }
-        }
-        program { name: "toggle_on";
-           signal: "elm,state,toggle,on";
-           source: "elm";
-           script {
-              set_drag(PART:"button", 100.0, 0.0);
-           }
-        }
-        program { name: "toggle_off";
-           signal: "elm,state,toggle,off";
-           source: "elm";
-           script {
-              set_drag(PART:"button", 0.0, 0.0);
-           }
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.text";
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "togbase";
-           target: "elm.offtext";
-           target: "elm.ontext";
-           target: "disabler";
-            after: "disable_text";
-        }
-         program { name: "disable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.text", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.text", "disabled", 0.0);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "disabled", 0.0);
-           }
-         }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "disabler";
-            after: "enable_text";
-        }
-         program { name: "enable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"elm.text", "visible", 0.0);
-              else
-                set_state(PART:"elm.text", "default", 0.0);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "default", 0.0);
-           }
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "textblock_style";
+                  min: 1 1;
+               }
+            }
          }
       }
    }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/flipdigit/default";
-      images {
-         image: "flip_base.png" COMP;
-         image: "flip_base_shad.png" COMP;
-         image: "flip_shad.png" COMP;
-         image: "flip_0t.png" COMP;
-         image: "flip_0b.png" COMP;
-         image: "flip_1t.png" COMP;
-         image: "flip_1b.png" COMP;
-         image: "flip_2t.png" COMP;
-         image: "flip_2b.png" COMP;
-         image: "flip_3t.png" COMP;
-         image: "flip_3b.png" COMP;
-         image: "flip_4t.png" COMP;
-         image: "flip_4b.png" COMP;
-         image: "flip_5t.png" COMP;
-         image: "flip_5b.png" COMP;
-         image: "flip_6t.png" COMP;
-         image: "flip_6b.png" COMP;
-         image: "flip_7t.png" COMP;
-         image: "flip_7b.png" COMP;
-         image: "flip_8t.png" COMP;
-         image: "flip_8b.png" COMP;
-         image: "flip_9t.png" COMP;
-         image: "flip_9b.png" COMP;
-        image: "arrow_up.png" COMP;
-        image: "arrow_down.png" COMP;
+   group {
+      name: "elm/label/base_wrap/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "textblock_style";
+                  min: 0 1;
+               }
+            }
+         }
       }
-      script {
-        public v0_cur, v0_pre, v0_lock, v0_next;
-
-       public animator2(val, Float:pos) {
-         new st1[11], st2[11], v;
-
-         v = get_int(v0_cur);
-         snprintf(st1, 10, "%ih", v);
-         snprintf(st2, 10, "%i", v);
-         set_tween_state(PART:"bot", pos, st1, 0.0, st2, 0.0);
-         set_tween_state(PART:"sh", pos, "half", 0.0, "full", 0.0);
-         if (pos >= 1.0) {
-            set_state(PART:"sh", "default", 0.0);
-            set_int(v0_lock, 0);
-            v = get_int(v0_next);
-            if (v >= 0) {
-               set_int(v0_next, -1);
-               message(MSG_INT, 1, v);
-            }
-         }
-       }
-       public animator1(val, Float:pos) {
-         new st1[11], st2[11], v;
-
-         v = get_int(v0_pre);
-         snprintf(st1, 10, "%i", v);
-         snprintf(st2, 10, "%ih", v);
-         set_tween_state(PART:"top", pos, st1, 0.0, st2, 0.0);
-         set_tween_state(PART:"sh", pos, "default", 0.0, "half", 0.0);
-         if (pos >= 1.0) anim(0.2, "animator2", val);
-       }
-       public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT) && (id == 1)) {
-            new value, v, buf[11];
-
-            value = getarg(2);
-            if (get_int(v0_lock) == 1) {
-               set_int(v0_next, value);
-               return;
-            }
-            v = get_int(v0_cur);
-            set_int(v0_pre, v);
-            set_int(v0_cur, value);
-            set_int(v0_lock, 1);
-            snprintf(buf, 10, "%i", get_int(v0_pre));
-            set_state(PART:"bot0", buf, 0.0);
-            snprintf(buf, 10, "%ih", get_int(v0_cur));
-            set_state(PART:"bot", buf, 0.0);
-            snprintf(buf, 10, "%i", get_int(v0_cur));
-            set_state(PART:"top0", buf, 0.0);
-            snprintf(buf, 10, "%i", get_int(v0_pre));
-            set_state(PART:"top", buf, 0.0);
-            set_state(PART:"sh", "default", 0.0);
-            anim(0.2, "animator1", 1);
-         }
-       }
+   }
+   group {
+      name: "elm/label/base/marker";
+      styles {
+         style {
+            name: "textblock_style2";
+            base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word";
+            tag: "br" "\n";
+            tag: "hilight" "+ color=#ffff";
+            tag: "b" "+ color=#ffff";
+            tag: "tab" "\t";
+         }
       }
       parts {
-        part { name: "shad";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.offset: -4 -4;
-              rel1.to: "base";
-              rel2.offset: 3 3;
-              rel2.to: "base";
-              image {
-                  normal: "flip_base_shad.png";
-                 border: 8 8 8 8;
-              }
-           }
-        }
-        part { name: "base";
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-              // FIXME 48x96 should be the native pixel design, right now
-              // its 80x160. fix int he artwork later
-              min: 24 48;
-               aspect: 0.5 0.5;
-//            max: 24 48;
-              image.normal: "flip_base.png";
-           }
-        }
-        part { name: "b";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel1.relative: 0.0 0.5;
-              rel2.to: "base";
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "t";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              rel2.relative: 1.0 0.5;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "bot0";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "flip_0b.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_0b.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_1b.png";
-           }
-           description { state: "2" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_2b.png";
-           }
-           description { state: "3" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_3b.png";
-           }
-           description { state: "4" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_4b.png";
-           }
-           description { state: "5" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_5b.png";
-           }
-           description { state: "6" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_6b.png";
-           }
-           description { state: "7" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_7b.png";
-           }
-           description { state: "8" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_8b.png";
-           }
-           description { state: "9" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_9b.png";
-           }
-        }
-        part { name: "sh";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "b";
-              rel2.to: "b";
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_shad.png";
-           }
-           description { state: "half" 0.0;
-              inherit: "default" 0.0;
-              rel2.relative: 1.0 0.5;
-           }
-           description { state: "full" 0.0;
-              inherit: "default" 0.0;
-              rel2.relative: 1.0 1.0;
-           }
-        }
-        part { name: "bot";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "flip_0b.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_0b.png";
-           }
-           description { state: "0h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_0b.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_1b.png";
-           }
-           description { state: "1h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_1b.png";
-           }
-           description { state: "2" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_2b.png";
-           }
-           description { state: "2h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_2b.png";
-           }
-           description { state: "3" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_3b.png";
-           }
-           description { state: "3h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_3b.png";
-           }
-           description { state: "4" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_4b.png";
-           }
-           description { state: "4h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_4b.png";
-           }
-           description { state: "5" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_5b.png";
-           }
-           description { state: "5h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_5b.png";
-           }
-           description { state: "6" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_6b.png";
-           }
-           description { state: "6h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_6b.png";
-           }
-           description { state: "7" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_7b.png";
-           }
-           description { state: "7h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_7b.png";
-           }
-           description { state: "8" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_8b.png";
-           }
-           description { state: "8h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_8b.png";
-           }
-           description { state: "9" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_9b.png";
-           }
-           description { state: "9h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_9b.png";
-           }
-        }
-        part { name: "top0";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "flip_0t.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_0t.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_1t.png";
-           }
-           description { state: "2" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_2t.png";
-           }
-           description { state: "3" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_3t.png";
-           }
-           description { state: "4" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_4t.png";
-           }
-           description { state: "5" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_5t.png";
-           }
-           description { state: "6" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_6t.png";
-           }
-           description { state: "7" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_7t.png";
-           }
-           description { state: "8" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_8t.png";
-           }
-           description { state: "9" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_9t.png";
-           }
-        }
-        part { name: "top";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "flip_0t.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_0t.png";
-           }
-           description { state: "0h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_0t.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_1t.png";
-           }
-           description { state: "1h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_1t.png";
-           }
-           description { state: "2" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_2t.png";
-           }
-           description { state: "2h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_2t.png";
-           }
-           description { state: "3" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_3t.png";
-           }
-           description { state: "3h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_3t.png";
-           }
-           description { state: "4" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_4t.png";
-           }
-           description { state: "4h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_4t.png";
-           }
-           description { state: "5" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_5t.png";
-           }
-           description { state: "5h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_5t.png";
-           }
-           description { state: "6" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_6t.png";
-           }
-           description { state: "6h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_6t.png";
-           }
-           description { state: "7" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_7t.png";
-           }
-           description { state: "7h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_7t.png";
-           }
-           description { state: "8" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_8t.png";
-           }
-           description { state: "8h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_8t.png";
-           }
-           description { state: "9" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_9t.png";
-           }
-           description { state: "9h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_9t.png";
-           }
-        }
-        part { name: "atop";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              min: 15 15;
-              max: 15 15;
-              align: 0.5 0.0;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "arrow_up.png";
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "abot";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              min: 15 15;
-              max: 15 15;
-              align: 0.5 1.0;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "arrow_down.png";
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "textblock_style2";
+                  min: 1 1;
+               }
+            }
+         }
       }
-      programs {
-        program { name: "load";
-           signal: "load";
-           source: "";
-           script {
-              set_int(v0_cur, 0);
-              set_int(v0_pre, 0);
-              set_int(v0_lock, 0);
-              set_int(v0_next, -1);
-           }
-        }
-        program { name: "edit_on";
-            signal: "elm,state,edit,on";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "atop";
-           target: "abot";
-        }
-        program { name: "edit_off";
-            signal: "elm,state,edit,off";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "atop";
-           target: "abot";
-        }
-        program { name: "up";
-           signal: "mouse,down,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up" "";
-        }
-        program { name: "down";
-           signal: "mouse,down,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down" "";
-        }
+   }
+   group {
+      name: "elm/label/base_wrap/marker";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "textblock_style2";
+                  min: 0 1;
+               }
+            }
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/flipampm/default";
+   group {
+      name: "elm/button/base/default";
       images {
-         image: "flip_base.png" COMP;
-         image: "flip_base_shad.png" COMP;
-         image: "flip_shad.png" COMP;
-         image: "flip_amt.png" COMP;
-         image: "flip_amb.png" COMP;
-         image: "flip_pmt.png" COMP;
-         image: "flip_pmb.png" COMP;
-        image: "arrow_up.png" COMP;
-        image: "arrow_down.png" COMP;
-      }
-      script {
-        public v0_cur, v0_pre, v0_lock, v0_next;
-
-       public animator2(val, Float:pos) {
-         new st1[11], st2[11], v;
-
-         v = get_int(v0_cur);
-         snprintf(st1, 10, "%ih", v);
-         snprintf(st2, 10, "%i", v);
-         set_tween_state(PART:"bot", pos, st1, 0.0, st2, 0.0);
-         set_tween_state(PART:"sh", pos, "half", 0.0, "full", 0.0);
-         if (pos >= 1.0) {
-            set_state(PART:"sh", "default", 0.0);
-            set_int(v0_lock, 0);
-            v = get_int(v0_next);
-            if (v >= 0) {
-               set_int(v0_next, -1);
-               message(MSG_INT, 1, v);
-            }
-         }
-       }
-       public animator1(val, Float:pos) {
-         new st1[11], st2[11], v;
-
-         v = get_int(v0_pre);
-         snprintf(st1, 10, "%i", v);
-         snprintf(st2, 10, "%ih", v);
-         set_tween_state(PART:"top", pos, st1, 0.0, st2, 0.0);
-         set_tween_state(PART:"sh", pos, "default", 0.0, "half", 0.0);
-         if (pos >= 1.0) anim(0.2, "animator2", val);
-       }
-       public message(Msg_Type:type, id, ...) {
-         if ((type == MSG_INT) && (id == 1)) {
-            new value, v, buf[11];
-
-            value = getarg(2);
-            if (get_int(v0_lock) == 1) {
-               set_int(v0_next, value);
-               return;
-            }
-            v = get_int(v0_cur);
-            set_int(v0_pre, v);
-            set_int(v0_cur, value);
-            set_int(v0_lock, 1);
-            snprintf(buf, 10, "%i", get_int(v0_pre));
-            set_state(PART:"bot0", buf, 0.0);
-            snprintf(buf, 10, "%ih", get_int(v0_cur));
-            set_state(PART:"bot", buf, 0.0);
-            snprintf(buf, 10, "%i", get_int(v0_cur));
-            set_state(PART:"top0", buf, 0.0);
-            snprintf(buf, 10, "%i", get_int(v0_pre));
-            set_state(PART:"top", buf, 0.0);
-            set_state(PART:"sh", "default", 0.0);
-            anim(0.2, "animator1", 1);
-         }
-       }
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
       }
       parts {
-        part { name: "shad";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.offset: -4 -4;
-              rel1.to: "base";
-              rel2.offset: 3 3;
-              rel2.to: "base";
-              image {
-                  normal: "flip_base_shad.png";
-                 border: 8 8 8 8;
-              }
-           }
-        }
-        part { name: "base";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-              // FIXME 48x96 should be the native pixel design, right now
-              // its 80x160. fix int he artwork later
-               aspect: 0.5 0.5;
-              min: 24 48;
-//            max: 24 48;
-              image.normal: "flip_base.png";
-           }
-        }
-        part { name: "b";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel1.relative: 0.0 0.5;
-              rel2.to: "base";
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "t";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              rel2.relative: 1.0 0.5;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "bot0";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "flip_amb.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_amb.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_pmb.png";
-           }
-        }
-        part { name: "sh";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "b";
-              rel2.to: "b";
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_shad.png";
-           }
-           description { state: "half" 0.0;
-              inherit: "default" 0.0;
-              rel2.relative: 1.0 0.5;
-           }
-           description { state: "full" 0.0;
-              inherit: "default" 0.0;
-              rel2.relative: 1.0 1.0;
-           }
-        }
-        part { name: "bot";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "flip_amb.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_amb.png";
-           }
-           description { state: "0h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_amb.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel2.relative: 1.0 1.0;
-              image.normal: "flip_pmb.png";
-           }
-           description { state: "1h" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-              image.normal: "flip_pmb.png";
-           }
-        }
-        part { name: "top0";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "flip_amt.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_amt.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              image.normal: "flip_pmt.png";
-           }
-        }
-        part { name: "top";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "flip_amt.png";
-           }
-           description { state: "0" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_amt.png";
-           }
-           description { state: "0h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_amt.png";
-           }
-           description { state: "1" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              rel1.relative: 0.0 0.0;
-              image.normal: "flip_pmt.png";
-           }
-           description { state: "1h" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-              image.normal: "flip_pmt.png";
-           }
-        }
-        part { name: "atop";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              min: 15 15;
-              max: 15 15;
-              align: 0.5 0.0;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "arrow_up.png";
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "abot";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              min: 15 15;
-              max: 15 15;
-              align: 0.5 1.0;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "arrow_down.png";
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-      }
-      programs {
-        program { name: "load";
-           signal: "load";
-           source: "";
-           script {
-              set_int(v0_cur, 0);
-              set_int(v0_pre, 0);
-              set_int(v0_lock, 0);
-              set_int(v0_next, -1);
-           }
-        }
-        program { name: "edit_on";
-            signal: "elm,state,edit,on";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "atop";
-           target: "abot";
-        }
-/*
-        program { name: "edit_off";
-            signal: "elm,state,edit,off";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "atop";
-           target: "abot";
-        }
- */
-        program { name: "up";
-           signal: "mouse,down,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up" "";
-        }
-        program { name: "down";
-           signal: "mouse,down,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down" "";
-        }
-      }
-   }
-
-   ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/menu/item/default";
-       images {
-           image: "bt_base1.png" COMP;
-           image: "bt_base2.png" COMP;
-           image: "bt_hilight.png" COMP;
-           image: "bt_shine.png" COMP;
-           image: "bt_glow.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       script {
-            public menu_text_visible; //0:hide (default), 1:visible
-            public menu_disable; //0:enable, 1:disable
-       }
-       parts {
-           part { name: "item_image";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "bt_base2.png";
-                       border: 7 7 7 7;
-                   }
-                   image.middle: SOLID;
+         part {
+            name: "button_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
                }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 255;
+               image.middle: SOLID;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-               description { state: "clicked" 0.0;
-                   inherit: "default" 0.0;
-                   inherit: "visible" 0.0;
-                   image.normal: "bt_base1.png";
-                   image.middle: SOLID;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1.offset: 4 4;
+               rel2.offset: 3 -5;
+               rel2.relative: 0.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 1 0;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -5;
+            }
+            description {
+               state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               fixed: 0 0;
+               visible: 1;
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               rel2.offset: -5 -5;
+               rel2.relative: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 4;
+               rel2.offset: -5 -5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 1;
+               text.min: 1 1;
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-           part { name: "item_image_disabled";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   visible: 1;
-                   align: 0.0 0.5;
-                   rel1.offset: 4 4;
-                   rel2.offset: 3 -5;
-                   rel2.relative: 0.0 1.0;
-                   aspect: 1.0 1.0;
-                   aspect_preference: VERTICAL;
-                   rel2.offset: 4 -5;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-           part {
-               name:          "elm.text";
-               type:          TEXT;
-               mouse_events:  0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   rel1.to_x: "elm.swallow.content";
-                   rel1.relative: 1.0 0.0;
-                   rel1.offset: 5 7;
-                   rel2.offset: -10 -8;
-                   color: 0 0 0 255;
-                   text {
-                       font:     "Sans,Edje-Vera";
-                       size:     10;
-                       min:      1 1;
-                       align:    0.0 0.5;
-                   }
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "button_click";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,press" "";
+            after: "button_click_anim";
+         }
+         program {
+            name: "button_click_anim";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
+         }
+         program {
+            name: "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "button_click2";
+            signal: "mouse,down,1";
+            source: "over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "over3";
+         }
+         program {
+            name: "button_unclick2";
+            signal: "mouse,up,1";
+            source: "over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "over3";
+         }
+         program {
+            name: "button_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0); else
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+            }
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "over2";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0); else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "over2";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0); else
+                  set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/button/base/hoversel_vertical/default";
+      alias: "elm/button/base/hoversel_vertical/entry";
+      alias: "elm/button/base/hoversel_horizontal/default";
+      alias: "elm/button/base/hoversel_horizontal/entry";
+      images {
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "updown.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "button_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
                }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   text.min: 1 1;
-               }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   inherit: "visible" 0.0;
-                   color: 254 254 254 255;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-               }
-               description { state: "disabled_visible" 0.0;
-                   inherit: "default" 0.0;
-                   inherit: "visible" 0.0;
-                   color: 0 0 0 128;
-               }
-           }
-           part {        name: "over1";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_hilight.png";
-                       border: 7 7 7 0;
-                   }
-               }
-               description { state: "visible" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-               }
-           }
-           part {        name: "over_disabled";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "over2";
-               mouse_events: 1;
-               repeat_events: 1;
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   image {
-                       normal: "bt_shine.png";
-                       border: 7 7 7 7;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 0;
-               }
-           }
-           part { name: "over3";
-               mouse_events: 1;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                   }
-                   fill.smooth : 0;
-               }
-               description { state: "clicked" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "disabler";
-               type: RECT;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   visible: 0;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
+               image.middle: SOLID;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-           }
-       }
-       programs {
-          //
-           program {
-               name:   "item_mouse_in";
-               signal: "mouse,in";
-               source: "over2";
-               action: SIGNAL_EMIT "elm,action,activate" "";
-               after: "item_mouse_in_2";
-               after: "item_mouse_in_3";
-           }
-           program {
-               name:   "item_mouse_in_2";
-               transition: DECELERATE 0.5;
-               script {
-                   new v, d;
-                   v = get_int(menu_text_visible);
-                   d = get_int(menu_disable);
-
-                   if (v==1 && d==0)
-                        run_program(PROGRAM:"selected_text");
+            }
+         }
+         part {
+            name: "arrow";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "updown.png";
+               aspect: 0.6666666666 0.6666666666;
+               aspect_preference: VERTICAL;
+               rel1.offset: 6 7;
+               rel2.offset: 6 -7;
+               rel2.relative: 0.0 1.0;
+               align: 0.0 0.5;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  offset: 2 4;
+                  relative: 1.0 0.0;
                }
-           }
-           program {
-               name:   "item_mouse_in_3";
-               action : STATE_SET "visible" 0.0;
-               target: "item_image";
-               target: "over1";
-               transition: DECELERATE 0.5;
-           }
-           program {
-               name:   "selected_text";
-               action: STATE_SET "selected" 0.0;
-               target: "elm.text";
-               transition: DECELERATE 0.5;
-           }
-           //
-
-           //
-           program {
-               name:   "item_mouse_out";
-               signal: "mouse,out";
-               source: "over2";
-               after: "item_mouse_out_2";
-               after: "item_mouse_out_3";
-           }
-           program {
-               name:   "item_mouse_out_2";
-               transition: DECELERATE 0.5;
-               script {
-                   new v, d;
-                   v = get_int(menu_text_visible);
-                   d = get_int(menu_disable);
-
-                   if (v==1 && d==0)
-                        run_program(PROGRAM:"visible_text");
+               rel2 {
+                  to_x: "arrow";
+                  offset: 1 -5;
+                  relative: 1.0 1.0;
                }
-           }
-           program {
-               name:   "item_mouse_out_3";
-               action: STATE_SET "default" 0.0;
-               target: "item_image";
-               target: "over1";
-               transition: DECELERATE 0.5;
-           }
-           program {
-               name:   "visible_text";
-               action: STATE_SET "visible" 0.0;
-               target: "elm.text";
-               transition: DECELERATE 0.5;
-           }
-           //
-
-           program {
-               name:   "item_unclick";
-               signal: "mouse,up,1";
-               source: "over2";
-               action: STATE_SET "visible" 0.0;
-               target: "item_image";
-           }
-           program {
-               name:   "item_click2";
-               signal: "mouse,down,1";
-               source: "over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "over3";
-           }
-           program {
-               name:   "item_unclick2";
-               signal: "mouse,up,1";
-               source: "over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "over3";
-           }
-           program {
-               name:   "item_unclick3";
-               signal: "mouse,up,1";
-               source: "over2";
-               action: SIGNAL_EMIT "elm,action,click" "";
-           }
-           program { name: "text_show";
-               signal: "elm,state,text,visible";
-               source: "elm";
-               script {
-                   set_int(menu_text_visible, 1);
-                   set_state(PART:"elm.text", "visible", 0.0);
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 0 0;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 2 -5;
+            }
+            description {
+               state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               fixed: 0 0;
+               visible: 1;
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               rel1 {
+                  to_x: "button_image";
+                  offset: -5 -5;
+                  relative: 1.0 1.0;
                }
-           }
-           program { name: "text_hide";
-               signal: "elm,state,text,hidden";
-               source: "elm";
-               script {
-                   set_int(menu_text_visible, 0);
-                   set_state(PART:"elm.text", "default", 0.0);
+               aspect_preference: VERTICAL;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 4;
+               rel2.offset: -5 -5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
                }
-           }
-           program { name: "disable";
-               signal: "elm,state,disabled";
-               source: "elm";
-               action: STATE_SET "disabled" 0.0;
-               target: "item_image";
-               target: "item_image_disabled";
-               target: "over1";
-               target: "over2";
-               target: "over_disabled";
-               target: "disabler";
-               after: "disable_text";
-           }
-           program { name: "disable_text";
-               script {
-                   new v;
-                   v = get_int(menu_text_visible);
-                   if (v==1)
-                    set_state(PART:"elm.text", "disabled_visible", 0.0);
-                   else if (v==0)
-                    set_state(PART:"elm.text", "disabled", 0.0);
-                   set_int(menu_disable, 1);
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 1;
+               text.min: 1 1;
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-           program { name: "enable";
-               signal: "elm,state,enabled";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "item_image";
-               target: "item_image_disabled";
-               target: "over1";
-               target: "over2";
-               target: "over_disabled";
-               target: "disabler";
-               after: "enable_text";
-           }
-           program { name: "enable_text";
-               script {
-                   new v;
-                   v = get_int(menu_text_visible);
-                   if (v==1)
-                    set_state(PART:"elm.text", "visible", 0.0);
-                   else  if (v==0)
-                    set_state(PART:"elm.text", "default", 0.0);
-                   set_int(menu_disable, 0);
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-           }
-       }
-   }
-
-   group { name: "elm/menu/item_with_submenu/default";
-       images {
-           image: "bt_base1.png" COMP;
-           image: "bt_base2.png" COMP;
-           image: "bt_hilight.png" COMP;
-           image: "bt_shine.png" COMP;
-           image: "bt_glow.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-           image: "arrow_right.png" COMP;
-       }
-       script {
-            public menu_text_visible; //0:hide (default), 1:visible
-            public menu_disable; //0:enable, 1:disable
-       }
-       parts {
-           part { name: "item_image";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "bt_base2.png";
-                       border: 7 7 7 7;
-                   }
-                   image.middle: SOLID;
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-               description { state: "clicked" 0.0;
-                   inherit: "default" 0.0;
-                   inherit: "visible" 0.0;
-                   image.normal: "bt_base1.png";
-                   image.middle: SOLID;
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-               }
-           }
-           part { name: "item_image_disabled";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "button_click";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "button_click2";
+            signal: "mouse,down,1";
+            source: "over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "over3";
+         }
+         program {
+            name: "button_unclick2";
+            signal: "mouse,up,1";
+            source: "over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "over3";
+         }
+         program {
+            name: "button_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0); else
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+            }
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "over2";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0); else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "over2";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0); else
+                  set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/button/base/hoversel_vertical_entry/default";
+      alias: "elm/button/base/hoversel_vertical_entry/entry";
+      alias: "elm/button/base/hoversel_horizontal_entry/default";
+      alias: "elm/button/base/hoversel_horizontal_entry/entry";
+      images {
+         image: "hoversel_entry_bg.png" COMP;
+      }
+      parts {
+         part {
+            name: "button_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image.normal: "hoversel_entry_bg.png";
+               image.border: 0 0 2 2;
+               fill.smooth: 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1.offset: 4 4;
+               rel2.offset: 3 -5;
+               rel2.relative: 0.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -5;
+            }
+            description {
+               state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               rel2.offset: -5 -5;
+               rel2.relative: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+         }
+         part {
+            name: "textvis";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "textvis";
+            description {
+               state: "default" 0.0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 4;
+               rel2.offset: -5 -5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+            }
+         }
+         part {
+            name: "over2";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "button_click";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program {
+            name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program {
+            name: "button_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"textvis", "visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"textvis", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"textvis", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0); else
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+            }
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+      }
+   }
+   group {
+      name: "elm/button/base/anchor";
+      images {
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "button_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "arrow";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 255;
-                   align: 1.0 0.5;
-                   aspect: 1 1;
-                   aspect_preference: BOTH;
-                   image {
-                       normal: "arrow_right.png";
-                   }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   visible: 1;
-                   align: 0.0 0.5;
-                   rel1.offset: 4 4;
-                   rel2.offset: 3 -5;
-                   rel2.relative: 0.0 1.0;
-                   aspect: 1.0 1.0;
-                   aspect_preference: VERTICAL;
-                   rel2.offset: 4 -5;
-               }
-           }
-           part {
-               name:          "elm.text";
-               type:          TEXT;
-               mouse_events:  0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   rel1.to_x: "elm.swallow.content";
-                   rel1.relative: 1.0 0.0;
-                   rel1.offset: 5 7;
-                   rel2.offset: -10 -8;
-                   color: 0 0 0 255;
-                   text {
-                       font:     "Sans,Edje-Vera";
-                       size:     10;
-                       min:      1 1;
-                       align:    0.0 0.5;
-                   }
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   text.min: 1 1;
-               }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   inherit: "visible" 0.0;
-                   color: 254 254 254 255;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-               }
-               description { state: "disabled_visible" 0.0;
-                   inherit: "default" 0.0;
-                   inherit: "visible" 0.0;
-                   color: 0 0 0 128;
-               }
-           }
-           part {        name: "over1";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_hilight.png";
-                       border: 7 7 7 0;
-                   }
-               }
-               description { state: "visible" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-               }
-           }
-           part { name: "over_disabled";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "over2";
-               mouse_events: 1;
-               repeat_events: 1;
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   image {
-                       normal: "bt_shine.png";
-                       border: 7 7 7 7;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 0;
-               }
-           }
-           part { name: "over3";
-               mouse_events: 1;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                   }
-                   fill.smooth : 0;
-               }
-               description { state: "clicked" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "disabler";
-               type: RECT;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   visible: 0;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-               }
-           }
-       }
-       programs {
-           //
-           program {
-               name:   "item_mouse_in";
-               signal: "mouse,in";
-               source: "over2";
-               action: SIGNAL_EMIT "elm,action,activate" "";
-               after: "item_mouse_in_2";
-               after: "item_mouse_in_3";
-           }
-           program {
-               name:   "item_mouse_in_2";
-               transition: DECELERATE 0.5;
-               script {
-                   new v, d;
-                   v = get_int(menu_text_visible);
-                   d = get_int(menu_disable);
-
-                   if (v==1 && d==0)
-                        run_program(PROGRAM:"selected_text");
-               }
-           }
-           program {
-               name:   "item_mouse_in_3";
-               action : STATE_SET "visible" 0.0;
-               target: "item_image";
-               target: "over1";
-               transition: DECELERATE 0.5;
-           }
-           program {
-               name:   "selected_text";
-               action: STATE_SET "selected" 0.0;
-               target: "elm.text";
-               transition: DECELERATE 0.5;
-           }
-           //
-
-           //
-           program {
-               name:   "item_mouse_out";
-               signal: "mouse,out";
-               source: "over2";
-               after: "item_mouse_out_2";
-               after: "item_mouse_out_3";
-           }
-           program {
-               name:   "item_mouse_out_2";
-               transition: DECELERATE 0.5;
-               script {
-                   new v, d;
-                   v = get_int(menu_text_visible);
-                   d = get_int(menu_disable);
-
-                   if (v==1 && d==0)
-                        run_program(PROGRAM:"visible_text");
-               }
-           }
-           program {
-               name:   "item_mouse_out_3";
-               action: STATE_SET "default" 0.0;
-               target: "item_image";
-               target: "over1";
-               transition: DECELERATE 0.5;
-           }
-           program {
-               name:   "visible_text";
-               action: STATE_SET "visible" 0.0;
-               target: "elm.text";
-               transition: DECELERATE 0.5;
-           }
-           //
-
-           program {
-               name:   "item_unclick";
-               signal: "mouse,up,1";
-               source: "over2";
-               action: STATE_SET "visible" 0.0;
-               target: "item_image";
-           }
-           program {
-               name:   "item_click2";
-               signal: "mouse,down,1";
-               source: "over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "over3";
-           }
-           program {
-               name:   "item_unclick2";
-               signal: "mouse,up,1";
-               source: "over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "over3";
-           }
-           program {
-               name:   "item_unclick3";
-               signal: "mouse,up,1";
-               source: "over2";
-               action: SIGNAL_EMIT "elm,action,click" "";
-           }
-           program {
-               name:   "menu_open";
-               signal: "mouse,in";
-               source: "over2";
-               action: SIGNAL_EMIT "elm,action,open" "";
-           }
-            program { name: "text_show";
-               signal: "elm,state,text,visible";
-               source: "elm";
-               script {
-                   set_int(menu_text_visible, 1);
-                   set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1.offset: 4 4;
+               rel2.offset: 3 -5;
+               rel2.relative: 0.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 1 0;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -5;
+            }
+            description {
+               state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               fixed: 0 0;
+               visible: 1;
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               rel2.offset: -5 -5;
+               rel2.relative: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 4;
+               rel2.offset: -5 -5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
                }
-           }
-           program { name: "text_hide";
-               signal: "elm,state,text,hidden";
-               source: "elm";
-               script {
-                   set_int(menu_text_visible, 0);
-                   set_state(PART:"elm.text", "default", 0.0);
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 1;
+               text.min: 1 1;
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-           program { name: "disable";
-               signal: "elm,state,disabled";
-               source: "elm";
-               action: STATE_SET "disabled" 0.0;
-               target: "item_image";
-               target: "item_image_disabled";
-               target: "over1";
-               target: "over2";
-               target: "over_disabled";
-               target: "disabler";
-               after: "disable_text";
-           }
-           program { name: "disable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "visible"))
-                   set_state(PART:"elm.text", "disabled_visible", 0.0);
-                   else if (!strcmp(st, "default"))
-                   set_state(PART:"elm.text", "disabled", 0.0);
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-           }
-           program { name: "enable";
-               signal: "elm,state,enabled";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "item_image";
-               target: "item_image_disabled";
-               target: "over1";
-               target: "over2";
-               target: "over_disabled";
-               target: "disabler";
-               after: "enable_text";
-           }
-           program { name: "enable_text";
-               script {
-                   new v;
-                   v = get_int(menu_text_visible);
-                   if (v==1)
-                    set_state(PART:"elm.text", "visible", 0.0);
-                   else  if (v==0)
-                    set_state(PART:"elm.text", "default", 0.0);
-                   set_int(menu_disable, 0);
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-           }
-       }
-   }
-
-   group { name: "elm/menu/separator/default";
-       images {
-           image: "separator_h.png" COMP;
-       }
-       parts {
-           part { name: "separator"; // separator group
-               description { state: "default" 0.0;
-                   min: 2 2;
-                   rel1.offset: 4 4;
-                   rel2.offset: -5 -5;
-                   image {
-                       normal: "separator_h.png";
-                   }
-                   fill {
-                       smooth: 0;
-                   }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-       }
-   }
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/base-all/default";
-      parts {
-        part { name: "d0";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.0000000 0.0;
-              rel2.relative: 0.1250000 1.0;
-           }
-        }
-        part { name: "d1";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.1250000 0.0;
-              rel2.relative: 0.2500000 1.0;
-           }
-        }
-        part { name: "c0";
-           type: SWALLOW;
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 0.2500000 0.0;
-              rel2.relative: 0.3125000 1.0;
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 text:     ":";
-                 size:     10;
-                 min:      1 1;
-                 align:    0.5 0.5;
-              }
-           }
-        }
-        part { name: "d2";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.3125000 0.0;
-              rel2.relative: 0.4375000 1.0;
-           }
-        }
-        part { name: "d3";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.4375000 0.0;
-              rel2.relative: 0.5625000 1.0;
-           }
-        }
-        // (if seconds)
-        part { name: "c1";
-           type: SWALLOW;
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 0.5625000 0.0;
-              rel2.relative: 0.6250000 1.0;
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 text:     ":";
-                 size:     10;
-                 min:      1 1;
-                 align:    0.5 0.5;
-              }
-           }
-        }
-        // (if seconds)
-        part { name: "d4";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.6250000 0.0;
-              rel2.relative: 0.7500000 1.0;
-           }
-        }
-        // (if seconds)
-        part { name: "d5";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.7500000 0.0;
-              rel2.relative: 0.8750000 1.0;
-           }
-        }
-        // (if am_pm)
-        part { name: "ampm";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.8750000 0.0;
-              rel2.relative: 1.0 1.0;
-           }
-        }
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
       }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/base-seconds/default";
-      parts {
-        part { name: "d0";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.000000000 0.0;
-              rel2.relative: 0.142857143 1.0;
-           }
-        }
-        part { name: "d1";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.142857143 0.0;
-              rel2.relative: 0.285714286 1.0;
-           }
-        }
-        part { name: "c0";
-           type: SWALLOW;
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 0.285714286 0.0;
-              rel2.relative: 0.357142857 1.0;
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 text:     ":";
-                 size:     10;
-                 min:      1 1;
-                 align:    0.5 0.5;
-              }
-           }
-        }
-        part { name: "d2";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.357142857 0.0;
-              rel2.relative: 0.500000000 1.0;
-           }
-        }
-        part { name: "d3";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.500000000 0.0;
-              rel2.relative: 0.642857143 1.0;
-           }
-        }
-        // (if seconds)
-        part { name: "c1";
-           type: SWALLOW;
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 0.642857143 0.0;
-              rel2.relative: 0.714285714 1.0;
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 text:     ":";
-                 size:     10;
-                 min:      1 1;
-                 align:    0.5 0.5;
-              }
-           }
-        }
-        // (if seconds)
-        part { name: "d4";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.714285714 0.0;
-              rel2.relative: 0.857142857 1.0;
-           }
-        }
-        // (if seconds)
-        part { name: "d5";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.857142857 0.0;
-              rel2.relative: 1.000000000 1.0;
-           }
-        }
+      programs {
+         program {
+            name: "button_mouse_in";
+            signal: "mouse,in";
+            source: "over2";
+            action: STATE_SET "visible" 0.0;
+            target: "button_image";
+            target: "over1";
+            transition: DECELERATE 0.5;
+         }
+         program {
+            name: "button_mouse_out";
+            signal: "mouse,out";
+            source: "over2";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over1";
+            transition: DECELERATE 0.5;
+         }
+         program {
+            name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: STATE_SET "visible" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "button_click2";
+            signal: "mouse,down,1";
+            source: "over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "over3";
+         }
+         program {
+            name: "button_unclick2";
+            signal: "mouse,up,1";
+            source: "over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "over3";
+         }
+         program {
+            name: "button_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0); else
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+            }
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "over2";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0); else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over1";
+            target: "over2";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0); else
+                  set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/base-am_pm/default";
-      parts {
-        part { name: "d0";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.000000000 0.0;
-              rel2.relative: 0.181818182 1.0;
-           }
-        }
-        part { name: "d1";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.181818182 0.0;
-              rel2.relative: 0.363636364 1.0;
-           }
-        }
-        part { name: "c0";
-           type: SWALLOW;
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 0.363636364 0.0;
-              rel2.relative: 0.454545455 1.0;
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 text:     ":";
-                 size:     10;
-                 min:      1 1;
-                 align:    0.5 0.5;
-              }
-           }
-        }
-        part { name: "d2";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.454545455 0.0;
-              rel2.relative: 0.636363636 1.0;
-           }
-        }
-        part { name: "d3";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.636363636 0.0;
-              rel2.relative: 0.818181818 1.0;
-           }
-        }
-        // (if am_pm)
-        part { name: "ampm";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.818181818 0.0;
-              rel2.relative: 1.0 1.0;
-           }
-        }
+   group {
+      name: "elm/toggle/base/default";
+      images {
+         image: "shelf_inset.png" COMP;
+         image: "bt_basew.png" COMP;
+         image: "bt_bases.png" COMP;
+         image: "bt_hilightw.png" COMP;
+         image: "tog_base.png" COMP;
+         image: "tog_dis_base.png" COMP;
       }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/base/default";
       parts {
-        part { name: "d0";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.000000000 0.0;
-              rel2.relative: 0.222222222 1.0;
-           }
-        }
-        part { name: "d1";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.222222222 0.0;
-              rel2.relative: 0.444444444 1.0;
-           }
-        }
-        part { name: "c0";
-           type: SWALLOW;
-           type: TEXT;
-           mouse_events:  0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.relative: 0.444444444 0.0;
-              rel2.relative: 0.555555556 1.0;
-              color: 0 0 0 255;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 text:     ":";
-                 size:     10;
-                 min:      1 1;
-                 align:    0.5 0.5;
-              }
-           }
-        }
-        part { name: "d2";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.555555556 0.0;
-              rel2.relative: 0.777777778 1.0;
-           }
-        }
-        part { name: "d3";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.relative: 0.777777778 0.0;
-              rel2.relative: 1.000000000 1.0;
-           }
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/frame/base/default";
-       images {
-           image: "frame_1.png" COMP;
-           image: "frame_2.png" COMP;
-           image: "dia_grad.png" COMP;
-       }
-       parts {
-           part { name: "base0";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "dia_grad.png";
-                   rel1.to: "over";
-                   rel2.to: "over";
-                   fill {
-                       smooth: 0;
-                       size {
-                           relative: 0.0 1.0;
-                           offset: 64 0;
-                       }
-                   }
-               }
-           }
-           part { name: "base";
-               mouse_events:  0;
-               description { state:    "default" 0.0;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 9 9;
-                   image {
-                       normal: "frame_2.png";
-                       border: 5 5 32 26;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "elm.text";
-               type: TEXT;
-               mouse_events:   0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   align: 0.0 0.0;
-                   fixed: 0 1;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: 6 6;
-                   }
-                   rel2 {
-                       relative: 1.0 0.0;
-                       offset: -7 6;
-                   }
-                   color: 0 0 0 64;
-                   text {
-                       font: "Sans:style=Bold,Edje-Vera-Bold";
-                       size: 10;
-                       min: 1 1;
-                       max: 1 1;
-                       align: 0.0 0.0;
-                   }
-               }
-           }
-           part { name: "over";
-               mouse_events:  0;
-               description { state:    "default" 0.0;
-                   rel1.offset: 4 4;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 5 5;
-                   image {
-                       normal: "frame_1.png";
-                       border: 2 2 28 22;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   align: 0.0 0.0;
-                   rel1 {
-                       to_y: "elm.text";
-                       relative: 0.0 1.0;
-                       offset: 8 2;
-                   }
-                   rel2.offset: -9 -9;
-               }
-           }
-       }
-   }
-
-   group { name: "elm/frame/base/pad_small";
-       parts {
-           part { name: "b0";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 4 4;
-                   max: 4 4;
-                   align: 0.0 0.0;
-               }
-           }
-           part { name: "b1";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 4 4;
-                   max: 4 4;
-                   align: 1.0 1.0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "b0";
-                       relative: 1.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "b1";
-                       relative: 0.0 0.0;
-                       offset: -1 -1;
-                   }
-               }
-           }
-       }
-   }
-
-   group { name: "elm/frame/base/pad_medium";
-       parts {
-           part { name: "b0";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 8 8;
-                   max: 8 8;
-                   align: 0.0 0.0;
-               }
-           }
-           part { name: "b1";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 8 8;
-                   max: 8 8;
-                   align: 1.0 1.0;
+         part {
+            name: "bg";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel1.offset: -4 3;
+               rel2.offset: -4 -4;
+               align: 1.0 0.5;
+               min: 96 16;
+               max: 96 16;
+               aspect: 4.0 4.0;
+               aspect_preference: VERTICAL;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "button";
+            type: RECT;
+            scale: 1;
+            clip_to: "clipper";
+            mouse_events: 1;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+               confine: "bg";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               min: 16 16;
+               max: 16 16;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "button_events";
+            type: RECT;
+            dragable {
+               events: "button";
+            }
+            description {
+               state: "default" 0.0;
+               rel1.to_x: "bg";
+               rel1.offset: 0 0;
+               rel1.relative: 0.0 0.0;
+               rel2.to_x: "bg";
+               rel2.offset: -1 -1;
+               rel2.relative: 1.0 1.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "onrect";
+            type: RECT;
+            scale: 1;
+            clip_to: "clipper";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "button";
+               rel1.relative: -5.0 0.0;
+               rel2.to: "button";
+               rel2.relative: 0.0 1.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "offrect";
+            type: RECT;
+            scale: 1;
+            clip_to: "clipper";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "button";
+               rel1.relative: 1.0 0.0;
+               rel2.to: "button";
+               rel2.relative: 6.0 1.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "togbase";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "onrect";
+               rel2.to: "offrect";
+               image.normal: "tog_base.png";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "tog_dis_base.png";
+            }
+         }
+         part {
+            name: "elm.offtext";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_x: "offrect";
+               rel2.to_x: "offrect";
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 1;
+                  align: 0.5 0.5;
+                  text: "OFF";
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "b0";
-                       relative: 1.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "b1";
-                       relative: 0.0 0.0;
-                       offset: -1 -1;
-                   }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+            }
+         }
+         part {
+            name: "elm.ontext";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_x: "onrect";
+               rel1.offset: 1 1;
+               rel2.to_x: "onrect";
+               rel2.offset: 0 0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 1;
+                  align: 0.5 0.5;
+                  text: "ON";
                }
-           }
-       }
-   }
-
-   group { name: "elm/frame/base/pad_large";
-       parts {
-           part { name: "b0";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 16 16;
-                   max: 16 16;
-                   align: 0.0 0.0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+               color3: 0 0 0 24;
+            }
+         }
+         part {
+            name: "conf_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: -1 -1;
+               rel1.to: "bg";
+               rel2.offset: 0 0;
+               rel2.to: "bg";
+               image {
+                  normal: "shelf_inset.png";
+                  border: 7 7 7 7;
+                  middle: 0;
                }
-           }
-           part { name: "b1";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 16 16;
-                   max: 16 16;
-                   align: 1.0 1.0;
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "button0";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "button2";
+               rel1.offset: -4 -4;
+               rel2.to: "button2";
+               rel2.offset: 3 3;
+               image {
+                  normal: "bt_bases.png";
+                  border: 11 11 11 11;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "b0";
-                       relative: 1.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "b1";
-                       relative: 0.0 0.0;
-                       offset: -1 -1;
-                   }
+               image.middle: SOLID;
+               color: 255 255 255 128;
+            }
+         }
+         part {
+            name: "button2";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "button";
+               rel1.offset: -2 -2;
+               rel2.to: "button";
+               rel2.offset: 1 1;
+               image {
+                  normal: "bt_basew.png";
+                  border: 7 7 7 7;
                }
-           }
-       }
-   }
-
-   group { name: "elm/frame/base/pad_huge";
-       parts {
-           part { name: "b0";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 32 32;
-                   max: 32 32;
-                   align: 0.0 0.0;
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "button3";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "button2";
+               rel2.to: "button2";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilightw.png";
+                  border: 4 4 4 0;
                }
-           }
-           part { name: "b1";
-               mouse_events:  0;
-               type: RECT;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   min: 32 32;
-                   max: 32 32;
-                   align: 1.0 1.0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "b0";
-                       relative: 1.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "b1";
-                       relative: 0.0 0.0;
-                       offset: -1 -1;
-                   }
-               }
-           }
-       }
-   }
-
-   group { name: "elm/frame/base/outdent_top";
-       images {
-           image: "outdent-top.png" COMP;
-       }
-       parts {
-           part { name: "base0";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "outdent-top.png";
-                   image.border: 0 0 0 13;
-                   fill.smooth: 0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.offset: 2 2;
-                   rel2.offset: -3 -13;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1.offset: 4 4;
+               rel2.relative: 0.0 1.0;
+               rel2.offset: 3 -5;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 1 1;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -5;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+               fixed: 1 1;
+               visible: 1;
+               aspect: 1.0 1.0;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 4;
+               rel2.to_x: "bg";
+               rel2.relative: 0.0 1.0;
+               rel2.offset: -5 -5;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.0 0.5;
                }
-           }
-       }
-   }
-
-   group { name: "elm/frame/base/outdent_bottom";
-       images {
-           image: "outdent-bottom.png" COMP;
-       }
-       parts {
-           part { name: "base0";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "outdent-bottom.png";
-                   image.border: 0 0 13 0;
-                   fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+               visible: 1;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "drag_end";
+            signal: "mouse,up,1";
+            source: "button";
+            script {
+               new Float:dx, Float:dy;
+               get_drag(PART:"button", dx, dy);
+               if (dx > 0.5) {
+                  set_drag(PART:"button", 1.0, 0.0);
+                  emit("elm,action,toggle,on", "");
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.offset: 2 12;
-                   rel2.offset: -3 -3;
+               else {
+                  set_drag(PART:"button", 0.0, 0.0);
+                  emit("elm,action,toggle,off", "");
                }
-           }
-       }
+            }
+         }
+         program {
+            name: "toggle_on";
+            signal: "elm,state,toggle,on";
+            source: "elm";
+            script {
+               set_drag(PART:"button", 100.0, 0.0);
+            }
+         }
+         program {
+            name: "toggle_off";
+            signal: "elm,state,toggle,off";
+            source: "elm";
+            script {
+               set_drag(PART:"button", 0.0, 0.0);
+            }
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "togbase";
+            target: "elm.offtext";
+            target: "elm.ontext";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0); else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "disabled_visible", 0.0); else
+                  set_state(PART:"elm.swallow.content", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0); else
+                  set_state(PART:"elm.text", "default", 0.0);
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0); else
+                  set_state(PART:"elm.swallow.content", "default", 0.0);
+            }
+         }
+      }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/hover/base/default";
+   group {
+      name: "elm/clock/flipdigit/default";
       images {
-        image: "shad_circ.png" COMP;
-      }
-      parts {
-        part { name: "elm.swallow.offset";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.relative: 0.0 0.0;
-              rel2.relative: 0.0 0.0;
-           }
-        }
-        part { name: "elm.swallow.size";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.to: "elm.swallow.offset";
-              rel1.relative: 1.0 1.0;
-              rel2.to: "elm.swallow.offset";
-              rel2.relative: 1.0 1.0;
-           }
-        }
-        part { name: "base";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              color: 0 0 0 64;
-           }
-        }
-         part { name: "shad";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "shad_circ.png";
-              rel1.to: "elm.swallow.size";
-              rel1.offset: -32 -32;
-              rel2.to: "elm.swallow.size";
-              rel2.offset: 31 31;
-               fill.smooth: 0;
-           }
-        }
-        part { name: "box";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              rel1.to: "elm.swallow.size";
-              rel1.offset: -2 -2;
-              rel2.to: "elm.swallow.size";
-              rel2.offset: 1 1;
-           }
-        }
-        part { name: "elm.swallow.slot.left";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 1.0 0.5;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 0.0;
-              rel1.offset: -1 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 0.0 1.0;
-              rel2.offset: -1 -1;
-           }
-        }
-        part { name: "elm.swallow.slot.right";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.5;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 1.0 0.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: 0 -1;
-           }
-        }
-        part { name: "elm.swallow.slot.top";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.5 1.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 0.0;
-              rel1.offset: 0 -1;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 0.0;
-              rel2.offset: -1 -1;
-           }
-        }
-        part { name: "elm.swallow.slot.bottom";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.5 0.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 1.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -1 0;
-           }
-        }
-        part { name: "elm.swallow.slot.middle";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.size";
-              rel2.to: "elm.swallow.size";
-           }
-        }
-      }
-      programs {
-        program { name: "end";
-           signal: "mouse,up,1";
-           source: "base";
-           action: SIGNAL_EMIT "elm,action,dismiss" "";
-        }
+         image: "flip_base.png" COMP;
+         image: "flip_base_shad.png" COMP;
+         image: "flip_shad.png" COMP;
+         image: "flip_0t.png" COMP;
+         image: "flip_0b.png" COMP;
+         image: "flip_1t.png" COMP;
+         image: "flip_1b.png" COMP;
+         image: "flip_2t.png" COMP;
+         image: "flip_2b.png" COMP;
+         image: "flip_3t.png" COMP;
+         image: "flip_3b.png" COMP;
+         image: "flip_4t.png" COMP;
+         image: "flip_4b.png" COMP;
+         image: "flip_5t.png" COMP;
+         image: "flip_5b.png" COMP;
+         image: "flip_6t.png" COMP;
+         image: "flip_6b.png" COMP;
+         image: "flip_7t.png" COMP;
+         image: "flip_7b.png" COMP;
+         image: "flip_8t.png" COMP;
+         image: "flip_8b.png" COMP;
+         image: "flip_9t.png" COMP;
+         image: "flip_9b.png" COMP;
+         image: "arrow_up.png" COMP;
+         image: "arrow_down.png" COMP;
       }
-   }
-
-   group { name: "elm/hover/base/popout";
-      images {
-        image: "shad_circ.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
+      script {
+         public v0_cur, v0_pre, v0_lock, v0_next;
+         public animator2(val, Float:pos) {
+            new st1[11], st2[11], v;
+            v = get_int(v0_cur);
+            snprintf(st1, 10, "%ih", v);
+            snprintf(st2, 10, "%i", v);
+            set_tween_state(PART:"bot", pos, st1, 0.0, st2, 0.0);
+            set_tween_state(PART:"sh", pos, "half", 0.0, "full", 0.0);
+            if (pos >= 1.0) {
+               set_state(PART:"sh", "default", 0.0);
+               set_int(v0_lock, 0);
+               v = get_int(v0_next);
+               if (v >= 0) {
+                  set_int(v0_next, -1);
+                  message(MSG_INT, 1, v);
+               }
+            }
+         }
+         public animator1(val, Float:pos) {
+            new st1[11], st2[11], v;
+            v = get_int(v0_pre);
+            snprintf(st1, 10, "%i", v);
+            snprintf(st2, 10, "%ih", v);
+            set_tween_state(PART:"top", pos, st1, 0.0, st2, 0.0);
+            set_tween_state(PART:"sh", pos, "default", 0.0, "half", 0.0);
+            if (pos >= 1.0) anim(0.2, "animator2", val);
+         }
+         public message(Msg_Type:type, id, ...) {
+            if ((type == MSG_INT) && (id == 1)) {
+               new value, v, buf[11];
+               value = getarg(2);
+               if (get_int(v0_lock) == 1) {
+                  set_int(v0_next, value);
+                  return;
+               }
+               v = get_int(v0_cur);
+               set_int(v0_pre, v);
+               set_int(v0_cur, value);
+               set_int(v0_lock, 1);
+               snprintf(buf, 10, "%i", get_int(v0_pre));
+               set_state(PART:"bot0", buf, 0.0);
+               snprintf(buf, 10, "%ih", get_int(v0_cur));
+               set_state(PART:"bot", buf, 0.0);
+               snprintf(buf, 10, "%i", get_int(v0_cur));
+               set_state(PART:"top0", buf, 0.0);
+               snprintf(buf, 10, "%i", get_int(v0_pre));
+               set_state(PART:"top", buf, 0.0);
+               set_state(PART:"sh", "default", 0.0);
+               anim(0.2, "animator1", 1);
+            }
+         }
       }
       parts {
-        part { name: "elm.swallow.offset";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.relative: 0.0 0.0;
-              rel2.relative: 0.0 0.0;
-           }
-        }
-        part { name: "elm.swallow.size";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.to: "elm.swallow.offset";
-              rel1.relative: 1.0 1.0;
-              rel2.to: "elm.swallow.offset";
-              rel2.relative: 1.0 1.0;
-           }
-        }
-        part { name: "base";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 1.0;
-              color: 0 0 0 64;
-           }
-        }
-        part { name: "leftclip";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel2.to_x: "pop";
-              rel2.relative: 0.0 1.0;
-               rel2.offset: 1 -1;
-           }
-        }
-        part { name: "left";
-           clip_to: "leftclip";
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to: "elm.swallow.slot.left";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.slot.left";
-               rel2.offset: 4 4;
-               image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.slot.left";
-            type: SWALLOW;
-           clip_to: "leftclip";
-           description { state: "default" 0.0;
-              align: 0.0 0.5;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 0.0;
-              rel1.offset: -1 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 0.0 1.0;
-              rel2.offset: -1 -1;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1.offset: -7 0;
-              rel2.offset: -7 -1;
-              align: 1.0 0.5;
-           }
-        }
-         part { name: "leftover";
-           clip_to: "leftclip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "left";
-              rel2.to: "left";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "rightclip";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel1.to_x: "pop";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: -2 0;
-           }
-        }
-        part { name: "right";
-           clip_to: "rightclip";
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to: "elm.swallow.slot.right";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.slot.right";
-               rel2.offset: 4 4;
-               image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.slot.right";
-            type: SWALLOW;
-           clip_to: "rightclip";
-           description { state: "default" 0.0;
-              align: 1.0 0.5;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 1.0 0.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: 0 -1;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1.offset: 6 0;
-              rel2.offset: 6 -1;
-              align: 0.0 0.5;
-           }
-        }
-         part { name: "rightover";
-           clip_to: "rightclip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "right";
-              rel2.to: "right";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "topclip";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel2.to_y: "pop";
-              rel2.relative: 1.0 0.0;
-               rel2.offset: -1 1;
-           }
-        }
-        part { name: "top";
-           clip_to: "topclip";
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to: "elm.swallow.slot.top";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.slot.top";
-               rel2.offset: 4 4;
-               image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.slot.top";
-            type: SWALLOW;
-           clip_to: "topclip";
-           description { state: "default" 0.0;
-              visible: 1;
-              align: 0.5 0.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 0.0;
-              rel1.offset: 0 -1;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 0.0;
-              rel2.offset: -1 -1;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1.offset: 0 -7;
-              rel2.offset: -1 -7;
-              align: 0.5 1.0;
-           }
-        }
-         part { name: "topover";
-           clip_to: "topclip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "top";
-              rel2.to: "top";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "bottomclip";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel1.to_y: "pop";
-              rel1.relative: 0.0 1.0;
-               rel1.offset: -1 -2;
-           }
-        }
-        part { name: "bottom";
-           clip_to: "bottomclip";
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to: "elm.swallow.slot.bottom";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.slot.bottom";
-               rel2.offset: 4 4;
-               image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.slot.bottom";
-            type: SWALLOW;
-           clip_to: "bottomclip";
-           description { state: "default" 0.0;
-              align: 0.5 1.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 1.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -1 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1.offset: 0 6;
-              rel2.offset: -1 6;
-              align: 0.5 0.0;
-           }
-        }
-         part { name: "bottomover";
-           clip_to: "bottomclip";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "bottom";
-              rel2.to: "bottom";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-         part { name: "shad";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "shad_circ.png";
-              rel1.to: "elm.swallow.size";
-              rel1.offset: -64 -64;
-              rel2.to: "elm.swallow.size";
-              rel2.offset: 63 63;
-               fill.smooth: 0;
-           }
-        }
-        part { name: "pop";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.slot.middle";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.slot.middle";
-               rel2.offset: 4 4;
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: -4 -4;
+               rel1.to: "base";
+               rel2.offset: 3 3;
+               rel2.to: "base";
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-        }
-        part { name: "elm.swallow.slot.middle";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.size";
-              rel2.to: "elm.swallow.size";
-           }
-        }
-         part { name: "popover";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "pop";
-              rel2.to: "pop";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "end";
-           signal: "mouse,up,1";
-           source: "base";
-           action: SIGNAL_EMIT "elm,action,dismiss" "";
-        }
-
-        program { name: "show";
-            signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
-            signal: "elm,action,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-
-        program { name: "leftshow";
-            signal: "elm,action,slot,left,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           transition: DECELERATE 0.5;
-           target: "left";
-           target: "elm.swallow.slot.left";
-        }
-        program { name: "lefthide";
-            signal: "elm,action,slot,left,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "left";
-           target: "elm.swallow.slot.left";
-        }
-        program { name: "rightshow";
-            signal: "elm,action,slot,right,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           transition: DECELERATE 0.5;
-           target: "right";
-           target: "elm.swallow.slot.right";
-        }
-        program { name: "righthide";
-            signal: "elm,action,slot,right,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "right";
-           target: "elm.swallow.slot.right";
-        }
-        program { name: "topshow";
-            signal: "elm,action,slot,top,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           transition: DECELERATE 0.5;
-           target: "top";
-           target: "elm.swallow.slot.top";
-        }
-        program { name: "tophide";
-            signal: "elm,action,slot,top,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "top";
-           target: "elm.swallow.slot.top";
-        }
-        program { name: "bottomshow";
-            signal: "elm,action,slot,bottom,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           transition: DECELERATE 0.5;
-           target: "bottom";
-           target: "elm.swallow.slot.bottom";
-        }
-        program { name: "bottomhide";
-            signal: "elm,action,slot,bottom,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "bottom";
-           target: "elm.swallow.slot.bottom";
-        }
-      }
-   }
-
-   //In the hover used by the menu only the bottom part is used.
-   group { name: "elm/hover/base/menu";
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-       }
-       parts {
-           part { name: "elm.swallow.offset";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   align: 0.0 0.0;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 0.0 0.0;
-               }
-           }
-           part { name: "elm.swallow.size";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   align: 0.0 0.0;
-                   rel1.to: "elm.swallow.offset";
-                   rel1.relative: 1.0 1.0;
-                   rel2.to: "elm.swallow.offset";
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           part { name: "base";
-               type: RECT;
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 1.0;
-                   color: 0 0 0 64;
-               }
-           }
-           part { name: "elm.swallow.slot.left";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               }
-           }
-           part { name: "elm.swallow.slot.right";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               }
-           }
-           part { name: "elm.swallow.slot.top";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-               }
-           }
-           part { name: "bottomclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to_y: "pop";
-                   rel1.relative: 0.0 1.0;
-                   rel1.offset: -1 -2;
-               }
-           }
-           part { name: "bottom";
-               clip_to: "bottomclip";
-               description { state: "default" 0.0;
-                   visible: 0;
-                   rel1.to: "elm.swallow.slot.bottom";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.slot.bottom";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-               }
-           }
-           part { name: "elm.swallow.slot.bottom";
-               type: SWALLOW;
-               clip_to: "bottomclip";
-               description { state: "default" 0.0;
-                   align: 0.5 1.0;
-                   rel1.to: "elm.swallow.slot.middle";
-                   rel1.relative: 0.0 1.0;
-                   rel1.offset: 0 0;
-                   rel2.to: "elm.swallow.slot.middle";
-                   rel2.relative: 1.0 1.0;
-                   rel2.offset: -1 0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   rel1.offset: 0 6;
-                   rel2.offset: -1 6;
-                   align: 0.5 0.0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               repeat_events:1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.slot.middle";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.slot.middle";
-                   rel2.offset: 4 4;
-               }
-           }
-           part { name: "elm.swallow.slot.middle";
-               type: SWALLOW;
-               repeat_events:1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.size";
-                   rel2.to: "elm.swallow.size";
-               }
-           }
-       }
-       programs {
-           program { name: "end";
-               signal: "mouse,up,1";
-               source: "base";
-               action: SIGNAL_EMIT "elm,action,dismiss" "";
-           }
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-                       //          transition: DECELERATE 0.5;
-               target: "base";
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-                       //          transition: DECELERATE 0.5;
-               target: "base";
-           }
-           program { name: "bottomshow";
-               signal: "elm,action,slot,bottom,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               transition: DECELERATE 0.3;
-               target: "bottom";
-               target: "elm.swallow.slot.bottom";
-           }
-           program { name: "bottomhide";
-               signal: "elm,action,slot,bottom,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "bottom";
-               target: "elm.swallow.slot.bottom";
-           }
-       }
-   }
-
-   //In the hover used by the submenu only the bottom part is used
-   //and no part should interact except the bottom area
-   group { name: "elm/hover/base/submenu";
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-       }
-       parts {
-           part { name: "elm.swallow.offset";
-               type: SWALLOW;
-               repeat_events:1;
-               description { state: "default" 0.0;
-                   align: 0.0 0.0;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 0.0 0.0;
-               }
-           }
-           part { name: "elm.swallow.size";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   align: 0.0 0.0;
-                   rel1.to: "elm.swallow.offset";
-                   rel1.relative: 1.0 1.0;
-                   rel2.to: "elm.swallow.offset";
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           //here we do non catch events like the hover hover does
-           part { name: "base";
-               type: RECT;
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   visible: 0;
-               }
-           }
-           part { name: "elm.swallow.slot.left";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               }
-           }
-           part { name: "elm.swallow.slot.right";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               }
-           }
-           part { name: "elm.swallow.slot.top";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               }
-           }
-           part { name: "bottomclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to_y: "pop";
-                   rel1.relative: 0.0 1.0;
-                   rel1.offset: -1 -2;
+                  normal: "flip_base_shad.png";
+                  border: 8 8 8 8;
                }
-           }
-           part { name: "bottom";
-               clip_to: "bottomclip";
-               description { state: "default" 0.0;
-                   visible: 0;
-                   rel1.to: "elm.swallow.slot.bottom";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.slot.bottom";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-               }
-           }
-           part { name: "elm.swallow.slot.bottom";
-               type: SWALLOW;
-               clip_to: "bottomclip";
-               description { state: "default" 0.0;
-                   align: 0.5 1.0;
-                   rel1.to: "elm.swallow.slot.middle";
-                   rel1.relative: 0.0 1.0;
-                   rel1.offset: 0 0;
-                   rel2.to: "elm.swallow.slot.middle";
-                   rel2.relative: 1.0 1.0;
-                   rel2.offset: -1 0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   rel1.offset: 0 6;
-                   rel2.offset: -1 6;
-                   align: 0.5 0.0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               repeat_events:1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.slot.middle";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.slot.middle";
-                   rel2.offset: 4 4;
-               }
-           }
-           part { name: "elm.swallow.slot.middle";
-               type: SWALLOW;
-               repeat_events:1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.size";
-                   rel2.to: "elm.swallow.size";
-               }
-           }
-       }
-       programs {
-           program { name: "end";
-               signal: "mouse,up,1";
-               source: "base";
-               action: SIGNAL_EMIT "elm,action,dismiss" "";
-           }
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-                       //          transition: DECELERATE 0.5;
-               target: "base";
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-                       //          transition: DECELERATE 0.5;
-               target: "base";
-           }
-           program { name: "bottomshow";
-               signal: "elm,action,slot,bottom,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               transition: DECELERATE 0.3;
-               target: "bottom";
-               target: "elm.swallow.slot.bottom";
-           }
-           program { name: "bottomhide";
-               signal: "elm,action,slot,bottom,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "bottom";
-               target: "elm.swallow.slot.bottom";
-           }
-       }
-   }
-
-   group { name: "elm/hover/base/hoversel_vertical/default";
-      alias: "elm/hover/base/hoversel_vertical/entry";
-      images {
-//      image: "shad_circ.png" COMP;
-        image: "bt_base2.png" COMP;
-        image: "bt_hilight.png" COMP;
-        image: "bt_shine.png" COMP;
-        image: "outdent-top.png" COMP;
-        image: "outdent-bottom.png" COMP;
-      }
-      parts {
-        part { name: "elm.swallow.offset";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.relative: 0.0 0.0;
-              rel2.relative: 0.0 0.0;
-           }
-        }
-        part { name: "elm.swallow.size";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.to: "elm.swallow.offset";
-              rel1.relative: 1.0 1.0;
-              rel2.to: "elm.swallow.offset";
-              rel2.relative: 1.0 1.0;
-           }
-        }
-/*
-        part { name: "shad";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "shad_circ.png";
-              rel1.to: "button_image";
-              rel1.offset: -64 -64;
-              rel2.to: "button_image";
-              rel2.offset: 63 63;
-               fill.smooth: 0;
-           }
-        }
- */
-        part { name: "button_image";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to_x: "elm.swallow.slot.top";
-              rel1.to_y: "elm.swallow.slot.top";
-               rel1.offset: -2 -6;
-              rel2.to_x: "elm.swallow.slot.top";
-              rel2.to_y: "elm.swallow.slot.bottom";
-               rel2.offset: 1 5;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
-               image.middle: SOLID;
-           }
-           description { state: "bottom" 0.0;
-              rel1.to_x: "elm.swallow.slot.bottom";
-              rel1.to_y: "elm.swallow.slot.top";
-               rel1.offset: -2 -6;
-              rel2.to_x: "elm.swallow.slot.bottom";
-              rel2.to_y: "elm.swallow.slot.bottom";
-               rel2.offset: 1 5;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
-               image.middle: SOLID;
-           }
-        }
-
-        part { name: "base";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 1.0;
-              color: 0 0 0 64;
-           }
-        }
-
-        part { name: "topclip";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel2.to_y: "edge_top";
-              rel2.relative: 1.0 0.0;
-               rel2.offset: -1 7;
-           }
-        }
-        part { name: "elm.swallow.slot.top";
-            type: SWALLOW;
-           clip_to: "topclip";
-           description { state: "default" 0.0;
-              visible: 1;
-              align: 0.5 0.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 0.0;
-              rel1.offset: 0 -1;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 0.0;
-              rel2.offset: -1 -1;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1.offset: 0 -7;
-              rel2.offset: -1 -7;
-              align: 0.5 1.0;
-           }
-        }
-
-        part { name: "bottomclip";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel1.to_y: "edge_bottom";
-              rel1.relative: 0.0 1.0;
-               rel1.offset: -1 -8;
-           }
-        }
-        part { name: "elm.swallow.slot.bottom";
-            type: SWALLOW;
-           clip_to: "bottomclip";
-           description { state: "default" 0.0;
-              align: 0.5 1.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 1.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -1 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1.offset: 0 6;
-              rel2.offset: -1 6;
-              align: 0.5 0.0;
-           }
-        }
-
-        part {   name: "over1";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_hilight.png";
-                 border: 7 7 7 0;
-              }
-           }
-        }
-        part { name: "over2";
-           mouse_events: 1;
-           repeat_events: 1;
-            ignore_flags: ON_HOLD;
-           description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-        }
-         part { name: "edge_top";
-           mouse_events:  0;
-           description { state: "default" 0.0;
+            }
+         }
+         part {
+            name: "base";
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               // FIXME 48x96 should be the native pixel design, right now
+               // its 80x160. fix int he artwork later
+               min: 24 48;
+               aspect: 0.5 0.5;
+               // max: 24 48;
+               image.normal: "flip_base.png";
+            }
+         }
+         part {
+            name: "b";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel1.relative: 0.0 0.5;
+               rel2.to: "base";
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "t";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               rel2.relative: 1.0 0.5;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "bot0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "flip_0b.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_0b.png";
+            }
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_1b.png";
+            }
+            description {
+               state: "2" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_2b.png";
+            }
+            description {
+               state: "3" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_3b.png";
+            }
+            description {
+               state: "4" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_4b.png";
+            }
+            description {
+               state: "5" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_5b.png";
+            }
+            description {
+               state: "6" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_6b.png";
+            }
+            description {
+               state: "7" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_7b.png";
+            }
+            description {
+               state: "8" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_8b.png";
+            }
+            description {
+               state: "9" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_9b.png";
+            }
+         }
+         part {
+            name: "sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "b";
+               rel2.to: "b";
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_shad.png";
+            }
+            description {
+               state: "half" 0.0;
+               inherit: "default" 0.0;
+               rel2.relative: 1.0 0.5;
+            }
+            description {
+               state: "full" 0.0;
+               inherit: "default" 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "bot";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "flip_0b.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_0b.png";
+            }
+            description {
+               state: "0h" 0.0;
+               inherit: "default" 0.0;
                visible: 0;
-              rel1 {
-                  to: "elm.swallow.size";
-                  offset: 0 -10;
-               }
-              rel2 {
-                  to: "elm.swallow.size";
-               }
-              image.normal: "outdent-bottom.png";
-               image.border: 0 0 13 0;
-               fill.smooth: 0;
-           }
-           description { state: "visible" 0.0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_0b.png";
+            }
+            description {
+               state: "1" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-           }
-        }
-         part { name: "edge_bottom";
-           mouse_events:  0;
-           description { state: "default" 0.0;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_1b.png";
+            }
+            description {
+               state: "1h" 0.0;
+               inherit: "default" 0.0;
                visible: 0;
-              rel1 {
-                  to: "elm.swallow.size";
-               }
-              rel2 {
-                  to: "elm.swallow.size";
-                  offset: -1 9;
-               }
-              image.normal: "outdent-top.png";
-               image.border: 0 0 0 13;
-               fill.smooth: 0;
-           }
-           description { state: "visible" 0.0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_1b.png";
+            }
+            description {
+               state: "2" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-           }
-        }
-        part { name: "elm.swallow.slot.middle";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.size";
-              rel2.to: "elm.swallow.size";
-           }
-        }
-      }
-      programs {
-        program { name: "end";
-           signal: "mouse,up,1";
-           source: "base";
-           action: SIGNAL_EMIT "elm,action,dismiss" "";
-        }
-
-        program { name: "show";
-            signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
-            signal: "elm,action,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "topshow";
-            signal: "elm,action,slot,top,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "edge_top";
-            after: "topshow2";
-        }
-        program { name: "topshow2";
-           action: STATE_SET "visible" 0.0;
-           transition: DECELERATE 0.5;
-           target: "elm.swallow.slot.top";
-        }
-        program { name: "topshow3";
-            signal: "elm,action,slot,top,show";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "button_image";
-        }
-        program { name: "tophide";
-            signal: "elm,action,slot,top,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "elm.swallow.slot.top";
-            after: "tophide2";
-        }
-        program { name: "tophide2";
-           action: STATE_SET "default" 0.0;
-           target: "edge_top";
-        }
-        program { name: "bottomshow";
-            signal: "elm,action,slot,bottom,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "edge_bottom";
-            after: "bottomshow2";
-        }
-        program { name: "bottomshow2";
-           action: STATE_SET "visible" 0.0;
-           transition: DECELERATE 0.5;
-           target: "elm.swallow.slot.bottom";
-        }
-        program { name: "bottomshow3";
-            signal: "elm,action,slot,bottom,show";
-           source: "elm";
-           action: STATE_SET "bottom" 0.0;
-           target: "button_image";
-        }
-        program { name: "bottomhide";
-            signal: "elm,action,slot,bottom,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "elm.swallow.slot.bottom";
-            after: "bottomhide2";
-        }
-        program { name: "bottomhide2";
-           action: STATE_SET "default" 0.0;
-           target: "edge_bottom";
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/entry/base/default";
-      styles
-       {
-          style { name: "entry_textblock_style";
-             base: "font=Sans font_size=10 align=left color=#000 wrap=word";
-             tag:  "br" "\n";
-             tag:  "tab" "\t";
-             tag:  "em" "+ font=Sans:style=Oblique";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-          }
-          style { name: "entry_textblock_disabled_style";
-             base: "font=Sans font_size=10 align=left color=#00000080 wrap=word";
-             tag:  "br" "\n";
-             tag:  "tab" "\t";
-             tag:  "em" "+ font=Sans:style=Oblique";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-          }
-       }
-      data {
-//         item: context_menu_orientation "horizontal";
-      }
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: EDITABLE;
-           select_mode: EXPLICIT;
-           multiline: 1;
-           source: "elm/entry/selection/default"; // selection under
-//         source2: "X"; // selection over
-//         source3: "X"; // cursor under
-           source4: "elm/entry/cursor/default"; // cursorover
-           source5: "elm/entry/anchor/default"; // anchor under
-//         source6: "X"; // anchor over
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              text {
-                 style: "entry_textblock_style";
-                 min: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_2b.png";
+            }
+            description {
+               state: "2h" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_textblock_disabled_style";
-                 min: 0 1;
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-    group { name: "elm/entry/base-charwrap/default";
-      styles
-       {
-          style { name: "entry_textblock_style_charwrap";
-             base: "font=Sans font_size=10 align=left color=#000 wrap=char";
-             tag:  "br" "\n";
-             tag:  "tab" "\t";
-             tag:  "em" "+ font=Sans:style=Oblique";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-          }
-          style { name: "entry_textblock_disabled_style_charwrap";
-             base: "font=Sans font_size=10 align=left color=#00000080 wrap=char";
-             tag:  "br" "\n";
-             tag:  "tab" "\t";
-             tag:  "em" "+ font=Sans:style=Oblique";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-          }
-       }
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: EDITABLE;
-           select_mode: EXPLICIT;
-           multiline: 1;
-           source: "elm/entry/selection/default"; // selection under
-//         source2: "X"; // selection over
-//         source3: "X"; // cursor under
-           source4: "elm/entry/cursor/default"; // cursorover
-           source5: "elm/entry/anchor/default"; // anchor under
-//         source6: "X"; // anchor over
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              text {
-                 style: "entry_textblock_style_charwrap";
-                 min: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_2b.png";
+            }
+            description {
+               state: "3" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_textblock_disabled_style_charwrap";
-                 min: 0 1;
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-
-   group { name: "elm/entry/base-nowrap/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: EDITABLE;
-           select_mode: EXPLICIT;
-           multiline: 1;
-           source: "elm/entry/selection/default"; // selection under
-           source4: "elm/entry/cursor/default"; // cursorover
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-              text {
-                 style: "entry_textblock_style";
-                 min: 1 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_3b.png";
+            }
+            description {
+               state: "3h" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_textblock_disabled_style";
-                 min: 0 1;
-              }
-           }
-        }
-/*
-        part { name: "sel";
-           type: RECT;
-            mouse_events: 0;
-           description { state: "default" 0.0;
-               align: 1.0 1.0;
-               max: 16 16;
-               aspect: 1.0 1.0;
-               color: 255 0 0 0;
-           }
-           description { state: "visible" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_3b.png";
+            }
+            description {
+               state: "4" 0.0;
                inherit: "default" 0.0;
-               color: 255 0 0 50;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_4b.png";
             }
-        }
- */
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-/*
-        program { name: "selmode0";
-            signal: "elm,state,select,on";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "sel";
-        }
-        program { name: "selmode1";
-            signal: "elm,state,select,off";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "sel";
-        }
- */
-      }
-   }
-
-   group { name: "elm/entry/base-single/default";
-      styles
-       {
-          style { name: "entry_single_textblock_style";
-             base: "font=Sans font_size=10 align=left color=#000 wrap=none";
-             tag:  "br" "\n";
-             tag:  "tab" "\t";
-             tag:  "em" "+ font=Sans:style=Oblique";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-          }
-          style { name: "entry_single_textblock_disabled_style";
-             base: "font=Sans font_size=10 align=left color=#00000080 wrap=none";
-             tag:  "br" "\n";
-             tag:  "tab" "\t";
-             tag:  "em" "+ font=Sans:style=Oblique";
-             tag:  "b" "+ font=Sans:style=Bold";
-             tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-             tag:  "hilight" "+ font=Sans:style=Bold";
-          }
-       }
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: EDITABLE;
-           select_mode: EXPLICIT;
-           multiline: 0;
-           source: "elm/entry/selection/default"; // selection under
-           source4: "elm/entry/cursor/default"; // cursorover
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-              text {
-                 style: "entry_single_textblock_style";
-                 min: 1 1;
-                  max: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+            description {
+               state: "4h" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_single_textblock_disabled_style";
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-   group { name: "elm/entry/base-single-noedit/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: PLAIN;
-           select_mode: EXPLICIT;
-           multiline: 0;
-           source: "elm/entry/selection/default"; // selection under
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-              text {
-                 style: "entry_single_textblock_style";
-                 min: 1 1;
-                  max: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_4b.png";
+            }
+            description {
+               state: "5" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_single_textblock_disabled_style";
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-   group { name: "elm/entry/base-noedit/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: PLAIN;
-           select_mode: EXPLICIT;
-           multiline: 1;
-           source: "elm/entry/selection/default"; // selection under
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              text {
-                 style: "entry_textblock_style";
-                 min: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_5b.png";
+            }
+            description {
+               state: "5h" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_textblock_disabled_style";
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-   group { name: "elm/entry/base-noedit-charwrap/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: PLAIN;
-           select_mode: EXPLICIT;
-           multiline: 1;
-           source: "elm/entry/selection/default"; // selection under
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              text {
-                 style: "entry_textblock_style_charwrap";
-                 min: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_5b.png";
+            }
+            description {
+               state: "6" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_textblock_disabled_style_charwrap";
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-   group { name: "elm/entry/base-nowrap-noedit/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: PLAIN;
-           select_mode: EXPLICIT;
-           multiline: 1;
-           source: "elm/entry/selection/default"; // selection under
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-              text {
-                 style: "entry_textblock_style";
-                 min: 1 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_6b.png";
+            }
+            description {
+               state: "6h" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_textblock_disabled_style";
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-  group { name: "elm/entry/base-password/default";
-      parts {
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 1;
-           scale: 1;
-           entry_mode: PASSWORD;
-           select_mode: EXPLICIT;
-           multiline: 0;
-           source: "elm/entry/selection/default"; // selection under
-           source4: "elm/entry/cursor/default"; // cursorover
-           source5: "elm/entry/anchor/default"; // anchor under
-           description { state: "default" 0.0;
-              text {
-                 style: "entry_single_textblock_style";
-                 repch: "*";
-                 min: 1 1;
-                  max: 0 1;
-              }
-           }
-           description { state: "disabled" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_6b.png";
+            }
+            description {
+               state: "7" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_7b.png";
+            }
+            description {
+               state: "7h" 0.0;
                inherit: "default" 0.0;
-              text {
-                 style: "entry_single_textblock_disabled_style";
-              }
-           }
-        }
-      }
-      programs {
-        program { name: "focus";
-            signal: "load";
-           source: "";
-           action: FOCUS_SET;
-           target: "elm.text";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "elm.text";
-        }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-      }
-   }
-
-   group { name: "elm/entry/cursor/default";
-      images {
-        image: "cur_box.png" COMP;
-        image: "cur_hi.png" COMP;
-        image: "cur_shad.png" COMP;
-        image: "cur_shine.png" COMP;
-        image: "cur_glow.png" COMP;
-      }
-      parts {
-         part { name: "clip2";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "clip";
-              rel2.to: "clip";
                visible: 0;
-           }
-           description { state: "focused" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-         part { name: "clip";
-           type: RECT;
-           mouse_events: 0;
-            clip_to: "clip2";
-           description { state: "default" 0.0;
-              rel1.offset: -10 0;
-              rel2.offset: 9 9;
-           }
-           description { state: "hidden" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-           }
-        }
-         part { name: "bg";
-           mouse_events: 0;
-           clip_to: "clip";
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel1.offset: -2 0;
-              rel2.to: "base";
-              rel2.offset: 1 1;
-              image.border: 2 2 2 2;
-              image.normal: "cur_shad.png";
-           }
-        }
-         part { name: "base";
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "clip";
-           description { state: "default" 0.0;
-              min: 2 2;
-              align: 0.5 1.0;
-              rel1.relative: 0.0 1.0;
-              rel1.offset: 0 -1;
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -1 -1;
-              image.normal: "cur_box.png";
-           }
-        }
-         part { name: "hi";
-           mouse_events: 0;
-           clip_to: "clip";
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              rel2.relative: 1.0 0.5;
-              image.normal: "cur_hi.png";
-           }
-        }
-         part { name: "shine";
-           mouse_events: 0;
-           clip_to: "clip";
-            clip_to: "clip2";
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              rel2.relative: 1.0 0.75;
-              image.border: 2 2 1 0;
-              image.normal: "cur_shine.png";
-              fill.smooth: 0;
-           }
-        }
-         part { name: "glow";
-           mouse_events: 0;
-            clip_to: "clip2";
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel1.relative: 0.0 -2.0;
-              rel1.offset: -2 0;
-              rel2.to: "base";
-              rel2.relative: 1.0 0.0;
-              rel2.offset: 1 1;
-              image.border: 2 2 0 4;
-              image.normal: "cur_glow.png";
-              fill.smooth: 0;
-           }
-           description { state: "hidden" 0.0;
-              inherit: "default" 0.0;
-              color: 255 255 255 0;
-           }
-        }
-      }
-      programs {
-        program { name: "show";
-            signal: "show";
-           source: "";
-            action: STATE_SET "hidden" 0.0;
-           in: 1.0 0.0;
-           transition: DECELERATE 2.0;
-           target: "glow";
-           after: "show2";
-        }
-        program { name: "show2";
-            action: STATE_SET "hidden" 0.0;
-           in: 0.2 0.0;
-           target: "clip";
-           after: "show3";
-        }
-        program { name: "show3";
-            action: STATE_SET "default" 0.0;
-           in: 0.5 0.0;
-           target: "clip";
-           after: "show4";
-        }
-        program { name: "show4";
-            action: STATE_SET "default" 0.0;
-           in: 0.5 0.0;
-           transition: DECELERATE 0.5;
-           target: "glow";
-           after: "show";
-        }
-        program { name: "focused";
-           signal: "elm,action,focus";
-           source: "elm";
-            action: STATE_SET "focused" 0.0;
-           target: "clip2";
-        }
-        program { name: "unfocused";
-           signal: "elm,action,unfocus";
-           source: "elm";
-            action: STATE_SET "default" 0.0;
-           target: "clip2";
-        }
-      }
-   }
-
-   group { name: "elm/entry/selection/default";
-      parts {
-         part { name: "bg";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              color: 128 128 128 128;
-           }
-        }
-      }
-   }
-
-   group { name: "elm/entry/anchor/default";
-      parts {
-         part { name: "bg";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              color: 128 0 0 64;
-           }
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-  group { name: "elm/bubble/top_left/default";
-    alias: "elm/bubble/base/default";
-    images {
-      image: "bubble_3.png" COMP;
-      image: "bubble_shine3.png" COMP;
-    }
-    parts {
-      part { name: "elm.swallow.icon";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          fixed: 1 1;
-          align: 0.0 0.0;
-          aspect: 1.0 1.0;
-          aspect_preference: VERTICAL;
-          rel1 {
-            relative: 0.0 0.0;
-            offset: 4 4;
-          }
-          rel2 {
-            to_y: "elm.text";
-            relative: 0.0 1.0;
-            offset: 4 -1;
-          }
-        }
-      }
-      part { name: "elm.text";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 0.0 0.0;
-          fixed: 0 1;
-          rel1 {
-            to_x: "elm.swallow.icon";
-            relative: 1.0 0.0;
-            offset: 4 4;
-          }
-          rel2 {
-            to_x: "elm.info";
-            relative: 0.0 0.0;
-            offset: -5 4;
-          }
-          color: 0 0 0 255;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 0 1;
-            max: 0 1;
-            align: 0.0 0.0;
-          }
-        }
-      }
-      part { name: "elm.info";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 1.0 0.0;
-          fixed: 1 1;
-          rel1 {
-            relative: 1.0 0.0;
-            offset: -5 4;
-          }
-          rel2 {
-            relative: 1.0 0.0;
-            offset: -5 4;
-          }
-          color: 0 0 0 64;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 1 1;
-            max: 1 1;
-            align: 1.0 0.0;
-          }
-        }
-      }
-      part { name: "base0";
-        mouse_events:  0;
-        description { state: "default" 0.0;
-          rel1 {
-            to_y: "elm.swallow.icon";
-            relative: 0.0 1.0;
-            offset: 0 0;
-          }
-          image {
-            normal: "bubble_3.png";
-            border: 36 11 18 9;
-          }
-          image.middle: SOLID;
-          fill.smooth: 0;
-        }
-      }
-      part { name: "elm.swallow.content";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 9 16;
-          }
-          rel2 {
-            to: "base0";
-            offset: -10 -9;
-          }
-        }
-      }
-      part { name: "shine";
-        mouse_events:  0;
-        description { state:    "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 5 4;
-          }
-          rel2 {
-            to: "base0";
-            relative: 1.0 0.5;
-            offset: -6 7;
-          }
-          image {
-            normal: "bubble_shine3.png";
-            border: 36 5 14 0;
-          }
-          fill.smooth: 0;
-        }
-      }
-    }
-  }
-
-  group { name: "elm/bubble/top_right/default";
-    images {
-      image: "bubble_4.png" COMP;
-      image: "bubble_shine4.png" COMP;
-    }
-    parts {
-      part { name: "elm.swallow.icon";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          fixed: 1 1;
-          align: 1.0 0.0;
-          aspect: 1.0 1.0;
-          aspect_preference: VERTICAL;
-          rel1 {
-            relative: 1.0 0.0;
-            offset: -5 4;
-          }
-          rel2 {
-            to_y: "elm.text";
-            relative: 1.0 1.0;
-            offset: -5 -1;
-          }
-        }
-      }
-      part { name: "elm.text";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 0.0 0.0;
-          fixed: 0 1;
-          rel1 {
-            relative: 0.0 0.0;
-            offset: 4 4;
-          }
-          rel2 {
-            to_x: "elm.info";
-            relative: 0.0 0.0;
-            offset: -5 4;
-          }
-          color: 0 0 0 255;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 0 1;
-            max: 0 1;
-            align: 0.0 0.0;
-          }
-        }
-      }
-      part { name: "elm.info";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 1.0 0.0;
-          fixed: 1 1;
-          rel1 {
-            relative: 1.0 0.0;
-            offset: -5 4;
-          }
-          rel2 {
-            to_x: "elm.swallow.icon";
-            relative: 0.0 0.0;
-            offset: -5 4;
-          }
-          color: 0 0 0 64;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 1 1;
-            max: 1 1;
-            align: 1.0 0.0;
-          }
-        }
-      }
-      part { name: "base0";
-        mouse_events:  0;
-        description { state: "default" 0.0;
-          rel1 {
-            to_y: "elm.swallow.icon";
-            relative: 0.0 1.0;
-            offset: 0 0;
-          }
-          image {
-            normal: "bubble_4.png";
-            border: 11 36 18 9;
-          }
-          image.middle: SOLID;
-          fill.smooth: 0;
-        }
-      }
-      part { name: "elm.swallow.content";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 9 16;
-          }
-          rel2 {
-            to: "base0";
-            offset: -10 -9;
-          }
-        }
-      }
-      part { name: "shine";
-        mouse_events:  0;
-        description { state:    "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 5 4;
-          }
-          rel2 {
-            to: "base0";
-            relative: 1.0 0.5;
-            offset: -6 7;
-          }
-          image {
-            normal: "bubble_shine4.png";
-            border: 5 36 14 0;
-          }
-          fill.smooth: 0;
-        }
-      }
-    }
-  }
-
-  group { name: "elm/bubble/bottom_left/default";
-    images {
-      image: "bubble_1.png" COMP;
-      image: "bubble_shine.png" COMP;
-    }
-    parts {
-      part { name: "elm.swallow.icon";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          fixed: 1 1;
-          align: 0.0 1.0;
-          aspect: 1.0 1.0;
-          aspect_preference: VERTICAL;
-          rel1 {
-            to_y: "elm.text";
-            relative: 0.0 0.0;
-            offset: 4 0;
-          }
-          rel2 {
-            relative: 0.0 1.0;
-            offset: 4 -5;
-          }
-        }
-      }
-      part { name: "elm.text";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 0.0 1.0;
-          fixed: 0 1;
-          rel1 {
-            to_x: "elm.swallow.icon";
-            relative: 1.0 1.0;
-            offset: 4 -5;
-          }
-          rel2 {
-            to_x: "elm.info";
-            relative: 0.0 1.0;
-            offset: -5 -5;
-          }
-          color: 0 0 0 255;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 0 1;
-            max: 0 1;
-            align: 0.0 1.0;
-          }
-        }
-      }
-      part { name: "elm.info";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 1.0 1.0;
-          fixed: 1 1;
-          rel1 {
-            relative: 1.0 1.0;
-            offset: -5 -5;
-          }
-          rel2 {
-            relative: 1.0 1.0;
-            offset: -5 -5;
-          }
-          color: 0 0 0 64;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 1 1;
-            max: 1 1;
-            align: 1.0 1.0;
-          }
-        }
-      }
-      part { name: "base0";
-        mouse_events:  0;
-        description { state: "default" 0.0;
-          rel2 {
-            to_y: "elm.swallow.icon";
-            relative: 1.0 0.0;
-            offset: -1 -1;
-          }
-          image {
-            normal: "bubble_1.png";
-            border: 36 11 10 19;
-          }
-          image.middle: SOLID;
-          fill.smooth: 0;
-        }
-      }
-      part { name: "elm.swallow.content";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 9 8;
-          }
-          rel2 {
-            to: "base0";
-            offset: -10 -17;
-          }
-        }
-      }
-      part { name: "shine";
-        mouse_events:  0;
-        description { state:    "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 5 4;
-          }
-          rel2 {
-            to: "base0";
-            relative: 1.0 0.5;
-            offset: -6 -16;
-          }
-          image {
-            normal: "bubble_shine.png";
-            border: 5 5 5 0;
-          }
-          fill.smooth: 0;
-        }
-      }
-    }
-  }
-
-  group { name: "elm/bubble/bottom_right/default";
-    images {
-      image: "bubble_2.png" COMP;
-      image: "bubble_shine.png" COMP;
-    }
-    parts {
-      part { name: "elm.swallow.icon";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          fixed: 1 1;
-          align: 1.0 1.0;
-          aspect: 1.0 1.0;
-          aspect_preference: VERTICAL;
-          rel1 {
-            to_y: "elm.text";
-            relative: 1.0 0.0;
-            offset: -5 0;
-          }
-          rel2 {
-            relative: 1.0 1.0;
-            offset: -5 -5;
-          }
-        }
-      }
-      part { name: "elm.text";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 0.0 1.0;
-          fixed: 0 1;
-          rel1 {
-            relative: 0.0 1.0;
-            offset: 4 -5;
-          }
-          rel2 {
-            to_x: "elm.info";
-            relative: 0.0 1.0;
-            offset: -5 -5;
-          }
-          color: 0 0 0 255;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 0 1;
-            max: 0 1;
-            align: 0.0 1.0;
-          }
-        }
-      }
-      part { name: "elm.info";
-        type: TEXT;
-        mouse_events:   0;
-        scale: 1;
-        description { state: "default" 0.0;
-          align: 1.0 1.0;
-          fixed: 1 1;
-          rel1 {
-            relative: 1.0 1.0;
-            offset: -5 -5;
-          }
-          rel2 {
-            to_x: "elm.swallow.icon";
-            relative: 0.0 1.0;
-            offset: -5 -5;
-          }
-          color: 0 0 0 64;
-          text {
-            font: "Sans:style=Bold,Edje-Vera-Bold";
-            size: 10;
-            min: 1 1;
-            max: 1 1;
-            align: 1.0 1.0;
-          }
-        }
-      }
-      part { name: "base0";
-        mouse_events:  0;
-        description { state: "default" 0.0;
-          rel2 {
-            to_y: "elm.swallow.icon";
-            relative: 1.0 0.0;
-            offset: -1 -1;
-          }
-          image {
-            normal: "bubble_2.png";
-            border: 11 36 10 19;
-          }
-          image.middle: SOLID;
-          fill.smooth: 0;
-        }
-      }
-      part { name: "elm.swallow.content";
-        type: SWALLOW;
-        description { state: "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 9 8;
-          }
-          rel2 {
-            to: "base0";
-            offset: -10 -17;
-          }
-        }
-      }
-      part { name: "shine";
-        mouse_events:  0;
-        description { state:    "default" 0.0;
-          rel1 {
-            to: "base0";
-            offset: 5 4;
-          }
-          rel2 {
-            to: "base0";
-            relative: 1.0 0.5;
-            offset: -6 -16;
-          }
-          image {
-            normal: "bubble_shine.png";
-            border: 5 5 5 0;
-          }
-          fill.smooth: 0;
-        }
-      }
-    }
-  }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/photo/base/default";
-      images {
-        image: "frame_1.png" COMP;
-        image: "frame_2.png" COMP;
-         image: "dia_grad.png" COMP;
-         image: "head.png" COMP;
-      }
-      parts {
-         part { name: "base0";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "dia_grad.png";
-              rel1.to: "over";
-              rel2.to: "over";
-               fill {
-                 smooth: 0;
-                 size {
-                    relative: 0.0 1.0;
-                     offset: 64 0;
-                 }
-              }
-           }
-        }
-        part { name: "base";
-           mouse_events:  0;
-           description { state:    "default" 0.0;
-              image {
-                 normal: "frame_2.png";
-                 border: 5 5 32 26;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-        }
-         part { name: "head";
-           mouse_events:  0;
-           description { state:    "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-              image.normal: "head.png";
-           }
-        }
-         part { name: "clip";
-           mouse_events:  0;
-            type: RECT;
-           description { state:    "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-               color: 255 255 255 255;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-            clip_to: "clip";
-           description { state: "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-           }
-        }
-         part { name: "over";
-           mouse_events:  0;
-           description { state:    "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-              image {
-                 normal: "frame_1.png";
-                 border: 2 2 28 22;
-                 middle: 0;
-              }
-              fill.smooth: 0;
-           }
-        }
-     }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/thumb/base/default";
-      images {
-        image: "frame_1.png" COMP;
-        image: "frame_2.png" COMP;
-        image: "dia_grad.png" COMP;
-        image: "busy-1.png" COMP;
-        image: "busy-2.png" COMP;
-        image: "busy-3.png" COMP;
-        image: "busy-4.png" COMP;
-        image: "busy-5.png" COMP;
-        image: "busy-6.png" COMP;
-        image: "busy-7.png" COMP;
-        image: "busy-8.png" COMP;
-        image: "busy-9.png" COMP;
-      }
-      parts {
-        part { name: "base0";
-           mouse_events:  0;
-           description { state:        "default" 0.0;
-              image.normal: "dia_grad.png";
-              rel1.to: "over";
-              rel2.to: "over";
-              fill {
-                 smooth: 0;
-                 size {
-                    relative: 0.0 1.0;
-                    offset: 64 0;
-                 }
-              }
-           }
-        }
-        part { name: "base";
-           mouse_events:  0;
-           description { state:        "default" 0.0;
-              image {
-                 normal: "frame_2.png";
-                 border: 5 5 32 26;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-        }
-        part { name: "clip";
-           mouse_events:  0;
-           type: RECT;
-           description { state:        "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-              color: 255 255 255 255;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           clip_to: "clip";
-           description { state:        "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-           }
-        }
-        part { name: "progress";
-           mouse_events: 0;
-
-           clip_to: "clip";
-           description { state:        "default" 0.0;
-              min: 32 32;
-              max: 32 32;
-              visible: 0;
-              aspect: 1.0 1.0;
-              aspect_preference: BOTH;
-           }
-           description { state:        "pulse" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              image {
-                 normal: "busy-9.png";
-                 tween:  "busy-1.png";
-                 tween:  "busy-2.png";
-                 tween:  "busy-3.png";
-                 tween:  "busy-4.png";
-                 tween:  "busy-5.png";
-                 tween:  "busy-6.png";
-                 tween:  "busy-7.png";
-                 tween:  "busy-8.png";
-                 border: 7 7 7 7;
-              }
-           }
-        }
-        part { name: "over";
-           mouse_events:  0;
-           description { state:        "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-              image {
-                 normal: "frame_1.png";
-                 border: 2 2 28 22;
-                 middle: 0;
-              }
-              fill.smooth: 0;
-           }
-        }
-        programs {
-           program { name: "start_pulse";
-              signal: "elm,state,pulse,start";
-              source: "elm";
-              action: STATE_SET "pulse" 0.0;
-              target: "progress";
-              transition: LINEAR 0.5;
-              after: "start_pulse";
-           }
-           program { name: "stop_pulse";
-              signal: "elm,state,pulse,stop";
-              source: "elm";
-              action: STATE_SET "default" 0.0;
-              target: "progress";
-           }
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/icon/home/default"; min: 32 32;
-      images.image: "icon_home.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_home.png"; } } } }
-   group { name: "elm/icon/close/default"; min: 32 32;
-      images.image: "icon_close.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_close.png"; } } } }
-   group { name: "elm/icon/apps/default"; min: 32 32;
-      images.image: "icon_apps.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_apps.png"; } } } }
-   group { name: "elm/icon/arrow_up/default"; min: 32 32;
-      images.image: "icon_arrow_up.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_arrow_up.png"; } } } }
-   group { name: "elm/icon/arrow_down/default"; min: 32 32;
-      images.image: "icon_arrow_down.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_arrow_down.png"; } } } }
-   group { name: "elm/icon/arrow_left/default"; min: 32 32;
-      images.image: "icon_arrow_left.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_arrow_left.png"; } } } }
-   group { name: "elm/icon/arrow_right/default"; min: 32 32;
-      images.image: "icon_arrow_right.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_arrow_right.png"; } } } }
-   group { name: "elm/icon/chat/default"; min: 32 32;
-      images.image: "icon_chat.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_chat.png"; } } } }
-   group { name: "elm/icon/clock/default"; min: 32 32;
-      images.image: "icon_clock.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_clock.png"; } } } }
-   group { name: "elm/icon/delete/default"; min: 32 32;
-      images.image: "icon_delete.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_delete.png"; } } } }
-   group { name: "elm/icon/edit/default"; min: 32 32;
-      images.image: "icon_edit.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_edit.png"; } } } }
-   group { name: "elm/icon/refresh/default"; min: 32 32;
-      images.image: "icon_refresh.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_refresh.png"; } } } }
-   group { name: "elm/icon/folder/default"; min: 32 32;
-      images.image: "icon_folder.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_folder.png"; } } } }
-   group { name: "elm/icon/file/default"; min: 32 32;
-      images.image: "icon_file.png" COMP; parts { part { name: "base";
-        description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
-           image.normal: "icon_file.png"; } } } }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/toolbar/base/default";
-      images {
-         image: "bt_dis_base.png" COMP;
-         image: "bt_dis_hilight.png" COMP;
-         image: "bt_dis_shine.png" COMP;
-         image: "icon_left_arrow.png" COMP;
-         image: "icon_right_arrow.png" COMP;
-      }
-      parts {
-         part { name: "base";
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: 2 2;
-               }
-               rel2.offset: -3 -3;
-               image {
-                  normal: "bt_dis_base.png";
-                  border: 4 4 4 4;
-               }
-               image.middle: SOLID;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_7b.png";
+            }
+            description {
+               state: "8" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_8b.png";
+            }
+            description {
+               state: "8h" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_8b.png";
+            }
+            description {
+               state: "9" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_9b.png";
+            }
+            description {
+               state: "9h" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_9b.png";
             }
          }
-         part { name: "clipper";
-            type: RECT;
+         part {
+            name: "top0";
             mouse_events: 0;
             description {
                state: "default" 0.0;
-               rel1 {
-                  to: "base";
-                  offset: 2 2;
-               }
-               rel2 {
-                  to: "base";
-                  offset: -3 -3;
-               }
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "flip_0t.png";
             }
-         }
-         part { name: "elm.swallow.content";
-            clip_to: "clipper";
-            type: SWALLOW;
             description {
-               state: "default" 0.0;
-               rel1.to: "clipper";
-               rel2.to: "clipper";
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_0t.png";
             }
-         }
-         part { name: "over2";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               image {
-                  normal: "bt_dis_shine.png";
-                  border: 4 4 4 4;
-               }
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_1t.png";
             }
-         }
-         part { name: "over1";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               rel2.relative: 1.0 0.5;
-               image {
-                  normal: "bt_dis_hilight.png";
-                  border: 4 4 4 0;
-               }
-               color: 255 255 255 128;
+            description {
+               state: "2" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_2t.png";
+            }
+            description {
+               state: "3" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_3t.png";
+            }
+            description {
+               state: "4" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_4t.png";
+            }
+            description {
+               state: "5" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_5t.png";
+            }
+            description {
+               state: "6" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_6t.png";
+            }
+            description {
+               state: "7" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_7t.png";
+            }
+            description {
+               state: "8" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_8t.png";
+            }
+            description {
+               state: "9" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_9t.png";
             }
          }
-         part { name: "left_arrow";
+         part {
+            name: "top";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               image.normal: "icon_left_arrow.png";
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               align: 0.0 0.5;
-               min: 32 32;
-               max: 32 32;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "flip_0t.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_0t.png";
             }
-            description { state: "hidden" 0.0;
+            description {
+               state: "0h" 0.0;
                inherit: "default" 0.0;
+               color: 128 128 128 255;
                visible: 0;
-               color: 255 255 255 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_0t.png";
             }
-         }
-         part { name: "right_arrow";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               image.normal: "icon_right_arrow.png";
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               align: 1.0 0.5;
-               min: 32 32;
-               max: 32 32;
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_1t.png";
             }
-            description { state: "hidden" 0.0;
+            description {
+               state: "1h" 0.0;
                inherit: "default" 0.0;
+               color: 128 128 128 255;
                visible: 0;
-               color: 255 255 255 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_1t.png";
             }
-         }
-         part { name: "event";
-            type: RECT;
-            mouse_events: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
+            description {
+               state: "2" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_2t.png";
+            }
+            description {
+               state: "2h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_2t.png";
+            }
+            description {
+               state: "3" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_3t.png";
+            }
+            description {
+               state: "3h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_3t.png";
+            }
+            description {
+               state: "4" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_4t.png";
+            }
+            description {
+               state: "4h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_4t.png";
+            }
+            description {
+               state: "5" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_5t.png";
+            }
+            description {
+               state: "5h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_5t.png";
+            }
+            description {
+               state: "6" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_6t.png";
+            }
+            description {
+               state: "6h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_6t.png";
+            }
+            description {
+               state: "7" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_7t.png";
+            }
+            description {
+               state: "7h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_7t.png";
+            }
+            description {
+               state: "8" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_8t.png";
+            }
+            description {
+               state: "8h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_8t.png";
+            }
+            description {
+               state: "9" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_9t.png";
+            }
+            description {
+               state: "9h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_9t.png";
             }
          }
-      }
-      programs {
-         program { name: "sb_hbar_show";
-            signal: "elm,action,show,hbar";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            transition: LINEAR 0.5;
-            target: "left_arrow";
-            target: "right_arrow";
-         }
-         program { name: "sb_hbar_hide";
-            signal: "elm,action,hide,hbar";
+         part {
+            name: "atop";
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 15 15;
+               max: 15 15;
+               align: 0.5 0.0;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "arrow_up.png";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "abot";
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 15 15;
+               max: 15 15;
+               align: 0.5 1.0;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "arrow_down.png";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "load";
+            signal: "load";
+            source: "";
+            script {
+               set_int(v0_cur, 0);
+               set_int(v0_pre, 0);
+               set_int(v0_lock, 0);
+               set_int(v0_next, -1);
+            }
+         }
+         program {
+            name: "edit_on";
+            signal: "elm,state,edit,on";
             source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "left_arrow";
-            target: "right_arrow";
-            transition: LINEAR 0.5;
+            action: STATE_SET "visible" 0.0;
+            target: "atop";
+            target: "abot";
+         }
+         program {
+            name: "edit_off";
+            signal: "elm,state,edit,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "atop";
+            target: "abot";
+         }
+         program {
+            name: "up";
+            signal: "mouse,down,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up" "";
+         }
+         program {
+            name: "down";
+            signal: "mouse,down,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down" "";
          }
       }
    }
 
-   group { name: "elm/toolbar/item/default";
-       images {
-           image: "toolbar_sel.png" COMP;
-       }
-       parts {
-           part { name: "label2";
-               type: TEXT;
-               mouse_events:  0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   align: 0.5 1.0;
-                   fixed: 0 1;
-                   rel1.to: "elm.text";
-                   rel2.to: "elm.text";
-                   color: 0 0 0 255;
-                   text {
-                       font: "Sans";
-                       text_source: "elm.text";
-                       size: 10;
-                       min: 1 1;
-                       align: 0.5 0.5;
-                   }
-               }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
-               }
-               description { state: "disabled_visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
-                   visible: 1;
-                   text.min: 1 1;
-               }
-           }
-           part { name: "bg";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   image {
-                       normal: "toolbar_sel.png";
-                       border: 3 3 0 0;
-                   }
-                   image.middle: SOLID;
-                   fill.smooth: 0;
-               }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-               }
-           }
-           part { name: "elm.swallow.icon";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   align: 0.5 0.5;
-                   fixed: 0 0;
-                   //aspect: 1.0 1.0;
-                   //aspect_preference: VERTICAL;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: 2 2;
-                   }
-                   rel2 {
-                       to_y: "elm.text";
-                       relative: 1.0 0.0;
-                       offset: -3 -1;
-                   }
-                   color: 0 0 0 0;
-               }
-           }
-           part { name: "elm.text";
-               type: TEXT;
-               effect: SOFT_SHADOW;
-               mouse_events:  0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   align: 0.5 1.0;
-                   fixed: 0 1;
-                   rel1 {
-                       relative: 0.0 1.0;
-                       offset:   0 -1;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset:   -1 -1;
-                   }
-                   visible: 0;
-                   color: 224 224 224 255;
-                   color3: 0 0 0 32;
-                   text {
-                       font: "Sans:style=Bold";
-                       size: 10;
-                       min: 1 1;
-                       align: 0.5 0.5;
-                   }
-               }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   text.min: 1 1;
-               }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
-               }
-               description { state: "disabled_visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
-                   visible: 1;
-                   text.min: 1 1;
-               }
-           }
-           part { name: "event";
-               type: RECT;
-               mouse_events: 1;
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-               }
-           }
-       }
-       programs {
-           program { name: "go_active";
-               signal:  "elm,state,selected";
-               source:  "elm";
-               action:  STATE_SET "selected" 0.0;
-               target:  "bg";
-               target:  "elm.text";
-               target:  "label2";
-               transition: LINEAR 0.2;
-           }
-           program { name: "go_passive";
-               signal:  "elm,state,unselected";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "bg";
-               target:  "elm.text";
-               target:  "label2";
-               transition: LINEAR 0.1;
-           }
-           program { name: "go";
-               signal:  "mouse,up,1";
-               source:  "event";
-               action:  SIGNAL_EMIT "elm,action,click" "elm";
-           }
-           program { name: "disable";
-               signal: "elm,state,disabled";
-               source: "elm";
-               action: STATE_SET "disabled" 0.0;
-               target: "label2";
-               target: "bg";
-               after: "disable_text";
-           }
-           program { name: "disable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "visible"))
-                   set_state(PART:"elm.text", "disabled_visible", 0.0);
-                   else
-                   set_state(PART:"elm.text", "disabled", 0.0);
-               }
-           }
-           program { name: "enable";
-               signal: "elm,state,enabled";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "label2";
-               target: "bg";
-               after: "enable_text";
-           }
-           program { name: "enable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "disabled_visible"))
-                   set_state(PART:"elm.text", "visible", 0.0);
-                   else
-                   set_state(PART:"elm.text", "default", 0.0);
-               }
-           }
-       }
-   }
-
-   group { name: "elm/toolbar/separator/default";
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/clock/flipampm/default";
       images {
-         image: "toolbar_separator_v.png" COMP;
-      }
-      parts {
-         part { name: "separator"; // separator group
-            description { state: "default" 0.0;
-               min: 2 2;
-               max: 2 9999;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-              image {
-                 normal: "toolbar_separator_v.png";
-              }
-              fill {
-                 smooth: 0;
-              }
-           }
-        }
+         image: "flip_base.png" COMP;
+         image: "flip_base_shad.png" COMP;
+         image: "flip_shad.png" COMP;
+         image: "flip_amt.png" COMP;
+         image: "flip_amb.png" COMP;
+         image: "flip_pmt.png" COMP;
+         image: "flip_pmb.png" COMP;
+         image: "arrow_up.png" COMP;
+         image: "arrow_down.png" COMP;
       }
-   }
-
-   ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/notify/block_events/default";
-       parts {
-           part { name: "block_events";
-               type: RECT;
-               description { state: "default" 0.0;
-                   color: 0 0 0 64;
-                   visible: 1;
+      script {
+         public v0_cur, v0_pre, v0_lock, v0_next;
+         public animator2(val, Float:pos) {
+            new st1[11], st2[11], v;
+            v = get_int(v0_cur);
+            snprintf(st1, 10, "%ih", v);
+            snprintf(st2, 10, "%i", v);
+            set_tween_state(PART:"bot", pos, st1, 0.0, st2, 0.0);
+            set_tween_state(PART:"sh", pos, "half", 0.0, "full", 0.0);
+            if (pos >= 1.0) {
+               set_state(PART:"sh", "default", 0.0);
+               set_int(v0_lock, 0);
+               v = get_int(v0_next);
+               if (v >= 0) {
+                  set_int(v0_next, -1);
+                  message(MSG_INT, 1, v);
+               }
+            }
+         }
+         public animator1(val, Float:pos) {
+            new st1[11], st2[11], v;
+            v = get_int(v0_pre);
+            snprintf(st1, 10, "%i", v);
+            snprintf(st2, 10, "%ih", v);
+            set_tween_state(PART:"top", pos, st1, 0.0, st2, 0.0);
+            set_tween_state(PART:"sh", pos, "default", 0.0, "half", 0.0);
+            if (pos >= 1.0) anim(0.2, "animator2", val);
+         }
+         public message(Msg_Type:type, id, ...) {
+            if ((type == MSG_INT) && (id == 1)) {
+               new value, v, buf[11];
+               value = getarg(2);
+               if (get_int(v0_lock) == 1) {
+                  set_int(v0_next, value);
+                  return;
+               }
+               v = get_int(v0_cur);
+               set_int(v0_pre, v);
+               set_int(v0_cur, value);
+               set_int(v0_lock, 1);
+               snprintf(buf, 10, "%i", get_int(v0_pre));
+               set_state(PART:"bot0", buf, 0.0);
+               snprintf(buf, 10, "%ih", get_int(v0_cur));
+               set_state(PART:"bot", buf, 0.0);
+               snprintf(buf, 10, "%i", get_int(v0_cur));
+               set_state(PART:"top0", buf, 0.0);
+               snprintf(buf, 10, "%i", get_int(v0_pre));
+               set_state(PART:"top", buf, 0.0);
+               set_state(PART:"sh", "default", 0.0);
+               anim(0.2, "animator1", 1);
+            }
+         }
+      }
+      parts {
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: -4 -4;
+               rel1.to: "base";
+               rel2.offset: 3 3;
+               rel2.to: "base";
+               image {
+                  normal: "flip_base_shad.png";
+                  border: 8 8 8 8;
                }
-           }
-       }
-          programs {
-                  program {
-                               name: "block_clicked";
-                               signal: "mouse,clicked,1";
-                               source: "block_events";
-                               action: SIGNAL_EMIT "elm,action,clicked" "elm";
-                  }
-          }
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               // FIXME 48x96 should be the native pixel design, right now
+               // its 80x160. fix int he artwork later
+               aspect: 0.5 0.5;
+               min: 24 48;
+               // max: 24 48;
+               image.normal: "flip_base.png";
+            }
+         }
+         part {
+            name: "b";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel1.relative: 0.0 0.5;
+               rel2.to: "base";
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "t";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               rel2.relative: 1.0 0.5;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "bot0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "flip_amb.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_amb.png";
+            }
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_pmb.png";
+            }
+         }
+         part {
+            name: "sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "b";
+               rel2.to: "b";
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_shad.png";
+            }
+            description {
+               state: "half" 0.0;
+               inherit: "default" 0.0;
+               rel2.relative: 1.0 0.5;
+            }
+            description {
+               state: "full" 0.0;
+               inherit: "default" 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "bot";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "flip_amb.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_amb.png";
+            }
+            description {
+               state: "0h" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_amb.png";
+            }
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel2.relative: 1.0 1.0;
+               image.normal: "flip_pmb.png";
+            }
+            description {
+               state: "1h" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+               image.normal: "flip_pmb.png";
+            }
+         }
+         part {
+            name: "top0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "flip_amt.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_amt.png";
+            }
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "flip_pmt.png";
+            }
+         }
+         part {
+            name: "top";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "flip_amt.png";
+            }
+            description {
+               state: "0" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_amt.png";
+            }
+            description {
+               state: "0h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_amt.png";
+            }
+            description {
+               state: "1" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               rel1.relative: 0.0 0.0;
+               image.normal: "flip_pmt.png";
+            }
+            description {
+               state: "1h" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+               image.normal: "flip_pmt.png";
+            }
+         }
+         part {
+            name: "atop";
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 15 15;
+               max: 15 15;
+               align: 0.5 0.0;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "arrow_up.png";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "abot";
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 15 15;
+               max: 15 15;
+               align: 0.5 1.0;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "arrow_down.png";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "load";
+            signal: "load";
+            source: "";
+            script {
+               set_int(v0_cur, 0);
+               set_int(v0_pre, 0);
+               set_int(v0_lock, 0);
+               set_int(v0_next, -1);
+            }
+         }
+         program {
+            name: "edit_on";
+            signal: "elm,state,edit,on";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "atop";
+            target: "abot";
+         }
+         /*
+               program { name: "edit_off";
+               signal: "elm,state,edit,off";
+                       source: "elm";
+                       action: STATE_SET "default" 0.0;
+                       target: "atop";
+                       target: "abot";
+               }
+                       */
+         program {
+            name: "up";
+            signal: "mouse,down,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up" "";
+         }
+         program {
+            name: "down";
+            signal: "mouse,down,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down" "";
+         }
+      }
    }
-   group { name: "elm/notify/base/default";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 0.0 -1.0;
-                   rel2.relative: 1.0 0.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/menu/item/default";
+      images {
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      script {
+         public menu_text_visible;
+         //0:hide (default), 1:visible
+         public menu_disable;
+         //0:enable, 1:disable
+      }
+      parts {
+         part {
+            name: "item_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part {
+            name: "item_image_disabled";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
-               }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               visible: 1;
+               align: 0.0 0.5;
+               rel1.offset: 4 4;
+               rel2.offset: 3 -5;
+               rel2.relative: 0.0 1.0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -5;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 5 7;
+               rel2.offset: -10 -8;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.0 0.5;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               color: 254 254 254 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               color: 0 0 0 128;
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-                signal: "show";
-                action: STATE_SET "default" 0.0;
-                target: "base";
-                after: "show_3";
-           }
-           program { name: "show_3";
-                signal: "show";
-                action: STATE_SET "visible" 0.0;
-                target: "base";
-                transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
-   }
-   group { name: "elm/notify/base/center";
-       //this group is a design similar to the inwin group
-       images {
-           image: "bt_dis_base.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part {
+            name: "over_disabled";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-                signal: "show";
-                action: STATE_SET "default" 0.0;
-                target: "base";
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         //
+         program {
+            name: "item_mouse_in";
+            signal: "mouse,in";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,activate" "";
+            after: "item_mouse_in_2";
+            after: "item_mouse_in_3";
+         }
+         program {
+            name: "item_mouse_in_2";
+            transition: DECELERATE 0.5;
+            script {
+               new v, d;
+               v = get_int(menu_text_visible);
+               d = get_int(menu_disable);
+               if (v==1 && d==0)
+                  run_program(PROGRAM:"selected_text");
+            }
+         }
+         program {
+            name: "item_mouse_in_3";
+            action : STATE_SET "visible" 0.0;
+            target: "item_image";
+            target: "over1";
+            transition: DECELERATE 0.5;
+         }
+         program {
+            name: "selected_text";
+            action: STATE_SET "selected" 0.0;
+            target: "elm.text";
+            transition: DECELERATE 0.5;
+         }
+         //
+         //
+         program {
+            name: "item_mouse_out";
+            signal: "mouse,out";
+            source: "over2";
+            after: "item_mouse_out_2";
+            after: "item_mouse_out_3";
+         }
+         program {
+            name: "item_mouse_out_2";
+            transition: DECELERATE 0.5;
+            script {
+               new v, d;
+               v = get_int(menu_text_visible);
+               d = get_int(menu_disable);
+               if (v==1 && d==0)
+                  run_program(PROGRAM:"visible_text");
+            }
+         }
+         program {
+            name: "item_mouse_out_3";
+            action: STATE_SET "default" 0.0;
+            target: "item_image";
+            target: "over1";
+            transition: DECELERATE 0.5;
+         }
+         program {
+            name: "visible_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+            transition: DECELERATE 0.5;
+         }
+         //
+         program {
+            name: "item_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: STATE_SET "visible" 0.0;
+            target: "item_image";
+         }
+         program {
+            name: "item_click2";
+            signal: "mouse,down,1";
+            source: "over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "over3";
+         }
+         program {
+            name: "item_unclick2";
+            signal: "mouse,up,1";
+            source: "over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "over3";
+         }
+         program {
+            name: "item_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               set_int(menu_text_visible, 1);
+               set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               set_int(menu_text_visible, 0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "item_image";
+            target: "item_image_disabled";
+            target: "over1";
+            target: "over2";
+            target: "over_disabled";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new v;
+               v = get_int(menu_text_visible);
+               if (v==1)
+                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else if (v==0)
+                  set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(menu_disable, 1);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "item_image";
+            target: "item_image_disabled";
+            target: "over1";
+            target: "over2";
+            target: "over_disabled";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new v;
+               v = get_int(menu_text_visible);
+               if (v==1)
+                  set_state(PART:"elm.text", "visible", 0.0);
+               else  if (v==0)
+                  set_state(PART:"elm.text", "default", 0.0);
+               set_int(menu_disable, 0);
+            }
+         }
+      }
    }
-   group { name: "elm/notify/base/bottom";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 0.0 1.0;
-                   rel2.relative: 1.0 2.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
-               }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
-               }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-                signal: "show";
-                action: STATE_SET "default" 0.0;
-                target: "base";
-                after: "show_3";
-           }
-           program { name: "show_3";
-                signal: "show";
-                action: STATE_SET "visible" 0.0;
-                target: "base";
-                transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
-   }
-   group { name: "elm/notify/base/left";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: -1.0 0.0;
-                   rel2.relative: 0.0 1.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
+   group {
+      name: "elm/menu/item_with_submenu/default";
+      images {
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+         image: "arrow_right.png" COMP;
+      }
+      script {
+         public menu_text_visible;
+         //0:hide (default), 1:visible
+         public menu_disable;
+         //0:enable, 1:disable
+      }
+      parts {
+         part {
+            name: "item_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part {
+            name: "item_image_disabled";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "arrow";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+               align: 1.0 0.5;
+               aspect: 1 1;
+               aspect_preference: BOTH;
+               image {
+                  normal: "arrow_right.png";
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-               after: "show_3";
-           }
-           program { name: "show_3";
-               signal: "show";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-               transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
-   }
-   group { name: "elm/notify/base/right";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-                description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 1.0 0.0;
-                   rel2.relative: 2.0 1.0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               visible: 1;
+               align: 0.0 0.5;
+               rel1.offset: 4 4;
+               rel2.offset: 3 -5;
+               rel2.relative: 0.0 1.0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -5;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 5 7;
+               rel2.offset: -10 -8;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.0 0.5;
                }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               color: 254 254 254 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               inherit: "visible" 0.0;
+               color: 0 0 0 128;
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part {
+            name: "over_disabled";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
-               }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-               after: "show_3";
-           }
-           program { name: "show_3";
-               signal: "show";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-               transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         //
+         program {
+            name: "item_mouse_in";
+            signal: "mouse,in";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,activate" "";
+            after: "item_mouse_in_2";
+            after: "item_mouse_in_3";
+         }
+         program {
+            name: "item_mouse_in_2";
+            transition: DECELERATE 0.5;
+            script {
+               new v, d;
+               v = get_int(menu_text_visible);
+               d = get_int(menu_disable);
+               if (v==1 && d==0)
+                  run_program(PROGRAM:"selected_text");
+            }
+         }
+         program {
+            name: "item_mouse_in_3";
+            action : STATE_SET "visible" 0.0;
+            target: "item_image";
+            target: "over1";
+            transition: DECELERATE 0.5;
+         }
+         program {
+            name: "selected_text";
+            action: STATE_SET "selected" 0.0;
+            target: "elm.text";
+            transition: DECELERATE 0.5;
+         }
+         //
+         //
+         program {
+            name: "item_mouse_out";
+            signal: "mouse,out";
+            source: "over2";
+            after: "item_mouse_out_2";
+            after: "item_mouse_out_3";
+         }
+         program {
+            name: "item_mouse_out_2";
+            transition: DECELERATE 0.5;
+            script {
+               new v, d;
+               v = get_int(menu_text_visible);
+               d = get_int(menu_disable);
+               if (v==1 && d==0)
+                  run_program(PROGRAM:"visible_text");
+            }
+         }
+         program {
+            name: "item_mouse_out_3";
+            action: STATE_SET "default" 0.0;
+            target: "item_image";
+            target: "over1";
+            transition: DECELERATE 0.5;
+         }
+         program {
+            name: "visible_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+            transition: DECELERATE 0.5;
+         }
+         //
+         program {
+            name: "item_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: STATE_SET "visible" 0.0;
+            target: "item_image";
+         }
+         program {
+            name: "item_click2";
+            signal: "mouse,down,1";
+            source: "over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "over3";
+         }
+         program {
+            name: "item_unclick2";
+            signal: "mouse,up,1";
+            source: "over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "over3";
+         }
+         program {
+            name: "item_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "menu_open";
+            signal: "mouse,in";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,open" "";
+         }
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               set_int(menu_text_visible, 1);
+               set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               set_int(menu_text_visible, 0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "item_image";
+            target: "item_image_disabled";
+            target: "over1";
+            target: "over2";
+            target: "over_disabled";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else if (!strcmp(st, "default"))
+                  set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "item_image";
+            target: "item_image_disabled";
+            target: "over1";
+            target: "over2";
+            target: "over_disabled";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new v;
+               v = get_int(menu_text_visible);
+               if (v==1)
+                                               set_state(PART:"elm.text", "visible", 0.0);
+                                       else  if (v==0)
+                                               set_state(PART:"elm.text", "default", 0.0);
+               set_int(menu_disable, 0);
+            }
+         }
+      }
    }
-   group { name: "elm/notify/base/top_left";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-                description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 0.0 -1.0;
-                   rel2.relative: 1.0 0.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
-               }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+   group {
+      name: "elm/menu/separator/default";
+      images {
+         image: "separator_h.png" COMP;
+      }
+      parts {
+         part {
+            name: "separator";
+            // separator group
+            description {
+               state: "default" 0.0;
+               min: 2 2;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "separator_h.png";
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+               fill {
+                  smooth: 0;
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-               after: "show_3";
-           }
-           program { name: "show_3";
-               signal: "show";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-               transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
+            }
+         }
+      }
    }
-   group { name: "elm/notify/base/top_right";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 0.0 -1.0;
-                   rel2.relative: 1.0 0.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
-               }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/clock/base-all/default";
+      parts {
+         part {
+            name: "d0";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.0000000 0.0;
+               rel2.relative: 0.1250000 1.0;
+            }
+         }
+         part {
+            name: "d1";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.1250000 0.0;
+               rel2.relative: 0.2500000 1.0;
+            }
+         }
+         part {
+            name: "c0";
+            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.2500000 0.0;
+               rel2.relative: 0.3125000 1.0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  text: ":";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+            }
+         }
+         part {
+            name: "d2";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.3125000 0.0;
+               rel2.relative: 0.4375000 1.0;
+            }
+         }
+         part {
+            name: "d3";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.4375000 0.0;
+               rel2.relative: 0.5625000 1.0;
+            }
+         }
+         // (if seconds)
+         part {
+            name: "c1";
+            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.5625000 0.0;
+               rel2.relative: 0.6250000 1.0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  text: ":";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-               after: "show_3";
-           }
-           program { name: "show_3";
-               signal: "show";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-               transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
+            }
+         }
+         // (if seconds)
+         part {
+            name: "d4";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.6250000 0.0;
+               rel2.relative: 0.7500000 1.0;
+            }
+         }
+         // (if seconds)
+         part {
+            name: "d5";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.7500000 0.0;
+               rel2.relative: 0.8750000 1.0;
+            }
+         }
+         // (if am_pm)
+         part {
+            name: "ampm";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.8750000 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+      }
    }
-   group { name: "elm/notify/base/bottom_left";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 0.0 1.0;
-                   rel2.relative: 1.0 2.0;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
-               }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
-               }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/clock/base-seconds/default";
+      parts {
+         part {
+            name: "d0";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.000000000 0.0;
+               rel2.relative: 0.142857143 1.0;
+            }
+         }
+         part {
+            name: "d1";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.142857143 0.0;
+               rel2.relative: 0.285714286 1.0;
+            }
+         }
+         part {
+            name: "c0";
+            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.285714286 0.0;
+               rel2.relative: 0.357142857 1.0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  text: ":";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+            }
+         }
+         part {
+            name: "d2";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.357142857 0.0;
+               rel2.relative: 0.500000000 1.0;
+            }
+         }
+         part {
+            name: "d3";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.500000000 0.0;
+               rel2.relative: 0.642857143 1.0;
+            }
+         }
+         // (if seconds)
+         part {
+            name: "c1";
+            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.642857143 0.0;
+               rel2.relative: 0.714285714 1.0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  text: ":";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+            }
+         }
+         // (if seconds)
+         part {
+            name: "d4";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.714285714 0.0;
+               rel2.relative: 0.857142857 1.0;
+            }
+         }
+         // (if seconds)
+         part {
+            name: "d5";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.857142857 0.0;
+               rel2.relative: 1.000000000 1.0;
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/clock/base-am_pm/default";
+      parts {
+         part {
+            name: "d0";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.000000000 0.0;
+               rel2.relative: 0.181818182 1.0;
+            }
+         }
+         part {
+            name: "d1";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.181818182 0.0;
+               rel2.relative: 0.363636364 1.0;
+            }
+         }
+         part {
+            name: "c0";
+            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.363636364 0.0;
+               rel2.relative: 0.454545455 1.0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  text: ":";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-               after: "show_3";
-           }
-           program { name: "show_3";
-               signal: "show";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-               transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
+            }
+         }
+         part {
+            name: "d2";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.454545455 0.0;
+               rel2.relative: 0.636363636 1.0;
+            }
+         }
+         part {
+            name: "d3";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.636363636 0.0;
+               rel2.relative: 0.818181818 1.0;
+            }
+         }
+         // (if am_pm)
+         part {
+            name: "ampm";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.818181818 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+      }
    }
-   group { name: "elm/notify/base/bottom_right";
-       //this group is a design similar to the inwin group
-       images {
-           image: "shad_circ.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-       }
-       parts {
-           part { name: "base";
-               type: RECT;
-               mouse_events: 0;
-               repeat_events: 1;
-              description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   rel1.offset: 10 10;
-                   rel2.offset: -10 -10;
-                   rel1.relative: 0.0 1.0;
-                   rel2.relative: 1.0 2.0;
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/clock/base/default";
+      parts {
+         part {
+            name: "d0";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.000000000 0.0;
+               rel2.relative: 0.222222222 1.0;
+            }
+         }
+         part {
+            name: "d1";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.222222222 0.0;
+               rel2.relative: 0.444444444 1.0;
+            }
+         }
+         part {
+            name: "c0";
+            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.444444444 0.0;
+               rel2.relative: 0.555555556 1.0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  text: ":";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 64;
-                   rel1.relative: 0.0 0.0;
-                   rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "d2";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.555555556 0.0;
+               rel2.relative: 0.777777778 1.0;
+            }
+         }
+         part {
+            name: "d3";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.777777778 0.0;
+               rel2.relative: 1.000000000 1.0;
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/frame/base/default";
+      images {
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
+      }
+      parts {
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
                }
-           }
-           part { name: "shad";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   image.normal: "shad_circ.png";
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -64 -64;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 63 63;
-                   fill.smooth: 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 9 9;
+               image {
+                  normal: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
                }
-           }
-           part { name: "pop";
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.swallow.content";
-                   rel1.offset: -5 -5;
-                   rel2.to: "elm.swallow.content";
-                   rel2.offset: 4 4;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-                   image.middle: SOLID;
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 6 6;
                }
-           }
-           part { name: "popover";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "pop";
-                   rel2.to: "pop";
-                   rel2.relative: 1.0 0.5;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: -7 6;
                }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.to: "base";
-                   rel2.to: "base";
+               color: 0 0 0 64;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 1 1;
+                  max: 1 1;
+                  align: 0.0 0.0;
                }
-           }
-       }
-       programs {
-           program { name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-           }
-           program { name: "show_2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-               after: "show_3";
-           }
-           program { name: "show_3";
-               signal: "show";
-               action: STATE_SET "visible" 0.0;
-               target: "base";
-               transition: LINEAR 0.5;
-           }
-           program { name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "base";
-           }
-       }
+            }
+         }
+         part {
+            name: "over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 5 5;
+               image {
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
+               }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1 {
+                  to_y: "elm.text";
+                  relative: 0.0 1.0;
+                  offset: 8 2;
+               }
+               rel2.offset: -9 -9;
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/frame/base/pad_small";
+      parts {
+         part {
+            name: "b0";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 4 4;
+               max: 4 4;
+               align: 0.0 0.0;
+            }
+         }
+         part {
+            name: "b1";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 4 4;
+               max: 4 4;
+               align: 1.0 1.0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "b0";
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "b1";
+                  relative: 0.0 0.0;
+                  offset: -1 -1;
+               }
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/frame/base/pad_medium";
+      parts {
+         part {
+            name: "b0";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 8 8;
+               max: 8 8;
+               align: 0.0 0.0;
+            }
+         }
+         part {
+            name: "b1";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 8 8;
+               max: 8 8;
+               align: 1.0 1.0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "b0";
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "b1";
+                  relative: 0.0 0.0;
+                  offset: -1 -1;
+               }
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/frame/base/pad_large";
+      parts {
+         part {
+            name: "b0";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 16 16;
+               max: 16 16;
+               align: 0.0 0.0;
+            }
+         }
+         part {
+            name: "b1";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 16 16;
+               max: 16 16;
+               align: 1.0 1.0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "b0";
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "b1";
+                  relative: 0.0 0.0;
+                  offset: -1 -1;
+               }
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/frame/base/pad_huge";
+      parts {
+         part {
+            name: "b0";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 32 32;
+               max: 32 32;
+               align: 0.0 0.0;
+            }
+         }
+         part {
+            name: "b1";
+            mouse_events: 0;
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 32 32;
+               max: 32 32;
+               align: 1.0 1.0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "b0";
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "b1";
+                  relative: 0.0 0.0;
+                  offset: -1 -1;
+               }
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/frame/base/outdent_top";
+      images {
+         image: "outdent-top.png" COMP;
+      }
+      parts {
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "outdent-top.png";
+               image.border: 0 0 0 13;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 2 2;
+               rel2.offset: -3 -13;
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/frame/base/outdent_bottom";
+      images {
+         image: "outdent-bottom.png" COMP;
+      }
+      parts {
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "outdent-bottom.png";
+               image.border: 0 0 13 0;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 2 12;
+               rel2.offset: -3 -3;
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/hover/base/default";
+      images {
+         image: "shad_circ.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.offset";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.size";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "elm.swallow.offset";
+               rel1.relative: 1.0 1.0;
+               rel2.to: "elm.swallow.offset";
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 64;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.size";
+               rel1.offset: -32 -32;
+               rel2.to: "elm.swallow.size";
+               rel2.offset: 31 31;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "box";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.to: "elm.swallow.size";
+               rel1.offset: -2 -2;
+               rel2.to: "elm.swallow.size";
+               rel2.offset: 1 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.left";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 0.0;
+               rel1.offset: -1 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 0.0 1.0;
+               rel2.offset: -1 -1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.right";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.5;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: 0 -1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.top";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 0.0;
+               rel1.offset: 0 -1;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 0.0;
+               rel2.offset: -1 -1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.bottom";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 0;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.middle";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.size";
+               rel2.to: "elm.swallow.size";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
+      }
+   }
+   group {
+      name: "elm/hover/base/popout";
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.offset";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.size";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "elm.swallow.offset";
+               rel1.relative: 1.0 1.0;
+               rel2.to: "elm.swallow.offset";
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 1.0;
+               color: 0 0 0 64;
+            }
+         }
+         part {
+            name: "leftclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel2.to_x: "pop";
+               rel2.relative: 0.0 1.0;
+               rel2.offset: 1 -1;
+            }
+         }
+         part {
+            name: "left";
+            clip_to: "leftclip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.slot.left";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.left";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.left";
+            type: SWALLOW;
+            clip_to: "leftclip";
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.5;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 0.0;
+               rel1.offset: -1 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 0.0 1.0;
+               rel2.offset: -1 -1;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: -7 0;
+               rel2.offset: -7 -1;
+               align: 1.0 0.5;
+            }
+         }
+         part {
+            name: "leftover";
+            clip_to: "leftclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "left";
+               rel2.to: "left";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "rightclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to_x: "pop";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: -2 0;
+            }
+         }
+         part {
+            name: "right";
+            clip_to: "rightclip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.slot.right";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.right";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.right";
+            type: SWALLOW;
+            clip_to: "rightclip";
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: 0 -1;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 6 0;
+               rel2.offset: 6 -1;
+               align: 0.0 0.5;
+            }
+         }
+         part {
+            name: "rightover";
+            clip_to: "rightclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "right";
+               rel2.to: "right";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "topclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel2.to_y: "pop";
+               rel2.relative: 1.0 0.0;
+               rel2.offset: -1 1;
+            }
+         }
+         part {
+            name: "top";
+            clip_to: "topclip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.slot.top";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.top";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.top";
+            type: SWALLOW;
+            clip_to: "topclip";
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               align: 0.5 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 0.0;
+               rel1.offset: 0 -1;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 0.0;
+               rel2.offset: -1 -1;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 0 -7;
+               rel2.offset: -1 -7;
+               align: 0.5 1.0;
+            }
+         }
+         part {
+            name: "topover";
+            clip_to: "topclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "top";
+               rel2.to: "top";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "bottomclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to_y: "pop";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: -1 -2;
+            }
+         }
+         part {
+            name: "bottom";
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.slot.bottom";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.bottom";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.bottom";
+            type: SWALLOW;
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 0 6;
+               rel2.offset: -1 6;
+               align: 0.5 0.0;
+            }
+         }
+         part {
+            name: "bottomover";
+            clip_to: "bottomclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bottom";
+               rel2.to: "bottom";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.size";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.size";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.middle";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.size";
+               rel2.to: "elm.swallow.size";
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "leftshow";
+            signal: "elm,action,slot,left,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "left";
+            target: "elm.swallow.slot.left";
+         }
+         program {
+            name: "lefthide";
+            signal: "elm,action,slot,left,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "left";
+            target: "elm.swallow.slot.left";
+         }
+         program {
+            name: "rightshow";
+            signal: "elm,action,slot,right,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "right";
+            target: "elm.swallow.slot.right";
+         }
+         program {
+            name: "righthide";
+            signal: "elm,action,slot,right,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "right";
+            target: "elm.swallow.slot.right";
+         }
+         program {
+            name: "topshow";
+            signal: "elm,action,slot,top,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "top";
+            target: "elm.swallow.slot.top";
+         }
+         program {
+            name: "tophide";
+            signal: "elm,action,slot,top,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "top";
+            target: "elm.swallow.slot.top";
+         }
+         program {
+            name: "bottomshow";
+            signal: "elm,action,slot,bottom,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
+         program {
+            name: "bottomhide";
+            signal: "elm,action,slot,bottom,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
+      }
+   }
+   //In the hover used by the menu only the bottom part is used.
+   group {
+      name: "elm/hover/base/menu";
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.offset";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.size";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "elm.swallow.offset";
+               rel1.relative: 1.0 1.0;
+               rel2.to: "elm.swallow.offset";
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 1.0;
+               color: 0 0 0 64;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.left";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.right";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.top";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part {
+            name: "bottomclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to_y: "pop";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: -1 -2;
+            }
+         }
+         part {
+            name: "bottom";
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.slot.bottom";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.bottom";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.bottom";
+            type: SWALLOW;
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 0 6;
+               rel2.offset: -1 6;
+               align: 0.5 0.0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            repeat_events:1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.offset: 4 4;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.middle";
+            type: SWALLOW;
+            repeat_events:1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.size";
+               rel2.to: "elm.swallow.size";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "bottomshow";
+            signal: "elm,action,slot,bottom,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.3;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
+         program {
+            name: "bottomhide";
+            signal: "elm,action,slot,bottom,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
+      }
+   }
+   //In the hover used by the submenu only the bottom part is used
+   //and no part should interact except the bottom area
+   group {
+      name: "elm/hover/base/submenu";
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.offset";
+            type: SWALLOW;
+            repeat_events:1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.size";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "elm.swallow.offset";
+               rel1.relative: 1.0 1.0;
+               rel2.to: "elm.swallow.offset";
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         //here we do non catch events like the hover hover does
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.left";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.right";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.top";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "bottomclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to_y: "pop";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: -1 -2;
+            }
+         }
+         part {
+            name: "bottom";
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.slot.bottom";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.bottom";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.bottom";
+            type: SWALLOW;
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 0 6;
+               rel2.offset: -1 6;
+               align: 0.5 0.0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            repeat_events:1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.offset: 4 4;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.middle";
+            type: SWALLOW;
+            repeat_events:1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.size";
+               rel2.to: "elm.swallow.size";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "bottomshow";
+            signal: "elm,action,slot,bottom,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.3;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
+         program {
+            name: "bottomhide";
+            signal: "elm,action,slot,bottom,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
+      }
+   }
+   group {
+      name: "elm/hover/base/hoversel_vertical/default";
+      alias: "elm/hover/base/hoversel_vertical/entry";
+      images {
+         // image: "shad_circ.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "outdent-top.png" COMP;
+         image: "outdent-bottom.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.offset";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.size";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "elm.swallow.offset";
+               rel1.relative: 1.0 1.0;
+               rel2.to: "elm.swallow.offset";
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         /*
+               part { name: "shad";
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                       image.normal: "shad_circ.png";
+                       rel1.to: "button_image";
+                       rel1.offset: -64 -64;
+                       rel2.to: "button_image";
+                       rel2.offset: 63 63;
+               fill.smooth: 0;
+                       }
+               }
+                       */
+         part {
+            name: "button_image";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to_x: "elm.swallow.slot.top";
+               rel1.to_y: "elm.swallow.slot.top";
+               rel1.offset: -2 -6;
+               rel2.to_x: "elm.swallow.slot.top";
+               rel2.to_y: "elm.swallow.slot.bottom";
+               rel2.offset: 1 5;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "bottom" 0.0;
+               rel1.to_x: "elm.swallow.slot.bottom";
+               rel1.to_y: "elm.swallow.slot.top";
+               rel1.offset: -2 -6;
+               rel2.to_x: "elm.swallow.slot.bottom";
+               rel2.to_y: "elm.swallow.slot.bottom";
+               rel2.offset: 1 5;
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 1.0;
+               color: 0 0 0 64;
+            }
+         }
+         part {
+            name: "topclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel2.to_y: "edge_top";
+               rel2.relative: 1.0 0.0;
+               rel2.offset: -1 7;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.top";
+            type: SWALLOW;
+            clip_to: "topclip";
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               align: 0.5 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 0.0;
+               rel1.offset: 0 -1;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 0.0;
+               rel2.offset: -1 -1;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 0 -7;
+               rel2.offset: -1 -7;
+               align: 0.5 1.0;
+            }
+         }
+         part {
+            name: "bottomclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to_y: "edge_bottom";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: -1 -8;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.bottom";
+            type: SWALLOW;
+            clip_to: "bottomclip";
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.offset: 0 6;
+               rel2.offset: -1 6;
+               align: 0.5 0.0;
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
+               }
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
+               }
+            }
+         }
+         part {
+            name: "edge_top";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to: "elm.swallow.size";
+                  offset: 0 -10;
+               }
+               rel2 {
+                  to: "elm.swallow.size";
+               }
+               image.normal: "outdent-bottom.png";
+               image.border: 0 0 13 0;
+               fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "edge_bottom";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to: "elm.swallow.size";
+               }
+               rel2 {
+                  to: "elm.swallow.size";
+                  offset: -1 9;
+               }
+               image.normal: "outdent-top.png";
+               image.border: 0 0 0 13;
+               fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "elm.swallow.slot.middle";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.size";
+               rel2.to: "elm.swallow.size";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "topshow";
+            signal: "elm,action,slot,top,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "edge_top";
+            after: "topshow2";
+         }
+         program {
+            name: "topshow2";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.swallow.slot.top";
+         }
+         program {
+            name: "topshow3";
+            signal: "elm,action,slot,top,show";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "tophide";
+            signal: "elm,action,slot,top,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.swallow.slot.top";
+            after: "tophide2";
+         }
+         program {
+            name: "tophide2";
+            action: STATE_SET "default" 0.0;
+            target: "edge_top";
+         }
+         program {
+            name: "bottomshow";
+            signal: "elm,action,slot,bottom,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "edge_bottom";
+            after: "bottomshow2";
+         }
+         program {
+            name: "bottomshow2";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.swallow.slot.bottom";
+         }
+         program {
+            name: "bottomshow3";
+            signal: "elm,action,slot,bottom,show";
+            source: "elm";
+            action: STATE_SET "bottom" 0.0;
+            target: "button_image";
+         }
+         program {
+            name: "bottomhide";
+            signal: "elm,action,slot,bottom,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.swallow.slot.bottom";
+            after: "bottomhide2";
+         }
+         program {
+            name: "bottomhide2";
+            action: STATE_SET "default" 0.0;
+            target: "edge_bottom";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/entry/base/default";
+      styles {
+         style {
+            name: "entry_textblock_style";
+            base: "font=Sans font_size=10 align=left color=#000 wrap=word";
+            tag: "br" "\n";
+            tag: "tab" "\t";
+            tag: "em" "+ font=Sans:style=Oblique";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "link" "+ color=#800 underline=on underline_color=#8008";
+            tag: "hilight" "+ font=Sans:style=Bold";
+         }
+         style {
+            name: "entry_textblock_disabled_style";
+            base: "font=Sans font_size=10 align=left color=#00000080 wrap=word";
+            tag: "br" "\n";
+            tag: "tab" "\t";
+            tag: "em" "+ font=Sans:style=Oblique";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "link" "+ color=#00000080 underline=on underline_color=#00000080";
+            tag: "hilight" "+ font=Sans:style=Bold";
+         }
+      }
+      data {
+         // item: context_menu_orientation "horizontal";
+      }
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: EDITABLE;
+            select_mode: EXPLICIT;
+            multiline: 1;
+            source: "elm/entry/selection/default";
+            // selection under
+            //  source2: "X"; // selection over
+            //  source3: "X"; // cursor under
+            source4: "elm/entry/cursor/default";
+            // cursorover
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            //  source6: "X"; // anchor over
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               text {
+                  style: "entry_textblock_style";
+                  min: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_textblock_disabled_style";
+                  min: 0 1;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-charwrap/default";
+      styles {
+         style {
+            name: "entry_textblock_style_charwrap";
+            base: "font=Sans font_size=10 align=left color=#000 wrap=char";
+            tag: "br" "\n";
+            tag: "tab" "\t";
+            tag: "em" "+ font=Sans:style=Oblique";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "link" "+ color=#800 underline=on underline_color=#8008";
+            tag: "hilight" "+ font=Sans:style=Bold";
+         }
+         style {
+            name: "entry_textblock_disabled_style_charwrap";
+            base: "font=Sans font_size=10 align=left color=#00000080 wrap=char";
+            tag: "br" "\n";
+            tag: "tab" "\t";
+            tag: "em" "+ font=Sans:style=Oblique";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "link" "+ color=#00000080 underline=on underline_color=#00000080";
+            tag: "hilight" "+ font=Sans:style=Bold";
+         }
+      }
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: EDITABLE;
+            select_mode: EXPLICIT;
+            multiline: 1;
+            source: "elm/entry/selection/default";
+            // selection under
+            //  source2: "X"; // selection over
+            //  source3: "X"; // cursor under
+            source4: "elm/entry/cursor/default";
+            // cursorover
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            //  source6: "X"; // anchor over
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               text {
+                  style: "entry_textblock_style_charwrap";
+                  min: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_textblock_disabled_style_charwrap";
+                  min: 0 1;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-nowrap/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: EDITABLE;
+            select_mode: EXPLICIT;
+            multiline: 1;
+            source: "elm/entry/selection/default";
+            // selection under
+            source4: "elm/entry/cursor/default";
+            // cursorover
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "entry_textblock_style";
+                  min: 1 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_textblock_disabled_style";
+                  min: 0 1;
+               }
+            }
+         }
+         /*
+               part { name: "sel";
+                       type: RECT;
+            mouse_events: 0;
+                       description { state: "default" 0.0;
+               align: 1.0 1.0;
+               max: 16 16;
+               aspect: 1.0 1.0;
+               color: 255 0 0 0;
+                       }
+                       description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 255 0 0 50;
+            }
+               }
+               */
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         /*
+               program { name: "selmode0";
+               signal: "elm,state,select,on";
+                       source: "elm";
+                       action: STATE_SET "visible" 0.0;
+                       target: "sel";
+               }
+               program { name: "selmode1";
+            signal: "elm,state,select,off";
+                       source: "elm";
+                       action: STATE_SET "default" 0.0;
+                       target: "sel";
+               }
+               */
+      }
+   }
+   group {
+      name: "elm/entry/base-single/default";
+      styles {
+         style {
+            name: "entry_single_textblock_style";
+            base: "font=Sans font_size=10 align=left color=#000 wrap=none";
+            tag: "br" "\n";
+            tag: "tab" "\t";
+            tag: "em" "+ font=Sans:style=Oblique";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "link" "+ color=#800 underline=on underline_color=#8008";
+            tag: "hilight" "+ font=Sans:style=Bold";
+         }
+         style {
+            name: "entry_single_textblock_disabled_style";
+            base: "font=Sans font_size=10 align=left color=#00000080 wrap=none";
+            tag: "br" "\n";
+            tag: "tab" "\t";
+            tag: "em" "+ font=Sans:style=Oblique";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "link" "+ color=#00000080 underline=on underline_color=#00000080";
+            tag: "hilight" "+ font=Sans:style=Bold";
+         }
+      }
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: EDITABLE;
+            select_mode: EXPLICIT;
+            multiline: 0;
+            source: "elm/entry/selection/default";
+            // selection under
+            source4: "elm/entry/cursor/default";
+            // cursorover
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "entry_single_textblock_style";
+                  min: 1 1;
+                  max: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_single_textblock_disabled_style";
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-single-noedit/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: PLAIN;
+            select_mode: EXPLICIT;
+            multiline: 0;
+            source: "elm/entry/selection/default";
+            // selection under
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "entry_single_textblock_style";
+                  min: 1 1;
+                  max: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_single_textblock_disabled_style";
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-noedit/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: PLAIN;
+            select_mode: EXPLICIT;
+            multiline: 1;
+            source: "elm/entry/selection/default";
+            // selection under
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               text {
+                  style: "entry_textblock_style";
+                  min: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_textblock_disabled_style";
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-noedit-charwrap/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: PLAIN;
+            select_mode: EXPLICIT;
+            multiline: 1;
+            source: "elm/entry/selection/default";
+            // selection under
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               text {
+                  style: "entry_textblock_style_charwrap";
+                  min: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_textblock_disabled_style_charwrap";
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-nowrap-noedit/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: PLAIN;
+            select_mode: EXPLICIT;
+            multiline: 1;
+            source: "elm/entry/selection/default";
+            // selection under
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "entry_textblock_style";
+                  min: 1 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_textblock_disabled_style";
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/base-password/default";
+      parts {
+         part {
+            name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 1;
+            scale: 1;
+            entry_mode: PASSWORD;
+            select_mode: EXPLICIT;
+            multiline: 0;
+            source: "elm/entry/selection/default";
+            // selection under
+            source4: "elm/entry/cursor/default";
+            // cursorover
+            source5: "elm/entry/anchor/default";
+            // anchor under
+            description {
+               state: "default" 0.0;
+               text {
+                  style: "entry_single_textblock_style";
+                  repch: "*";
+                  min: 1 1;
+                  max: 0 1;
+               }
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "entry_single_textblock_disabled_style";
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "focus";
+            signal: "load";
+            source: "";
+            action: FOCUS_SET;
+            target: "elm.text";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/cursor/default";
+      images {
+         image: "cur_box.png" COMP;
+         image: "cur_hi.png" COMP;
+         image: "cur_shad.png" COMP;
+         image: "cur_shine.png" COMP;
+         image: "cur_glow.png" COMP;
+      }
+      parts {
+         part {
+            name: "clip2";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "clip";
+               rel2.to: "clip";
+               visible: 0;
+            }
+            description {
+               state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "clip";
+            type: RECT;
+            mouse_events: 0;
+            clip_to: "clip2";
+            description {
+               state: "default" 0.0;
+               rel1.offset: -10 0;
+               rel2.offset: 9 9;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "bg";
+            mouse_events: 0;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel1.offset: -2 0;
+               rel2.to: "base";
+               rel2.offset: 1 1;
+               image.border: 2 2 2 2;
+               image.normal: "cur_shad.png";
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               min: 2 2;
+               align: 0.5 1.0;
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 0 -1;
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 -1;
+               image.normal: "cur_box.png";
+            }
+         }
+         part {
+            name: "hi";
+            mouse_events: 0;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               rel2.relative: 1.0 0.5;
+               image.normal: "cur_hi.png";
+            }
+         }
+         part {
+            name: "shine";
+            mouse_events: 0;
+            clip_to: "clip";
+            clip_to: "clip2";
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               rel2.relative: 1.0 0.75;
+               image.border: 2 2 1 0;
+               image.normal: "cur_shine.png";
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "glow";
+            mouse_events: 0;
+            clip_to: "clip2";
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel1.relative: 0.0 -2.0;
+               rel1.offset: -2 0;
+               rel2.to: "base";
+               rel2.relative: 1.0 0.0;
+               rel2.offset: 1 1;
+               image.border: 2 2 0 4;
+               image.normal: "cur_glow.png";
+               fill.smooth: 0;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "show";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            in: 1.0 0.0;
+            transition: DECELERATE 2.0;
+            target: "glow";
+            after: "show2";
+         }
+         program {
+            name: "show2";
+            action: STATE_SET "hidden" 0.0;
+            in: 0.2 0.0;
+            target: "clip";
+            after: "show3";
+         }
+         program {
+            name: "show3";
+            action: STATE_SET "default" 0.0;
+            in: 0.5 0.0;
+            target: "clip";
+            after: "show4";
+         }
+         program {
+            name: "show4";
+            action: STATE_SET "default" 0.0;
+            in: 0.5 0.0;
+            transition: DECELERATE 0.5;
+            target: "glow";
+            after: "show";
+         }
+         program {
+            name: "focused";
+            signal: "elm,action,focus";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "clip2";
+         }
+         program {
+            name: "unfocused";
+            signal: "elm,action,unfocus";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "clip2";
+         }
+      }
+   }
+   group {
+      name: "elm/entry/selection/default";
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 128 128 128 128;
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/entry/anchor/default";
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 128 0 0 64;
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/bubble/top_left/default";
+      alias: "elm/bubble/base/default";
+      images {
+         image: "bubble_3.png" COMP;
+         image: "bubble_shine3.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_y: "elm.text";
+                  relative: 0.0 1.0;
+                  offset: 4 -1;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               fixed: 0 1;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_x: "elm.info";
+                  relative: 0.0 0.0;
+                  offset: -5 4;
+               }
+               color: 0 0 0 255;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 0 1;
+                  max: 0 1;
+                  align: 0.0 0.0;
+               }
+            }
+         }
+         part {
+            name: "elm.info";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -5 4;
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: -5 4;
+               }
+               color: 0 0 0 64;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 1 1;
+                  max: 1 1;
+                  align: 1.0 0.0;
+               }
+            }
+         }
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to_y: "elm.swallow.icon";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               image {
+                  normal: "bubble_3.png";
+                  border: 36 11 18 9;
+               }
+               image.middle: SOLID;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 9 16;
+               }
+               rel2 {
+                  to: "base0";
+                  offset: -10 -9;
+               }
+            }
+         }
+         part {
+            name: "shine";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 5 4;
+               }
+               rel2 {
+                  to: "base0";
+                  relative: 1.0 0.5;
+                  offset: -6 7;
+               }
+               image {
+                  normal: "bubble_shine3.png";
+                  border: 36 5 14 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/bubble/top_right/default";
+      images {
+         image: "bubble_4.png" COMP;
+         image: "bubble_shine4.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 1.0 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -5 4;
+               }
+               rel2 {
+                  to_y: "elm.text";
+                  relative: 1.0 1.0;
+                  offset: -5 -1;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_x: "elm.info";
+                  relative: 0.0 0.0;
+                  offset: -5 4;
+               }
+               color: 0 0 0 255;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 0 1;
+                  max: 0 1;
+                  align: 0.0 0.0;
+               }
+            }
+         }
+         part {
+            name: "elm.info";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -5 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.icon";
+                  relative: 0.0 0.0;
+                  offset: -5 4;
+               }
+               color: 0 0 0 64;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 1 1;
+                  max: 1 1;
+                  align: 1.0 0.0;
+               }
+            }
+         }
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to_y: "elm.swallow.icon";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               image {
+                  normal: "bubble_4.png";
+                  border: 11 36 18 9;
+               }
+               image.middle: SOLID;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 9 16;
+               }
+               rel2 {
+                  to: "base0";
+                  offset: -10 -9;
+               }
+            }
+         }
+         part {
+            name: "shine";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 5 4;
+               }
+               rel2 {
+                  to: "base0";
+                  relative: 1.0 0.5;
+                  offset: -6 7;
+               }
+               image {
+                  normal: "bubble_shine4.png";
+                  border: 5 36 14 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/bubble/bottom_left/default";
+      images {
+         image: "bubble_1.png" COMP;
+         image: "bubble_shine.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 1.0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  to_y: "elm.text";
+                  relative: 0.0 0.0;
+                  offset: 4 0;
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: 4 -5;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 1.0;
+               fixed: 0 1;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 1.0;
+                  offset: 4 -5;
+               }
+               rel2 {
+                  to_x: "elm.info";
+                  relative: 0.0 1.0;
+                  offset: -5 -5;
+               }
+               color: 0 0 0 255;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 0 1;
+                  max: 0 1;
+                  align: 0.0 1.0;
+               }
+            }
+         }
+         part {
+            name: "elm.info";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 1.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: -5 -5;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: -5 -5;
+               }
+               color: 0 0 0 64;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 1 1;
+                  max: 1 1;
+                  align: 1.0 1.0;
+               }
+            }
+         }
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2 {
+                  to_y: "elm.swallow.icon";
+                  relative: 1.0 0.0;
+                  offset: -1 -1;
+               }
+               image {
+                  normal: "bubble_1.png";
+                  border: 36 11 10 19;
+               }
+               image.middle: SOLID;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 9 8;
+               }
+               rel2 {
+                  to: "base0";
+                  offset: -10 -17;
+               }
+            }
+         }
+         part {
+            name: "shine";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 5 4;
+               }
+               rel2 {
+                  to: "base0";
+                  relative: 1.0 0.5;
+                  offset: -6 -16;
+               }
+               image {
+                  normal: "bubble_shine.png";
+                  border: 5 5 5 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/bubble/bottom_right/default";
+      images {
+         image: "bubble_2.png" COMP;
+         image: "bubble_shine.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 1.0 1.0;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  to_y: "elm.text";
+                  relative: 1.0 0.0;
+                  offset: -5 0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: -5 -5;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 1.0;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 4 -5;
+               }
+               rel2 {
+                  to_x: "elm.info";
+                  relative: 0.0 1.0;
+                  offset: -5 -5;
+               }
+               color: 0 0 0 255;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 0 1;
+                  max: 0 1;
+                  align: 0.0 1.0;
+               }
+            }
+         }
+         part {
+            name: "elm.info";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 1.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  offset: -5 -5;
+               }
+               rel2 {
+                  to_x: "elm.swallow.icon";
+                  relative: 0.0 1.0;
+                  offset: -5 -5;
+               }
+               color: 0 0 0 64;
+               text {
+                  font: "Sans:style=Bold,Edje-Vera-Bold";
+                  size: 10;
+                  min: 1 1;
+                  max: 1 1;
+                  align: 1.0 1.0;
+               }
+            }
+         }
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2 {
+                  to_y: "elm.swallow.icon";
+                  relative: 1.0 0.0;
+                  offset: -1 -1;
+               }
+               image {
+                  normal: "bubble_2.png";
+                  border: 11 36 10 19;
+               }
+               image.middle: SOLID;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 9 8;
+               }
+               rel2 {
+                  to: "base0";
+                  offset: -10 -17;
+               }
+            }
+         }
+         part {
+            name: "shine";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+                  offset: 5 4;
+               }
+               rel2 {
+                  to: "base0";
+                  relative: 1.0 0.5;
+                  offset: -6 -16;
+               }
+               image {
+                  normal: "bubble_shine.png";
+                  border: 5 5 5 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/photo/base/default";
+      images {
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
+         image: "head.png" COMP;
+      }
+      parts {
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
+               }
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
+               }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "head";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "head.png";
+            }
+         }
+         part {
+            name: "clip";
+            mouse_events: 0;
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
+         part {
+            name: "over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/thumb/base/default";
+      images {
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
+         image: "busy-1.png" COMP;
+         image: "busy-2.png" COMP;
+         image: "busy-3.png" COMP;
+         image: "busy-4.png" COMP;
+         image: "busy-5.png" COMP;
+         image: "busy-6.png" COMP;
+         image: "busy-7.png" COMP;
+         image: "busy-8.png" COMP;
+         image: "busy-9.png" COMP;
+      }
+      parts {
+         part {
+            name: "base0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
+               }
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
+               }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "clip";
+            mouse_events: 0;
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
+         part {
+            name: "progress";
+            mouse_events: 0;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               min: 32 32;
+               max: 32 32;
+               visible: 0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+            }
+            description {
+               state: "pulse" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "busy-9.png";
+                  tween: "busy-1.png";
+                  tween: "busy-2.png";
+                  tween: "busy-3.png";
+                  tween: "busy-4.png";
+                  tween: "busy-5.png";
+                  tween: "busy-6.png";
+                  tween: "busy-7.png";
+                  tween: "busy-8.png";
+                  border: 7 7 7 7;
+               }
+            }
+         }
+         part {
+            name: "over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
+               }
+               fill.smooth: 0;
+            }
+         }
+         programs {
+            program {
+               name: "start_pulse";
+               signal: "elm,state,pulse,start";
+               source: "elm";
+               action: STATE_SET "pulse" 0.0;
+               target: "progress";
+               transition: LINEAR 0.5;
+               after: "start_pulse";
+            }
+            program {
+               name: "stop_pulse";
+               signal: "elm,state,pulse,stop";
+               source: "elm";
+               action: STATE_SET "default" 0.0;
+               target: "progress";
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/icon/home/default";
+      min: 32 32;
+      images.image: "icon_home.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_home.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/close/default";
+      min: 32 32;
+      images.image: "icon_close.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_close.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/apps/default";
+      min: 32 32;
+      images.image: "icon_apps.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_apps.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/arrow_up/default";
+      min: 32 32;
+      images.image: "icon_arrow_up.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_arrow_up.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/arrow_down/default";
+      min: 32 32;
+      images.image: "icon_arrow_down.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_arrow_down.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/arrow_left/default";
+      min: 32 32;
+      images.image: "icon_arrow_left.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_arrow_left.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/arrow_right/default";
+      min: 32 32;
+      images.image: "icon_arrow_right.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_arrow_right.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/chat/default";
+      min: 32 32;
+      images.image: "icon_chat.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_chat.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/clock/default";
+      min: 32 32;
+      images.image: "icon_clock.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_clock.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/delete/default";
+      min: 32 32;
+      images.image: "icon_delete.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_delete.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/edit/default";
+      min: 32 32;
+      images.image: "icon_edit.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_edit.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/refresh/default";
+      min: 32 32;
+      images.image: "icon_refresh.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_refresh.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/folder/default";
+      min: 32 32;
+      images.image: "icon_folder.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_folder.png";
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/icon/file/default";
+      min: 32 32;
+      images.image: "icon_file.png" COMP;
+      parts {
+         part {
+            name: "base";
+            description {
+               state: "default" 0.0;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image.normal: "icon_file.png";
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/toolbar/base/default";
+      images {
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+         image: "bt_dis_shine.png" COMP;
+         image: "icon_left_arrow.png" COMP;
+         image: "icon_right_arrow.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 2 2;
+               }
+               rel2.offset: -3 -3;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  offset: 2 2;
+               }
+               rel2 {
+                  to: "base";
+                  offset: -3 -3;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            clip_to: "clipper";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "clipper";
+               rel2.to: "clipper";
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               image {
+                  normal: "bt_dis_shine.png";
+                  border: 4 4 4 4;
+               }
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+               color: 255 255 255 128;
+            }
+         }
+         part {
+            name: "left_arrow";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "icon_left_arrow.png";
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               align: 0.0 0.5;
+               min: 32 32;
+               max: 32 32;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "right_arrow";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "icon_right_arrow.png";
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               align: 1.0 0.5;
+               min: 32 32;
+               max: 32 32;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "event";
+            type: RECT;
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "sb_hbar_show";
+            signal: "elm,action,show,hbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 0.5;
+            target: "left_arrow";
+            target: "right_arrow";
+         }
+         program {
+            name: "sb_hbar_hide";
+            signal: "elm,action,hide,hbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "left_arrow";
+            target: "right_arrow";
+            transition: LINEAR 0.5;
+         }
+      }
+   }
+   group {
+      name: "elm/toolbar/item/default";
+      images {
+         image: "toolbar_sel.png" COMP;
+      }
+      parts {
+         part {
+            name: "label2";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               fixed: 0 1;
+               rel1.to: "elm.text";
+               rel2.to: "elm.text";
+               color: 0 0 0 255;
+               text {
+                  font: "Sans";
+                  text_source: "elm.text";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 1;
+               text.min: 1 1;
+            }
+         }
+         part {
+            name: "bg";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               image {
+                  normal: "toolbar_sel.png";
+                  border: 3 3 0 0;
+               }
+               image.middle: SOLID;
+               fill.smooth: 0;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               fixed: 0 0;
+               //aspect: 1.0 1.0;
+               //aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 2 2;
+               }
+               rel2 {
+                  to_y: "elm.text";
+                  relative: 1.0 0.0;
+                  offset: -3 -1;
+               }
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 -1;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
+               }
+               visible: 0;
+               color: 224 224 224 255;
+               color3: 0 0 0 32;
+               text {
+                  font: "Sans:style=Bold";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text.min: 1 1;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 1;
+               text.min: 1 1;
+            }
+         }
+         part {
+            name: "event";
+            type: RECT;
+            mouse_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "elm.text";
+            target: "label2";
+            transition: LINEAR 0.2;
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "elm.text";
+            target: "label2";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go";
+            signal: "mouse,up,1";
+            source: "event";
+            action: SIGNAL_EMIT "elm,action,click" "elm";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "label2";
+            target: "bg";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                                               set_state(PART:"elm.text", "disabled_visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "label2";
+            target: "bg";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                                               set_state(PART:"elm.text", "visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/toolbar/separator/default";
+      images {
+         image: "toolbar_separator_v.png" COMP;
+      }
+      parts {
+         part {
+            name: "separator";
+            // separator group
+            description {
+               state: "default" 0.0;
+               min: 2 2;
+               max: 2 9999;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "toolbar_separator_v.png";
+               }
+               fill {
+                  smooth: 0;
+               }
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/notify/block_events/default";
+      parts {
+         part {
+            name: "block_events";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 64;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "block_clicked";
+            signal: "mouse,clicked,1";
+            source: "block_events";
+            action: SIGNAL_EMIT "elm,action,clicked" "elm";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/default";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 0.0 -1.0;
+               rel2.relative: 1.0 0.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/center";
+      //this group is a design similar to the inwin group
+      images {
+         image: "bt_dis_base.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/bottom";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 2.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/left";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/right";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/top_left";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 0.0 -1.0;
+               rel2.relative: 1.0 0.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/top_right";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 0.0 -1.0;
+               rel2.relative: 1.0 0.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/bottom_left";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 2.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/notify/base/bottom_right";
+      //this group is a design similar to the inwin group
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 10 10;
+               rel2.offset: -10 -10;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 2.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 64;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+         }
+         program {
+            name: "show_2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            after: "show_3";
+         }
+         program {
+            name: "show_3";
+            signal: "show";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/slideshow/base/default";
+      data {
+         item: transitions "fade black_fade horizontal vertical square";
+      }
+      parts {
+         part {
+            name: "whole";
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "image_1_whole";
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "fade_prev_next" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "black_fade_prev_next_init" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "black_fade_prev_next" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 255;
+            }
+            description {
+               state: "horizontal_next_init" 0.0;
+               inherit: "default" 0.0;
+            }
+            description {
+               state: "horizontal_next" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+            description {
+               state: "horizontal_prev_init" 0.0;
+               inherit: "default" 0.0;
+            }
+            description {
+               state: "horizontal_prev" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+            description {
+               state: "vertical_next_init" 0.0;
+               inherit: "default" 0.0;
+            }
+            description {
+               state: "vertical_next" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 -1.0;
+               rel2.relative: 1.0 0.0;
+            }
+            description {
+               state: "vertical_prev_init" 0.0;
+               inherit: "default" 0.0;
+            }
+            description {
+               state: "vertical_prev" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 2.0;
+            }
+         }
+         part {
+            name: "image_2_whole";
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "fade_prev_next" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "black_fade_prev_next_init" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "black_fade_prev_next" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "horizontal_next_init" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "horizontal_next" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "horizontal_prev_init" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "horizontal_prev" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "vertical_next_init" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 2.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "vertical_next" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "vertical_prev_init" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 -1.0;
+               rel2.relative: 1.0 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "vertical_prev" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "square_prev_next_init" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.5 0.5;
+               rel2.relative: 0.5 0.5;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "square_prev_next" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.1";
+            type: SWALLOW;
+            clip_to: "image_1_whole";
+            description {
+               state: "default" 0.0;
+               rel1.to: "image_1_whole";
+               rel2.to: "image_1_whole";
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.2";
+            type: SWALLOW;
+            clip_to: "image_2_whole";
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+               rel1.to: "image_2_whole";
+               rel2.to: "image_2_whole";
+            }
+         }
+         part {
+            name: "events_catcher";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               color: 0 0 0 0;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "fade_next";
+            signal: "fade,next";
+            source: "slideshow";
+            action: STATE_SET "default" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "fade_next_2";
+         }
+         program {
+            name: "fade_next_2";
+            action: STATE_SET "fade_prev_next" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "fade_previous";
+            signal: "fade,previous";
+            source: "slideshow";
+            action: STATE_SET "default" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "fade_previous_2";
+         }
+         program {
+            name: "fade_previous_2";
+            action: STATE_SET "fade_prev_next" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "black_fade_next";
+            signal: "black_fade,next";
+            source: "slideshow";
+            action: STATE_SET "black_fade_prev_next_init" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "black_fade_next_2";
+         }
+         program {
+            name: "black_fade_next_2";
+            action: STATE_SET "black_fade_prev_next" 0.0;
+            target: "image_1_whole";
+            transition: SINUSOIDAL 0.75;
+            after: "black_fade_next_3";
+         }
+         program {
+            name: "black_fade_next_3";
+            action: STATE_SET "black_fade_prev_next" 0.0;
+            target: "image_2_whole";
+            transition: SINUSOIDAL 0.75;
+            after: "end";
+         }
+         program {
+            name: "black_fade_previous";
+            signal: "black_fade,previous";
+            source: "slideshow";
+            action: STATE_SET "black_fade_prev_next_init" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "black_fade_previous_2";
+         }
+         program {
+            name: "black_fade_previous_2";
+            action: STATE_SET "black_fade_prev_next" 0.0;
+            target: "image_1_whole";
+            transition: SINUSOIDAL 0.75;
+            after: "black_fade_previous_3";
+         }
+         program {
+            name: "black_fade_previous_3";
+            action: STATE_SET "black_fade_prev_next" 0.0;
+            target: "image_2_whole";
+            transition: SINUSOIDAL 0.75;
+            after: "end";
+         }
+         program {
+            name: "horizontal_next";
+            signal: "horizontal,next";
+            source: "slideshow";
+            action: STATE_SET "horizontal_next_init" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "horizontal_next_2";
+         }
+         program {
+            name: "horizontal_next_2";
+            action: STATE_SET "horizontal_next" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "horizontal_previous";
+            signal: "horizontal,previous";
+            source: "slideshow";
+            action: STATE_SET "horizontal_prev_init" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "horizontal_previous_2";
+         }
+         program {
+            name: "horizontal_previous_2";
+            action: STATE_SET "horizontal_prev" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "vertical_next";
+            signal: "vertical,next";
+            source: "slideshow";
+            action: STATE_SET "vertical_next_init" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "vertical_next_2";
+         }
+         program {
+            name: "vertical_next_2";
+            action: STATE_SET "vertical_next" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "vertical_previous";
+            signal: "vertical,previous";
+            source: "slideshow";
+            action: STATE_SET "vertical_prev_init" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "vertical_previous_2";
+         }
+         program {
+            name: "vertical_previous_2";
+            action: STATE_SET "vertical_prev" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "square_next";
+            signal: "square,next";
+            source: "slideshow";
+            action: STATE_SET "square_prev_next_init" 0.0;
+            target: "image_2_whole";
+            after: "square_next_2";
+         }
+         program {
+            name: "square_next_2";
+            action: STATE_SET "square_prev_next" 0.0;
+            target: "image_2_whole";
+            transition: SINUSOIDAL 1.5;
+            after: "end";
+         }
+         program {
+            name: "square_previous";
+            signal: "square,previous";
+            source: "slideshow";
+            action: STATE_SET "square_prev_next_init" 0.0;
+            target: "image_2_whole";
+            after: "square_next_2";
+         }
+         program {
+            name: "end";
+            action: STATE_SET "default" 0.0;
+            target: "image_1_whole";
+            target: "image_2_whole";
+            after: "end_signal";
+         }
+         program {
+            name: "end_signal";
+            action: SIGNAL_EMIT "end" "slideshow";
+         }
+      }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/slideshow/base/default";
-      data {
-         item: transitions "fade black_fade horizontal vertical square";
+   group {
+      name: "elm/win/inwin/default";
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
       }
       parts {
-         part { name: "whole";
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
             description {
                state: "default" 0.0;
-               visible: 1;
                color: 0 0 0 0;
             }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 1.0;
+               color: 0 0 0 64;
+            }
          }
-         part { name: "image_1_whole";
+         part {
+            name: "shad";
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-               color: 255 255 255 255;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
             }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
             description {
-               state: "fade_prev_next" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 0;
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
             }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
             description {
-               state: "black_fade_prev_next_init" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
             }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
             description {
-               state: "black_fade_prev_next" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 255;
+               state: "default" 0.0;
+               rel1.relative: 0.1 0.1;
+               rel2.relative: 0.9 0.9;
             }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/win/inwin/minimal";
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
             description {
-               state: "horizontal_next_init" 0.0;
-               inherit: "default" 0.0;
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
             description {
-               state: "horizontal_next" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 0.0;
-               rel2.relative: 0.0 1.0;
+               state: "visible" 0.0;
+               inherit: "default" 1.0;
+               color: 0 0 0 64;
             }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
             description {
-               state: "horizontal_prev_init" 0.0;
-               inherit: "default" 0.0;
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
             }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
             description {
-               state: "horizontal_prev" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 2.0 1.0;
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
             }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
             description {
-               state: "vertical_next_init" 0.0;
-               inherit: "default" 0.0;
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1.relative: 0.5 0.5;
+               rel2.relative: 0.5 0.5;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+      }
+   }
+   group {
+      name: "elm/win/inwin/minimal_vertical";
+      images {
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "base";
+            type: RECT;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 1.0;
+               color: 0 0 0 64;
+            }
+         }
+         part {
+            name: "shad";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image.normal: "shad_circ.png";
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -64 -64;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 63 63;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "pop";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.swallow.content";
+               rel1.offset: -5 -5;
+               rel2.to: "elm.swallow.content";
+               rel2.offset: 4 4;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "popover";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "pop";
+               rel2.to: "pop";
+               rel2.relative: 1.0 0.5;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1.relative: 0.1 0.5;
+               rel2.relative: 0.9 0.5;
             }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            // transition: DECELERATE 0.5;
+            target: "base";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/list/item/default";
+      data.item: "stacking" "above";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
             description {
-               state: "vertical_next" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 -1.0;
-               rel2.relative: 1.0 0.0;
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
+         }
+         part {
+            name: "base_sh";
+            mouse_events: 0;
             description {
-               state: "vertical_prev_init" 0.0;
-               inherit: "default" 0.0;
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
             }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
             description {
-               state: "vertical_prev" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 2.0;
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
             }
          }
-         part { name: "image_2_whole";
+         part {
+            name: "bg";
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-               visible: 1;
+               visible: 0;
                color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
+               }
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
+               }
+               image.middle: SOLID;
             }
             description {
-               state: "fade_prev_next" 0.0;
+               state: "selected" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
                color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
+               }
             }
+         }
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
             description {
-               state: "black_fade_prev_next_init" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 0;
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
+               }
             }
+         }
+         part {
+            name: "elm.swallow.end";
+            type: SWALLOW;
             description {
-               state: "black_fade_prev_next" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
+               }
             }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
             description {
-               state: "horizontal_next_init" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 2.0 1.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
+               }
             }
             description {
-               state: "horizontal_next" 0.0;
+               state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 255;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
             }
+         }
+         part {
+            name: "fg1";
+            mouse_events: 0;
             description {
-               state: "horizontal_prev_init" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 0.0;
-               rel2.relative: 0.0 1.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
+               }
             }
             description {
-               state: "horizontal_prev" 0.0;
+               state: "selected" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
                color: 255 255 255 255;
             }
+         }
+         part {
+            name: "fg2";
+            mouse_events: 0;
             description {
-               state: "vertical_next_init" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 2.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
             }
             description {
-               state: "vertical_next" 0.0;
+               state: "selected" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
                color: 255 255 255 255;
             }
+         }
+      }
+      programs {
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+      }
+   }
+   group {
+      name: "elm/list/item_odd/default";
+      data.item: "stacking" "below";
+      data.item: "selectraise" "on";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_2.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
             description {
-               state: "vertical_prev_init" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 -1.0;
-               rel2.relative: 1.0 0.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
             description {
-               state: "vertical_prev" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_2.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
             }
+         }
+         part {
+            name: "bg";
+            mouse_events: 0;
             description {
-               state: "square_prev_next_init" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.5 0.5;
-               rel2.relative: 0.5 0.5;
-               color: 255 255 255 255;
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
+               }
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
+               }
+               image.middle: SOLID;
             }
             description {
-               state: "square_prev_next" 0.0;
+               state: "selected" 0.0;
                inherit: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
+               visible: 1;
                color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
+               }
             }
          }
-         part { name: "elm.swallow.1";
+         part {
+            name: "elm.swallow.icon";
             type: SWALLOW;
-            clip_to: "image_1_whole";
             description {
                state: "default" 0.0;
-               rel1.to: "image_1_whole";
-               rel2.to: "image_1_whole";
-               color: 255 255 255 255;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
+               }
             }
          }
-         part { name: "elm.swallow.2";
+         part {
+            name: "elm.swallow.end";
             type: SWALLOW;
-            clip_to: "image_2_whole";
             description {
                state: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.to: "image_2_whole";
-               rel2.to: "image_2_whole";
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
+               }
             }
          }
-         part { name: "events_catcher";
-            type: RECT;
-            repeat_events: 1;
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
             description {
                state: "default" 0.0;
-               visible: 1;
-               color: 0 0 0 0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
             }
          }
-      }
-      programs {
-         program { name: "fade_next";
-            signal: "fade,next";
-            source: "slideshow";
-            action: STATE_SET "default" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "fade_next_2";
-         }
-         program { name: "fade_next_2";
-            action: STATE_SET "fade_prev_next" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "fade_previous";
-            signal: "fade,previous";
-            source: "slideshow";
-            action: STATE_SET "default" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "fade_previous_2";
-         }
-         program { name: "fade_previous_2";
-            action: STATE_SET "fade_prev_next" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "black_fade_next";
-            signal: "black_fade,next";
-            source: "slideshow";
-            action: STATE_SET "black_fade_prev_next_init" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "black_fade_next_2";
-         }
-         program { name: "black_fade_next_2";
-            action: STATE_SET "black_fade_prev_next" 0.0;
-            target: "image_1_whole";
-            transition: SINUSOIDAL 0.75;
-            after: "black_fade_next_3";
-         }
-         program { name: "black_fade_next_3";
-            action: STATE_SET "black_fade_prev_next" 0.0;
-            target: "image_2_whole";
-            transition: SINUSOIDAL 0.75;
-            after: "end";
-         }
-         program { name: "black_fade_previous";
-            signal: "black_fade,previous";
-            source: "slideshow";
-            action: STATE_SET "black_fade_prev_next_init" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "black_fade_previous_2";
-         }
-         program { name: "black_fade_previous_2";
-            action: STATE_SET "black_fade_prev_next" 0.0;
-            target: "image_1_whole";
-            transition: SINUSOIDAL 0.75;
-            after: "black_fade_previous_3";
-         }
-         program { name: "black_fade_previous_3";
-            action: STATE_SET "black_fade_prev_next" 0.0;
-            target: "image_2_whole";
-            transition: SINUSOIDAL 0.75;
-            after: "end";
-         }
-         program { name: "horizontal_next";
-            signal: "horizontal,next";
-            source: "slideshow";
-            action: STATE_SET "horizontal_next_init" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "horizontal_next_2";
-         }
-         program { name: "horizontal_next_2";
-            action: STATE_SET "horizontal_next" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "horizontal_previous";
-            signal: "horizontal,previous";
-            source: "slideshow";
-            action: STATE_SET "horizontal_prev_init" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "horizontal_previous_2";
-         }
-         program { name: "horizontal_previous_2";
-            action: STATE_SET "horizontal_prev" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "vertical_next";
-            signal: "vertical,next";
-            source: "slideshow";
-            action: STATE_SET "vertical_next_init" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "vertical_next_2";
-         }
-         program { name: "vertical_next_2";
-            action: STATE_SET "vertical_next" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "vertical_previous";
-            signal: "vertical,previous";
-            source: "slideshow";
-            action: STATE_SET "vertical_prev_init" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "vertical_previous_2";
-         }
-         program { name: "vertical_previous_2";
-            action: STATE_SET "vertical_prev" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "square_next";
-            signal: "square,next";
-            source: "slideshow";
-            action: STATE_SET "square_prev_next_init" 0.0;
-            target: "image_2_whole";
-            after: "square_next_2";
-         }
-         program { name: "square_next_2";
-            action: STATE_SET "square_prev_next" 0.0;
-            target: "image_2_whole";
-            transition: SINUSOIDAL 1.5;
-            after: "end";
-         }
-         program { name: "square_previous";
-            signal: "square,previous";
-            source: "slideshow";
-            action: STATE_SET "square_prev_next_init" 0.0;
-            target: "image_2_whole";
-            after: "square_next_2";
-         }
-         program { name: "end";
-            action: STATE_SET "default" 0.0;
-            target: "image_1_whole";
-            target: "image_2_whole";
-            after: "end_signal";
-         }
-         program { name: "end_signal";
-            action: SIGNAL_EMIT "end" "slideshow";
+         part {
+            name: "fg1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
          }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/win/inwin/default";
-      images {
-        image: "shad_circ.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
-      }
-      parts {
-        part { name: "base";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 1.0;
-              color: 0 0 0 64;
-           }
-        }
-         part { name: "shad";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "shad_circ.png";
-              rel1.to: "elm.swallow.content";
-              rel1.offset: -64 -64;
-              rel2.to: "elm.swallow.content";
-              rel2.offset: 63 63;
-               fill.smooth: 0;
-           }
-        }
-        part { name: "pop";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.content";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.content";
-               rel2.offset: 4 4;
+         part {
+            name: "fg2";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-        }
-         part { name: "popover";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "pop";
-              rel2.to: "pop";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-               rel1.relative: 0.1 0.1;
-               rel2.relative: 0.9 0.9;
-           }
-        }
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
       }
       programs {
-        program { name: "show";
-            signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
-            signal: "elm,action,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
       }
    }
-
-   group { name: "elm/win/inwin/minimal";
+   group {
+      name: "elm/list/item_compress/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
       images {
-        image: "shad_circ.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
       }
       parts {
-        part { name: "base";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 1.0;
-              color: 0 0 0 64;
-           }
-        }
-         part { name: "shad";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "shad_circ.png";
-              rel1.to: "elm.swallow.content";
-              rel1.offset: -64 -64;
-              rel2.to: "elm.swallow.content";
-              rel2.offset: 63 63;
+         part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               min: 0 10;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
                fill.smooth: 0;
-           }
-        }
-        part { name: "pop";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.content";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.content";
-               rel2.offset: 4 4;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
-               image.middle: SOLID;
-           }
-        }
-         part { name: "popover";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "pop";
-              rel2.to: "pop";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.relative: 0.5 0.5;
-               rel2.relative: 0.5 0.5;
-           }
-        }
-      }
-      programs {
-        program { name: "show";
-            signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
-            signal: "elm,action,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-      }
-   }
-
-   group { name: "elm/win/inwin/minimal_vertical";
-      images {
-        image: "shad_circ.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
-      }
-      parts {
-        part { name: "base";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 1.0;
-              color: 0 0 0 64;
-           }
-        }
-         part { name: "shad";
-           mouse_events:  0;
-           description { state: "default" 0.0;
-              image.normal: "shad_circ.png";
-              rel1.to: "elm.swallow.content";
-              rel1.offset: -64 -64;
-              rel2.to: "elm.swallow.content";
-              rel2.offset: 63 63;
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
+               }
                fill.smooth: 0;
-           }
-        }
-        part { name: "pop";
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.content";
-               rel1.offset: -5 -5;
-              rel2.to: "elm.swallow.content";
-               rel2.offset: 4 4;
+            }
+         }
+         part {
+            name: "bg";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
+               }
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
+               }
                image.middle: SOLID;
-           }
-        }
-         part { name: "popover";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "pop";
-              rel2.to: "pop";
-              rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_dis_hilight.png";
-                 border: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "elm.swallow.content";
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
             type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.relative: 0.1 0.5;
-               rel2.relative: 0.9 0.5;
-           }
-        }
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  // min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "fg1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
       }
       programs {
-        program { name: "show";
-            signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
-            signal: "elm,action,hide";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
       }
    }
-
-///////////////////////////////////////////////////////////////////////////////
-
-   ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/list/item/default";
-      data.item: "stacking" "above";
+   group {
+      name: "elm/list/item_compress_odd/default";
+      data.item: "stacking" "below";
+      data.item: "selectraise" "on";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
+         image: "ilist_2.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
-            repeat_events: 1;
+            name: "base";
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-               color: 0 0 0 0;
+               image {
+                  normal: "ilist_2.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
             }
          }
          part {
-            name: "base_sh";
+            name: "bg";
             mouse_events: 0;
             description {
                state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
+               visible: 0;
+               color: 255 255 255 0;
                rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
                rel2 {
-                  to: "base";
                   relative: 1.0 1.0;
-                  offset: -1 0;
+                  offset: 4 4;
                }
                image {
-                  normal: "ilist_item_shadow.png";
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
                }
-               fill.smooth: 0;
+               image.middle: SOLID;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 4 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  // min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "fg1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
          }
+      }
+      programs {
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/slider/horizontal/default";
+      images {
+         image: "sl_bg.png" COMP;
+         image: "sl_bg_over.png" COMP;
+         image: "sl_bt_0.png" COMP;
+         image: "sl_bt_1.png" COMP;
+         image: "sl_bt_2.png" COMP;
+         image: "sl_bt2_0_0.png" COMP;
+         image: "sl_bt2_0_1.png" COMP;
+         image: "sl_bt2_0_2.png" COMP;
+         image: "sl_bt2_1.png" COMP;
+         image: "sl_bt2_2.png" COMP;
+         image: "sl_units.png" COMP;
+      }
+      parts {
          part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
+               max: 99999 6;
+               min: 0 6;
+               rel1 {
+                  to: "bg";
+                  offset: 1 0;
+               }
+               rel2 {
+                  to: "bg";
+                  offset: -2 -1;
+               }
+               image.normal: "sl_bg.png";
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "level";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "base";
+               rel2 {
+                  to_y: "base";
+                  to_x: "elm.dragable.slider";
+                  relative: 0.5 1.0;
+               }
+               color: 255 0 0 200;
+            }
+            description {
+               state: "inverted" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "level2";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               rel1 {
+                  to_y: "base";
+                  to_x: "elm.dragable.slider";
+                  relative: 0.5 0.0;
+               }
+               rel2.to: "base";
+               color: 255 0 0 200;
+            }
+            description {
+               state: "inverted" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "base_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel1.offset: -1 -1;
+               rel2.to: "base";
+               rel2.offset: 0 0;
                image {
-                  normal: "ilist_1.png";
-                  border: 2 2 2 2;
+                  normal: "sl_bg_over.png";
+                  border: 3 3 3 3;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
+            type: RECT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -5 -5;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
-               }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
-               }
-               image.middle: SOLID;
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
+               rel1.to: "elm.swallow.bar";
+               rel2.to: "elm.swallow.bar";
+               color: 0 0 0 0;
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.bar";
             type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min: 48 24;
+               max: 99999 24;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
+                  to_x: "elm.text";
+                  relative: 1.0 0.0;
+                  offset: 8 0;
                }
                rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+                  to_x: "elm.units";
+                  relative: 0.0 1.0;
+                  offset: -10 -1;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.content";
             type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 1.0 0.5;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: 4 0;
+                  to_y: "elm.swallow.bar";
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: 3 -1;
+                  relative: 0.0 1.0;
+                  to_y: "elm.swallow.bar";
                }
             }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel2.offset: 4 -1;
+            }
          }
-         part { name: "elm.text";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
-               rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   4 4;
-               }
-               rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
-               }
+               visible: 0;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: -1 4;
+               rel2.to_x: "elm.swallow.content";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -1 -5;
                color: 0 0 0 255;
-               color3: 0 0 0 0;
                text {
-                  font: "Sans";
+                  font: "Sans,Edje-Vera";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
+                  min: 0 0;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 0 4;
+               rel2.offset: 0 -5;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "units";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
+               rel1 {
+                  to_x: "elm.units";
+                  offset: 0 5;
+               }
                image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
+                  normal: "sl_units.png";
+                  border: 0 5 3 8;
                }
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "elm.units";
+            type: TEXT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
+               fixed: 1 1;
+               align: 1.0 0.5;
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 0 8;
+               rel2.relative: 1.0 1.0;
+               rel2.offset: 0 -9;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
+               fixed: 1 1;
                visible: 1;
-               color: 255 255 255 255;
+               text.min: 1 1;
+               rel1.offset: -5 0;
+               rel2.offset: -5 -1;
             }
          }
-      }
-      programs {
-         program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-         }
-         program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
+         part {
+            name: "elm.dragable.slider";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+               confine: "bg";
+            }
+            description {
+               state: "default" 0.0;
+               min: 0 24;
+               max: 0 24;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.5 0.0;
+                  to_x: "bg";
+               }
+               rel2 {
+                  relative: 0.5 1.0;
+                  to_x: "bg";
+               }
+               color: 255 0 0 100;
+            }
          }
-      }
-   }
-   group { name: "elm/list/item_odd/default";
-      data.item: "stacking" "below";
-      data.item: "selectraise" "on";
-      images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
-      }
-      parts {
          part {
-            name:           "event";
-            type:           RECT;
-            repeat_events: 1;
+            name: "button_events";
+            type: RECT;
+            dragable {
+               events: "elm.dragable.slider";
+            }
+            mouse_events: 1;
             description {
                state: "default" 0.0;
+               fixed: 1 1;
+               min: 16 16;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1.to_x: "elm.dragable.slider";
+               rel2.to_x: "elm.dragable.slider";
                color: 0 0 0 0;
             }
          }
          part {
-            name: "base";
+            name: "button0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               max: 17 999;
+               min: 17 24;
+               rel1.to: "elm.dragable.slider";
+               rel2.to: "elm.dragable.slider";
+               image {
+                  normal: "sl_bt_0.png";
+                  border: 5 5 5 10;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "button1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "button0";
+               rel2 {
+                  to: "button0";
+                  relative: 1.0 0.5;
+                  offset: -1 -5;
+               }
+               image {
+                  normal: "sl_bt_1.png";
+                  border: 5 5 5 0;
+               }
+            }
+         }
+         part {
+            name: "button2";
             mouse_events: 0;
             description {
                state: "default" 0.0;
+               rel1.to: "button0";
+               rel2.to: "button0";
                image {
-                  normal: "ilist_2.png";
-                  border: 2 2 2 2;
+                  normal: "sl_bt_2.png";
+                  border: 5 5 5 10;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "button3";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
                visible: 0;
-               color: 255 255 255 0;
+               min: 8 32;
+               align: 1.0 0.5;
                rel1 {
+                  to_x: "elm.indicator";
+                  to_y: "button4";
                   relative: 0.0 0.0;
-                  offset: -5 -5;
+                  offset: -7 0;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
+                  to: "button4";
+                  relative: 0.0 1.0;
+                  offset: -1 -1;
                }
                image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
+                  normal: "sl_bt2_0_0.png";
+                  border: 6 0 6 12;
                }
-               image.middle: SOLID;
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
             }
          }
          part {
-            name:          "elm.swallow.icon";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
-               fixed: 1 0;
-               align:    0.0 0.5;
+            name: "button4";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               max: 15 999;
+               min: 15 32;
                rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
+                  to_x: "button0";
+                  to_y: "elm.indicator";
+                  offset: 0 0;
                }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+               rel2.to: "button0";
+               image {
+                  normal: "sl_bt2_0_1.png";
+                  border: 0 0 6 12;
                }
+               fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part {
-            name:          "elm.swallow.end";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
-               fixed: 1 0;
-               align: 1.0 0.5;
+            name: "button5";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 8 32;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  to: "button4";
+                  relative: 1.0 0.0;
+                  offset: 0 0;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  to_x: "elm.indicator";
+                  to_y: "button4";
+                  relative: 1.0 1.0;
+                  offset: 6 -1;
+               }
+               image {
+                  normal: "sl_bt2_0_2.png";
+                  border: 0 6 6 12;
                }
+               fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part {
-            name:           "elm.text";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            name: "elm.indicator";
+            type: TEXT;
+            mouse_events: 0;
+            effect: SOFT_SHADOW;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min:      16 16;
+               visible: 0;
+               fixed: 1 1;
+               align: 0.5 1.0;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   4 4;
+                  to: "button0";
+                  relative: 0.0 -0.25;
+                  offset: 0 0;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  to_x: "button0";
+                  relative: 1.0 -0.25;
+                  offset: -1 0;
                }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
                text {
-                  font: "Sans";
+                  font: "Sans,Edje-Vera";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: 0.0 0.5;
+                  min: 0 0;
+                  align: 0.5 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 0 -1;
+               rel2.offset: -1 -1;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "button6";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
+               rel1.to: "button3";
+               rel2 {
+                  to: "button5";
+                  relative: 1.0 0.3;
+                  offset: -1 -1;
+               }
                image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
+                  normal: "sl_bt2_1.png";
+                  border: 5 5 5 0;
                }
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "button7";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               rel1.to: "button3";
+               rel2.to: "button5";
                image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
+                  normal: "sl_bt2_2.png";
+                  border: 5 5 5 0;
+                  middle: 0;
                }
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
          }
       }
       programs {
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "units_show";
+            signal: "elm,state,units,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.units";
+            target: "units";
+         }
+         program {
+            name: "units_hide";
+            signal: "elm,state,units,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.units";
+            target: "units";
+         }
+         program {
+            name: "invert_on";
+            signal: "elm,state,inverted,on";
+            source: "elm";
+            action: STATE_SET "inverted" 0.0;
+            target: "level";
+            target: "level2";
+         }
+         program {
+            name: "invert_off";
+            signal: "elm,state,inverted,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "level";
+            target: "level2";
+         }
+         program {
+            name: "val_show";
+            signal: "mouse,down,*";
+            source: "elm.dragable.slider";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.indicator";
+            target: "button3";
+            target: "button4";
+            target: "button5";
+            target: "button6";
+            target: "button7";
+         }
+         program {
+            name: "val_hide";
+            signal: "mouse,up,*";
+            source: "elm.dragable.slider";
+            action: STATE_SET "default" 0.0;
+            target: "elm.indicator";
+            target: "button3";
+            target: "button4";
+            target: "button5";
+            target: "button6";
+            target: "button7";
          }
       }
    }
-   group { name: "elm/list/item_compress/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
+   group {
+      name: "elm/slider/vertical/default";
       images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
+         image: "slv_bg.png" COMP;
+         image: "slv_bg_over.png" COMP;
+         image: "sl_bt_0.png" COMP;
+         image: "sl_bt_1.png" COMP;
+         image: "sl_bt_2.png" COMP;
+         image: "sl_bt2_0_0.png" COMP;
+         image: "sl_bt2_0_1.png" COMP;
+         image: "sl_bt2_0_2.png" COMP;
+         image: "sl_bt2_1.png" COMP;
+         image: "sl_bt2_2.png" COMP;
+         image: "slv_units.png" COMP;
       }
       parts {
          part {
-            name: "base_sh";
+            name: "base";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.0 0.0;
-               min: 0 10;
+            description {
+               state: "default" 0.0;
+               max: 6 99999;
+               min: 0;
                rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
+                  to: "bg";
+                  offset: 1 0;
                }
                rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
+                  to: "bg";
+                  offset: -2 -1;
                }
+               image.normal: "slv_bg.png";
                fill.smooth: 0;
             }
          }
          part {
-            name: "base";
+            name: "level";
+            type: RECT;
             mouse_events: 0;
             description {
                state: "default" 0.0;
-               image {
-                  normal: "ilist_1.png";
-                  border: 2 2 2 2;
+               fixed: 1 1;
+               rel1.to: "base";
+               rel2 {
+                  to_x: "base";
+                  to_y: "elm.dragable.slider";
+                  relative: 1.0 0.5;
                }
-               fill.smooth: 0;
+               color: 255 0 0 200;
+            }
+            description {
+               state: "inverted" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "level2";
+            type: RECT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
                visible: 0;
-               color: 255 255 255 0;
                rel1 {
-                  relative: 0.0 0.0;
-                  offset: -5 -5;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
-               }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
+                  to_x: "base";
+                  to_y: "elm.dragable.slider";
+                  relative: 0.0 0.5;
                }
-               image.middle: SOLID;
+               rel2.to: "base";
+               color: 255 0 0 200;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "inverted" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
+            }
+         }
+         part {
+            name: "base_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "base";
+               rel1.offset: -1 -1;
+               rel2.to: "base";
+               rel2.offset: 0 0;
+               image {
+                  normal: "slv_bg_over.png";
+                  border: 3 3 3 3;
                }
+               fill.smooth: 0;
             }
          }
-         part { name:          "elm.swallow.icon";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
-               fixed: 1 0;
-               align:    0.0 0.5;
+         part {
+            name: "bg";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               rel1.to: "elm.swallow.bar";
+               rel2.to: "elm.swallow.bar";
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "elm.swallow.bar";
+            type: SWALLOW;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min: 24 48;
+               max: 24 9999;
+               align: 0.5 1.0;
                rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
+                  to_y: "elm.text";
+                  relative: 0.0 1.0;
+                  offset: 0 10;
                }
                rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+                  to_y: "elm.units";
+                  relative: 1.0 0.0;
+                  offset: -1 -8;
                }
             }
          }
-         part { name:          "elm.swallow.end";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
-               fixed: 1 0;
-               align:    1.0 0.5;
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               align: 0.5 0.0;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: 0 4;
+                  to_x: "elm.swallow.bar";
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -1 3;
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.bar";
                }
             }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: HORIZONTAL;
+               rel2.offset: -1 4;
+            }
          }
          part {
-            name:           "elm.text";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-//               min:      16 16;
-               rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   4 4;
-               }
-               rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
-               }
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               align: 0.5 0.0;
+               rel1.to_y: "elm.swallow.content";
+               rel1.relative: 0.5 1.0;
+               rel1.offset: 0 -1;
+               rel2.to_y: "elm.swallow.content";
+               rel2.relative: 0.5 1.0;
+               rel2.offset: -1 -1;
                color: 0 0 0 255;
-               color3: 0 0 0 0;
                text {
-                  font: "Sans";
+                  font: "Sans,Edje-Vera";
                   size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  min: 0 0;
+                  align: 0.5 0.0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 4 0;
+               rel2.offset: -5 0;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "units";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
+               rel1 {
+                  to: "elm.units";
+                  offset: -8 0;
+               }
+               rel2 {
+                  to: "elm.units";
+                  offset: 7 8;
+               }
                image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
+                  normal: "slv_units.png";
+                  border: 8 8 0 9;
                }
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "elm.units";
+            type: TEXT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               fixed: 1 1;
+               align: 0.5 1.0;
+               rel1.relative: 0.0 1.0;
+               rel1.offset: 8 0;
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -9 0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.0;
+               }
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 1 1;
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 8 -9;
+               rel2.offset: -9 -9;
+            }
+         }
+         part {
+            name: "elm.dragable.slider";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            dragable {
+               x: 0 0 0;
+               y: 1 1 0;
+               confine: "bg";
+            }
+            description {
+               state: "default" 0.0;
+               min: 24 0;
+               max: 24 0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.5  0.0;
+                  to_y: "bg";
+               }
+               rel2 {
+                  relative: 0.5  1.0;
+                  to_y: "bg";
+               }
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "button_events";
+            type: RECT;
+            dragable {
+               events: "elm.dragable.slider";
+            }
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 16 16;
+               aspect: 1.0 1.0;
+               aspect_preference: HORIZONTAL;
+               rel1.to_y: "elm.dragable.slider";
+               rel2.to_y: "elm.dragable.slider";
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "button0";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               max: 17 999;
+               min: 17 24;
+               rel1.to: "elm.dragable.slider";
+               rel2.to: "elm.dragable.slider";
                image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
+                  normal: "sl_bt_0.png";
+                  border: 5 5 5 10;
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+               fill.smooth: 0;
             }
          }
          part {
-            name:           "event";
-            type:           RECT;
-            repeat_events: 1;
+            name: "button1";
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-               color: 0 0 0 0;
+               rel1.to: "button0";
+               rel2 {
+                  to: "button0";
+                  relative: 1.0 0.5;
+                  offset: -1 -5;
+               }
+               image {
+                  normal: "sl_bt_1.png";
+                  border: 5 5 5 0;
+               }
             }
          }
-      }
-      programs {
-         program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-         }
-         program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
-         }
-      }
-   }
-   group { name: "elm/list/item_compress_odd/default";
-      data.item: "stacking" "below";
-      data.item: "selectraise" "on";
-      images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
-      }
-      parts {
          part {
-            name: "base";
+            name: "button2";
             mouse_events: 0;
             description {
                state: "default" 0.0;
+               rel1.to: "button0";
+               rel2.to: "button0";
                image {
-                  normal: "ilist_2.png";
-                  border: 2 2 2 2;
+                  normal: "sl_bt_2.png";
+                  border: 5 5 5 10;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "button3";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
+               min: 8 32;
+               align: 1.0 0.5;
                rel1 {
+                  to_x: "elm.indicator";
+                  to_y: "button4";
                   relative: 0.0 0.0;
-                  offset: -5 -5;
+                  offset: -7 0;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
+                  to: "button4";
+                  relative: 0.0 1.0;
+                  offset: -1 -1;
                }
                image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
+                  normal: "sl_bt2_0_0.png";
+                  border: 6 0 6 12;
                }
-               image.middle: SOLID;
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
             }
          }
-         part { name:          "elm.swallow.icon";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
-               fixed: 1 0;
-               align:    0.0 0.5;
+         part {
+            name: "button4";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               max: 15 999;
+               min: 15 32;
+               fixed: 1 1;
                rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
+                  to_x: "button0";
+                  to_y: "elm.indicator";
+                  offset: 0 -7;
                }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+               rel2.to: "button0";
+               image {
+                  normal: "sl_bt2_0_1.png";
+                  border: 0 0 6 12;
                }
+               fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name:          "elm.swallow.end";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
-               fixed: 1 0;
-               align:    1.0 0.5;
+         part {
+            name: "button5";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               min: 8 32;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  to: "button4";
+                  relative: 1.0 0.0;
+                  offset: 0 0;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  to_x: "elm.indicator";
+                  to_y: "button4";
+                  relative: 1.0 1.0;
+                  offset: 6 -1;
+               }
+               image {
+                  normal: "sl_bt2_0_2.png";
+                  border: 0 6 6 12;
                }
+               fill.smooth: 0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part {
-            name:           "elm.text";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            name: "elm.indicator";
+            type: TEXT;
+            mouse_events: 0;
+            effect: SOFT_SHADOW;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min:      16 16;
+               visible: 0;
+               fixed: 1 1;
+               align: 0.5 1.0;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   4 4;
+                  to: "button0";
+                  relative: 0.0 -1.0;
+                  offset: 0 0;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  to: "button0";
+                  relative: 1.0 -1.0;
+                  offset: -1 0;
                }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
                text {
-                  font: "Sans";
+                  font: "Sans,Edje-Vera";
                   size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  min: 0 0;
+                  align: 0.5 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 0 -1;
+               rel2.offset: -1 -1;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "button6";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
+               rel1.to: "button3";
+               rel2 {
+                  to: "button5";
+                  relative: 1.0 0.3;
+                  offset: -1 -1;
+               }
                image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
+                  normal: "sl_bt2_1.png";
+                  border: 5 5 5 0;
                }
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "button7";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               rel1.to: "button3";
+               rel2.to: "button5";
                image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
+                  normal: "sl_bt2_2.png";
+                  border: 5 5 5 0;
+                  middle: 0;
                }
+               fill.smooth: 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
             }
          }
-         part {
-            name:           "event";
-            type:           RECT;
-            repeat_events: 1;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
-            }
+      }
+      programs {
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "units_show";
+            signal: "elm,state,units,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.units";
+            target: "units";
+         }
+         program {
+            name: "units_hide";
+            signal: "elm,state,units,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.units";
+            target: "units";
          }
-      }
-      programs {
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "invert_on";
+            signal: "elm,state,inverted,on";
+            source: "elm";
+            action: STATE_SET "inverted" 0.0;
+            target: "level";
+            target: "level2";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
+            name: "invert_off";
+            signal: "elm,state,inverted,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "level";
+            target: "level2";
+         }
+         program {
+            name: "val_show";
+            signal: "mouse,down,*";
+            source: "elm.dragable.slider";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.indicator";
+            target: "button3";
+            target: "button4";
+            target: "button5";
+            target: "button6";
+            target: "button7";
+         }
+         program {
+            name: "val_hide";
+            signal: "mouse,up,*";
+            source: "elm.dragable.slider";
+            action: STATE_SET "default" 0.0;
+            target: "elm.indicator";
+            target: "button3";
+            target: "button4";
+            target: "button5";
+            target: "button6";
+            target: "button7";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/slider/horizontal/default";
+   group {
+      name: "elm/genlist/item/default/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      // data.item: "states" "";
       images {
-        image: "sl_bg.png" COMP;
-        image: "sl_bg_over.png" COMP;
-        image: "sl_bt_0.png" COMP;
-        image: "sl_bt_1.png" COMP;
-        image: "sl_bt_2.png" COMP;
-        image: "sl_bt2_0_0.png" COMP;
-        image: "sl_bt2_0_1.png" COMP;
-        image: "sl_bt2_0_2.png" COMP;
-        image: "sl_bt2_1.png" COMP;
-        image: "sl_bt2_2.png" COMP;
-         image: "sl_units.png" COMP;
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
       }
       parts {
-         part { name: "base";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               max: 99999 6;
-               min: 0 6;
-               rel1 { to: "bg";
-                  offset: 1 0;
-               }
-               rel2 { to: "bg";
-                  offset: -2 -1;
-               }
-               image.normal: "sl_bg.png";
-               fill.smooth: 0;
-            }
-         }
-         part { name: "level";
+         part {
+            name: "event";
             type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "base";
-               rel2 {
-                  to_y: "base";
-                  to_x: "elm.dragable.slider";
-                  relative: 0.5 1.0;
-               }
-               color: 255 0 0 200;
-            }
-            description { state: "inverted" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
          }
-         part { name: "level2";
-            type: RECT;
+         part {
+            name: "base_sh";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
                fixed: 1 1;
-               visible: 0;
                rel1 {
-                  to_y: "base";
-                  to_x: "elm.dragable.slider";
-                  relative: 0.5 0.0;
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
                }
-               rel2.to: "base";
-               color: 255 0 0 200;
-            }
-            description { state: "inverted" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part {
-            name: "base_over";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel1.offset: -1 -1;
-               rel2.to: "base";
-               rel2.offset: 0 0;
                image {
-                  normal: "sl_bg_over.png";
-                  border: 3 3 3 3;
+                  normal: "ilist_item_shadow.png";
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
-           type: RECT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-               visible: 0;
-              rel1.to: "elm.swallow.bar";
-              rel2.to: "elm.swallow.bar";
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "elm.swallow.bar";
-           type: SWALLOW;
-            scale: 1;
-           description { state: "default" 0.0;
-              min: 48 24;
-              max: 99999 24;
-              align: 1.0 0.5;
-              rel1 {
-                  to_x: "elm.text";
-                  relative: 1.0 0.0;
-                  offset: 8 0;
-               }
-              rel2 {
-                  to_x: "elm.units";
-                  relative: 0.0 1.0;
-                  offset: -10 -1;
-               }
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1 {
-                  offset: 4 0;
-                  to_y: "elm.swallow.bar";
-               }
-              rel2 {
-                  offset: 3 -1;
-                  relative: 0.0 1.0;
-                  to_y: "elm.swallow.bar";
-               }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-              rel2.offset: 4 -1;
-           }
-        }
-         part { name: "elm.text";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-               fixed: 1 1;
-               align: 0.0 0.5;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: -1 4;
-              rel2.to_x: "elm.swallow.content";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -1 -5;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.0 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-               rel1.offset: 0 4;
-               rel2.offset: 0 -5;
-           }
-        }
-         part { name: "units";
+         part {
+            name: "base";
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               rel1 {
-                  to_x: "elm.units";
-                  offset: 0 5;
-               }
+            description {
+               state: "default" 0.0;
                image {
-                  normal: "sl_units.png";
-                  border: 0 5 3 8;
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-            }
          }
-         part { name: "elm.units";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-               fixed: 1 1;
-              align: 1.0 0.5;
-              rel1.relative: 1.0 0.0;
-              rel1.offset: 0 8;
-              rel2.relative: 1.0 1.0;
-              rel2.offset: 0 -9;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.0 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 1;
-              visible: 1;
-              text.min: 1 1;
-              rel1.offset: -5 0;
-              rel2.offset: -5 -1;
-           }
-        }
-         part { name: "elm.dragable.slider";
-            type: RECT;
+         part {
+            name: "bg";
+            clip_to: "disclip";
             mouse_events: 0;
-            scale: 1;
-            dragable {
-               x: 1 1 0;
-               y: 0 0 0;
-               confine: "bg";
-            }
-            description { state: "default" 0.0;
-               min: 0 24;
-               max: 0 24;
-               fixed: 1 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
                rel1 {
-                  relative: 0.5 0.0;
-                  to_x: "bg";
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
                rel2 {
-                  relative: 0.5 1.0;
-                  to_x: "bg";
+                  relative: 1.0 1.0;
+                  offset: 4 4;
                }
-               color: 255 0 0 100;
-            }
-         }
-         part { name: "button_events";
-           type: RECT;
-           dragable {
-              events: "elm.dragable.slider";
-           }
-            mouse_events: 1;
-           description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 16 16;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-              rel1.to_x: "elm.dragable.slider";
-              rel2.to_x: "elm.dragable.slider";
-              color: 0 0 0 0;
-           }
-        }
-         part { name: "button0";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               max: 17 999;
-               min: 17 24;
-               rel1.to: "elm.dragable.slider";
-               rel2.to: "elm.dragable.slider";
                image {
-                  normal: "sl_bt_0.png";
-                  border: 5 5 5 10;
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
                }
-               fill.smooth: 0;
+               image.middle: SOLID;
             }
-         }
-         part { name: "button1";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "button0";
-               rel2 {
-                  to: "button0";
-                  relative: 1.0 0.5;
-                  offset: -1 -5;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
                }
-               image {
-                  normal: "sl_bt_1.png";
-                  border: 5 5 5 0;
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
             }
          }
-         part { name: "button2";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "button0";
-               rel2.to: "button0";
-               image {
-                  normal: "sl_bt_2.png";
-                  border: 5 5 5 10;
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-               fill.smooth: 0;
             }
          }
-         part { name: "button3";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-              visible: 0;
-               min: 8 32;
-               align: 1.0 0.5;
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
                rel1 {
-                  to_x: "elm.indicator";
-                  to_y: "button4";
-                  relative: 0.0 0.0;
-                  offset: -7 0;
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
                rel2 {
-                  to: "button4";
-                  relative: 0.0 1.0;
-                  offset: -1 -1;
-               }
-               image {
-                  normal: "sl_bt2_0_0.png";
-                  border: 6 0 6 12;
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-               fill.smooth: 0;
-            }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
             }
          }
-         part { name: "button4";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               max: 15 999;
-               min: 15 32;
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
                rel1 {
-                  to_x: "button0";
-                  to_y: "elm.indicator";
-                  offset: 0 0;
+                  relative: 1.0  0.0;
+                  offset: -5    4;
                }
-               rel2.to: "button0";
-               image {
-                  normal: "sl_bt2_0_1.png";
-                  border: 0 0 6 12;
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
                }
-               fill.smooth: 0;
-            }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
             }
          }
-         part { name: "button5";
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
             mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-              visible: 0;
-               min: 8 32;
-               align: 0.0 0.5;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
                rel1 {
-                  to: "button4";
-                  relative: 1.0 0.0;
-                  offset: 0 0;
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x: "elm.indicator";
-                  to_y: "button4";
-                  relative: 1.0 1.0;
-                  offset: 6 -1;
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
                }
-               image {
-                  normal: "sl_bt2_0_2.png";
-                  border: 0 6 6 12;
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
             }
          }
-         part { name: "elm.indicator";
-           type: TEXT;
-           mouse_events: 0;
-            effect: SOFT_SHADOW;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-               fixed: 1 1;
-               align: 0.5 1.0;
-              rel1 {
-                  to: "button0";
-                  relative: 0.0 -0.25;
-                  offset: 0 0;
-               }
-              rel2 {
-                  to_x: "button0";
-                  relative: 1.0 -0.25;
-                  offset: -1 0;
-               }
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 0;
-                 align:    0.5 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-               rel1.offset: 0 -1;
-               rel2.offset: -1 -1;
-           }
-        }
-         part { name: "button6";
+         part {
+            name: "fg1";
+            clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               rel1.to: "button3";
-               rel2 {
-                  to: "button5";
-                  relative: 1.0 0.3;
-                  offset: -1 -1;
-               }
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
                image {
-                  normal: "sl_bt2_1.png";
-                  border: 5 5 5 0;
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
             }
          }
-         part { name: "button7";
+         part {
+            name: "fg2";
+            clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               rel1.to: "button3";
-               rel2.to: "button5";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
                image {
-                  normal: "sl_bt2_2.png";
-                  border: 5 5 5 0;
-                  middle: 0;
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
             }
          }
       }
       programs {
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.text";
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "units_show";
-           signal: "elm,state,units,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.units";
-           target: "units";
-        }
-        program { name: "units_hide";
-           signal: "elm,state,units,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.units";
-           target: "units";
-        }
-        program { name: "invert_on";
-           signal: "elm,state,inverted,on";
-           source: "elm";
-           action:  STATE_SET "inverted" 0.0;
-           target: "level";
-           target: "level2";
-        }
-        program { name: "invert_off";
-           signal: "elm,state,inverted,off";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "level";
-           target: "level2";
-        }
-        program { name: "val_show";
-           signal: "mouse,down,*";
-           source: "elm.dragable.slider";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.indicator";
-           target: "button3";
-           target: "button4";
-           target: "button5";
-           target: "button6";
-           target: "button7";
-        }
-        program { name: "val_hide";
-           signal: "mouse,up,*";
-           source: "elm.dragable.slider";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.indicator";
-           target: "button3";
-           target: "button4";
-           target: "button5";
-           target: "button6";
-           target: "button7";
-        }
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
       }
    }
-
-   group { name: "elm/slider/vertical/default";
+   group {
+      name: "elm/genlist/item_compress/default/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      // data.item: "states" "";
       images {
-        image: "slv_bg.png" COMP;
-        image: "slv_bg_over.png" COMP;
-
-        image: "sl_bt_0.png" COMP;
-        image: "sl_bt_1.png" COMP;
-        image: "sl_bt_2.png" COMP;
-        image: "sl_bt2_0_0.png" COMP;
-        image: "sl_bt2_0_1.png" COMP;
-        image: "sl_bt2_0_2.png" COMP;
-        image: "sl_bt2_1.png" COMP;
-        image: "sl_bt2_2.png" COMP;
-
-         image: "slv_units.png" COMP;
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
       }
       parts {
-         part { name: "base";
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "base_sh";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               max: 6 99999;
-               min: 6 0;
-               rel1 { to: "bg";
-                  offset: 1 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
                }
-               rel2 { to: "bg";
-                  offset: -2 -1;
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
                }
-               image.normal: "slv_bg.png";
                fill.smooth: 0;
             }
          }
-         part { name: "level";
-            type: RECT;
+         part {
+            name: "base";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "base";
-               rel2 {
-                  to_x: "base";
-                  to_y: "elm.dragable.slider";
-                  relative: 1.0 0.5;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
                }
-               color: 255 0 0 200;
-            }
-            description { state: "inverted" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+               fill.smooth: 0;
             }
          }
-         part { name: "level2";
-            type: RECT;
+         part {
+            name: "bg";
+            clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
+            description {
+               state: "default" 0.0;
                visible: 0;
+               color: 255 255 255 0;
                rel1 {
-                  to_x: "base";
-                  to_y: "elm.dragable.slider";
-                  relative: 0.0 0.5;
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
-               rel2.to: "base";
-               color: 255 0 0 200;
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
+               }
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
+               }
+               image.middle: SOLID;
             }
-            description { state: "inverted" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
+               }
             }
          }
          part {
-            name: "base_over";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel1.offset: -1 -1;
-               rel2.to: "base";
-               rel2.offset: 0 0;
-               image {
-                  normal: "slv_bg_over.png";
-                  border: 3 3 3 3;
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-               fill.smooth: 0;
             }
          }
-         part { name: "bg";
-           type: RECT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-               visible: 0;
-              rel1.to: "elm.swallow.bar";
-              rel2.to: "elm.swallow.bar";
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "elm.swallow.bar";
-           type: SWALLOW;
-            scale: 1;
-           description { state: "default" 0.0;
-              min: 24 48;
-              max: 24 9999;
-              align: 0.5 1.0;
-              rel1 {
-                  to_y: "elm.text";
-                  relative: 0.0 1.0;
-                  offset: 0 10;
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
-              rel2 {
-                  to_y: "elm.units";
-                  relative: 1.0 0.0;
-                  offset: -1 -8;
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              visible: 0;
-              align: 0.5 0.0;
-              rel1 {
-                  offset: 0 4;
-                  to_x: "elm.swallow.bar";
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
                }
-              rel2 {
-                  offset: -1 3;
-                  relative: 1.0 0.0;
-                  to_x: "elm.swallow.bar";
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
                }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: HORIZONTAL;
-              rel2.offset: -1 4;
-           }
-        }
-         part { name: "elm.text";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-               fixed: 1 1;
-               align: 0.5 0.0;
-              rel1.to_y: "elm.swallow.content";
-              rel1.relative: 0.5 1.0;
-               rel1.offset: 0 -1;
-              rel2.to_y: "elm.swallow.content";
-              rel2.relative: 0.5 1.0;
-              rel2.offset: -1 -1;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.5 0.0;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-               rel1.offset: 4 0;
-               rel2.offset: -5 0;
-           }
-        }
-         part { name: "units";
+            }
+         }
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
                rel1 {
-                  to: "elm.units";
-                  offset: -8 0;
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
                }
                rel2 {
-                  to: "elm.units";
-                  offset: 7 8;
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 0 1;
+                  // min: 1 1;
+                  align: 0.0 0.5;
                }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "fg1";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
                image {
-                  normal: "slv_units.png";
-                  border: 8 8 0 9;
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
             }
          }
-         part { name: "elm.units";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-               fixed: 1 1;
-              align: 0.5 1.0;
-              rel1.relative: 0.0 1.0;
-              rel1.offset: 8 0;
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -9 0;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.5 0.0;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 1;
-              visible: 1;
-              text.min: 1 1;
-              rel1.offset: 8 -9;
-              rel2.offset: -9 -9;
-           }
-        }
-         part { name: "elm.dragable.slider";
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+   group {
+      name: "elm/genlist/item_odd/default/default";
+      data.item: "stacking" "below";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      // data.item: "states" "";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_2.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
             type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            dragable {
-               x: 0 0 0;
-               y: 1 1 0;
-               confine: "bg";
-            }
-            description { state: "default" 0.0;
-               min: 24 0;
-               max: 24 0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.5  0.0;
-                  to_y: "bg";
-               }
-               rel2 {
-                  relative: 0.5  1.0;
-                  to_y: "bg";
-               }
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
-         part { name: "button_events";
-           type: RECT;
-           dragable {
-              events: "elm.dragable.slider";
-           }
-            mouse_events: 1;
-           description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 16 16;
-               aspect: 1.0 1.0;
-               aspect_preference: HORIZONTAL;
-              rel1.to_y: "elm.dragable.slider";
-              rel2.to_y: "elm.dragable.slider";
-              color: 0 0 0 0;
-           }
-        }
-         part { name: "button0";
+         part {
+            name: "base";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               max: 17 999;
-               min: 17 24;
-               rel1.to: "elm.dragable.slider";
-               rel2.to: "elm.dragable.slider";
+            description {
+               state: "default" 0.0;
                image {
-                  normal: "sl_bt_0.png";
-                  border: 5 5 5 10;
+                  normal: "ilist_2.png";
+                  border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "button1";
+         part {
+            name: "bg";
+            clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "button0";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
+               }
                rel2 {
-                  to: "button0";
-                  relative: 1.0 0.5;
-                  offset: -1 -5;
+                  relative: 1.0 1.0;
+                  offset: 4 4;
                }
                image {
-                  normal: "sl_bt_1.png";
-                  border: 5 5 5 0;
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
                }
+               image.middle: SOLID;
             }
-         }
-         part { name: "button2";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "button0";
-               rel2.to: "button0";
-               image {
-                  normal: "sl_bt_2.png";
-                  border: 5 5 5 10;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
-               fill.smooth: 0;
             }
          }
-         part { name: "button3";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               min: 8 32;
-               align: 1.0 0.5;
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
                rel1 {
-                  to_x: "elm.indicator";
-                  to_y: "button4";
-                  relative: 0.0 0.0;
-                  offset: -7 0;
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
                rel2 {
-                  to: "button4";
-                  relative: 0.0 1.0;
-                  offset: -1 -1;
-               }
-               image {
-                  normal: "sl_bt2_0_0.png";
-                  border: 6 0 6 12;
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-               fill.smooth: 0;
-            }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
             }
          }
-         part { name: "button4";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               max: 15 999;
-               min: 15 32;
-               fixed: 1 1;
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
                rel1 {
-                  to_x: "button0";
-                  to_y: "elm.indicator";
-                  offset: 0 -7;
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
-               rel2.to: "button0";
-               image {
-                  normal: "sl_bt2_0_1.png";
-                  border: 0 0 6 12;
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
+               }
             }
          }
-         part { name: "button5";
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               min: 8 32;
-               align: 0.0 0.5;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
                rel1 {
-                  to: "button4";
-                  relative: 1.0 0.0;
-                  offset: 0 0;
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x: "elm.indicator";
-                  to_y: "button4";
-                  relative: 1.0 1.0;
-                  offset: 6 -1;
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
                }
-               image {
-                  normal: "sl_bt2_0_2.png";
-                  border: 0 6 6 12;
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
             }
          }
-         part { name: "elm.indicator";
-           type: TEXT;
-           mouse_events: 0;
-            effect: SOFT_SHADOW;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-               fixed: 1 1;
-               align: 0.5 1.0;
-              rel1 {
-                  to: "button0";
-                  relative: 0.0 -1.0;
-                  offset: 0 0;
-               }
-              rel2 {
-                  to: "button0";
-                  relative: 1.0 -1.0;
-                  offset: -1 0;
-               }
-              color: 224 224 224 255;
-              color3: 0 0 0 64;
-              text {
-                 font:     "Sans,Edje-Vera";
-                 size:     10;
-                 min:      0 0;
-                 align:    0.5 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-               rel1.offset: 0 -1;
-               rel2.offset: -1 -1;
-           }
-        }
-         part { name: "button6";
+         part {
+            name: "fg1";
+            clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               rel1.to: "button3";
-               rel2 {
-                  to: "button5";
-                  relative: 1.0 0.3;
-                  offset: -1 -1;
-               }
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
                image {
-                  normal: "sl_bt2_1.png";
-                  border: 5 5 5 0;
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
             }
          }
-         part { name: "button7";
+         part {
+            name: "fg2";
+            clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
-              visible: 0;
-               rel1.to: "button3";
-               rel2.to: "button5";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
                image {
-                  normal: "sl_bt2_2.png";
-                  border: 5 5 5 0;
-                  middle: 0;
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-               fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
             }
          }
       }
       programs {
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.text";
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "units_show";
-           signal: "elm,state,units,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.units";
-           target: "units";
-        }
-        program { name: "units_hide";
-           signal: "elm,state,units,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.units";
-           target: "units";
-        }
-        program { name: "invert_on";
-           signal: "elm,state,inverted,on";
-           source: "elm";
-           action:  STATE_SET "inverted" 0.0;
-           target: "level";
-           target: "level2";
-        }
-        program { name: "invert_off";
-           signal: "elm,state,inverted,off";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "level";
-           target: "level2";
-        }
-        program { name: "val_show";
-           signal: "mouse,down,*";
-           source: "elm.dragable.slider";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.indicator";
-           target: "button3";
-           target: "button4";
-           target: "button5";
-           target: "button6";
-           target: "button7";
-        }
-        program { name: "val_hide";
-           signal: "mouse,up,*";
-           source: "elm.dragable.slider";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.indicator";
-           target: "button3";
-           target: "button4";
-           target: "button5";
-           target: "button6";
-           target: "button7";
-        }
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
       }
    }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/genlist/item/default/default";
-      data.item: "stacking" "above";
+   group {
+      name: "elm/genlist/item_compress_odd/default/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
+         image: "ilist_2.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -10686,45 +13061,23 @@ collections {
             }
          }
          part {
-            name: "base_sh";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
-               }
-               fill.smooth: 0;
-            }
-         }
-         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_1.png";
+                  normal: "ilist_2.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -10741,7 +13094,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -10755,96 +13109,106 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
+                  min: 0 1;
+                  // min: 1 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -10855,16 +13219,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -10874,19 +13241,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -10899,60 +13270,63 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
       }
    }
-   group { name: "elm/genlist/item_compress/default/default";
+   group {
+      name: "elm/genlist/tree/default/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_1.png" COMP;
          image: "ilist_item_shadow.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -10995,10 +13369,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -11015,7 +13391,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -11029,96 +13406,133 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  to_x: "arrow";
+                  relative: 1.0  1.0;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 0 1;
-//                  min: 1 1;
+                  min: 1 1;
+                  // min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11129,16 +13543,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11148,19 +13565,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -11173,57 +13594,82 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-   group { name: "elm/genlist/item_odd/default/default";
-      data.item: "stacking" "below";
+   group {
+      name: "elm/genlist/tree_compress/default/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
-         part { name: "event";
+         part {
+            name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -11232,21 +13678,47 @@ collections {
             }
          }
          part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_2.png";
+                  normal: "ilist_1.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -11263,7 +13735,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -11277,96 +13750,133 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
+               }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  to_x: "arrow";
+                  relative: 1.0  1.0;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align:    1.0 0.5;
+               align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min:      16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
+                  // min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11377,16 +13887,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11396,19 +13909,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -11421,57 +13938,81 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/default/default";
+   group {
+      name: "elm/genlist/tree_odd/default/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_2.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
-         part { name: "event";
+         part {
+            name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -11491,10 +14032,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -11511,7 +14054,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -11525,96 +14069,133 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "arrow";
+            clip_to: "disclip";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               aspect: 1.0 1.0;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
-                  to_x: "elm.swallow.pad";
+                  to_x: "arrow";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: 4    4;
                }
                rel2 {
-                  to_x: "elm.swallow.pad";
+                  to_x: "arrow";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align:    1.0 0.5;
+               align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min:      16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 0 1;
-//                  min: 1 1;
+                  min: 1 1;
+                  // min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11625,16 +14206,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11644,19 +14228,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -11669,63 +14257,82 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-
-   group { name: "elm/genlist/tree/default/default";
-      data.item: "stacking" "above";
+   group {
+      name: "elm/genlist/tree_compress_odd/default/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
+         image: "ilist_2.png" COMP;
          image: "icon_arrow_right.png" COMP;
          image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -11733,45 +14340,23 @@ collections {
             }
          }
          part {
-            name: "base_sh";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
-               }
-               fill.smooth: 0;
-            }
-         }
-         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_1.png";
+                  normal: "ilist_2.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -11788,7 +14373,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -11802,120 +14388,133 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "arrow";
+         part {
+            name: "arrow";
             clip_to: "disclip";
             ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
                image.normal: "icon_arrow_right.png";
             }
-            description { state: "active" 0.0;
+            description {
+               state: "active" 0.0;
                inherit: "default" 0.0;
                image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   to_x: "arrow";
                   relative: 1.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   to_x: "arrow";
                   relative: 1.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
+                  // min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11926,16 +14525,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -11945,19 +14547,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -11970,82 +14576,98 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-   group { name: "elm/genlist/tree_compress/default/default";
+   group {
+      name: "elm/genlist/item/default_style/default";
+      styles {
+         style {
+            name: "genlist_style";
+            base: "font=Sans font_size=10 align=left valign=0.5 color=#000";
+            tag: "br" "\n";
+            tag: "hilight" "+ font=Sans:style=Bold";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "tab" "\t";
+         }
+         style {
+            name: "genlist_selected_style";
+            base: "font=Sans font_size=10 align=left valign=0.5 color=#fff";
+            tag: "br" "\n";
+            tag: "hilight" "+ font=Sans:style=Bold";
+            tag: "b" "+ font=Sans:style=Bold";
+            tag: "tab" "\t";
+         }
+      }
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_1.png" COMP;
          image: "ilist_item_shadow.png" COMP;
-         image: "icon_arrow_right.png" COMP;
-         image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -12081,6 +14703,7 @@ collections {
             mouse_events: 0;
             description {
                state: "default" 0.0;
+               min: 16 28;
                image {
                   normal: "ilist_1.png";
                   border: 2 2 2 2;
@@ -12088,10 +14711,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -12108,7 +14733,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -12117,125 +14743,109 @@ collections {
                   offset: -2 -2;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
-            }
-         }
-         part { name: "elm.swallow.pad";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
             }
          }
-         part { name: "arrow";
-            clip_to: "disclip";
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
-               aspect: 1.0 1.0;
                rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  0.0;
-                  offset:   -1    4;
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
                rel2 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-               image.normal: "icon_arrow_right.png";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
-                  to_x: "arrow";
+                  to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   4    4;
+                  offset: -1    4;
                }
                rel2 {
-                  to_x: "arrow";
+                  to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   4   -5;
+                  offset: -1   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               align: 0.0 0.5;
+               fixed: 0 1;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to_x: "elm.swallow.icon";
+                  to_y: "base";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  to_x: "elm.swallow.end";
+                  to_y: "base";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
                }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
                text {
-                  font: "Sans";
-                  size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  style: "genlist_style";
+                  min: 1 1;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               text {
+                  style: "genlist_selected_style";
+               }
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -12246,16 +14856,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -12265,19 +14878,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -12290,81 +14907,59 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
-         }
-         program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
       }
    }
-   group { name: "elm/genlist/tree_odd/default/default";
+   group {
+      name: "elm/genlist/item_odd/default_style/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_2.png" COMP;
-         image: "icon_arrow_right.png" COMP;
-         image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -12376,6 +14971,7 @@ collections {
             mouse_events: 0;
             description {
                state: "default" 0.0;
+               min: 16 28;
                image {
                   normal: "ilist_2.png";
                   border: 2 2 2 2;
@@ -12383,10 +14979,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -12403,7 +15001,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -12417,120 +15016,104 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "arrow";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
-               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
-               }
-               image.normal: "icon_arrow_right.png";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
-            }
-         }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  to_x: "arrow";
-                  relative: 1.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  to_x: "arrow";
-                  relative: 1.0  1.0;
-                  offset:   4   -5;
+                  offset: -1   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               align: 0.0 0.5;
+               fixed: 0 1;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to_x: "elm.swallow.icon";
+                  to_y: "base";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  to_x: "elm.swallow.end";
+                  to_y: "base";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
                }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
                text {
-                  font: "Sans";
-                  size: 10;
+                  style: "genlist_style";
                   min: 1 1;
-//                  min: 0 1;
-                  align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               text {
+                  style: "genlist_selected_style";
+               }
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -12541,16 +15124,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -12560,106 +15146,91 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 64;
-            }
-         }
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-         }
-         program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
-         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
+            }
+         }
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
       }
    }
-   group { name: "elm/genlist/tree_compress_odd/default/default";
-      data.item: "stacking" "below";
+   group {
+      name: "elm/genlist/tree/default_style/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
          image: "icon_arrow_right.png" COMP;
          image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -12667,21 +15238,48 @@ collections {
             }
          }
          part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
+               min: 16 28;
                image {
-                  normal: "ilist_2.png";
+                  normal: "ilist_1.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -12698,7 +15296,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -12712,120 +15311,132 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "arrow";
+         part {
+            name: "arrow";
             clip_to: "disclip";
             ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
                image.normal: "icon_arrow_right.png";
             }
-            description { state: "active" 0.0;
+            description {
+               state: "active" 0.0;
                inherit: "default" 0.0;
                image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   to_x: "arrow";
                   relative: 1.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   to_x: "arrow";
                   relative: 1.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXTBLOCK;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               align: 0.0 0.5;
+               fixed: 0 1;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to_x: "elm.swallow.icon";
+                  to_y: "base";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  to_x: "elm.swallow.end";
+                  to_y: "base";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
                }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
                text {
-                  font: "Sans";
-                  size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  style: "genlist_style";
+                  min: 1 1;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               text {
+                  style: "genlist_selected_style";
+               }
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -12836,16 +15447,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -12855,19 +15469,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -12880,1232 +15498,1372 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-
-   group { name: "elm/genlist/item/default_style/default";
-       styles
-       {
-           style { name: "genlist_style";
-               base: "font=Sans font_size=10 align=left valign=0.5 color=#000";
-               tag:  "br" "\n";
-               tag:  "hilight" "+ font=Sans:style=Bold";
-               tag:  "b" "+ font=Sans:style=Bold";
-               tag:  "tab" "\t";
-           }
-           style { name: "genlist_selected_style";
-               base: "font=Sans font_size=10 align=left valign=0.5 color=#fff";
-               tag:  "br" "\n";
-               tag:  "hilight" "+ font=Sans:style=Bold";
-               tag:  "b" "+ font=Sans:style=Bold";
-               tag:  "tab" "\t";
-           }
-       }
-       data.item: "stacking" "above";
-       data.item: "selectraise" "on";
-       data.item: "labels" "elm.text";
-       data.item: "icons" "elm.swallow.icon elm.swallow.end";
-       data.item: "treesize" "20";
-       images {
-           image: "bt_sm_base1.png" COMP;
-           image: "bt_sm_shine.png" COMP;
-           image: "bt_sm_hilight.png" COMP;
-           image: "ilist_1.png" COMP;
-           image: "ilist_item_shadow.png" COMP;
-       }
-       parts {
-           part {
-               name:           "event";
-               type:           RECT;
-               repeat_events: 1;
-               description {
-                   state: "default" 0.0;
-                   color: 0 0 0 0;
+   group {
+      name: "elm/genlist/tree_odd/default_style/default";
+      data.item: "stacking" "below";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_2.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 16 28;
+               image {
+                  normal: "ilist_2.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "bg";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
-           }
-           part {
-               name: "base_sh";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.0;
-                   min: 0 10;
-                   fixed: 1 1;
-                   rel1 {
-                       to: "base";
-                       relative: 0.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "base";
-                       relative: 1.0 1.0;
-                       offset: -1 0;
-                   }
-                   image {
-                       normal: "ilist_item_shadow.png";
-                   }
-                   fill.smooth: 0;
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
                }
-           }
-           part {
-               name: "base";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   min: 16 28;
-                   image {
-                       normal: "ilist_1.png";
-                       border: 2 2 2 2;
-                   }
-                   fill.smooth: 0;
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
                }
-           }
-           part { name: "bg";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -5 -5;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 4 4;
-                   }
-                   image {
-                       normal: "bt_sm_base1.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               image.middle: SOLID;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -2 -2;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 1 1;
-                   }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
-           }
-           part { name: "elm.swallow.pad";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       relative: 0.0  0.0;
-                       offset:   4    4;
-                   }
-                   rel2 {
-                       relative: 0.0  1.0;
-                       offset:   4   -5;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
-           }
-           part { name: "elm.swallow.icon";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  0.0;
-                       offset:   -1    4;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  1.0;
-                       offset:   -1   -5;
-                   }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-           }
-           part { name: "elm.swallow.end";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 1.0 0.5;
-                   aspect: 1.0 1.0;
-                   aspect_preference: VERTICAL;
-                   rel1 {
-                       relative: 1.0  0.0;
-                       offset:   -5    4;
-                   }
-                   rel2 {
-                       relative: 1.0  1.0;
-                       offset:   -5   -5;
-                   }
+            }
+         }
+         part {
+            name: "arrow";
+            clip_to: "disclip";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               aspect: 1.0 1.0;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
-           }
-           part { name: "elm.text";
-               clip_to: "disclip";
-               type: TEXTBLOCK;
-               mouse_events: 0;
-               scale: 1;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.5;
-                   fixed: 0 1;
-                   rel1 {
-                       to_x: "elm.swallow.icon";
-                       to_y: "base";
-                       relative: 1.0  0.5;
-                       offset:   0 4;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.end";
-                       to_y: "base";
-                       relative: 0.0  0.5;
-                       offset:   -1 -5;
-                   }
-                   text {
-                       style: "genlist_style";
-                       min: 1 1;
-                   }
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   text {
-                       style: "genlist_selected_style";
-                   }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
                }
-           }
-           part { name: "fg1";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+               rel2 {
+                  to_x: "arrow";
+                  relative: 1.0  1.0;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.5;
+               fixed: 0 1;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  to_y: "base";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  to_y: "base";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
                }
-           }
-           part { name: "fg2";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+               text {
+                  style: "genlist_style";
+                  min: 1 1;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "genlist_selected_style";
                }
-           }
-           part { name: "disclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
+            }
+         }
+         part {
+            name: "fg1";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 64;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-           }
-       }
-       programs {
-           // signal: elm,state,%s,active
-           //   a "check" item named %s went active
-           // signal: elm,state,%s,passive
-           //   a "check" item named %s went passive
-           // default is passive
-           program {
-               name:    "go_active";
-               signal:  "elm,state,selected";
-               source:  "elm";
-               action:  STATE_SET "selected" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-           }
-           program {
-               name:    "go_passive";
-               signal:  "elm,state,unselected";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-               transition: LINEAR 0.1;
-           }
-           program {
-               name:    "go_disabled";
-               signal:  "elm,state,disabled";
-               source:  "elm";
-               action:  STATE_SET "disabled" 0.0;
-               target:  "disclip";
-           }
-           program {
-               name:    "go_enabled";
-               signal:  "elm,state,enabled";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "disclip";
-           }
-       }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
+            }
+         }
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
+         }
+      }
    }
-   group { name: "elm/genlist/item_odd/default_style/default";
-       data.item: "stacking" "below";
-       data.item: "selectraise" "on";
-       data.item: "labels" "elm.text";
-       data.item: "icons" "elm.swallow.icon elm.swallow.end";
-       data.item: "treesize" "20";
-       images {
-           image: "bt_sm_base1.png" COMP;
-           image: "bt_sm_shine.png" COMP;
-           image: "bt_sm_hilight.png" COMP;
-           image: "ilist_2.png" COMP;
-       }
-       parts {
-           part { name: "event";
-               type: RECT;
-               repeat_events: 1;
-               description {
-                   state: "default" 0.0;
-                   color: 0 0 0 0;
+   group {
+      name: "elm/genlist/item/double_label/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text elm.text.sub";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      // data.item: "states" "";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "bg";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
-           }
-           part {
-               name: "base";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   min: 16 28;
-                   image {
-                       normal: "ilist_2.png";
-                       border: 2 2 2 2;
-                   }
-                   fill.smooth: 0;
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
                }
-           }
-           part { name: "bg";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -5 -5;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 4 4;
-                   }
-                   image {
-                       normal: "bt_sm_base1.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -2 -2;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 1 1;
-                   }
+               image.middle: SOLID;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
                }
-           }
-           part { name: "elm.swallow.pad";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       relative: 0.0  0.0;
-                       offset:   4    4;
-                   }
-                   rel2 {
-                       relative: 0.0  1.0;
-                       offset:   4   -5;
-                   }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
-           }
-           part { name: "elm.swallow.icon";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  0.0;
-                       offset:   -1    4;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  1.0;
-                       offset:   -1   -5;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
-           }
-           part { name: "elm.swallow.end";
-               clip_to: "disclip";
-               type:          SWALLOW;
-               description { state:    "default" 0.0;
-                   fixed: 1 0;
-                   align:    1.0 0.5;
-                   aspect: 1.0 1.0;
-                   aspect_preference: VERTICAL;
-                   rel1 {
-                       relative: 1.0  0.0;
-                       offset:   -5    4;
-                   }
-                   rel2 {
-                       relative: 1.0  1.0;
-                       offset:   -5   -5;
-                   }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-           }
-           part { name: "elm.text";
-               clip_to: "disclip";
-               type:           TEXTBLOCK;
-               mouse_events:   0;
-               scale: 1;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.5;
-                   fixed: 0 1;
-                   rel1 {
-                       to_x: "elm.swallow.icon";
-                       to_y: "base";
-                       relative: 1.0  0.5;
-                       offset:   0 4;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.end";
-                       to_y: "base";
-                       relative: 0.0  0.5;
-                       offset:   -1 -5;
-                   }
-                   text {
-                       style: "genlist_style";
-                       min: 1 1;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   text {
-                       style: "genlist_selected_style";
-                   }
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-           }
-           part { name: "fg1";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
                }
-           }
-           part { name: "fg2";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+            }
+         }
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "elm.text.sub";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
                }
-           }
-           part { name: "disclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 8;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 64;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               color3: 0 0 0 32;
+            }
+         }
+         part {
+            name: "fg1";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-           }
-       }
-       programs {
-           // signal: elm,state,%s,active
-           //   a "check" item named %s went active
-           // signal: elm,state,%s,passive
-           //   a "check" item named %s went passive
-           // default is passive
-           program {
-               name:    "go_active";
-               signal:  "elm,state,selected";
-               source:  "elm";
-               action:  STATE_SET "selected" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-           }
-           program {
-               name:    "go_passive";
-               signal:  "elm,state,unselected";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-               transition: LINEAR 0.1;
-           }
-           program {
-               name:    "go_disabled";
-               signal:  "elm,state,disabled";
-               source:  "elm";
-               action:  STATE_SET "disabled" 0.0;
-               target:  "disclip";
-           }
-           program {
-               name:    "go_enabled";
-               signal:  "elm,state,enabled";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "disclip";
-           }
-       }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
+            }
+         }
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
    }
-
-   group { name: "elm/genlist/tree/default_style/default";
-       data.item: "stacking" "above";
-       data.item: "selectraise" "on";
-       data.item: "labels" "elm.text";
-       data.item: "icons" "elm.swallow.icon elm.swallow.end";
-       data.item: "treesize" "20";
-       images {
-           image: "bt_sm_base1.png" COMP;
-           image: "bt_sm_shine.png" COMP;
-           image: "bt_sm_hilight.png" COMP;
-           image: "ilist_1.png" COMP;
-           image: "ilist_item_shadow.png" COMP;
-           image: "icon_arrow_right.png" COMP;
-           image: "icon_arrow_down.png" COMP;
-       }
-       parts {
-           part {
-               name:           "event";
-               type:           RECT;
-               repeat_events: 1;
-               description {
-                   state: "default" 0.0;
-                   color: 0 0 0 0;
+   group {
+      name: "elm/genlist/item_compress/double_label/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text elm.text.sub";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      // data.item: "states" "";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
                }
-           }
-           part {
-               name: "base_sh";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.0;
-                   min: 0 10;
-                   fixed: 1 1;
-                   rel1 {
-                       to: "base";
-                       relative: 0.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "base";
-                       relative: 1.0 1.0;
-                       offset: -1 0;
-                   }
-                   image {
-                       normal: "ilist_item_shadow.png";
-                   }
-                   fill.smooth: 0;
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
                }
-           }
-           part {
-               name: "base";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   min: 16 28;
-                   image {
-                       normal: "ilist_1.png";
-                       border: 2 2 2 2;
-                   }
-                   fill.smooth: 0;
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "bg";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
-           }
-           part { name: "bg";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -5 -5;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 4 4;
-                   }
-                   image {
-                       normal: "bt_sm_base1.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -2 -2;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 1 1;
-                   }
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
                }
-           }
-           part { name: "elm.swallow.pad";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       relative: 0.0  0.0;
-                       offset:   4    4;
-                   }
-                   rel2 {
-                       relative: 0.0  1.0;
-                       offset:   4   -5;
-                   }
+               image.middle: SOLID;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
                }
-           }
-           part { name: "arrow";
-               clip_to: "disclip";
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   aspect: 1.0 1.0;
-                   rel1 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  0.0;
-                       offset:   -1    4;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  1.0;
-                       offset:   -1   -5;
-                   }
-                   image.normal: "icon_arrow_right.png";
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "icon_arrow_down.png";
+            }
+         }
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
-           }
-           part { name: "elm.swallow.icon";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       to_x: "arrow";
-                       relative: 1.0  0.0;
-                       offset:   4    4;
-                   }
-                   rel2 {
-                       to_x: "arrow";
-                       relative: 1.0  1.0;
-                       offset:   4   -5;
-                   }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-           }
-           part { name: "elm.swallow.end";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 1.0 0.5;
-                   aspect: 1.0 1.0;
-                   aspect_preference: VERTICAL;
-                   rel1 {
-                       relative: 1.0  0.0;
-                       offset:   -5    4;
-                   }
-                   rel2 {
-                       relative: 1.0  1.0;
-                       offset:   -5   -5;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
-           }
-           part { name: "elm.text";
-               clip_to: "disclip";
-               type:           TEXTBLOCK;
-               effect:         SOFT_SHADOW;
-               mouse_events:   0;
-               scale: 1;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.5;
-                   fixed: 0 1;
-                   rel1 {
-                       to_x:     "elm.swallow.icon";
-                       to_y: "base";
-                       relative: 1.0  0.5;
-                       offset:   0 4;
-                   }
-                   rel2 {
-                       to_x:     "elm.swallow.end";
-                       to_y: "base";
-                       relative: 0.0  0.5;
-                       offset:   -1 -5;
-                   }
-                   text {
-                       style: "genlist_style";
-                       min: 1 1;
-                   }
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   text {
-                       style: "genlist_selected_style";
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
                }
-           }
-           part { name: "fg1";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
                }
-           }
-           part { name: "fg2";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  // min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "elm.text.sub";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
                }
-           }
-           part { name: "disclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 8;
+                  // min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 64;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               color3: 0 0 0 32;
+            }
+         }
+         part {
+            name: "fg1";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-           }
-       }
-       programs {
-           // signal: elm,state,%s,active
-           //   a "check" item named %s went active
-           // signal: elm,state,%s,passive
-           //   a "check" item named %s went passive
-           // default is passive
-           program {
-               name:    "go_active";
-               signal:  "elm,state,selected";
-               source:  "elm";
-               action:  STATE_SET "selected" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-           }
-           program {
-               name:    "go_passive";
-               signal:  "elm,state,unselected";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-               transition: LINEAR 0.1;
-           }
-           program {
-               name:    "go_disabled";
-               signal:  "elm,state,disabled";
-               source:  "elm";
-               action:  STATE_SET "disabled" 0.0;
-               target:  "disclip";
-           }
-           program {
-               name:    "go_enabled";
-               signal:  "elm,state,enabled";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "disclip";
-           }
-           program {
-               name:    "expand";
-               signal:  "mouse,up,1";
-               source:  "arrow";
-               action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
-           }
-           program {
-               name:    "go_expanded";
-               signal:  "elm,state,expanded";
-               source:  "elm";
-               action:  STATE_SET "active" 0.0;
-               target:  "arrow";
-           }
-           program {
-               name:    "go_contracted";
-               signal:  "elm,state,contracted";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "arrow";
-           }
-       }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
+            }
+         }
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
    }
-   group { name: "elm/genlist/tree_odd/default_style/default";
-       data.item: "stacking" "below";
-       data.item: "selectraise" "on";
-       data.item: "labels" "elm.text";
-       data.item: "icons" "elm.swallow.icon elm.swallow.end";
-       data.item: "treesize" "20";
-       images {
-           image: "bt_sm_base1.png" COMP;
-           image: "bt_sm_shine.png" COMP;
-           image: "bt_sm_hilight.png" COMP;
-           image: "ilist_2.png" COMP;
-           image: "icon_arrow_right.png" COMP;
-           image: "icon_arrow_down.png" COMP;
-       }
-       parts {
-           part {
-               name:           "event";
-               type:           RECT;
-               repeat_events: 1;
-               description {
-                   state: "default" 0.0;
-                   color: 0 0 0 0;
+   group {
+      name: "elm/genlist/item_odd/double_label/default";
+      data.item: "stacking" "below";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.text elm.text.sub";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "treesize" "20";
+      // data.item: "states" "";
+      images {
+         image: "bt_sm_base1.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "ilist_2.png" COMP;
+      }
+      parts {
+         part {
+            name: "event";
+            type: RECT;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_2.png";
+                  border: 2 2 2 2;
                }
-           }
-           part {
-               name: "base";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   min: 16 28;
-                   image {
-                       normal: "ilist_2.png";
-                       border: 2 2 2 2;
-                   }
-                   fill.smooth: 0;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "bg";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -5 -5;
                }
-           }
-           part { name: "bg";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -5 -5;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 4 4;
-                   }
-                   image {
-                       normal: "bt_sm_base1.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 4 4;
+               }
+               image {
+                  normal: "bt_sm_base1.png";
+                  border: 6 6 6 6;
+               }
+               image.middle: SOLID;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset: -2 -2;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: 1 1;
-                   }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
-           }
-           part { name: "elm.swallow.pad";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       relative: 0.0  0.0;
-                       offset:   4    4;
-                   }
-                   rel2 {
-                       relative: 0.0  1.0;
-                       offset:   4   -5;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.pad";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
-           }
-           part { name: "arrow";
-               clip_to: "disclip";
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   aspect: 1.0 1.0;
-                   rel1 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  0.0;
-                       offset:   -1    4;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.pad";
-                       relative: 1.0  1.0;
-                       offset:   -1   -5;
-                   }
-                   image.normal: "icon_arrow_right.png";
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "icon_arrow_down.png";
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
-           }
-           part { name: "elm.swallow.icon";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 0.0 0.5;
-                   rel1 {
-                       to_x: "arrow";
-                       relative: 1.0  0.0;
-                       offset:   4    4;
-                   }
-                   rel2 {
-                       to_x: "arrow";
-                       relative: 1.0  1.0;
-                       offset:   4   -5;
-                   }
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset: -1   -5;
                }
-           }
-           part { name: "elm.swallow.end";
-               clip_to: "disclip";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   fixed: 1 0;
-                   align: 1.0 0.5;
-                   aspect: 1.0 1.0;
-                   aspect_preference: VERTICAL;
-                   rel1 {
-                       relative: 1.0  0.0;
-                       offset:   -5    4;
-                   }
-                   rel2 {
-                       relative: 1.0  1.0;
-                       offset:   -5   -5;
-                   }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               rel1 {
+                  relative: 1.0  0.0;
+                  offset: -5    4;
                }
-           }
-           part { name: "elm.text";
-               clip_to: "disclip";
-               type:           TEXTBLOCK;
-               effect:         SOFT_SHADOW;
-               mouse_events:   0;
-               scale: 1;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.5;
-                   fixed: 0 1;
-                   rel1 {
-                       to_x:     "elm.swallow.icon";
-                       to_y: "base";
-                       relative: 1.0  0.5;
-                       offset:   0 4;
-                   }
-                   rel2 {
-                       to_x:     "elm.swallow.end";
-                       to_y: "base";
-                       relative: 0.0  0.5;
-                       offset:   -1 -5;
-                   }
-                   text {
-                       style: "genlist_style";
-                       min: 1 1;
-                   }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset: -5   -5;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   text {
-                       style: "genlist_selected_style";
-                   }
+            }
+         }
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
                }
-           }
-           part { name: "fg1";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
                }
-           }
-           part { name: "fg2";
-               clip_to: "disclip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "elm.text.sub";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
                }
-           }
-           part { name: "disclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 8;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               color3: 0 0 0 32;
+            }
+         }
+         part {
+            name: "fg1";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 64;
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "fg2";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-           }
-       }
-       programs {
-           // signal: elm,state,%s,active
-           //   a "check" item named %s went active
-           // signal: elm,state,%s,passive
-           //   a "check" item named %s went passive
-           // default is passive
-           program {
-               name:    "go_active";
-               signal:  "elm,state,selected";
-               source:  "elm";
-               action:  STATE_SET "selected" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-           }
-           program {
-               name:    "go_passive";
-               signal:  "elm,state,unselected";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "bg";
-               target:  "fg1";
-               target:  "fg2";
-               target:  "elm.text";
-               transition: LINEAR 0.1;
-           }
-           program {
-               name:    "go_disabled";
-               signal:  "elm,state,disabled";
-               source:  "elm";
-               action:  STATE_SET "disabled" 0.0;
-               target:  "disclip";
-           }
-           program {
-               name:    "go_enabled";
-               signal:  "elm,state,enabled";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "disclip";
-           }
-           program {
-               name:    "expand";
-               signal:  "mouse,up,1";
-               source:  "arrow";
-               action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
-           }
-           program {
-               name:    "go_expanded";
-               signal:  "elm,state,expanded";
-               source:  "elm";
-               action:  STATE_SET "active" 0.0;
-               target:  "arrow";
-           }
-           program {
-               name:    "go_contracted";
-               signal:  "elm,state,contracted";
-               source:  "elm";
-               action:  STATE_SET "default" 0.0;
-               target:  "arrow";
-           }
-       }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "disclip";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 64;
+            }
+         }
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program {
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+         }
+         program {
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
+         }
+         program {
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
    }
-
-
-   group { name: "elm/genlist/item/double_label/default";
-      data.item: "stacking" "above";
+   group {
+      name: "elm/genlist/item_compress_odd/double_label/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text elm.text.sub";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
+         image: "ilist_2.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -14113,45 +16871,23 @@ collections {
             }
          }
          part {
-            name: "base_sh";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
-               }
-               fill.smooth: 0;
-            }
-         }
-         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_1.png";
+                  normal: "ilist_2.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -14168,7 +16904,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -14182,130 +16919,142 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
+                  // min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part {
+            name: "elm.text.sub";
             clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.5;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 128;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 8;
-                  min: 1 1;
-//                  min: 0 1;
+                  // min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 128 128 128 255;
                color3: 0 0 0 32;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -14316,16 +17065,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -14335,19 +17087,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -14360,62 +17116,65 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
-         }
-         program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
-            transition: LINEAR 0.1;
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
       }
    }
-   group { name: "elm/genlist/item_compress/double_label/default";
+   group {
+      name: "elm/genlist/tree/double_label/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text elm.text.sub";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_1.png" COMP;
          image: "ilist_item_shadow.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -14458,10 +17217,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -14478,7 +17239,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -14492,130 +17254,169 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  to_x: "arrow";
+                  relative: 1.0  1.0;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.swallow.end";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-//                  min: 1 1;
-                  min: 0 1;
+                  min: 1 1;
+                  // min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part {
+            name: "elm.text.sub";
             clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.5;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 128;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 8;
-//                  min: 1 1;
-                  min: 0 1;
+                  min: 1 1;
+                  // min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 128 128 128 255;
                color3: 0 0 0 32;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -14626,16 +17427,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -14645,19 +17449,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -14670,59 +17478,84 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-   group { name: "elm/genlist/item_odd/double_label/default";
-      data.item: "stacking" "below";
+   group {
+      name: "elm/genlist/tree_compress/double_label/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text elm.text.sub";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
-         part { name: "event";
+         part {
+            name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -14731,21 +17564,47 @@ collections {
             }
          }
          part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_2.png";
+                  normal: "ilist_1.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -14762,7 +17621,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -14776,130 +17636,169 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
+               }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  to_x: "arrow";
+                  relative: 1.0  1.0;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align:    1.0 0.5;
+               align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
+                  // min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part {
+            name: "elm.text.sub";
             clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.5;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 128;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 8;
-                  min: 1 1;
-//                  min: 0 1;
+                  // min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 128 128 128 255;
                color3: 0 0 0 32;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -14910,16 +17809,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -14929,19 +17831,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -14954,59 +17860,83 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/double_label/default";
+   group {
+      name: "elm/genlist/tree_odd/double_label/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text elm.text.sub";
       data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_2.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
-         part { name: "event";
+         part {
+            name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -15026,10 +17956,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -15046,7 +17978,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -15060,130 +17993,169 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
+               }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
+            }
+         }
+         part {
+            name: "elm.swallow.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
+               }
+               rel2 {
+                  to_x: "arrow";
+                  relative: 1.0  1.0;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
-            type:          SWALLOW;
-            description { state:    "default" 0.0;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align:    1.0 0.5;
+               align: 1.0 0.5;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
                rel1 {
                   relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -5   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-//                  min: 1 1;
-                  min: 0 1;
+                  min: 1 1;
+                  // min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part {
+            name: "elm.text.sub";
             clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
+                  to_x: "elm.swallow.icon";
                   relative: 1.0  0.5;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
+                  to_x: "elm.swallow.end";
                   relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  offset: -1 -5;
                }
                color: 0 0 0 128;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 8;
-//                  min: 1 1;
-                  min: 0 1;
+                  min: 1 1;
+                  // min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 128 128 128 255;
                color3: 0 0 0 32;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -15194,16 +18166,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -15213,19 +18188,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -15238,65 +18217,83 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-
-   group { name: "elm/genlist/tree/double_label/default";
+   group {
+      name: "elm/genlist/item/icon_top_text_bottom/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text elm.text.sub";
-      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
          image: "ilist_1.png" COMP;
          image: "ilist_item_shadow.png" COMP;
-         image: "icon_arrow_right.png" COMP;
-         image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -15339,10 +18336,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -15359,7 +18358,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -15373,99 +18373,61 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
-               }
-            }
-         }
-         part { name: "arrow";
-            clip_to: "disclip";
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               aspect: 1.0 1.0;
-               rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  0.0;
-                  offset:   -1    4;
-               }
-               rel2 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -5;
-               }
-               image.normal: "icon_arrow_right.png";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
-            }
-         }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
-                  to_x: "arrow";
-                  relative: 1.0  0.0;
-                  offset:   4    4;
+                  relative: 0.0  0.0;
+                  offset: 4    4;
                }
                rel2 {
-                  to_x: "arrow";
                   relative: 1.0  1.0;
-                  offset:   4   -5;
+                  offset: -4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align: 1.0 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               align: 0.5 0.5;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  to_x: "elm.swallow.pad";
+                  relative: 0.0  0.0;
+                  offset: -1    4;
                }
                rel2 {
+                  to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -1   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to_y: "elm.swallow.icon";
+                  relative: 0.0  1.0;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  relative: 1.0  1.0;
+                  offset: -5 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
@@ -15473,54 +18435,23 @@ collections {
                   font: "Sans";
                   size: 10;
                   min: 1 1;
-//                  min: 0 1;
-                  align: 0.0 0.5;
+                  // min: 0 1;
+                  align: 0.5 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part {
+            name: "fg1";
             clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
-            scale: 1;
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-//               min: 16 16;
-               rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.5;
-                  offset:   0 4;
-               }
-               rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 8;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 128 128 128 255;
-               color3: 0 0 0 32;
-            }
-         }
-         part { name: "fg1";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -15531,16 +18462,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -15550,19 +18484,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -15575,84 +18513,60 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
-         }
-         program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
       }
    }
-   group { name: "elm/genlist/tree_compress/double_label/default";
-      data.item: "stacking" "above";
+   group {
+      name: "elm/genlist/item_odd/icon_top_text_bottom/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text elm.text.sub";
-      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
-         image: "icon_arrow_right.png" COMP;
-         image: "icon_arrow_down.png" COMP;
+         image: "ilist_2.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -15660,45 +18574,23 @@ collections {
             }
          }
          part {
-            name: "base_sh";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
-               }
-               fill.smooth: 0;
-            }
-         }
-         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_1.png";
+                  normal: "ilist_2.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -15715,7 +18607,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -15729,154 +18622,85 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
-               }
-            }
-         }
-         part { name: "arrow";
-            clip_to: "disclip";
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               aspect: 1.0 1.0;
-               rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  0.0;
-                  offset:   -1    4;
-               }
-               rel2 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -5;
-               }
-               image.normal: "icon_arrow_right.png";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
-            }
-         }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  to_x: "arrow";
-                  relative: 1.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
-                  to_x: "arrow";
                   relative: 1.0  1.0;
-                  offset:   4   -5;
+                  offset: -4   -5;
                }
             }
          }
-         part { name: "elm.swallow.end";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align: 1.0 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               align: 0.5 0.5;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  to_x: "elm.swallow.pad";
+                  relative: 0.0  0.0;
+                  offset: -1    4;
                }
                rel2 {
+                  to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -1   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to_y: "elm.swallow.icon";
+                  relative: 0.0  1.0;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  relative: 1.0  1.0;
+                  offset: -5 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
-                  size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
-            }
-         }
-         part { name: "elm.text.sub";
-            clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-//               min: 16 16;
-               rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.5;
-                  offset:   0 4;
-               }
-               rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 8;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.5 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: 128 128 128 255;
-               color3: 0 0 0 32;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -15887,16 +18711,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -15906,19 +18733,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -15931,83 +18762,63 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
-         }
-         program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
       }
    }
-   group { name: "elm/genlist/tree_odd/double_label/default";
-      data.item: "stacking" "below";
+   group {
+      name: "elm/genlist/tree/icon_top_text_bottom/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text elm.text.sub";
-      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      data.item: "labels" "elm.text";
+      data.item: "icons" "elm.swallow.icon";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
          image: "icon_arrow_right.png" COMP;
          image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -16015,21 +18826,47 @@ collections {
             }
          }
          part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
+               }
+               image {
+                  normal: "ilist_item_shadow.png";
+               }
+               fill.smooth: 0;
+            }
+         }
+         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_2.png";
+                  normal: "ilist_1.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -16046,7 +18883,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -16060,99 +18898,87 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "arrow";
+         part {
+            name: "arrow";
             clip_to: "disclip";
             ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
                image.normal: "icon_arrow_right.png";
             }
-            description { state: "active" 0.0;
+            description {
+               state: "active" 0.0;
                inherit: "default" 0.0;
                image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align: 0.0 0.5;
+               align: 0.5 0.5;
                rel1 {
                   to_x: "arrow";
                   relative: 1.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  to_x: "arrow";
-                  relative: 1.0  1.0;
-                  offset:   4   -5;
-               }
-            }
-         }
-         part { name: "elm.swallow.end";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 1.0 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  offset: -4   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to_y: "elm.swallow.icon";
+                  relative: 0.0  1.0;
+                  offset: 0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  0.5;
-                  offset:   -1 -5;
+                  relative: 1.0  1.0;
+                  offset: -5 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
@@ -16160,54 +18986,23 @@ collections {
                   font: "Sans";
                   size: 10;
                   min: 1 1;
-//                  min: 0 1;
-                  align: 0.0 0.5;
+                  // min: 0 1;
+                  align: 0.5 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part {
+            name: "fg1";
             clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
-            scale: 1;
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-//               min: 16 16;
-               rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.5;
-                  offset:   0 4;
-               }
-               rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 8;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 128 128 128 255;
-               color3: 0 0 0 32;
-            }
-         }
-         part { name: "fg1";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -16218,16 +19013,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -16237,19 +19035,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -16262,83 +19064,82 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-
-   group { name: "elm/genlist/item/icon_top_text_bottom/default";
-      data.item: "stacking" "above";
+   group {
+      name: "elm/genlist/tree_odd/icon_top_text_bottom/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
       data.item: "icons" "elm.swallow.icon";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
          image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
+         image: "ilist_2.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -16346,45 +19147,23 @@ collections {
             }
          }
          part {
-            name: "base_sh";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
-               }
-               fill.smooth: 0;
-            }
-         }
-         part {
             name: "base";
             mouse_events: 0;
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_1.png";
+                  normal: "ilist_2.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -16401,7 +19180,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -16415,56 +19195,87 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
+               }
+               rel2 {
+                  relative: 0.0  1.0;
+                  offset: 4   -5;
+               }
+            }
+         }
+         part {
+            name: "arrow";
+            clip_to: "disclip";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               aspect: 1.0 1.0;
+               rel1 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset: -1    4;
                }
                rel2 {
+                  to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -4   -5;
+                  offset: -1   -5;
                }
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.5 0.5;
                rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 0.0  0.0;
-                  offset:   -1    4;
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset: 4    4;
                }
                rel2 {
-                  to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -4   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               // min: 16 16;
                rel1 {
-                  to_y:     "elm.swallow.icon";
+                  to_y: "elm.swallow.icon";
                   relative: 0.0  1.0;
-                  offset:   0 4;
+                  offset: 0 4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5 -5;
+                  offset: -5 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
@@ -16472,20 +19283,23 @@ collections {
                   font: "Sans";
                   size: 10;
                   min: 1 1;
-//                  min: 0 1;
+                  // min: 0 1;
                   align: 0.5 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -16496,16 +19310,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -16515,19 +19332,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -16540,579 +19361,601 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program {
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+         }
+         program {
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
-   group { name: "elm/genlist/item_odd/icon_top_text_bottom/default";
-      data.item: "stacking" "below";
-      data.item: "selectraise" "on";
-      data.item: "labels" "elm.text";
-      data.item: "icons" "elm.swallow.icon";
-      data.item: "treesize" "20";
-//      data.item: "states" "";
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/check/base/default";
       images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
+         image: "check_base.png" COMP;
+         image: "check.png" COMP;
+         image: "check2.png" COMP;
       }
       parts {
-         part { name: "event";
-            type: RECT;
-            repeat_events: 1;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
          part {
-            name: "base";
+            name: "bg";
             mouse_events: 0;
+            scale: 1;
             description {
                state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.relative: 0.0 1.0;
+               rel2.offset: 1 -2;
+               align: 0.0 0.5;
+               min: 16 16;
+               max: 16 16;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
                image {
-                  normal: "ilist_2.png";
-                  border: 2 2 2 2;
+                  normal: "check_base.png";
+                  border: 5 5 5 5;
+                  middle: 0;
                }
-               fill.smooth: 0;
+               fill.smooth : 0;
             }
          }
-         part { name: "bg";
-            clip_to: "disclip";
+         part {
+            name: "check";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
                rel1 {
-                  relative: 0.0 0.0;
-                  offset: -5 -5;
+                  to: "bg";
+                  offset: 1 1;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
-               }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
+                  to: "bg";
+                  offset: -2 -2;
                }
-               image.middle: SOLID;
+               visible: 0;
+               color: 255 255 255 255;
+               image.normal: "check.png";
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
             }
-         }
-         part { name: "elm.swallow.pad";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -4   -5;
-               }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               color: 128 128 128 128;
             }
-         }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.5 0.5;
-               rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 0.0  0.0;
-                  offset:   -1    4;
-               }
-               rel2 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -5;
-               }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+               visible: 1;
             }
          }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
-            scale: 1;
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
             description {
                state: "default" 0.0;
-//               min:      16 16;
-               rel1 {
-                  to_y:     "elm.swallow.icon";
-                  relative: 0.0  1.0;
-                  offset:   0 4;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5 -5;
-               }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: 0.5 0.5;
-               }
+               fixed: 1 0;
+               visible: 0;
+               color: 255 255 255 255;
+               align: 0.0 0.5;
+               rel1.to_x: "bg";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 1 1;
+               rel2.to_x: "bg";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: 2 -2;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               fixed: 1 1;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
             }
-         }
-         part { name: "fg1";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
-               }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
+               color: 128 128 128 128;
+               fixed: 1 1;
                visible: 1;
-               color: 255 255 255 255;
+               aspect: 1.0 1.0;
             }
          }
-         part { name: "fg2";
-            clip_to: "disclip";
+         part {
+            name: "elm.text";
+            type: TEXT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
                visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 1 1;
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -2 -2;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
+               text.min: 1 1;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 1;
+               text.min: 1 1;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "events";
             type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
-            description { state: "disabled" 0.0;
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               visible: 1;
             }
          }
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "click";
+            signal: "mouse,up,1";
+            source: "events";
+            action: SIGNAL_EMIT "elm,action,check,toggle" "";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
+            name: "check_on";
+            signal: "elm,state,check,on";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "check";
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "check_off";
+            signal: "elm,state,check,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "check";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
+               else
+                  set_state(PART:"elm.swallow.content", "disabled", 0.0);
+               get_state(PART:"check", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"check", "disabled_visible", 0.0);
+               else
+                  set_state(PART:"check", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                                               set_state(PART:"elm.text", "visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "default", 0.0);
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+               else
+                  set_state(PART:"elm.swallow.content", "default", 0.0);
+               get_state(PART:"check", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"check", "visible", 0.0);
+               else
+                  set_state(PART:"check", "default", 0.0);
+            }
          }
       }
    }
 
-   group { name: "elm/genlist/tree/icon_top_text_bottom/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "labels" "elm.text";
-      data.item: "icons" "elm.swallow.icon";
-      data.item: "treesize" "20";
-//      data.item: "states" "";
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/radio/base/default";
       images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "ilist_1.png" COMP;
-         image: "ilist_item_shadow.png" COMP;
-         image: "icon_arrow_right.png" COMP;
-         image: "icon_arrow_down.png" COMP;
+         image: "radio_base.png" COMP;
+         image: "radio.png" COMP;
+         image: "radio2.png" COMP;
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
-            repeat_events: 1;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "base_sh";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               image {
-                  normal: "ilist_item_shadow.png";
-               }
-               fill.smooth: 0;
-            }
-         }
-         part {
-            name: "base";
+            name: "bg";
             mouse_events: 0;
+            scale: 1;
             description {
                state: "default" 0.0;
-               image {
-                  normal: "ilist_1.png";
-                  border: 2 2 2 2;
-               }
-               fill.smooth: 0;
+               rel1.offset: 1 1;
+               rel2.relative: 0.0 1.0;
+               rel2.offset: 1 -2;
+               align: 0.0 0.5;
+               min: 16 16;
+               max: 16 16;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               image.normal: "radio_base.png";
             }
          }
-         part { name: "bg";
-            clip_to: "disclip";
+         part {
+            name: "radio";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
                visible: 0;
-               color: 255 255 255 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -5 -5;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
-               }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
-               }
-               image.middle: SOLID;
+               image.normal: "radio.png";
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.content";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
+               visible: 0;
                align: 0.0 0.5;
-               rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
-               }
+               color: 0 0 0 0;
+               rel1.to_x: "bg";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 1 1;
+               rel2.to_x: "bg";
+               rel2.relative: 1.0 1.0;
+               rel2.offset: 2 -2;
             }
-         }
-         part { name: "arrow";
-            clip_to: "disclip";
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               fixed: 1 1;
+               visible: 1;
+               color: 255 255 255 255;
                aspect: 1.0 1.0;
-               rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  0.0;
-                  offset:   -1    4;
-               }
-               rel2 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -5;
-               }
-               image.normal: "icon_arrow_right.png";
+               aspect_preference: VERTICAL;
             }
-            description { state: "active" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
+               color: 128 128 128 128;
             }
-         }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.5 0.5;
-               rel1 {
-                  to_x: "arrow";
-                  relative: 1.0  0.0;
-                  offset:   4    4;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -4   -5;
-               }
+            description {
+               state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 128;
+               visible: 1;
             }
          }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
-               rel1 {
-                  to_y:     "elm.swallow.icon";
-                  relative: 0.0  1.0;
-                  offset:   0 4;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5 -5;
-               }
+               visible: 0;
+               rel1.to_x: "elm.swallow.content";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 1 1;
+               rel2.relative: 1.0 1.0;
+               rel2.offset: -2 -2;
                color: 0 0 0 255;
-               color3: 0 0 0 0;
                text {
-                  font: "Sans";
+                  font: "Sans,Edje-Vera";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: 0.5 0.5;
+                  min: 0 0;
+                  align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               visible: 1;
+               text.min: 1 1;
             }
-         }
-         part { name: "fg1";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
-               }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
                visible: 1;
-               color: 255 255 255 255;
+               text.min: 1 1;
             }
          }
-         part { name: "fg2";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+         part {
+            name: "events";
+            type: RECT;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disabler";
             type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               visible: 1;
             }
          }
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "click";
+            signal: "mouse,up,1";
+            source: "events";
+            action: SIGNAL_EMIT "elm,action,radio,toggle" "";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
+            name: "radio_on";
+            signal: "elm,state,radio,on";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "radio";
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "radio_off";
+            signal: "elm,state,radio,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "radio";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                                               set_state(PART:"elm.text", "disabled_visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "disabled", 0.0);
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                                               set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.swallow.content", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                                               set_state(PART:"elm.text", "visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "default", 0.0);
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                                               set_state(PART:"elm.swallow.content", "visible", 0.0);
+                                       else
+                                               set_state(PART:"elm.swallow.content", "default", 0.0);
+            }
          }
       }
    }
-   group { name: "elm/genlist/tree_odd/icon_top_text_bottom/default";
+   group {
+      name: "elm/genlist/tree_compress_odd/double_label/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text";
-      data.item: "icons" "elm.swallow.icon";
+      data.item: "labels" "elm.text elm.text.sub";
+      data.item: "icons" "elm.swallow.icon elm.swallow.end";
       data.item: "treesize" "20";
-//      data.item: "states" "";
+      // data.item: "states" "";
       images {
          image: "bt_sm_base1.png" COMP;
          image: "bt_sm_shine.png" COMP;
@@ -17123,8 +19966,8 @@ collections {
       }
       parts {
          part {
-            name:           "event";
-            type:           RECT;
+            name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -17143,10 +19986,12 @@ collections {
                fill.smooth: 0;
             }
          }
-         part { name: "bg";
+         part {
+            name: "bg";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1 {
@@ -17163,7 +20008,8 @@ collections {
                }
                image.middle: SOLID;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
@@ -17177,100 +20023,169 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.pad";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                rel1 {
                   relative: 0.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
                   relative: 0.0  1.0;
-                  offset:   4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "arrow";
+         part {
+            name: "arrow";
             clip_to: "disclip";
             ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.5;
                aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  0.0;
-                  offset:   -1    4;
+                  offset: -1    4;
                }
                rel2 {
                   to_x: "elm.swallow.pad";
                   relative: 1.0  1.0;
-                  offset:   -1   -5;
+                  offset: -1   -5;
                }
                image.normal: "icon_arrow_right.png";
             }
-            description { state: "active" 0.0;
+            description {
+               state: "active" 0.0;
                inherit: "default" 0.0;
                image.normal: "icon_arrow_down.png";
             }
          }
-         part { name: "elm.swallow.icon";
+         part {
+            name: "elm.swallow.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 0;
-               align: 0.5 0.5;
+               align: 0.0 0.5;
                rel1 {
                   to_x: "arrow";
                   relative: 1.0  0.0;
-                  offset:   4    4;
+                  offset: 4    4;
                }
                rel2 {
+                  to_x: "arrow";
                   relative: 1.0  1.0;
-                  offset:   -4   -5;
+                  offset: 4   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.swallow.end";
             clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
-            scale: 1;
+            type: SWALLOW;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+               fixed: 1 0;
+               align: 1.0 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
                rel1 {
-                  to_y:     "elm.swallow.icon";
-                  relative: 0.0  1.0;
-                  offset:   0 4;
+                  relative: 1.0  0.0;
+                  offset: -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -5 -5;
+                  offset: -5   -5;
+               }
+            }
+         }
+         part {
+            name: "elm.text";
+            clip_to: "disclip";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset: 0 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  0.5;
+                  offset: -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: 0.5 0.5;
+                  // min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
          }
-         part { name: "fg1";
+         part {
+            name: "elm.text.sub";
             clip_to: "disclip";
+            type: TEXT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0  0.5;
+                  offset: 0 4;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset: -1 -5;
+               }
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 8;
+                  // min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description {
+               state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               color3: 0 0 0 32;
+            }
+         }
+         part {
+            name: "fg1";
+            clip_to: "disclip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -17281,16 +20196,19 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "fg2";
+         part {
+            name: "fg2";
             clip_to: "disclip";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                color: 255 255 255 0;
                rel1.to: "bg";
@@ -17300,19 +20218,23 @@ collections {
                   border: 6 6 6 0;
                }
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "selected" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                color: 255 255 255 255;
             }
          }
-         part { name: "disclip";
+         part {
+            name: "disclip";
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 64;
             }
@@ -17325,1358 +20247,626 @@ collections {
          //   a "check" item named %s went passive
          // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
+            name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "fg1";
+            target: "fg2";
+            target: "elm.text";
+            target: "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "expand";
+            signal: "mouse,up,1";
+            source: "arrow";
+            action: SIGNAL_EMIT "elm,action,expand,toggle" "elm";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
-         }
-      }
-   }
-
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/check/base/default";
-      images {
-         image: "check_base.png" COMP;
-        image: "check.png" COMP;
-        image: "check2.png" COMP;
-      }
-      parts {
-         part { name: "bg";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.offset: 1 1;
-              rel2.relative: 0.0 1.0;
-              rel2.offset: 1 -2;
-              align: 0.0 0.5;
-              min: 16 16;
-              max: 16 16;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-               image {
-                  normal: "check_base.png";
-                  border: 5 5 5 5;
-                  middle: 0;
-               }
-               fill.smooth : 0;
-           }
-        }
-         part { name: "check";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-               rel1 {
-                  to: "bg";
-                  offset: 1 1;
-               }
-               rel2 {
-                  to: "bg";
-                  offset: -2 -2;
-               }
-               visible: 0;
-               color: 255 255 255 255;
-               image.normal: "check.png";
-           }
-           description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-               visible: 0;
-              color: 128 128 128 128;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              visible: 0;
-               color: 255 255 255 255;
-              align: 0.0 0.5;
-               rel1.to_x: "bg";
-               rel1.relative: 1.0 0.0;
-              rel1.offset: 1 1;
-               rel2.to_x: "bg";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: 2 -2;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 1;
-              visible: 1;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-               fixed: 1 1;
-              visible: 1;
-              aspect: 1.0 1.0;
-           }
-        }
-         part { name: "elm.text";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 1 1;
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -2 -2;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.0 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-              visible: 1;
-              text.min: 1 1;
-           }
-        }
-         part { name: "events";
-           type: RECT;
-            ignore_flags: ON_HOLD;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-      }
-      programs {
-        program { name: "click";
-           signal: "mouse,up,1";
-           source: "events";
-            action: SIGNAL_EMIT "elm,action,check,toggle" "";
-        }
-        program { name: "check_on";
-           signal: "elm,state,check,on";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "check";
-        }
-        program { name: "check_off";
-           signal: "elm,state,check,off";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "check";
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.text";
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "disabler";
-            after: "disable_text";
-        }
-         program { name: "disable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.text", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.text", "disabled", 0.0);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "disabled", 0.0);
-
-               get_state(PART:"check", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"check", "disabled_visible", 0.0);
-              else
-                set_state(PART:"check", "disabled", 0.0);
-           }
-         }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "disabler";
-            after: "enable_text";
-        }
-         program { name: "enable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"elm.text", "visible", 0.0);
-              else
-                set_state(PART:"elm.text", "default", 0.0);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "default", 0.0);
-
-               get_state(PART:"check", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"check", "visible", 0.0);
-              else
-                set_state(PART:"check", "default", 0.0);
-           }
+            name: "go_expanded";
+            signal: "elm,state,expanded";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "arrow";
+         }
+         program {
+            name: "go_contracted";
+            signal: "elm,state,contracted";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "arrow";
          }
       }
    }
+
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/radio/base/default";
+   group {
+      name: "elm/pager/base/default";
+      data.item: "onshow" "raise";
+      // other options
+      // data.item: "onhide" "lower";
+      // data.item: "onshow" "lower";
       images {
-         image: "radio_base.png" COMP;
-        image: "radio.png" COMP;
-        image: "radio2.png" COMP;
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
       }
       parts {
-         part { name: "bg";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              rel1.offset: 1 1;
-              rel2.relative: 0.0 1.0;
-              rel2.offset: 1 -2;
-              align: 0.0 0.5;
-              min: 16 16;
-              max: 16 16;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-               image.normal: "radio_base.png";
-           }
-        }
-         part { name: "radio";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               visible: 0;
-               image.normal: "radio.png";
-           }
-           description { state: "visible" 0.0;
+         part {
+            name: "clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  offset: -9999 -9999;
+               }
+               rel2 {
+                  to: "base";
+                  offset: 9999 9999;
+               }
+               color: 255 255 255 255;
+            }
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
             }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               fixed: 1 0;
-              visible: 0;
-              align: 0.0 0.5;
-               color: 0 0 0 0;
-               rel1.to_x: "bg";
-               rel1.relative: 1.0 0.0;
-              rel1.offset: 1 1;
-               rel2.to_x: "bg";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: 2 -2;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-               fixed: 1 1;
-              visible: 1;
-               color: 255 255 255 255;
-              aspect: 1.0 1.0;
-              aspect_preference: VERTICAL;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 128;
-              visible: 1;
-           }
-        }
-         part { name: "elm.text";
-           type: TEXT;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to_x: "elm.swallow.content";
-              rel1.relative: 1.0 0.0;
-               rel1.offset: 1 1;
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -2 -2;
-              color: 0 0 0 255;
-              text {
-                 font: "Sans,Edje-Vera";
-                 size: 10;
-                 min: 0 0;
-                 align: 0.0 0.5;
-              }
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              text.min: 1 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-              visible: 1;
-              text.min: 1 1;
-           }
-        }
-         part { name: "events";
-           type: RECT;
-            ignore_flags: ON_HOLD;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-      }
-      programs {
-        program { name: "click";
-           signal: "mouse,up,1";
-           source: "events";
-            action: SIGNAL_EMIT "elm,action,radio,toggle" "";
-        }
-        program { name: "radio_on";
-           signal: "elm,state,radio,on";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "radio";
-        }
-        program { name: "radio_off";
-           signal: "elm,state,radio,off";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "radio";
-        }
-        program { name: "text_show";
-           signal: "elm,state,text,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.text";
-        }
-        program { name: "text_hide";
-           signal: "elm,state,text,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.text";
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.content";
-        }
-        program { name: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "disabler";
-            after: "disable_text";
-        }
-         program { name: "disable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.text", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.text", "disabled", 0.0);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "disabled_visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "disabled", 0.0);
-           }
-         }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "disabler";
-            after: "enable_text";
-        }
-         program { name: "enable_text";
-           script {
-              new st[31];
-              new Float:vl;
-              get_state(PART:"elm.text", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                set_state(PART:"elm.text", "visible", 0.0);
-              else
-                set_state(PART:"elm.text", "default", 0.0);
-
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-              if (!strcmp(st, "visible"))
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "default", 0.0);
-           }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
          }
-      }
-   }
-   group { name: "elm/genlist/tree_compress_odd/double_label/default";
-      data.item: "stacking" "below";
-      data.item: "selectraise" "on";
-      data.item: "labels" "elm.text elm.text.sub";
-      data.item: "icons" "elm.swallow.icon elm.swallow.end";
-      data.item: "treesize" "20";
-//      data.item: "states" "";
-      images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-         image: "ilist_2.png" COMP;
-         image: "icon_arrow_right.png" COMP;
-         image: "icon_arrow_down.png" COMP;
-      }
-      parts {
          part {
-            name:           "event";
-            type:           RECT;
-            repeat_events: 1;
+            name: "base0";
+            mouse_events: 0;
+            clip_to: "clip";
             description {
                state: "default" 0.0;
-               color: 0 0 0 0;
+               image.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
+               }
             }
          }
          part {
             name: "base";
             mouse_events: 0;
+            clip_to: "clip";
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_2.png";
-                  border: 2 2 2 2;
+                  normal: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
                }
-               fill.smooth: 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "bg";
-            clip_to: "disclip";
+         part {
+            name: "over";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
                rel1 {
-                  relative: 0.0 0.0;
-                  offset: -5 -5;
+                  to: "base";
+                  offset: 4 4;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
+                  to: "base";
+                  offset: -5 -5;
                }
                image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
-               }
-               image.middle: SOLID;
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
                }
+               fill.smooth : 0;
             }
          }
-         part { name: "elm.swallow.pad";
+         part {
+            name: "elm.swallow.content";
             type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
                rel1 {
-                  relative: 0.0  0.0;
-                  offset:   4    4;
+                  to: "base";
+                  offset: 8 8;
                }
                rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+                  to: "base";
+                  offset: -9 -9;
                }
             }
          }
-         part { name: "arrow";
-            clip_to: "disclip";
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               aspect: 1.0 1.0;
-               rel1 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  0.0;
-                  offset:   -1    4;
-               }
-               rel2 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -5;
-               }
-               image.normal: "icon_arrow_right.png";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
-            }
+      }
+      programs {
+         program {
+            name: "show_start";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "base";
+            target: "clip";
+            after: "show_start2";
          }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
+         program {
+            name: "show_start2";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "base";
+            target: "clip";
+            after: "show_end";
+         }
+         program {
+            name: "show_end";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
+         }
+         program {
+            name: "hide_start";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "base";
+            target: "clip";
+            after: "hide_start2";
+         }
+         program {
+            name: "hide_start2";
+            action: STATE_SET "hidden" 0.0;
+            transition: DECELERATE 0.5;
+            target: "base";
+            target: "clip";
+            after: "hide_end";
+         }
+         program {
+            name: "hide_end";
+            action: SIGNAL_EMIT "elm,action,hide,finished" "";
+         }
+         program {
+            name: "reset";
+            signal: "elm,action,reset";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            target: "clip";
+         }
+      }
+   }
+   group {
+      name: "elm/pager/base/fade";
+      data.item: "onshow" "raise";
+      // other options
+      // data.item: "onhide" "lower";
+      // data.item: "onshow" "lower";
+      images {
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
+      }
+      parts {
+         part {
+            name: "clip_base";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
                rel1 {
-                  to_x: "arrow";
-                  relative: 1.0  0.0;
-                  offset:   4    4;
+                  to: "base";
+                  offset: -9999 -9999;
                }
                rel2 {
-                  to_x: "arrow";
-                  relative: 1.0  1.0;
-                  offset:   4   -5;
+                  to: "base";
+                  offset: 9999 9999;
                }
+               color: 255 255 255 120;
             }
-         }
-         part { name: "elm.swallow.end";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 1.0 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5   -5;
-               }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
             }
          }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
-            scale: 1;
+         part {
+            name: "clip";
+            type: RECT;
+            mouse_events: 0;
             description {
                state: "default" 0.0;
-//               min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  to: "base";
+                  offset: -9999 -9999;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  0.5;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  to: "base";
+                  offset: 9999 9999;
                }
+               color: 255 255 255 255;
             }
-            description { state: "selected" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
             }
          }
-         part { name: "elm.text.sub";
-            clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
-            scale: 1;
+         part {
+            name: "base0";
+            mouse_events: 0;
+            clip_to: "clip_base";
             description {
                state: "default" 0.0;
-//               min: 16 16;
-               rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.5;
-                  offset:   0 4;
-               }
-               rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 8;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+               image.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 128 128 128 255;
-               color3: 0 0 0 32;
-            }
          }
-         part { name: "fg1";
-            clip_to: "disclip";
+         part {
+            name: "base";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
+            clip_to: "clip_base";
+            description {
+               state: "default" 0.0;
                image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
+                  normal: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+               fill.smooth : 0;
             }
          }
-         part { name: "fg2";
-            clip_to: "disclip";
+         part {
+            name: "over";
             mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  offset: 4 4;
+               }
+               rel2 {
+                  to: "base";
+                  offset: -5 -5;
+               }
                image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+               fill.smooth : 0;
             }
          }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 64;
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  offset: 8 8;
+               }
+               rel2 {
+                  to: "base";
+                  offset: -9 -9;
+               }
             }
          }
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
          program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            name: "show_start";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "clip";
+            target: "clip_base";
+            after: "show_start2";
          }
          program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
-            transition: LINEAR 0.1;
+            name: "show_start2";
+            action: STATE_SET "visible" 0.0;
+            transition: DECELERATE 0.5;
+            target: "clip";
+            target: "clip_base";
+            after: "show_end";
          }
          program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+            name: "show_end";
+            action: SIGNAL_EMIT "elm,action,show,finished" "";
          }
          program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            name: "hide_start";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "clip";
+            target: "clip_base";
+            after: "hide_start2";
          }
          program {
-            name:    "expand";
-            signal:  "mouse,up,1";
-            source:  "arrow";
-            action:  SIGNAL_EMIT "elm,action,expand,toggle" "elm";
+            name: "hide_start2";
+            action: STATE_SET "hidden" 0.0;
+            transition: DECELERATE 0.5;
+            target: "clip";
+            target: "clip_base";
+            after: "hide_end";
          }
          program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+            name: "hide_end";
+            action: SIGNAL_EMIT "elm,action,hide,finished" "";
          }
          program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            name: "reset";
+            signal: "elm,action,reset";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "clip_base";
+            target: "clip";
          }
       }
    }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/pager/base/default";
+   group {
+      name: "elm/pager/base/fade_translucide";
       data.item: "onshow" "raise";
-// other options
-//      data.item: "onhide" "lower";
-//      data.item: "onshow" "lower";
+      // other options
+      // data.item: "onhide" "lower";
+      // data.item: "onshow" "lower";
       images {
-        image: "frame_1.png" COMP;
-        image: "frame_2.png" COMP;
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
          image: "dia_grad.png" COMP;
       }
       parts {
-         part { name: "clip";
+         part {
+            name: "clip_base";
             type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1 {
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
                   to: "base";
                   offset: -9999 -9999;
                }
-              rel2 {
+               rel2 {
+                  to: "base";
+                  offset: 9999 9999;
+               }
+               color: 255 255 255 120;
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  offset: -9999 -9999;
+               }
+               rel2 {
                   to: "base";
                   offset: 9999 9999;
                }
                color: 255 255 255 255;
-           }
-           description { state: "visible" 0.0;
+            }
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
-           }
-           description { state: "hidden" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
                inherit: "default" 0.0;
                color: 255 255 255 0;
                visible: 0;
-           }
-        }
-         part { name: "base0";
-           mouse_events:  0;
-            clip_to: "clip";
-           description { state: "default" 0.0;
-              image.normal: "dia_grad.png";
-              rel1.to: "over";
-              rel2.to: "over";
+            }
+         }
+         part {
+            name: "base0";
+            mouse_events: 0;
+            clip_to: "clip_base";
+            description {
+               state: "default" 0.0;
+               image.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
                fill {
-                 smooth: 0;
-                 size {
-                    relative: 0.0 1.0;
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
                      offset: 64 0;
-                 }
-              }
-           }
-        }
-        part { name: "base";
-           mouse_events:  0;
-            clip_to: "clip";
-           description { state: "default" 0.0;
-              image {
-                 normal: "frame_2.png";
-                 border: 5 5 32 26;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-           description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: -1.0 0.0;
-               rel2.relative: 0.0 1.0;
-           }
-           description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-           }
-        }
-         part { name: "over";
-           mouse_events:  0;
+                  }
+               }
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            clip_to: "clip_base";
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
+               }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "over";
+            mouse_events: 0;
             clip_to: "clip";
-           description { state:    "default" 0.0;
-              rel1 {
+            description {
+               state: "default" 0.0;
+               rel1 {
                   to: "base";
                   offset: 4 4;
                }
-              rel2 {
+               rel2 {
                   to: "base";
                   offset: -5 -5;
                }
-              image {
-                 normal: "frame_1.png";
-                 border: 2 2 28 22;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
+               image {
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
+               }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
             clip_to: "clip";
-           description { state: "default" 0.0;
-              rel1 {
+            description {
+               state: "default" 0.0;
+               rel1 {
                   to: "base";
                   offset: 8 8;
                }
-              rel2 {
+               rel2 {
                   to: "base";
                   offset: -9 -9;
                }
-           }
-        }
+            }
+         }
       }
       programs {
-         program { name: "show_start";
-           signal: "elm,action,show";
-           source: "elm";
-           action:  STATE_SET "hidden" 0.0;
-           target: "base";
-           target: "clip";
+         program {
+            name: "show_start";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "clip";
+            target: "clip_base";
             after: "show_start2";
-        }
-         program { name: "show_start2";
-           action:  STATE_SET "visible" 0.0;
+         }
+         program {
+            name: "show_start2";
+            action: STATE_SET "visible" 0.0;
             transition: DECELERATE 0.5;
-           target: "base";
-           target: "clip";
+            target: "clip";
+            target: "clip_base";
             after: "show_end";
-        }
-         program { name: "show_end";
+         }
+         program {
+            name: "show_end";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
-        }
-         program { name: "hide_start";
-           signal: "elm,action,hide";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "base";
-           target: "clip";
+         }
+         program {
+            name: "hide_start";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "clip";
+            target: "clip_base";
             after: "hide_start2";
-        }
-         program { name: "hide_start2";
-           action:  STATE_SET "hidden" 0.0;
+         }
+         program {
+            name: "hide_start2";
+            action: STATE_SET "hidden" 0.0;
             transition: DECELERATE 0.5;
-           target: "base";
-           target: "clip";
+            target: "clip";
+            target: "clip_base";
             after: "hide_end";
-        }
-         program { name: "hide_end";
-            action: SIGNAL_EMIT "elm,action,hide,finished" "";
-        }
-         program { name: "reset";
-           signal: "elm,action,reset";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "base";
-           target: "clip";
-        }
-      }
-   }
-
-   group { name: "elm/pager/base/fade";
-       data.item: "onshow" "raise";
-       // other options
-       //      data.item: "onhide" "lower";
-       //      data.item: "onshow" "lower";
-       images {
-           image: "frame_1.png" COMP;
-           image: "frame_2.png" COMP;
-           image: "dia_grad.png" COMP;
-       }
-       parts {
-           part { name: "clip_base";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: -9999 -9999;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: 9999 9999;
-                   }
-                   color: 255 255 255 120;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-               }
-               description { state: "hidden" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 0;
-                   visible: 0;
-               }
-           }
-           part { name: "clip";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: -9999 -9999;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: 9999 9999;
-                   }
-                   color: 255 255 255 255;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-               }
-               description { state: "hidden" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 0;
-                   visible: 0;
-               }
-           }
-           part { name: "base0";
-               mouse_events:  0;
-               clip_to: "clip_base";
-               description { state: "default" 0.0;
-                   image.normal: "dia_grad.png";
-                   rel1.to: "over";
-                   rel2.to: "over";
-                   fill {
-                       smooth: 0;
-                       size {
-                           relative: 0.0 1.0;
-                           offset: 64 0;
-                       }
-                   }
-               }
-           }
-           part { name: "base";
-               mouse_events:  0;
-               clip_to: "clip_base";
-               description { state: "default" 0.0;
-                   image {
-                       normal: "frame_2.png";
-                       border: 5 5 32 26;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "over";
-               mouse_events:  0;
-               clip_to: "clip";
-               description { state:    "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: 4 4;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: -5 -5;
-                   }
-                   image {
-                       normal: "frame_1.png";
-                       border: 2 2 28 22;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: 8 8;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: -9 -9;
-                   }
-               }
-           }
-       }
-       programs {
-           program { name: "show_start";
-               signal: "elm,action,show";
-               source: "elm";
-               action:  STATE_SET "hidden" 0.0;
-               target: "clip";
-               target: "clip_base";
-               after: "show_start2";
-           }
-           program { name: "show_start2";
-               action:  STATE_SET "visible" 0.0;
-               transition: DECELERATE 0.5;
-               target: "clip";
-               target: "clip_base";
-               after: "show_end";
-           }
-           program { name: "show_end";
-               action: SIGNAL_EMIT "elm,action,show,finished" "";
-           }
-           program { name: "hide_start";
-               signal: "elm,action,hide";
-               source: "elm";
-               action:  STATE_SET "visible" 0.0;
-               target: "clip";
-               target: "clip_base";
-               after: "hide_start2";
-           }
-           program { name: "hide_start2";
-               action:  STATE_SET "hidden" 0.0;
-               transition: DECELERATE 0.5;
-               target: "clip";
-               target: "clip_base";
-               after: "hide_end";
-           }
-           program { name: "hide_end";
-               action: SIGNAL_EMIT "elm,action,hide,finished" "";
-           }
-           program { name: "reset";
-               signal: "elm,action,reset";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "clip_base";
-               target: "clip";
-           }
-       }
-   }
-   group { name: "elm/pager/base/fade_translucide";
-       data.item: "onshow" "raise";
-       // other options
-       //      data.item: "onhide" "lower";
-       //      data.item: "onshow" "lower";
-       images {
-           image: "frame_1.png" COMP;
-           image: "frame_2.png" COMP;
-           image: "dia_grad.png" COMP;
-       }
-       parts {
-           part { name: "clip_base";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: -9999 -9999;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: 9999 9999;
-                   }
-                   color: 255 255 255 120;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-               }
-               description { state: "hidden" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 0;
-                   visible: 0;
-               }
-           }
-           part { name: "clip";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: -9999 -9999;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: 9999 9999;
-                   }
-                   color: 255 255 255 255;
-               }
-               description { state: "visible" 0.0;
-                   inherit: "default" 0.0;
-               }
-               description { state: "hidden" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 0;
-                   visible: 0;
-               }
-           }
-           part { name: "base0";
-               mouse_events:  0;
-               clip_to: "clip_base";
-               description { state: "default" 0.0;
-                   image.normal: "dia_grad.png";
-                   rel1.to: "over";
-                   rel2.to: "over";
-                   fill {
-                       smooth: 0;
-                       size {
-                           relative: 0.0 1.0;
-                           offset: 64 0;
-                       }
-                   }
-               }
-           }
-           part { name: "base";
-               mouse_events:  0;
-               clip_to: "clip_base";
-               description { state: "default" 0.0;
-                   image {
-                       normal: "frame_2.png";
-                       border: 5 5 32 26;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "over";
-               mouse_events:  0;
-               clip_to: "clip";
-               description { state:    "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: 4 4;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: -5 -5;
-                   }
-                   image {
-                       normal: "frame_1.png";
-                       border: 2 2 28 22;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "base";
-                       offset: 8 8;
-                   }
-                   rel2 {
-                       to: "base";
-                       offset: -9 -9;
-                   }
-               }
-           }
-       }
-       programs {
-           program { name: "show_start";
-               signal: "elm,action,show";
-               source: "elm";
-               action:  STATE_SET "hidden" 0.0;
-               target: "clip";
-               target: "clip_base";
-               after: "show_start2";
-           }
-           program { name: "show_start2";
-               action:  STATE_SET "visible" 0.0;
-               transition: DECELERATE 0.5;
-               target: "clip";
-               target: "clip_base";
-               after: "show_end";
-           }
-           program { name: "show_end";
-               action: SIGNAL_EMIT "elm,action,show,finished" "";
-           }
-           program { name: "hide_start";
-               signal: "elm,action,hide";
-               source: "elm";
-               action:  STATE_SET "visible" 0.0;
-               target: "clip";
-               target: "clip_base";
-               after: "hide_start2";
-           }
-           program { name: "hide_start2";
-               action:  STATE_SET "hidden" 0.0;
-               transition: DECELERATE 0.5;
-               target: "clip";
-               target: "clip_base";
-               after: "hide_end";
-           }
-           program { name: "hide_end";
-               action: SIGNAL_EMIT "elm,action,hide,finished" "";
-           }
-           program { name: "reset";
-               signal: "elm,action,reset";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "clip_base";
-               target: "clip";
-           }
-       }
+         }
+         program {
+            name: "hide_end";
+            action: SIGNAL_EMIT "elm,action,hide,finished" "";
+         }
+         program {
+            name: "reset";
+            signal: "elm,action,reset";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "clip_base";
+            target: "clip";
+         }
+      }
    }
 
-
-
 ///////////////////////////////////////////////////////////////////////////////
-// FIXME: this doesn't look too hot. need to fix it up
-   group { name: "elm/progressbar/horizontal/default";
+   // FIXME: this doesn't look too hot. need to fix it up
+   group {
+      name: "elm/progressbar/horizontal/default";
       images {
          image: "shelf_inset.png" COMP;
          image: "bt_sm_base2.png" COMP;
@@ -18684,7 +20874,8 @@ collections {
          image: "bt_sm_shine.png" COMP;
       }
       parts {
-         part { name: "elm.background.progressbar";
+         part {
+            name: "elm.background.progressbar";
             mouse_events: 0;
             description {
                state: "default" 0.0;
@@ -18697,7 +20888,8 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.bar";
+         part {
+            name: "elm.swallow.bar";
             mouse_events: 0;
             type: SWALLOW;
             description {
@@ -18715,9 +20907,11 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.content";
+         part {
+            name: "elm.swallow.content";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
                rel1 {
@@ -18730,7 +20924,8 @@ collections {
                   to_y: "elm.background.progressbar";
                }
             }
-            description { state: "visible" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                aspect: 1.0 1.0;
@@ -18738,11 +20933,13 @@ collections {
                rel2.offset: 4 -1;
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
                align: 0.0 0.5;
@@ -18760,7 +20957,8 @@ collections {
                   align: 0.0 0.5;
                }
             }
-            description { state: "visible" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                text.min: 1 1;
@@ -18768,8 +20966,8 @@ collections {
                rel2.offset: 0 -5;
             }
          }
-
-         part { name: "background";
+         part {
+            name: "background";
             mouse_events: 0;
             clip_to: "elm.background.progressbar";
             description {
@@ -18789,11 +20987,12 @@ collections {
                }
             }
          }
-
-         part { name: "elm.text.status";
+         part {
+            name: "elm.text.status";
             type: TEXT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                fixed: 1 1;
                visible: 1;
                rel1 {
@@ -18812,14 +21011,15 @@ collections {
                }
                color: 0 0 0 255;
             }
-            description { state: "hidden" 0.0;
+            description {
+               state: "hidden" 0.0;
                inherit: "default" 0.0;
                visible: 0;
                text.min: 0 0;
             }
          }
-
-         part { name: "elm.progress.progressbar";
+         part {
+            name: "elm.progress.progressbar";
             mouse_events: 0;
             clip_to: "elm.background.progressbar";
             description {
@@ -18877,13 +21077,15 @@ collections {
                }
             }
          }
-         part { name: "text-bar";
+         part {
+            name: "text-bar";
             type: TEXT;
             mouse_events: 0;
             clip_to: "progress-rect";
             effect: SOFT_SHADOW;
             scale: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                align: 0.0 0.0;
                fixed: 1 1;
                visible: 1;
@@ -18900,16 +21102,18 @@ collections {
                color: 224 224 224 255;
                color3: 0 0 0 64;
             }
-            description { state: "hidden" 0.0;
+            description {
+               state: "hidden" 0.0;
                inherit: "default" 0.0;
                visible: 0;
                text.min: 0 0;
             }
          }
-
-         part { name: "over1";
+         part {
+            name: "over1";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "elm.progress.progressbar";
                rel2.to: "elm.progress.progressbar";
                rel2.relative: 1.0 0.5;
@@ -18919,11 +21123,12 @@ collections {
                }
             }
          }
-
-         part { name: "over2";
+         part {
+            name: "over2";
             mouse_events: 1;
             repeat_events: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "elm.progress.progressbar";
                rel2.to: "elm.progress.progressbar";
                image {
@@ -18932,15 +21137,16 @@ collections {
                }
             }
          }
-
-         part { name: "elm.cur.progressbar";
+         part {
+            name: "elm.cur.progressbar";
             mouse_events: 0;
             dragable {
                confine: "background";
                x: 1 1 1;
                y: 0 0 0;
             }
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                min: 14 28;
                fixed: 1 1;
                visible: 0;
@@ -18949,9 +21155,10 @@ collections {
                   relative: 0 0;
                }
                rel2.to: "background";
-           }
+            }
          }
-         part { name: "progress-rect";
+         part {
+            name: "progress-rect";
             mouse_events: 0;
             description {
                state: "default" 0.0;
@@ -18961,63 +21168,73 @@ collections {
          }
       }
       programs {
-         program { name: "label_show";
+         program {
+            name: "label_show";
             signal: "elm,state,text,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.text";
          }
-         program { name: "label_hide";
+         program {
+            name: "label_hide";
             signal: "elm,state,text,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.text";
          }
-         program { name: "icon_show";
+         program {
+            name: "icon_show";
             signal: "elm,state,icon,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.swallow.content";
          }
-         program { name: "icon_hide";
+         program {
+            name: "icon_hide";
             signal: "elm,state,icon,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
          }
-         program { name: "units_show";
+         program {
+            name: "units_show";
             signal: "elm,state,units,visible";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "text-bar";
             target: "elm.text.status";
          }
-         program { name: "units_hide";
+         program {
+            name: "units_hide";
             signal: "elm,state,units,hidden";
             source: "elm";
-            action:  STATE_SET "hidden" 0.0;
+            action: STATE_SET "hidden" 0.0;
             target: "text-bar";
             target: "elm.text.status";
          }
-         program { name: "slide_to_end";
-            action:  STATE_SET "state_end" 0.0;
+         program {
+            name: "slide_to_end";
+            action: STATE_SET "state_end" 0.0;
             transition: LINEAR 0.5;
             target: "elm.progress.progressbar";
             after: "slide_to_begin";
          }
-         program { name: "slide_to_begin";
+         program {
+            name: "slide_to_begin";
             signal: "elm,state,slide,begin";
             action: STATE_SET "state_begin" 0.0;
             target: "elm.progress.progressbar";
             transition: LINEAR 0.5;
             after: "slide_to_end";
          }
-         program { name: "start_pulse";
+         program {
+            name: "start_pulse";
             signal: "elm,state,pulse,start";
             source: "elm";
             after: "slide_to_end";
          }
-         program { name: "stop_pulse";
+         program {
+            name: "stop_pulse";
             signal: "elm,state,pulse,stop";
             source: "elm";
             action: ACTION_STOP;
@@ -19026,14 +21243,16 @@ collections {
             target: "start_pulse";
             after: "state_pulse";
          }
-         program { name: "state_pulse";
+         program {
+            name: "state_pulse";
             signal: "elm,state,pulse";
             source: "elm";
             action: STATE_SET "state_begin" 0.0;
             target: "elm.progress.progressbar";
             after: "units_hide";
          }
-         program { name: "state_fraction";
+         program {
+            name: "state_fraction";
             signal: "elm,state,fraction";
             source: "elm";
             action: ACTION_STOP;
@@ -19043,23 +21262,26 @@ collections {
             action: STATE_SET "default" 0.0;
             target: "elm.progress.progressbar";
          }
-         program { name: "set_invert_on";
+         program {
+            name: "set_invert_on";
             signal: "elm,state,inverted,on";
             source: "elm";
-            action:  STATE_SET "invert" 0.0;
+            action: STATE_SET "invert" 0.0;
             target: "elm.progress.progressbar";
          }
-         program { name: "set_invert_off";
+         program {
+            name: "set_invert_off";
             signal: "elm,state,inverted,off";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.progress.progressbar";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/progressbar/vertical/default";
+   group {
+      name: "elm/progressbar/vertical/default";
       images {
          image: "shelf_inset.png" COMP;
          image: "bt_sm_base2.png" COMP;
@@ -19067,7 +21289,8 @@ collections {
          image: "bt_sm_shine.png" COMP;
       }
       parts {
-         part { name: "elm.background.progressbar";
+         part {
+            name: "elm.background.progressbar";
             type: RECT;
             mouse_events: 0;
             description {
@@ -19082,10 +21305,12 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.bar";
+         part {
+            name: "elm.swallow.bar";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                min: 28 48;
                max: 28 9999;
                align: 0.5 1.0;
@@ -19101,9 +21326,11 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.content";
+         part {
+            name: "elm.swallow.content";
             type: SWALLOW;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                align: 0.5 0.0;
                rel1 {
@@ -19116,7 +21343,8 @@ collections {
                   to_x: "elm.swallow.bar";
                }
             }
-            description { state: "visible" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                aspect: 1.0 1.0;
@@ -19124,11 +21352,13 @@ collections {
                rel2.offset: -1 4;
             }
          }
-         part { name: "elm.text";
+         part {
+            name: "elm.text";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
                align: 0.5 0.0;
@@ -19146,7 +21376,8 @@ collections {
                   align: 0.5 0.0;
                }
             }
-            description { state: "visible" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
                text.min: 1 1;
@@ -19154,8 +21385,8 @@ collections {
                rel2.offset: -5 0;
             }
          }
-
-         part { name: "background";
+         part {
+            name: "background";
             mouse_events: 0;
             clip_to: "elm.background.progressbar";
             description {
@@ -19175,8 +21406,8 @@ collections {
                }
             }
          }
-
-         part { name: "elm.progress.progressbar";
+         part {
+            name: "elm.progress.progressbar";
             mouse_events: 0;
             clip_to: "elm.background.progressbar";
             description {
@@ -19234,10 +21465,11 @@ collections {
                }
             }
          }
-
-         part { name: "over1";
+         part {
+            name: "over1";
             mouse_events: 0;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "elm.progress.progressbar";
                rel2.to: "elm.progress.progressbar";
                rel2.relative: 1.0 0.5;
@@ -19247,11 +21479,12 @@ collections {
                }
             }
          }
-
-         part { name: "over2";
+         part {
+            name: "over2";
             mouse_events: 1;
             repeat_events: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                rel1.to: "elm.progress.progressbar";
                rel2.to: "elm.progress.progressbar";
                image {
@@ -19260,15 +21493,16 @@ collections {
                }
             }
          }
-
-         part { name: "elm.cur.progressbar";
+         part {
+            name: "elm.cur.progressbar";
             mouse_events: 0;
             dragable {
                confine: "background";
                x: 0 0 0;
                y: 1 1 1;
             }
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                min: 28 14;
                fixed: 1 1;
                visible: 0;
@@ -19277,13 +21511,14 @@ collections {
                   relative: 0 0;
                }
                rel2.to: "background";
-           }
+            }
          }
-
-         part { name: "elm.text.box";
+         part {
+            name: "elm.text.box";
             mouse_events: 0;
             type: RECT;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                rel1 {
                   to: "elm.text.status";
@@ -19295,16 +21530,19 @@ collections {
                }
                color: 255 255 255 0;
             }
-            description { state: "visible" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
-         part { name: "elm.text.status";
+         part {
+            name: "elm.text.status";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
+            description {
+               state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
                align: 0.5 1.0;
@@ -19320,7 +21558,8 @@ collections {
                   align: 0.5 0.0;
                }
             }
-            description { state: "visible" 0.0;
+            description {
+               state: "visible" 0.0;
                inherit: "default" 0.0;
                fixed: 1 1;
                visible: 1;
@@ -19331,1605 +21570,1721 @@ collections {
          }
       }
       programs {
-         program { name: "label_show";
+         program {
+            name: "label_show";
             signal: "elm,state,text,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.text";
          }
-         program { name: "label_hide";
+         program {
+            name: "label_hide";
             signal: "elm,state,text,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.text";
          }
-         program { name: "icon_show";
+         program {
+            name: "icon_show";
             signal: "elm,state,icon,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.swallow.content";
          }
-         program { name: "icon_hide";
+         program {
+            name: "icon_hide";
             signal: "elm,state,icon,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
          }
-         program { name: "units_show";
+         program {
+            name: "units_show";
             signal: "elm,state,units,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.text.status";
             target: "elm.text.box";
          }
-         program { name: "units_hide";
+         program {
+            name: "units_hide";
             signal: "elm,state,units,hidden";
             source: "elm";
-            action:  STATE_SET "default" 0.0;
+            action: STATE_SET "default" 0.0;
             target: "elm.text.status";
             target: "elm.text.box";
          }
-         program { name: "slide_to_end";
-            action:  STATE_SET "state_end" 0.0;
+         program {
+            name: "slide_to_end";
+            action: STATE_SET "state_end" 0.0;
             transition: LINEAR 0.5;
             target: "elm.progress.progressbar";
             after: "slide_to_begin";
          }
-         program { name: "slide_to_begin";
-            action:  STATE_SET "state_begin" 0.0;
+         program {
+            name: "slide_to_begin";
+            action: STATE_SET "state_begin" 0.0;
             target: "elm.progress.progressbar";
             transition: LINEAR 0.5;
             after: "slide_to_end";
          }
-         program { name: "start_pulse";
+         program {
+            name: "start_pulse";
+            signal: "elm,state,pulse,start";
+            source: "elm";
+            action: STATE_SET "state_begin" 0.0;
+            target: "elm.progress.progressbar";
+            after: "slide_to_end";
+         }
+         program {
+            name: "stop_pulse";
+            signal: "elm,state,pulse,stop";
+            source: "elm";
+            action: ACTION_STOP;
+            target: "slide_to_begin";
+            target: "slide_to_end";
+            target: "start_pulse";
+            after: "state_pulse";
+         }
+         program {
+            name: "state_pulse";
+            signal: "elm,state,pulse";
+            source: "elm";
+            action: STATE_SET "state_begin" 0.0;
+            target: "elm.progress.progressbar";
+            after: "units_hide";
+         }
+         program {
+            name: "state_fraction";
+            signal: "elm,state,fraction";
+            source: "elm";
+            action: ACTION_STOP;
+            target: "slide_to_begin";
+            target: "slide_to_end";
+            target: "start_pulse";
+            action: STATE_SET "default" 0.0;
+            target: "elm.progress.progressbar";
+         }
+         program {
+            name: "set_invert_on";
+            signal: "elm,state,inverted,on";
+            source: "elm";
+            action: STATE_SET "invert" 0.0;
+            target: "elm.progress.progressbar";
+            target: "elm.cur.progressbar";
+         }
+         program {
+            name: "set_invert_off";
+            signal: "elm,state,inverted,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.progress.progressbar";
+            target: "elm.cur.progressbar";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/separator/horizontal/default";
+      images {
+         image: "separator_h.png" COMP;
+      }
+      parts {
+         part {
+            name: "separator";
+            // separator group
+            description {
+               state: "default" 0.0;
+               min: 2 2;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "separator_h.png";
+               }
+               fill {
+                  smooth: 0;
+               }
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/separator/vertical/default";
+      images {
+         image: "separator_v.png" COMP;
+      }
+      parts {
+         part {
+            name: "separator";
+            // separator group
+            description {
+               state: "default" 0.0;
+               min: 2 2;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "separator_v.png";
+               }
+               fill {
+                  smooth: 0;
+               }
+            }
+         }
+      }
+   }
+   group {
+      name: "elm/progressbar/horizontal/wheel";
+      images {
+         image: "busy-1.png" COMP;
+         image: "busy-2.png" COMP;
+         image: "busy-3.png" COMP;
+         image: "busy-4.png" COMP;
+         image: "busy-5.png" COMP;
+         image: "busy-6.png" COMP;
+         image: "busy-7.png" COMP;
+         image: "busy-8.png" COMP;
+         image: "busy-9.png" COMP;
+      }
+      parts {
+         part {
+            name: "elm.background.progressbar";
+            mouse_events: 0;
+            type: RECT;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.bar";
+            mouse_events: 0;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               min: 0 0;
+               max: 0 0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               min: 0 0;
+               max: 0 0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "background";
+            mouse_events: 0;
+            clip_to: "elm.background.progressbar";
+            description {
+               state: "default" 0.0;
+               min: 32 32;
+               max: 32 32;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
+               image {
+                  normal: "busy-9.png";
+                  border: 7 7 7 7;
+               }
+            }
+            description {
+               state: "pulse" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "busy-9.png";
+                  tween: "busy-1.png";
+                  tween: "busy-2.png";
+                  tween: "busy-3.png";
+                  tween: "busy-4.png";
+                  tween: "busy-5.png";
+                  tween: "busy-6.png";
+                  tween: "busy-7.png";
+                  tween: "busy-8.png";
+                  border: 7 7 7 7;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "start_pulse";
             signal: "elm,state,pulse,start";
             source: "elm";
-            action: STATE_SET "state_begin" 0.0;
-            target: "elm.progress.progressbar";
-            after: "slide_to_end";
+            action: STATE_SET "pulse" 0.0;
+            target: "background";
+            transition: LINEAR 0.5;
+            after: "start_pulse";
          }
-         program { name: "stop_pulse";
+         program {
+            name: "stop_pulse";
             signal: "elm,state,pulse,stop";
             source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-            after: "state_pulse";
-         }
-         program { name: "state_pulse";
-            signal: "elm,state,pulse";
-            source: "elm";
-            action: STATE_SET "state_begin" 0.0;
-            target: "elm.progress.progressbar";
-            after: "units_hide";
-         }
-         program { name: "state_fraction";
-            signal: "elm,state,fraction";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
             action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "set_invert_on";
-            signal: "elm,state,inverted,on";
-            source: "elm";
-            action:  STATE_SET "invert" 0.0;
-            target: "elm.progress.progressbar";
-            target: "elm.cur.progressbar";
-         }
-         program { name: "set_invert_off";
-            signal: "elm,state,inverted,off";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-            target: "elm.cur.progressbar";
+            target: "background";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/separator/horizontal/default";
-       images {
-           image: "separator_h.png" COMP;
-       }
-       parts {
-           part { name: "separator"; // separator group
-               description { state: "default" 0.0;
-                   min: 2 2;
-                   rel1.offset: 4 4;
-                   rel2.offset: -5 -5;
-                   image {
-                       normal: "separator_h.png";
-                   }
-                   fill {
-                       smooth: 0;
-                   }
-               }
-           }
-       }
-   }
-
-   ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/separator/vertical/default";
-       images {
-           image: "separator_v.png" COMP;
-       }
-       parts {
-           part { name: "separator"; // separator group
-               description { state: "default" 0.0;
-                   min: 2 2;
-                   rel1.offset: 4 4;
-                   rel2.offset: -5 -5;
-                   image {
-                       normal: "separator_v.png";
-                   }
-                   fill {
-                       smooth: 0;
-                   }
-               }
-           }
-       }
-   }
-
-   group { name: "elm/progressbar/horizontal/wheel";
-       images {
-           image: "busy-1.png" COMP;
-           image: "busy-2.png" COMP;
-           image: "busy-3.png" COMP;
-           image: "busy-4.png" COMP;
-           image: "busy-5.png" COMP;
-           image: "busy-6.png" COMP;
-           image: "busy-7.png" COMP;
-           image: "busy-8.png" COMP;
-           image: "busy-9.png" COMP;
-       }
-       parts {
-           part { name: "elm.background.progressbar";
-               mouse_events: 0;
-               type: RECT;
-               description {
-                   state: "default" 0.0;
-               }
-           }
-           part { name: "elm.swallow.bar";
-               mouse_events: 0;
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   min: 0 0;
-                   max: 0 0;
-                   visible: 0;
-               }
-           }
-           part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   min: 0 0;
-                   max: 0 0;
-                   visible: 0;
-               }
-           }
-           part { name: "background";
-               mouse_events: 0;
-               clip_to: "elm.background.progressbar";
-               description {
-                   state: "default" 0.0;
-                   min: 32 32;
-                   max: 32 32;
-                   visible: 1;
-                   aspect: 1.0 1.0;
-                   aspect_preference: BOTH;
-                   image {
-                       normal: "busy-9.png";
-                       border: 7 7 7 7;
-                   }
-               }
-               description {
-                   state: "pulse" 0.0;
-                   inherit: "default" 0.0;
-                   image {
-                       normal: "busy-9.png";
-                       tween:  "busy-1.png";
-                       tween:  "busy-2.png";
-                       tween:  "busy-3.png";
-                       tween:  "busy-4.png";
-                       tween:  "busy-5.png";
-                       tween:  "busy-6.png";
-                       tween:  "busy-7.png";
-                       tween:  "busy-8.png";
-                       border: 7 7 7 7;
-                   }
-               }
-           }
-       }
-       programs {
-           program { name: "start_pulse";
-               signal: "elm,state,pulse,start";
-               source: "elm";
-               action: STATE_SET "pulse" 0.0;
-               target: "background";
-               transition: LINEAR 0.5;
-               after: "start_pulse";
-           }
-           program { name: "stop_pulse";
-               signal: "elm,state,pulse,stop";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "background";
-           }
-       }
-   }
-
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/spinner/base/default";
-       images {
-           image: "shelf_inset.png" COMP;
-           image: "bt_base1.png" COMP;
-           image: "bt_hilight.png" COMP;
-           image: "bt_shine.png" COMP;
-           image: "bt_glow.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-           image: "sp_bt_l.png" COMP;
-           image: "sp_bt_r.png" COMP;
-       }
-       parts {
-           part { name: "bg";
-               type: RECT;
-               description { state: "default" 0.0;
-                   max: 99999 30;
-                   min: 0 30;
-                   rel1.offset: 1 1;
-                   rel2.offset: -2 -2;
-                   color: 255 255 255 0;
-               }
-           }
-           part { name: "conf_over";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   image {
-                       normal: "shelf_inset.png";
-                       border: 7 7 7 7;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
-               }
-           }
-           part { name: "left_bt";
-               mouse_events:  1;
-               description { state: "default" 0.0;
-                   rel1 { to: "bg";
-                       offset: 2 2;
-                   }
-                   rel2 { to: "bg";
-                       offset: -3 -3;
-                   }
-                   align: 0.0 0.5;
-                   min: 24 24;
-                   max: 24 24;
-                   image {
-                       normal: "bt_base1.png";
-                       border: 6 6 6 6;
-                   }
-                   fill.smooth : 0;
-               }
-               description { state: "clicked" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "bt_base1.png";
-                   image.middle: SOLID;
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-               }
-           }
-           part {        name: "left_over1";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "left_bt";
-                   rel2 { to: "left_bt";
-                       relative: 1.0 0.5;
-                   }
-                   image {
-                       normal: "bt_hilight.png";
-                       border: 7 7 7 0;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
-               }
-           }
-           part { name: "left_over2";
-               mouse_events: 1;
-               repeat_events: 1;
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   rel1.to: "left_bt";
-                   rel2.to: "left_bt";
-                   image {
-                       normal: "bt_shine.png";
-                       border: 7 7 7 7;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 0;
-               }
-           }
-           part { name: "left_over3";
-               mouse_events: 1;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel1.to: "left_bt";
-                   rel2.to: "left_bt";
-                   image {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                   }
-                   fill.smooth : 0;
-               }
-               description { state: "clicked" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "right_bt";
-               mouse_events:  1;
-               description { state: "default" 0.0;
-                   rel1 { to: "bg";
-                       offset: -27 3;
-                   }
-                   rel2 { to: "bg";
-                       offset: -3 -3;
-                   }
-                   align: 1.0 0.5;
-                   min: 24 24;
-                   max: 24 24;
-                   image {
-                       normal: "bt_base1.png";
-                       border: 5 5 4 12;
-                   }
-                   fill.smooth : 0;
-               }
-               description { state: "clicked" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "bt_base1.png";
-                   image.middle: SOLID;
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
-               }
-           }
-           part { name: "right_over1";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "right_bt";
-                   rel2 { to: "right_bt";
-                       relative: 1.0 0.5;
-                   }
-                   image {
-                       normal: "bt_hilight.png";
-                       border: 7 7 7 0;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
-               }
-           }
-           part { name: "right_over2";
-               mouse_events: 1;
-               repeat_events: 1;
-               ignore_flags: ON_HOLD;
-               description { state: "default" 0.0;
-                   rel1.to: "right_bt";
-                   rel2.to: "right_bt";
-                   image {
-                       normal: "bt_shine.png";
-                       border: 7 7 7 7;
-                   }
-               }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 0;
-               }
-           }
-           part { name: "right_over3";
-               mouse_events: 1;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel1.to: "right_bt";
-                   rel2.to: "right_bt";
-                   image {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                   }
-                   fill.smooth : 0;
-               }
-               description { state: "clicked" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "left_bt_icon";
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "left_bt";
-                   rel2.to: "left_bt";
-                   align: 0.5 0.5;
-                   min: 16 16;
-                   max: 16 16;
-                   image.normal: "sp_bt_l.png";
+   group {
+      name: "elm/spinner/base/default";
+      images {
+         image: "shelf_inset.png" COMP;
+         image: "bt_base1.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+         image: "sp_bt_l.png" COMP;
+         image: "sp_bt_r.png" COMP;
+      }
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               max: 99999 30;
+               min: 0 30;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "conf_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               image {
+                  normal: "shelf_inset.png";
+                  border: 7 7 7 7;
+                  middle: 0;
                }
-           }
-           part { name: "right_bt_icon";
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "right_bt";
-                   rel2.to: "right_bt";
-                   align: 0.5 0.5;
-                   min: 16 16;
-                   max: 16 16;
-                   image.normal: "sp_bt_r.png";
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "left_bt";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "bg";
+                  offset: 2 2;
                }
-           }
-           part { name: "elm.text";
-               type: TEXT;
-               mouse_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 1;
-                   align: 0.0 0.5;
-                   rel1 { relative: 1.0 0.0;
-                       offset: 3 2;
-                       to_x: "left_bt";
-                       to_y: "bg";
-                   }
-                   rel2 { relative: 0.0 1.0;
-                       offset: -3 -2;
-                       to_x: "right_bt";
-                       to_y: "bg";
-                   }
-                   color: 0 0 0 255;
-                   text {
-                       font: "Sans,Edje-Vera";
-                       size: 10;
-                       min: 1 1;
-                       align: 0.5 0.5;
-                   }
+               rel2 {
+                  to: "bg";
+                  offset: -3 -3;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
+               align: 0.0 0.5;
+               min: 24 24;
+               max: 24 24;
+               image {
+                  normal: "bt_base1.png";
+                  border: 6 6 6 6;
                }
-               description { state: "disabled_active" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
+            }
+         }
+         part {
+            name: "left_over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "left_bt";
+               rel2 {
+                  to: "left_bt";
+                  relative: 1.0 0.5;
                }
-           }
-           part { name: "elm.dragable.slider";
-               type: RECT;
-               mouse_events: 0;
-               scale: 1;
-               dragable {
-                   x: 1 1 0;
-                   y: 0 0 0;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   fixed: 1 1;
-                   color: 0 0 0 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-           }
-           part { name: "button_events";
-               type: RECT;
-               dragable {
-                   events: "elm.dragable.slider";
+            }
+         }
+         part {
+            name: "left_over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               rel1.to: "left_bt";
+               rel2.to: "left_bt";
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.text";
-                   rel2.to: "elm.text";
-                   color: 0 0 0 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "left_over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.to: "left_bt";
+               rel2.to: "left_bt";
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-           part { name: "elm.swallow.entry";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   align: 0.5 0.5;
-                   rel1 { relative: 1.0 0.5;
-                       offset: 3 2;
-                       to_x: "left_bt";
-                       to_y: "bg";
-                   }
-                   rel2 { relative: 0.0 0.5;
-                       offset: -3 -2;
-                       to_x: "right_bt";
-                       to_y: "bg";
-                   }
-                   fixed: 1 1;
-                   color: 0 0 0 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "right_bt";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "bg";
+                  offset: -27 3;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to: "bg";
+                  offset: -3 -3;
                }
-               description { state: "disabled_active" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
+               align: 1.0 0.5;
+               min: 24 24;
+               max: 24 24;
+               image {
+                  normal: "bt_base1.png";
+                  border: 5 5 4 12;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_base1.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-           }
-           part { name: "disabler";
-               type: RECT;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   visible: 0;
+            }
+         }
+         part {
+            name: "right_over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "right_bt";
+               rel2 {
+                  to: "right_bt";
+                  relative: 1.0 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-       }
-       programs {
-           program { name: "text_show";
-               signal: "elm,state,text,visible";
-               source: "elm";
-               action:  STATE_SET "visible" 0.0;
-               target: "elm.text";
-           }
-           program { name: "text_hide";
-               signal: "elm,state,text,hidden";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "elm.text";
-           }
-           program { name: "dec";
-               signal: "mouse,down,1";
-               source: "left_bt";
-               action: SIGNAL_EMIT "elm,action,decrement,start" "";
-           }
-           program { name: "dec2";
-               signal: "mouse,up,1";
-               source: "left_bt";
-               action: SIGNAL_EMIT "elm,action,decrement,stop" "";
-           }
-           program { name: "inc";
-               signal: "mouse,down,1";
-               source: "right_bt";
-               action: SIGNAL_EMIT "elm,action,increment,start" "";
-           }
-           program { name: "inc2";
-               signal: "mouse,up,1";
-               source: "right_bt";
-               action: SIGNAL_EMIT "elm,action,increment,stop" "";
-           }
-           program {
-               name:   "left_bt_click";
-               signal: "mouse,down,1";
-               source: "left_over2";
-               action: STATE_SET "clicked" 0.0;
-               target: "left_bt";
-           }
-           program {
-               name:   "left_bt_unclick";
-               signal: "mouse,up,1";
-               source: "left_over2";
-               action: STATE_SET "default" 0.0;
-               target: "left_bt";
-           }
-           program {
-               name:   "left_bt_click2";
-               signal: "mouse,down,1";
-               source: "left_over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "left_over3";
-           }
-           program {
-               name:   "left_bt_unclick2";
-               signal: "mouse,up,1";
-               source: "left_over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "left_over3";
-           }
-           program {
-               name:   "left_bt_unclick3";
-               signal: "mouse,up,1";
-               source: "left_over2";
-               action: SIGNAL_EMIT "elm,action,click" "";
-           }
-
-           program {
-               name:   "right_bt_click";
-               signal: "mouse,down,1";
-               source: "right_over2";
-               action: STATE_SET "clicked" 0.0;
-               target: "right_bt";
-           }
-           program {
-               name:   "right_bt_unclick";
-               signal: "mouse,up,1";
-               source: "right_over2";
-               action: STATE_SET "default" 0.0;
-               target: "right_bt";
-           }
-           program {
-               name:   "right_bt_click2";
-               signal: "mouse,down,1";
-               source: "right_over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "right_over3";
-           }
-           program {
-               name:   "right_bt_unclick2";
-               signal: "mouse,up,1";
-               source: "right_over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "right_over3";
-           }
-           program {
-               name:   "right_bt_unclick3";
-               signal: "mouse,up,1";
-               source: "right_over2";
-               action: SIGNAL_EMIT "elm,action,click" "";
-           }
-           program { name: "disable";
-               signal: "elm,state,disabled";
-               source: "elm";
-               action: STATE_SET "disabled" 0.0;
-               target: "left_bt";
-               target: "left_over1";
-               target: "left_over2";
-               target: "right_bt";
-               target: "right_over1";
-               target: "right_over2";
-               target: "disabler";
-               after: "disable_text";
-           }
-           program { name: "disable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "active"))
-                   set_state(PART:"elm.text", "disabled_active", 0.0);
-                   else
-                   set_state(PART:"elm.text", "disabled", 0.0);
-
-                   get_state(PART:"elm.swallow.entry", st, 30, vl);
-                   if (!strcmp(st, "active"))
-                   set_state(PART:"elm.swallow.entry", "disabled_active", 0.0);
-                   else
-                   set_state(PART:"elm.swallow.entry", "disabled", 0.0);
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-           }
-           program { name: "enable";
-               signal: "elm,state,enabled";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "left_bt";
-               target: "left_over1";
-               target: "left_over2";
-               target: "right_bt";
-               target: "right_over1";
-               target: "right_over2";
-               target: "disabler";
-               after: "enable_text";
-           }
-           program { name: "enable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "disabled_active"))
-                   set_state(PART:"elm.text", "active", 0.0);
-                   else
-                   set_state(PART:"elm.text", "default", 0.0);
-
-                   get_state(PART:"elm.swallow.entry", st, 30, vl);
-                   if (!strcmp(st, "disabled_active"))
-                   set_state(PART:"elm.swallow.entry", "active", 0.0);
-                   else
-                   set_state(PART:"elm.swallow.entry", "default", 0.0);
+            }
+         }
+         part {
+            name: "right_over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               rel1.to: "right_bt";
+               rel2.to: "right_bt";
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-           }
-           program { name: "active";
-               signal: "elm,state,active";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               target: "elm.text";
-               target: "elm.swallow.entry";
-           }
-           program { name: "inactive";
-               signal: "elm,state,inactive";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "elm.text";
-               target: "elm.swallow.entry";
-           }
-           program { name: "toggle_text";
-               signal: "mouse,up,1";
-               source: "button_events";
-               action: SIGNAL_EMIT "elm,action,entry,toggle" "";
-           }
-       }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/spinner/base/vertical";
-       images {
-           image: "shelf_inset.png" COMP;
-           image: "bt_hilight.png" COMP;
-           image: "bt_shine.png" COMP;
-           image: "bt_glow.png" COMP;
-           image: "bt_dis_base.png" COMP;
-           image: "bt_dis_hilight.png" COMP;
-           image: "up.png" COMP;
-           image: "down.png" COMP;
-           image: "bt_spinner_up.png" COMP;
-           image: "bt_spinner_down.png" COMP;
-           image: "bt_spinner_hilight.png" COMP;
-       }
-       parts {
-           part { name: "bg";
-               type: RECT;
-               description { state: "default" 0.0;
-                   max: 99999 30;
-                   min: 0 30;
-                   rel1.offset: 1 1;
-                   rel2.offset: -2 -2;
-                   color: 255 255 255 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "right_over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.to: "right_bt";
+               rel2.to: "right_bt";
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-           part { name: "conf_over";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   rel1 {
-                     to: "bg";
-                     relative: 0.0 0.0;
-                   }
-                   rel2 {
-                      to_x: "down_bt";
-                      offset: -22 -1;
-                   }
-                   rel2 {
-                      to_y: "bg";
-                   }
-                   image {
-                       normal: "shelf_inset.png";
-                       border: 7 7 7 7;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "left_bt_icon";
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "left_bt";
+               rel2.to: "left_bt";
+               align: 0.5 0.5;
+               min: 16 16;
+               max: 16 16;
+               image.normal: "sp_bt_l.png";
+            }
+         }
+         part {
+            name: "right_bt_icon";
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "right_bt";
+               rel2.to: "right_bt";
+               align: 0.5 0.5;
+               min: 16 16;
+               max: 16 16;
+               image.normal: "sp_bt_r.png";
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: 3 2;
+                  to_x: "left_bt";
+                  to_y: "bg";
                }
-           }
-           part { name: "down_bt";
-               mouse_events:  1;
-               description { state: "default" 0.0;
-                   rel1 {
-                       to_x: "bg";
-                       to_y: "up_bt";
-                       relative: 1 1;
-                       offset: 0 1;
-                   }
-                   rel2 { to: "bg";
-                       relative: 1 1;
-                       offset: -1 -1;
-                   }
-                   align: 1.0 0.5;
-                   min: 24 16;
-                   max: 24 16;
-                   image {
-                       normal: "bt_spinner_down.png";
-                       border: 6 6 6 6;
-                   }
-                   fill.smooth : 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: -3 -2;
+                  to_x: "right_bt";
+                  to_y: "bg";
                }
-               description { state: "clicked" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "bt_spinner_down.png";
-                   image.middle: SOLID;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description {
+               state: "disabled_active" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+         }
+         part {
+            name: "elm.dragable.slider";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+            }
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "button_events";
+            type: RECT;
+            dragable {
+               events: "elm.dragable.slider";
+            }
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.text";
+               rel2.to: "elm.text";
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "elm.swallow.entry";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 0.5;
+                  offset: 3 2;
+                  to_x: "left_bt";
+                  to_y: "bg";
                }
-           }
-           part { name: "down_over3";
-               mouse_events: 1;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel1.to: "down_bt";
-                   rel2.to: "down_bt";
-                   image {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                   }
-                   fill.smooth : 0;
+               rel2 {
+                  relative: 0.0 0.5;
+                  offset: -3 -2;
+                  to_x: "right_bt";
+                  to_y: "bg";
+               }
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled_active" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "dec";
+            signal: "mouse,down,1";
+            source: "left_bt";
+            action: SIGNAL_EMIT "elm,action,decrement,start" "";
+         }
+         program {
+            name: "dec2";
+            signal: "mouse,up,1";
+            source: "left_bt";
+            action: SIGNAL_EMIT "elm,action,decrement,stop" "";
+         }
+         program {
+            name: "inc";
+            signal: "mouse,down,1";
+            source: "right_bt";
+            action: SIGNAL_EMIT "elm,action,increment,start" "";
+         }
+         program {
+            name: "inc2";
+            signal: "mouse,up,1";
+            source: "right_bt";
+            action: SIGNAL_EMIT "elm,action,increment,stop" "";
+         }
+         program {
+            name: "left_bt_click";
+            signal: "mouse,down,1";
+            source: "left_over2";
+            action: STATE_SET "clicked" 0.0;
+            target: "left_bt";
+         }
+         program {
+            name: "left_bt_unclick";
+            signal: "mouse,up,1";
+            source: "left_over2";
+            action: STATE_SET "default" 0.0;
+            target: "left_bt";
+         }
+         program {
+            name: "left_bt_click2";
+            signal: "mouse,down,1";
+            source: "left_over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "left_over3";
+         }
+         program {
+            name: "left_bt_unclick2";
+            signal: "mouse,up,1";
+            source: "left_over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "left_over3";
+         }
+         program {
+            name: "left_bt_unclick3";
+            signal: "mouse,up,1";
+            source: "left_over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "right_bt_click";
+            signal: "mouse,down,1";
+            source: "right_over2";
+            action: STATE_SET "clicked" 0.0;
+            target: "right_bt";
+         }
+         program {
+            name: "right_bt_unclick";
+            signal: "mouse,up,1";
+            source: "right_over2";
+            action: STATE_SET "default" 0.0;
+            target: "right_bt";
+         }
+         program {
+            name: "right_bt_click2";
+            signal: "mouse,down,1";
+            source: "right_over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "right_over3";
+         }
+         program {
+            name: "right_bt_unclick2";
+            signal: "mouse,up,1";
+            source: "right_over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "right_over3";
+         }
+         program {
+            name: "right_bt_unclick3";
+            signal: "mouse,up,1";
+            source: "right_over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "left_bt";
+            target: "left_over1";
+            target: "left_over2";
+            target: "right_bt";
+            target: "right_over1";
+            target: "right_over2";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "active"))
+                                               set_state(PART:"elm.text", "disabled_active", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "disabled", 0.0);
+               get_state(PART:"elm.swallow.entry", st, 30, vl);
+               if (!strcmp(st, "active"))
+                                               set_state(PART:"elm.swallow.entry", "disabled_active", 0.0);
+                                       else
+                                               set_state(PART:"elm.swallow.entry", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "left_bt";
+            target: "left_over1";
+            target: "left_over2";
+            target: "right_bt";
+            target: "right_over1";
+            target: "right_over2";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_active"))
+                                               set_state(PART:"elm.text", "active", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "default", 0.0);
+               get_state(PART:"elm.swallow.entry", st, 30, vl);
+               if (!strcmp(st, "disabled_active"))
+                                               set_state(PART:"elm.swallow.entry", "active", 0.0);
+                                       else
+                                               set_state(PART:"elm.swallow.entry", "default", 0.0);
+            }
+         }
+         program {
+            name: "active";
+            signal: "elm,state,active";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "elm.text";
+            target: "elm.swallow.entry";
+         }
+         program {
+            name: "inactive";
+            signal: "elm,state,inactive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+            target: "elm.swallow.entry";
+         }
+         program {
+            name: "toggle_text";
+            signal: "mouse,up,1";
+            source: "button_events";
+            action: SIGNAL_EMIT "elm,action,entry,toggle" "";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/spinner/base/vertical";
+      images {
+         image: "shelf_inset.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
+         image: "up.png" COMP;
+         image: "down.png" COMP;
+         image: "bt_spinner_up.png" COMP;
+         image: "bt_spinner_down.png" COMP;
+         image: "bt_spinner_hilight.png" COMP;
+      }
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               max: 99999 30;
+               min: 0 30;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "conf_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "bg";
+                  relative: 0.0 0.0;
                }
-               description { state: "clicked" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to_x: "down_bt";
+                  offset: -22 -1;
                }
-           }
-           part { name: "up_bt";
-               mouse_events:  1;
-               description { state: "default" 0.0;
-                   rel1 { to: "bg";
-                       relative: 0 0;
-                       offset: 0 0;
-                   }
-                   rel2 { to: "bg";
-                       relative: 1 0.5;
-                       offset: -1 -1;
-                   }
-                   align: 1.0 0.5;
-                   min: 24 16;
-                   max: 24 16;
-                   image {
-                       normal: "bt_spinner_up.png";
-                       border: 6 6 6 6;
-                   }
-                   fill.smooth : 0;
+               rel2 {
+                  to_y: "bg";
                }
-               description { state: "clicked" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "bt_spinner_up.png";
-                   image.middle: SOLID;
+               image {
+                  normal: "shelf_inset.png";
+                  border: 7 7 7 7;
+                  middle: 0;
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_base.png";
-                       border: 4 4 4 4;
-                   }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "down_bt";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to_x: "bg";
+                  to_y: "up_bt";
+                  relative: 1 1;
+                  offset: 0 1;
                }
-           }
-           part { name: "up_over1";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "up_bt";
-                   rel2 { to: "up_bt";
-                       relative: 1.0 0.5;
-                   }
-                   image {
-                       normal: "bt_spinner_hilight.png";
-                       border: 7 7 7 0;
-                   }
+               rel2 {
+                  to: "bg";
+                  relative: 1 1;
+                  offset: -1 -1;
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
-                   image {
-                       normal: "bt_dis_hilight.png";
-                       border: 4 4 4 0;
-                   }
+               align: 1.0 0.5;
+               min: 24 16;
+               max: 24 16;
+               image {
+                  normal: "bt_spinner_down.png";
+                  border: 6 6 6 6;
                }
-           }
-           part { name: "up_over3";
-               mouse_events: 1;
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   color: 255 255 255 0;
-                   rel1.to: "up_bt";
-                   rel2.to: "up_bt";
-                   image {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                   }
-                   fill.smooth : 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_spinner_down.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-               description { state: "clicked" 0.0;
-                   inherit:  "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "down_over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.to: "down_bt";
+               rel2.to: "down_bt";
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-           part { name: "down_bt_icon";
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "down_bt";
-                   rel2.to: "down_bt";
-                   align: 0.5 0.5;
-                   min: 14 12;
-                   max: 14 12;
-                   image.normal: "down.png";
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "up_bt";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "bg";
+                  relative: 0 0;
+                  offset: 0 0;
                }
-           }
-           part { name: "up_bt_icon";
-               repeat_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "up_bt";
-                   rel2.to: "up_bt";
-                   align: 0.5 0.5;
-                   min: 14 12;
-                   max: 14 12;
-                   image.normal: "up.png";
+               rel2 {
+                  to: "bg";
+                  relative: 1 0.5;
+                  offset: -1 -1;
                }
-           }
-           part { name: "elm.text";
-               type: TEXT;
-               mouse_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                   visible: 1;
-                   align: 0.0 0.5;
-                   rel1 { relative: 0.0 0.0;
-                       offset: 3 2;
-                       to_x: "bg";
-                       to_y: "bg";
-                   }
-                   rel2 { relative: 0.0 1.0;
-                       offset: -3 -2;
-                       to_x: "bg";
-                       to_y: "bg";
-                   }
-                   color: 0 0 0 255;
-                   text {
-                       font: "Sans,Edje-Vera";
-                       size: 10;
-                       min: 1 1;
-                       align: 0.5 0.5;
-                   }
+               align: 1.0 0.5;
+               min: 24 16;
+               max: 24 16;
+               image {
+                  normal: "bt_spinner_up.png";
+                  border: 6 6 6 6;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "bt_spinner_up.png";
+               image.middle: SOLID;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
                }
-               description { state: "disabled_active" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
+            }
+         }
+         part {
+            name: "up_over1";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "up_bt";
+               rel2 {
+                  to: "up_bt";
+                  relative: 1.0 0.5;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 128;
-                   color3: 0 0 0 0;
+               image {
+                  normal: "bt_spinner_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-           part { name: "elm.dragable.slider";
-               type: RECT;
-               mouse_events: 0;
-               scale: 1;
-               dragable {
-                   x: 1 1 0;
-                   y: 0 0 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "bt_dis_hilight.png";
+                  border: 4 4 4 0;
                }
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-                   fixed: 1 1;
-                   color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "up_over3";
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.to: "up_bt";
+               rel2.to: "up_bt";
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
                }
-           }
-           part { name: "button_events";
-               type: RECT;
-               dragable {
-                   events: "elm.dragable.slider";
+               fill.smooth : 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "down_bt_icon";
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "down_bt";
+               rel2.to: "down_bt";
+               align: 0.5 0.5;
+               min: 14 12;
+               max: 14 12;
+               image.normal: "down.png";
+            }
+         }
+         part {
+            name: "up_bt_icon";
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "up_bt";
+               rel2.to: "up_bt";
+               align: 0.5 0.5;
+               min: 14 12;
+               max: 14 12;
+               image.normal: "up.png";
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 3 2;
+                  to_x: "bg";
+                  to_y: "bg";
                }
-               mouse_events: 1;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.text";
-                   rel2.to: "elm.text";
-                   color: 0 0 0 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: -3 -2;
+                  to_x: "bg";
+                  to_y: "bg";
                }
-           }
-           part { name: "elm.swallow.entry";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   align: 0.5 0.5;
-                   rel1 { relative: 0.0 0.5;
-                       offset: 3 2;
-                       to: "bg";
-                   }
-                   rel2 { relative: 1.0 0.5;
-                       offset: -3 -2;
-                       to: "bg";
-                   }
-                   fixed: 1 1;
-                   color: 0 0 0 0;
+               color: 0 0 0 255;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description {
+               state: "disabled_active" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+         }
+         part {
+            name: "elm.dragable.slider";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+            }
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "button_events";
+            type: RECT;
+            dragable {
+               events: "elm.dragable.slider";
+            }
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.text";
+               rel2.to: "elm.text";
+               color: 0 0 0 0;
+            }
+         }
+         part {
+            name: "elm.swallow.entry";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               align: 0.5 0.5;
+               rel1 {
+                  relative: 0.0 0.5;
+                  offset: 3 2;
+                  to: "bg";
                }
-               description { state: "disabled_active" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
+               rel2 {
+                  relative: 1.0 0.5;
+                  offset: -3 -2;
+                  to: "bg";
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 0;
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled_active" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part {
+            name: "disabler";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+         }
+         program {
+            name: "dec";
+            signal: "mouse,down,1";
+            source: "down_bt";
+            action: SIGNAL_EMIT "elm,action,decrement,start" "";
+         }
+         program {
+            name: "dec2";
+            signal: "mouse,up,1";
+            source: "down_bt";
+            action: SIGNAL_EMIT "elm,action,decrement,stop" "";
+         }
+         program {
+            name: "inc";
+            signal: "mouse,down,1";
+            source: "up_bt";
+            action: SIGNAL_EMIT "elm,action,increment,start" "";
+         }
+         program {
+            name: "inc2";
+            signal: "mouse,up,1";
+            source: "up_bt";
+            action: SIGNAL_EMIT "elm,action,increment,stop" "";
+         }
+         program {
+            name: "down_bt_click2";
+            signal: "mouse,down,1";
+            source: "down_over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "down_over3";
+         }
+         program {
+            name: "down_bt_unclick2";
+            signal: "mouse,up,1";
+            source: "down_over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "down_over3";
+         }
+         program {
+            name: "up_bt_click2";
+            signal: "mouse,down,1";
+            source: "up_over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "up_over3";
+         }
+         program {
+            name: "up_bt_unclick2";
+            signal: "mouse,up,1";
+            source: "up_over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "up_over3";
+         }
+         program {
+            name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "down_bt";
+            target: "up_bt";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program {
+            name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "active"))
+                                               set_state(PART:"elm.text", "disabled_active", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "disabled", 0.0);
+               get_state(PART:"elm.swallow.entry", st, 30, vl);
+               if (!strcmp(st, "active"))
+                                               set_state(PART:"elm.swallow.entry", "disabled_active", 0.0);
+                                       else
+                                               set_state(PART:"elm.swallow.entry", "disabled", 0.0);
+            }
+         }
+         program {
+            name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "down_bt";
+            target: "up_bt";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program {
+            name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_active"))
+                                               set_state(PART:"elm.text", "active", 0.0);
+                                       else
+                                               set_state(PART:"elm.text", "default", 0.0);
+               get_state(PART:"elm.swallow.entry", st, 30, vl);
+               if (!strcmp(st, "disabled_active"))
+                                               set_state(PART:"elm.swallow.entry", "active", 0.0);
+                                       else
+                                               set_state(PART:"elm.swallow.entry", "default", 0.0);
+            }
+         }
+         program {
+            name: "active";
+            signal: "elm,state,active";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            target: "elm.text";
+            target: "elm.swallow.entry";
+         }
+         program {
+            name: "inactive";
+            signal: "elm,state,inactive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+            target: "elm.swallow.entry";
+         }
+         program {
+            name: "toggle_text";
+            signal: "mouse,up,1";
+            source: "button_events";
+            action: SIGNAL_EMIT "elm,action,entry,toggle" "";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/index/base/vertical/default";
+      images {
+         image: "bt_base1.png" COMP;
+         image: "bt_base2.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+      }
+      parts {
+         part {
+            name: "clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "active" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "clip2";
+            type: RECT;
+            mouse_events: 0;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "active" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.swallow.index.0";
+            type: SWALLOW;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0 0.5;
+                  offset: -1 5;
                }
-           }
-           part { name: "disabler";
-               type: RECT;
-               description { state: "default" 0.0;
-                   color: 0 0 0 0;
-                   visible: 0;
+               rel2 {
+                  relative: 1.0 0.5;
+                  offset: -1 -6;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
+            }
+         }
+         part {
+            name: "button_image";
+            mouse_events: 1;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "elm.text.body";
+                  offset: -5 -5;
                }
-           }
-       }
-       programs {
-           program { name: "text_show";
-               signal: "elm,state,text,visible";
-               source: "elm";
-               action:  STATE_SET "visible" 0.0;
-               target: "elm.text";
-           }
-           program { name: "text_hide";
-               signal: "elm,state,text,hidden";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "elm.text";
-           }
-           program { name: "dec";
-               signal: "mouse,down,1";
-               source: "down_bt";
-               action: SIGNAL_EMIT "elm,action,decrement,start" "";
-           }
-           program { name: "dec2";
-               signal: "mouse,up,1";
-               source: "down_bt";
-               action: SIGNAL_EMIT "elm,action,decrement,stop" "";
-           }
-           program { name: "inc";
-               signal: "mouse,down,1";
-               source: "up_bt";
-               action: SIGNAL_EMIT "elm,action,increment,start" "";
-           }
-           program { name: "inc2";
-               signal: "mouse,up,1";
-               source: "up_bt";
-               action: SIGNAL_EMIT "elm,action,increment,stop" "";
-           }
-           program {
-               name:   "down_bt_click2";
-               signal: "mouse,down,1";
-               source: "down_over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "down_over3";
-           }
-           program {
-               name:   "down_bt_unclick2";
-               signal: "mouse,up,1";
-               source: "down_over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "down_over3";
-           }
-           program {
-               name:   "up_bt_click2";
-               signal: "mouse,down,1";
-               source: "up_over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "up_over3";
-           }
-           program {
-               name:   "up_bt_unclick2";
-               signal: "mouse,up,1";
-               source: "up_over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "up_over3";
-           }
-           program { name: "disable";
-               signal: "elm,state,disabled";
-               source: "elm";
-               action: STATE_SET "disabled" 0.0;
-               target: "down_bt";
-               target: "up_bt";
-               target: "disabler";
-               after: "disable_text";
-           }
-           program { name: "disable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "active"))
-                   set_state(PART:"elm.text", "disabled_active", 0.0);
-                   else
-                   set_state(PART:"elm.text", "disabled", 0.0);
-
-                   get_state(PART:"elm.swallow.entry", st, 30, vl);
-                   if (!strcmp(st, "active"))
-                   set_state(PART:"elm.swallow.entry", "disabled_active", 0.0);
-                   else
-                   set_state(PART:"elm.swallow.entry", "disabled", 0.0);
+               rel2 {
+                  to: "elm.text";
+                  offset: 4 4;
                }
-           }
-           program { name: "enable";
-               signal: "elm,state,enabled";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "down_bt";
-               target: "up_bt";
-               target: "disabler";
-               after: "enable_text";
-           }
-           program { name: "enable_text";
-               script {
-                   new st[31];
-                   new Float:vl;
-                   get_state(PART:"elm.text", st, 30, vl);
-                   if (!strcmp(st, "disabled_active"))
-                   set_state(PART:"elm.text", "active", 0.0);
-                   else
-                   set_state(PART:"elm.text", "default", 0.0);
-
-                   get_state(PART:"elm.swallow.entry", st, 30, vl);
-                   if (!strcmp(st, "disabled_active"))
-                   set_state(PART:"elm.swallow.entry", "active", 0.0);
-                   else
-                   set_state(PART:"elm.swallow.entry", "default", 0.0);
+               image {
+                  normal: "bt_base2.png";
+                  border: 7 7 7 7;
                }
-           }
-           program { name: "active";
-               signal: "elm,state,active";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               target: "elm.text";
-               target: "elm.swallow.entry";
-           }
-           program { name: "inactive";
-               signal: "elm,state,inactive";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "elm.text";
-               target: "elm.swallow.entry";
-           }
-           program { name: "toggle_text";
-               signal: "mouse,up,1";
-               source: "button_events";
-               action: SIGNAL_EMIT "elm,action,entry,toggle" "";
-           }
-       }
-   }
-
-
-   ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/index/base/vertical/default";
-       images {
-           image: "bt_base1.png" COMP;
-           image: "bt_base2.png" COMP;
-           image: "bt_hilight.png" COMP;
-           image: "bt_shine.png" COMP;
-       }
-       parts {
-           part { name: "clip";
-               type: RECT;
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   visible:  0;
-                   color: 255 255 255 0;
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "elm.text.body";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  to: "elm.text";
+                  relative: 0.0 0.0;
+                  offset: 5 0;
                }
-               description { state: "active" 0.0;
-                   visible:  1;
-                   color: 255 255 255 255;
+               rel2 {
+                  to: "elm.text";
+                  relative: 0.0 1.0;
+                  offset: 5 -1;
                }
-           }
-           part { name: "clip2";
-               type: RECT;
-               mouse_events:  0;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 20;
+                  min: 1 1;
+                  align: 1.0 0.5;
                }
-               description { state: "active" 0.0;
-                   visible:  1;
-                   color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  to_x: "elm.swallow.event.0";
+                  to_y: "elm.dragable.pointer";
+                  relative: 0.0 0.5;
+                  offset: -16 0;
                }
-           }
-           part { name: "elm.swallow.index.0";
-               type: SWALLOW;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   align: 1.0 0.5;
-                   rel1 {
-                       relative: 1.0 0.5;
-                       offset: -1 5;
-                   }
-                   rel2 {
-                       relative: 1.0 0.5;
-                       offset: -1 -6;
-                   }
+               rel2 {
+                  to_x: "elm.swallow.event.0";
+                  to_y: "elm.dragable.pointer";
+                  relative: 0.0 0.5;
+                  offset: -16 -1;
                }
-           }
-           part { name: "button_image";
-               mouse_events: 1;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "elm.text.body";
-                       offset: -5 -5;
-                   }
-                   rel2 {
-                       to: "elm.text";
-                       offset: 4 4;
-                   }
-                   image {
-                       normal: "bt_base2.png";
-                       border: 7 7 7 7;
-                   }
-                   image.middle: SOLID;
+               color: 255 0 0 255;
+               color3: 0 0 0 64;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 20;
+                  min: 1 1;
+                  align: 1.0 0.5;
                }
-           }
-           part { name: "elm.text.body";
-               type: TEXT;
-               effect: SOFT_SHADOW;
-               mouse_events: 0;
-               scale: 1;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   align: 1.0 0.5;
-                   rel1 {
-                       to: "elm.text";
-                       relative: 0.0 0.0;
-                       offset: 5 0;
-                   }
-                   rel2 {
-                       to: "elm.text";
-                       relative: 0.0 1.0;
-                       offset: 5 -1;
-                   }
-                   color: 224 224 224 255;
-                   color3: 0 0 0 64;
-                   text {
-                       font:     "Sans,Edje-Vera";
-                       size:     20;
-                       min:      1 1;
-                       align:    1.0 0.5;
-                   }
+            }
+         }
+         part {
+            name: "over1";
+            mouse_events: 0;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "button_image";
                }
-           }
-           part { name: "elm.text";
-               type: TEXT;
-               effect: SOFT_SHADOW;
-               mouse_events: 0;
-               scale: 1;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   align: 1.0 0.5;
-                   rel1 {
-                       to_x: "elm.swallow.event.0";
-                       to_y: "elm.dragable.pointer";
-                       relative: 0.0 0.5;
-                       offset: -16 0;
-                   }
-                   rel2 {
-                       to_x: "elm.swallow.event.0";
-                       to_y: "elm.dragable.pointer";
-                       relative: 0.0 0.5;
-                       offset: -16 -1;
-                   }
-                   color: 255 0 0 255;
-                   color3: 0 0 0 64;
-                   text {
-                       font:     "Sans,Edje-Vera";
-                       size:     20;
-                       min:      1 1;
-                       align:    1.0 0.5;
-                   }
+               rel2 {
+                  to: "button_image";
+                  relative: 1.0 0.5;
                }
-           }
-           part {      name: "over1";
-               mouse_events: 0;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "button_image";
-                   }
-                   rel2 {
-                       to: "button_image";
-                       relative: 1.0 0.5;
-                   }
-                   image {
-                       normal: "bt_hilight.png";
-                       border: 7 7 7 0;
-                   }
+               image {
+                  normal: "bt_hilight.png";
+                  border: 7 7 7 0;
                }
-           }
-           part { name: "over2";
-               mouse_events: 1;
-               repeat_events: 1;
-               ignore_flags: ON_HOLD;
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   rel1 {
-                       to: "button_image";
-                   }
-                   rel2 {
-                       to: "button_image";
-                   }
-                   image {
-                       normal: "bt_shine.png";
-                       border: 7 7 7 7;
-                   }
+            }
+         }
+         part {
+            name: "over2";
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "button_image";
                }
-           }
-           part { name: "elm.dragable.pointer";
-               type: RECT;
-               mouse_events: 0;
-               dragable {
-                   x: 1 1 0;
-                   y: 1 1 0;
+               rel2 {
+                  to: "button_image";
                }
-               clip_to: "clip";
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 8 8;
-                   max: 8 8;
-                   rel1 {
-                       relative: 0.0 0.0;
-                       offset:   0 0;
-                   }
-                   rel2 {
-                       relative: 0.0 0.0;
-                       offset:   0 0;
-                   }
-                   color: 0 0 255 128;
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
                }
-           }
-           part { name: "elm.swallow.event.0";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   align: 1.0 0.5;
-                   rel1 {
-                       relative: 1.0 0.0;
-                       offset: -1 0;
-                   }
-                   rel2 {
-                       relative: 1.0 1.0;
-                       offset: -1 -1;
-                   }
+            }
+         }
+         part {
+            name: "elm.dragable.pointer";
+            type: RECT;
+            mouse_events: 0;
+            dragable {
+               x: 1 1 0;
+               y: 1 1 0;
+            }
+            clip_to: "clip";
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 8 8;
+               max: 8 8;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
                }
-           }
-       }
-       programs {
-           program { name: "active";
-               signal: "elm,state,active";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               transition: DECELERATE 0.5;
-               target: "clip";
-           }
-           program { name: "inactive";
-               signal: "elm,state,inactive";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "clip";
-           }
-       }
-   }
-
-   group { name: "elm/index/item/vertical/default";
-       data.item: "stacking" "above";
-       data.item: "selectraise" "on";
-       images {
-           image: "ilist_1.png" COMP;
-           image: "ilist_item_shadow.png" COMP;
-       }
-       parts {
-           part {
-               name: "base_sh";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   align: 0.0 0.0;
-                   min: 0 10;
-                   fixed: 1 1;
-                   rel1 {
-                       to: "base";
-                       relative: 0.0 1.0;
-                       offset: 0 0;
-                   }
-                   rel2 {
-                       to: "base";
-                       relative: 1.0 1.0;
-                       offset: -1 0;
-                   }
-                   image {
-                       normal: "ilist_item_shadow.png";
-                   }
-                   fill.smooth: 0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
                }
-           }
-           part {
-               name: "base";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   image {
-                       normal: "ilist_1.png";
-                       border: 2 2 2 2;
-                   }
-                   fill.smooth: 0;
+               color: 0 0 255 128;
+            }
+         }
+         part {
+            name: "elm.swallow.event.0";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -1 0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "active";
+            signal: "elm,state,active";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            transition: DECELERATE 0.5;
+            target: "clip";
+         }
+         program {
+            name: "inactive";
+            signal: "elm,state,inactive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "clip";
+         }
+      }
+   }
+   group {
+      name: "elm/index/item/vertical/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      images {
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+      }
+      parts {
+         part {
+            name: "base_sh";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 0 10;
+               fixed: 1 1;
+               rel1 {
+                  to: "base";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   rel1 {
-                       offset: -16 0;
-                   }
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
                }
-           }
-           part { name: "elm.text";
-               type:           TEXT;
-               mouse_events:   0;
-               scale: 1;
-               description {
-                   state: "default" 0.0;
-                          //               min: 16 16;
-                   rel1 {
-                       to: "base";
-                       relative: 0.0  0.0;
-                       offset:   4 4;
-                   }
-                   rel2 {
-                       to: "base";
-                       relative: 1.0  1.0;
-                       offset:   -5 -5;
-                   }
-                   color: 0 0 0 128;
-                   text {
-                       font: "Sans";
-                       size: 10;
-                       min: 1 1;
-                            //                  min: 0 1;
-                       align: 0.0 0.5;
-                   }
+               image {
+                  normal: "ilist_item_shadow.png";
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 255;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_1.png";
+                  border: 2 2 2 2;
                }
-           }
-       }
-       programs {
-           program { name: "active";
-               signal: "elm,state,active";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               transition: DECELERATE 0.5;
-               target: "elm.text";
-               target: "base";
-           }
-           program { name: "inactive";
-               signal: "elm,state,inactive";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "elm.text";
-               target: "base";
-           }
-       }
-   }
-
-   group { name: "elm/index/item_odd/vertical/default";
-       data.item: "stacking" "below";
-       images {
-           image: "ilist_2.png" COMP;
-       }
-       parts {
-           part {
-               name: "base";
-               mouse_events: 0;
-               description {
-                   state: "default" 0.0;
-                   image {
-                       normal: "ilist_2.png";
-                       border: 2 2 2 2;
-                   }
-                   fill.smooth: 0;
+               fill.smooth: 0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  offset: -16 0;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   rel1 {
-                       offset: -16 0;
-                   }
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to: "base";
+                  relative: 0.0  0.0;
+                  offset: 4 4;
                }
-           }
-           part { name: "elm.text";
-               type:           TEXT;
-               mouse_events:   0;
-               scale: 1;
-               description {
-                   state: "default" 0.0;
-                          //               min: 16 16;
-                   rel1 {
-                       to: "base";
-                       relative: 0.0  0.0;
-                       offset:   4 4;
-                   }
-                   rel2 {
-                       to: "base";
-                       relative: 1.0  1.0;
-                       offset:   -5 -5;
-                   }
-                   color: 0 0 0 128;
-                   text {
-                       font: "Sans";
-                       size: 10;
-                       min: 1 1;
-                            //                  min: 0 1;
-                       align: 0.0 0.5;
-                   }
+               rel2 {
+                  to: "base";
+                  relative: 1.0  1.0;
+                  offset: -5 -5;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   color: 0 0 0 255;
+               color: 0 0 0 128;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
                }
-           }
-       }
-       programs {
-           program { name: "active";
-               signal: "elm,state,active";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               transition: DECELERATE 0.5;
-               target: "elm.text";
-               target: "base";
-           }
-           program { name: "inactive";
-               signal: "elm,state,inactive";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "elm.text";
-               target: "base";
-           }
-       }
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 255;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "active";
+            signal: "elm,state,active";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.text";
+            target: "base";
+         }
+         program {
+            name: "inactive";
+            signal: "elm,state,inactive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.text";
+            target: "base";
+         }
+      }
    }
 
    ///////////////////////////////////////////////////////////////////////////////
@@ -21500,1598 +23855,1798 @@ collections {
                        set_int(sbvis_v, 0);
                    }
                }
-               v = get_int(sbvis_h);
-               if (v) {
-                   v = get_int(sbalways_h);
-                   if (!v) {
-                       emit("do-hide-hbar", "");
-                       set_int(sbvis_h, 0);
-                   }
-               }
-               set_int(sbvis_timer, 0);
-               return 0;
-           }
-       }
-       images {
-           image: "shelf_inset.png" COMP;
-           image: "bt_sm_base2.png" COMP;
-           image: "bt_sm_shine.png" COMP;
-           image: "bt_sm_hilight.png" COMP;
-           image: "sb_runnerh.png" COMP;
-           image: "sb_runnerv.png" COMP;
-           image: "busy-1.png" COMP;
-           image: "busy-2.png" COMP;
-           image: "busy-3.png" COMP;
-           image: "busy-4.png" COMP;
-           image: "busy-5.png" COMP;
-           image: "busy-6.png" COMP;
-           image: "busy-7.png" COMP;
-           image: "busy-8.png" COMP;
-           image: "busy-9.png" COMP;
-       }
-       parts {
-           part { name: "bg";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.offset: 1 1;
-                   rel2.offset: -2 -2;
-                   color: 255 255 255 0;
-               }
-           }
-           part { name: "clipper";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-               }
-           }
-           part { name: "elm.swallow.content";
-               clip_to: "clipper";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.offset: 1 1;
-                   rel2.offset: -2 -2;
-               }
-           }
-           part { name: "busy_clip";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+               fill.smooth: 0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  offset: -16 0;
                }
-               description { state: "active" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               // min: 16 16;
+               rel1 {
+                  to: "base";
+                  relative: 0.0  0.0;
+                  offset: 4 4;
                }
-           }
-           part { name: "busy";
-               clip_to: "busy_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 32 32;
-                   aspect: 1.0 1.0;
-                   align: 1.0 1.0;
-                   aspect_preference: BOTH;
-                   rel1 {
-                       relative: 0.9 0.9;
-                       offset:   -9 -9;
-                   }
-                   rel2 {
-                       relative: 0.9 0.9;
-                       offset:   -9 -9;
-                   }
-                   image {
-                       normal: "busy-9.png";
-                       tween:  "busy-1.png";
-                       tween:  "busy-2.png";
-                       tween:  "busy-3.png";
-                       tween:  "busy-4.png";
-                       tween:  "busy-5.png";
-                       tween:  "busy-6.png";
-                       tween:  "busy-7.png";
-                       tween:  "busy-8.png";
-                   }
+               rel2 {
+                  to: "base";
+                  relative: 1.0  1.0;
+                  offset: -5 -5;
                }
-           }
-           part { name: "conf_over";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   rel1.offset: 0 0;
-                   rel2.offset: -1 -1;
-                   image {
-                       normal: "shelf_inset.png";
-                       border: 7 7 7 7;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
+               color: 0 0 0 128;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  // min: 0 1;
+                  align: 0.0 0.5;
                }
-           }
-           part { name: "sb_vbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 255;
+            }
+         }
+      }
+      programs {
+         program {
+            name: "active";
+            signal: "elm,state,active";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.text";
+            target: "base";
+         }
+         program {
+            name: "inactive";
+            signal: "elm,state,inactive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "elm.text";
+            target: "base";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/photocam/base/default";
+      script {
+         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
+         public timer0(val) {
+            new v;
+            v = get_int(sbvis_v);
+            if (v) {
+               v = get_int(sbalways_v);
+               if (!v) {
+                  emit("do-hide-vbar", "");
+                  set_int(sbvis_v, 0);
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+            }
+            v = get_int(sbvis_h);
+            if (v) {
+               v = get_int(sbalways_h);
+               if (!v) {
+                  emit("do-hide-hbar", "");
+                  set_int(sbvis_h, 0);
                }
-           }
-           part { name: "sb_vbar_clip";
-               clip_to: "sb_vbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+            }
+            set_int(sbvis_timer, 0);
+            return 0;
+         }
+      }
+      images {
+         image: "shelf_inset.png" COMP;
+         image: "bt_sm_base2.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "sb_runnerh.png" COMP;
+         image: "sb_runnerv.png" COMP;
+         image: "busy-1.png" COMP;
+         image: "busy-2.png" COMP;
+         image: "busy-3.png" COMP;
+         image: "busy-4.png" COMP;
+         image: "busy-5.png" COMP;
+         image: "busy-6.png" COMP;
+         image: "busy-7.png" COMP;
+         image: "busy-8.png" COMP;
+         image: "busy-9.png" COMP;
+      }
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            clip_to: "clipper";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+            }
+         }
+         part {
+            name: "busy_clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "active" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "busy";
+            clip_to: "busy_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 32 32;
+               aspect: 1.0 1.0;
+               align: 1.0 1.0;
+               aspect_preference: BOTH;
+               rel1 {
+                  relative: 0.9 0.9;
+                  offset: -9 -9;
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+               rel2 {
+                  relative: 0.9 0.9;
+                  offset: -9 -9;
                }
-           }
-           part { name: "sb_vbar";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   visible: 0;
-                   min: 17 17;
-                   align: 1.0 0.0;
-                   rel1 {
-                       relative: 1.0 0.0;
-                       offset:   -2 0;
-                   }
-                   rel2 {
-                       relative: 1.0 0.0;
-                       offset:   -2 -1;
-                       to_y:     "sb_hbar";
-                   }
+               image {
+                  normal: "busy-9.png";
+                  tween: "busy-1.png";
+                  tween: "busy-2.png";
+                  tween: "busy-3.png";
+                  tween: "busy-4.png";
+                  tween: "busy-5.png";
+                  tween: "busy-6.png";
+                  tween: "busy-7.png";
+                  tween: "busy-8.png";
                }
-           }
-           part { name: "sb_vbar_runner";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   min: 3 3;
-                   max: 3 99999;
-                   rel1.to:       "sb_vbar";
-                   rel2.to:       "sb_vbar";
-                   image {
-                       normal: "sb_runnerv.png";
-                       border: 0 0 4 4;
-                   }
-                   fill.smooth: 0;
+            }
+         }
+         part {
+            name: "conf_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 0 0;
+               rel2.offset: -1 -1;
+               image {
+                  normal: "shelf_inset.png";
+                  border: 7 7 7 7;
+                  middle: 0;
                }
-           }
-           part { name: "elm.dragable.vbar";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               dragable {
-                   x: 0 0 0;
-                   y: 1 1 0;
-                   confine: "sb_vbar";
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "sb_vbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_vbar_clip";
+            clip_to: "sb_vbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_vbar";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 17 17;
+               align: 1.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -2 0;
                }
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 17 17;
-                   rel1 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_vbar";
-                   }
-                   rel2 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_vbar";
-                   }
-                   image {
-                       normal: "bt_sm_base2.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: -2 -1;
+                  to_y: "sb_hbar";
                }
-           }
-           part { name: "sb_vbar_over1";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.vbar";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "elm.dragable.vbar";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+            }
+         }
+         part {
+            name: "sb_vbar_runner";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 3 3;
+               max: 3 99999;
+               rel1.to: "sb_vbar";
+               rel2.to: "sb_vbar";
+               image {
+                  normal: "sb_runnerv.png";
+                  border: 0 0 4 4;
                }
-           }
-           part { name: "sb_vbar_over2";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.vbar";
-                   rel2.to: "elm.dragable.vbar";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.dragable.vbar";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 0 0 0;
+               y: 1 1 0;
+               confine: "sb_vbar";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 17 17;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_vbar";
                }
-           }
-
-           part { name: "sb_hbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_vbar";
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
                }
-           }
-           part { name: "sb_hbar_clip";
-               clip_to: "sb_hbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "sb_vbar_over1";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.vbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.vbar";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_vbar_over2";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.vbar";
+               rel2.to: "elm.dragable.vbar";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-           }
-           part { name: "sb_hbar";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   visible: 0;
-                   min: 17 17;
-                   align: 0.0 1.0;
-                   rel1 {
-                       relative: 0.0 1.0;
-                       offset:   0 -2;
-                   }
-                   rel2 {
-                       relative: 0.0 1.0;
-                       offset:   -1 -2;
-                       to_x:     "sb_vbar";
-                   }
+            }
+         }
+         part {
+            name: "sb_hbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_hbar_clip";
+            clip_to: "sb_hbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_hbar";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 17 17;
+               align: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 -2;
                }
-           }
-           part { name: "sb_hbar_runner";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   min: 3 3;
-                   max: 99999 3;
-                   rel1.to:       "sb_hbar";
-                   rel2.to:       "sb_hbar";
-                   image {
-                       normal: "sb_runnerh.png";
-                       border: 4 4 0 0;
-                   }
-                   fill.smooth: 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: -1 -2;
+                  to_x: "sb_vbar";
                }
-           }
-           part { name: "elm.dragable.hbar";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               dragable {
-                   x: 1 1 0;
-                   y: 0 0 0;
-                   confine: "sb_hbar";
+            }
+         }
+         part {
+            name: "sb_hbar_runner";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 3 3;
+               max: 99999 3;
+               rel1.to: "sb_hbar";
+               rel2.to: "sb_hbar";
+               image {
+                  normal: "sb_runnerh.png";
+                  border: 4 4 0 0;
                }
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 17 17;
-                   rel1 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_hbar";
-                   }
-                   rel2 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_hbar";
-                   }
-                   image {
-                       normal: "bt_sm_base2.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.dragable.hbar";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+               confine: "sb_hbar";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 17 17;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_hbar";
                }
-           }
-           part { name: "sb_hbar_over1";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.hbar";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "elm.dragable.hbar";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_hbar";
                }
-           }
-           part { name: "sb_hbar_over2";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.hbar";
-                   rel2.to: "elm.dragable.hbar";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
                }
-           }
-       }
-       programs {
-           program { name: "load";
-               signal: "load";
-               source: "";
-               script {
-                   set_state(PART:"sb_hbar_clip", "hidden", 0.0);
-                   set_state(PART:"sb_vbar_clip", "hidden", 0.0);
-                   set_int(sbvis_h, 0);
-                   set_int(sbvis_v, 0);
-                   set_int(sbalways_v, 0);
-                   set_int(sbalways_h, 0);
-                   set_int(sbvis_timer, 0);
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "sb_hbar_over1";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.hbar";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-           }
-
-           program { name: "vbar_show";
-               signal: "elm,action,show,vbar";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "sb_vbar_clip_master";
-           }
-           program { name: "vbar_hide";
-               signal: "elm,action,hide,vbar";
-               source: "elm";
-               action:  STATE_SET "hidden" 0.0;
-               target: "sb_vbar_clip_master";
-           }
-           program { name: "vbar_show_always";
-               signal: "elm,action,show_always,vbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbvis_v);
-                   v |= get_int(sbalways_v);
-                   if (!v) {
-                       set_int(sbalways_v, 1);
-                       emit("do-show-vbar", "");
-                       set_int(sbvis_v, 1);
-                   }
+            }
+         }
+         part {
+            name: "sb_hbar_over2";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.to: "elm.dragable.hbar";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-           }
-           program { name: "vbar_show_notalways";
-               signal: "elm,action,show_notalways,vbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbalways_v);
-                   if (v) {
-                       set_int(sbalways_v, 0);
-                       v = get_int(sbvis_v);
-                       if (!v) {
-                           emit("do-hide-vbar", "");
-                           set_int(sbvis_v, 0);
-                       }
-                   }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "load";
+            signal: "load";
+            source: "";
+            script {
+               set_state(PART:"sb_hbar_clip", "hidden", 0.0);
+               set_state(PART:"sb_vbar_clip", "hidden", 0.0);
+               set_int(sbvis_h, 0);
+               set_int(sbvis_v, 0);
+               set_int(sbalways_v, 0);
+               set_int(sbalways_h, 0);
+               set_int(sbvis_timer, 0);
+            }
+         }
+         program {
+            name: "vbar_show";
+            signal: "elm,action,show,vbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sb_vbar_clip_master";
+         }
+         program {
+            name: "vbar_hide";
+            signal: "elm,action,hide,vbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "sb_vbar_clip_master";
+         }
+         program {
+            name: "vbar_show_always";
+            signal: "elm,action,show_always,vbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_v);
+               v |= get_int(sbalways_v);
+               if (!v) {
+                  set_int(sbalways_v, 1);
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
                }
-           }
-           program { name: "sb_vbar_show";
-               signal: "do-show-vbar";
-               source: "";
-               action:  STATE_SET "default" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_vbar_clip";
-           }
-           program { name: "sb_vbar_hide";
-               signal: "do-hide-vbar";
-               source: "";
-               action:  STATE_SET "hidden" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_vbar_clip";
-           }
-
-           program { name: "hbar_show";
-               signal: "elm,action,show,hbar";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "sb_hbar_clip_master";
-           }
-           program { name: "hbar_hide";
-               signal: "elm,action,hide,hbar";
-               source: "elm";
-               action:  STATE_SET "hidden" 0.0;
-               target: "sb_hbar_clip_master";
-           }
-           program { name: "hbar_show_always";
-               signal: "elm,action,show_always,hbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbvis_h);
-                   v |= get_int(sbalways_h);
-                   if (!v) {
-                       set_int(sbalways_h, 1);
-                       emit("do-show-hbar", "");
-                       set_int(sbvis_h, 1);
-                   }
+            }
+         }
+         program {
+            name: "vbar_show_notalways";
+            signal: "elm,action,show_notalways,vbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbalways_v);
+               if (v) {
+                  set_int(sbalways_v, 0);
+                  v = get_int(sbvis_v);
+                  if (!v) {
+                     emit("do-hide-vbar", "");
+                     set_int(sbvis_v, 0);
+                  }
                }
-           }
-           program { name: "hbar_show_notalways";
-               signal: "elm,action,show_notalways,hbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbalways_h);
-                   if (v) {
-                       set_int(sbalways_h, 0);
-                       v = get_int(sbvis_h);
-                       if (!v) {
-                           emit("do-hide-hbar", "");
-                           set_int(sbvis_h, 0);
-                       }
-                   }
+            }
+         }
+         program {
+            name: "sb_vbar_show";
+            signal: "do-show-vbar";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_vbar_clip";
+         }
+         program {
+            name: "sb_vbar_hide";
+            signal: "do-hide-vbar";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_vbar_clip";
+         }
+         program {
+            name: "hbar_show";
+            signal: "elm,action,show,hbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sb_hbar_clip_master";
+         }
+         program {
+            name: "hbar_hide";
+            signal: "elm,action,hide,hbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "sb_hbar_clip_master";
+         }
+         program {
+            name: "hbar_show_always";
+            signal: "elm,action,show_always,hbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_h);
+               v |= get_int(sbalways_h);
+               if (!v) {
+                  set_int(sbalways_h, 1);
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
                }
-           }
-           program { name: "sb_hbar_show";
-               signal: "do-show-hbar";
-               source: "";
-               action:  STATE_SET "default" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_hbar_clip";
-           }
-           program { name: "sb_hbar_hide";
-               signal: "do-hide-hbar";
-               source: "";
-               action:  STATE_SET "hidden" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_hbar_clip";
-           }
-
-           program { name: "scroll";
-               signal: "elm,action,scroll";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbvis_v);
-                   v |= get_int(sbalways_v);
-                   if (!v) {
-                       emit("do-show-vbar", "");
-                       set_int(sbvis_v, 1);
-                   }
-                   v = get_int(sbvis_h);
-                   v |= get_int(sbalways_h);
-                   if (!v) {
-                       emit("do-show-hbar", "");
-                       set_int(sbvis_h, 1);
-                   }
-                   v = get_int(sbvis_timer);
-                   if (v > 0) cancel_timer(v);
-                   v = timer(2.0, "timer0", 0);
-                   set_int(sbvis_timer, v);
+            }
+         }
+         program {
+            name: "hbar_show_notalways";
+            signal: "elm,action,show_notalways,hbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbalways_h);
+               if (v) {
+                  set_int(sbalways_h, 0);
+                  v = get_int(sbvis_h);
+                  if (!v) {
+                     emit("do-hide-hbar", "");
+                     set_int(sbvis_h, 0);
+                  }
                }
-           }
-           program { name: "go1";
-               signal: "elm,state,busy,start";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               transition: SINUSOIDAL 1.0;
-               target:  "busy_clip";
-           }
-           program { name: "go2";
-               signal: "elm,state,busy,start";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: LINEAR 0.5;
-               target: "busy";
-               after:  "go2";
-           }
-           program { name: "stop1";
-               signal: "elm,state,busy,stop";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: SINUSOIDAL 1.0;
-               target: "busy_clip";
-               after: "stop2";
-           }
-         program { name: "stop2";
+            }
+         }
+         program {
+            name: "sb_hbar_show";
+            signal: "do-show-hbar";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_hbar_clip";
+         }
+         program {
+            name: "sb_hbar_hide";
+            signal: "do-hide-hbar";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_hbar_clip";
+         }
+         program {
+            name: "scroll";
+            signal: "elm,action,scroll";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_v);
+               v |= get_int(sbalways_v);
+               if (!v) {
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
+               }
+               v = get_int(sbvis_h);
+               v |= get_int(sbalways_h);
+               if (!v) {
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
+               }
+               v = get_int(sbvis_timer);
+               if (v > 0) cancel_timer(v);
+               v = timer(2.0, "timer0", 0);
+               set_int(sbvis_timer, v);
+            }
+         }
+         program {
+            name: "go1";
+            signal: "elm,state,busy,start";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            transition: SINUSOIDAL 1.0;
+            target: "busy_clip";
+         }
+         program {
+            name: "go2";
+            signal: "elm,state,busy,start";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 0.5;
+            target: "busy";
+            after: "go2";
+         }
+         program {
+            name: "stop1";
+            signal: "elm,state,busy,stop";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 1.0;
+            target: "busy_clip";
+            after: "stop2";
+         }
+         program {
+            name: "stop2";
             action: ACTION_STOP;
             target: "go2";
          }
       }
    }
 
-   ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/map/base/default";
-       script {
-           public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
-           public timer0(val) {
-               new v;
-               v = get_int(sbvis_v);
-               if (v) {
-                   v = get_int(sbalways_v);
-                   if (!v) {
-                       emit("do-hide-vbar", "");
-                       set_int(sbvis_v, 0);
-                   }
-               }
-               v = get_int(sbvis_h);
-               if (v) {
-                   v = get_int(sbalways_h);
-                   if (!v) {
-                       emit("do-hide-hbar", "");
-                       set_int(sbvis_h, 0);
-                   }
-               }
-               set_int(sbvis_timer, 0);
-               return 0;
-           }
-       }
-       images {
-           image: "shelf_inset.png" COMP;
-           image: "bt_sm_base2.png" COMP;
-           image: "bt_sm_shine.png" COMP;
-           image: "bt_sm_hilight.png" COMP;
-           image: "sb_runnerh.png" COMP;
-           image: "sb_runnerv.png" COMP;
-           image: "busy-1.png" COMP;
-           image: "busy-2.png" COMP;
-           image: "busy-3.png" COMP;
-           image: "busy-4.png" COMP;
-           image: "busy-5.png" COMP;
-           image: "busy-6.png" COMP;
-           image: "busy-7.png" COMP;
-           image: "busy-8.png" COMP;
-           image: "busy-9.png" COMP;
-       }
-       parts {
-           part { name: "bg";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.offset: 1 1;
-                   rel2.offset: -2 -2;
-                   color: 255 255 255 0;
-               }
-           }
-           part { name: "clipper";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
-               }
-           }
-           part { name: "elm.swallow.content";
-               clip_to: "clipper";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                   rel1.offset: 1 1;
-                   rel2.offset: -2 -2;
-               }
-           }
-           part { name: "busy_clip";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
-               }
-               description { state: "active" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-               }
-           }
-           part { name: "busy";
-               clip_to: "busy_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 32 32;
-                   aspect: 1.0 1.0;
-                   align: 1.0 1.0;
-                   aspect_preference: BOTH;
-                   rel1 {
-                       relative: 0.9 0.9;
-                       offset:   -9 -9;
-                   }
-                   rel2 {
-                       relative: 0.9 0.9;
-                       offset:   -9 -9;
-                   }
-                   image {
-                       normal: "busy-9.png";
-                       tween:  "busy-1.png";
-                       tween:  "busy-2.png";
-                       tween:  "busy-3.png";
-                       tween:  "busy-4.png";
-                       tween:  "busy-5.png";
-                       tween:  "busy-6.png";
-                       tween:  "busy-7.png";
-                       tween:  "busy-8.png";
-                   }
+///////////////////////////////////////////////////////////////////////////////
+   group {
+      name: "elm/map/base/default";
+      script {
+         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
+         public timer0(val) {
+            new v;
+            v = get_int(sbvis_v);
+            if (v) {
+               v = get_int(sbalways_v);
+               if (!v) {
+                  emit("do-hide-vbar", "");
+                  set_int(sbvis_v, 0);
                }
-           }
-           part { name: "conf_over";
-               mouse_events:  0;
-               description { state: "default" 0.0;
-                   rel1.offset: 0 0;
-                   rel2.offset: -1 -1;
-                   image {
-                       normal: "shelf_inset.png";
-                       border: 7 7 7 7;
-                       middle: 0;
-                   }
-                   fill.smooth : 0;
+            }
+            v = get_int(sbvis_h);
+            if (v) {
+               v = get_int(sbalways_h);
+               if (!v) {
+                  emit("do-hide-hbar", "");
+                  set_int(sbvis_h, 0);
                }
-           }
-           part { name: "sb_vbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+            }
+            set_int(sbvis_timer, 0);
+            return 0;
+         }
+      }
+      images {
+         image: "shelf_inset.png" COMP;
+         image: "bt_sm_base2.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
+         image: "sb_runnerh.png" COMP;
+         image: "sb_runnerv.png" COMP;
+         image: "busy-1.png" COMP;
+         image: "busy-2.png" COMP;
+         image: "busy-3.png" COMP;
+         image: "busy-4.png" COMP;
+         image: "busy-5.png" COMP;
+         image: "busy-6.png" COMP;
+         image: "busy-7.png" COMP;
+         image: "busy-8.png" COMP;
+         image: "busy-9.png" COMP;
+      }
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            clip_to: "clipper";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+            }
+         }
+         part {
+            name: "busy_clip";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "active" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "busy";
+            clip_to: "busy_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 32 32;
+               aspect: 1.0 1.0;
+               align: 1.0 1.0;
+               aspect_preference: BOTH;
+               rel1 {
+                  relative: 0.9 0.9;
+                  offset: -9 -9;
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+               rel2 {
+                  relative: 0.9 0.9;
+                  offset: -9 -9;
                }
-           }
-           part { name: "sb_vbar_clip";
-               clip_to: "sb_vbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+               image {
+                  normal: "busy-9.png";
+                  tween: "busy-1.png";
+                  tween: "busy-2.png";
+                  tween: "busy-3.png";
+                  tween: "busy-4.png";
+                  tween: "busy-5.png";
+                  tween: "busy-6.png";
+                  tween: "busy-7.png";
+                  tween: "busy-8.png";
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "conf_over";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 0 0;
+               rel2.offset: -1 -1;
+               image {
+                  normal: "shelf_inset.png";
+                  border: 7 7 7 7;
+                  middle: 0;
                }
-           }
-           part { name: "sb_vbar";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   visible: 0;
-                   min: 17 17;
-                   align: 1.0 0.0;
-                   rel1 {
-                       relative: 1.0 0.0;
-                       offset:   -2 0;
-                   }
-                   rel2 {
-                       relative: 1.0 0.0;
-                       offset:   -2 -1;
-                       to_y:     "sb_hbar";
-                   }
+               fill.smooth : 0;
+            }
+         }
+         part {
+            name: "sb_vbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_vbar_clip";
+            clip_to: "sb_vbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_vbar";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 17 17;
+               align: 1.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -2 0;
                }
-           }
-           part { name: "sb_vbar_runner";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   min: 3 3;
-                   max: 3 99999;
-                   rel1.to:       "sb_vbar";
-                   rel2.to:       "sb_vbar";
-                   image {
-                       normal: "sb_runnerv.png";
-                       border: 0 0 4 4;
-                   }
-                   fill.smooth: 0;
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset: -2 -1;
+                  to_y: "sb_hbar";
                }
-           }
-           part { name: "elm.dragable.vbar";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               dragable {
-                   x: 0 0 0;
-                   y: 1 1 0;
-                   confine: "sb_vbar";
+            }
+         }
+         part {
+            name: "sb_vbar_runner";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 3 3;
+               max: 3 99999;
+               rel1.to: "sb_vbar";
+               rel2.to: "sb_vbar";
+               image {
+                  normal: "sb_runnerv.png";
+                  border: 0 0 4 4;
                }
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 17 17;
-                   rel1 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_vbar";
-                   }
-                   rel2 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_vbar";
-                   }
-                   image {
-                       normal: "bt_sm_base2.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.dragable.vbar";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 0 0 0;
+               y: 1 1 0;
+               confine: "sb_vbar";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 17 17;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_vbar";
                }
-           }
-           part { name: "sb_vbar_over1";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.vbar";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "elm.dragable.vbar";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_vbar";
                }
-           }
-           part { name: "sb_vbar_over2";
-               clip_to: "sb_vbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.vbar";
-                   rel2.to: "elm.dragable.vbar";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
                }
-           }
-
-           part { name: "sb_hbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "sb_vbar_over1";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.vbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.vbar";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_vbar_over2";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.vbar";
+               rel2.to: "elm.dragable.vbar";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-           }
-           part { name: "sb_hbar_clip";
-               clip_to: "sb_hbar_clip_master";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
+            }
+         }
+         part {
+            name: "sb_hbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_hbar_clip";
+            clip_to: "sb_hbar_clip_master";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+            description {
+               state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
+            }
+         }
+         part {
+            name: "sb_hbar";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 17 17;
+               align: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset: 0 -2;
                }
-               description { state: "hidden" 0.0;
-                   visible: 0;
-                   color: 255 255 255 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: -1 -2;
+                  to_x: "sb_vbar";
                }
-           }
-           part { name: "sb_hbar";
-               type: RECT;
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   visible: 0;
-                   min: 17 17;
-                   align: 0.0 1.0;
-                   rel1 {
-                       relative: 0.0 1.0;
-                       offset:   0 -2;
-                   }
-                   rel2 {
-                       relative: 0.0 1.0;
-                       offset:   -1 -2;
-                       to_x:     "sb_vbar";
-                   }
+            }
+         }
+         part {
+            name: "sb_hbar_runner";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               min: 3 3;
+               max: 99999 3;
+               rel1.to: "sb_hbar";
+               rel2.to: "sb_hbar";
+               image {
+                  normal: "sb_runnerh.png";
+                  border: 4 4 0 0;
                }
-           }
-           part { name: "sb_hbar_runner";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   min: 3 3;
-                   max: 99999 3;
-                   rel1.to:       "sb_hbar";
-                   rel2.to:       "sb_hbar";
-                   image {
-                       normal: "sb_runnerh.png";
-                       border: 4 4 0 0;
-                   }
-                   fill.smooth: 0;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "elm.dragable.hbar";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 1 1 0;
+               y: 0 0 0;
+               confine: "sb_hbar";
+            }
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               min: 17 17;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_hbar";
                }
-           }
-           part { name: "elm.dragable.hbar";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               dragable {
-                   x: 1 1 0;
-                   y: 0 0 0;
-                   confine: "sb_hbar";
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset: 0    0;
+                  to: "sb_hbar";
                }
-               description { state: "default" 0.0;
-                   fixed: 1 1;
-                   min: 17 17;
-                   rel1 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_hbar";
-                   }
-                   rel2 {
-                       relative: 0.5  0.5;
-                       offset:   0    0;
-                       to: "sb_hbar";
-                   }
-                   image {
-                       normal: "bt_sm_base2.png";
-                       border: 6 6 6 6;
-                   }
-                   image.middle: SOLID;
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
                }
-           }
-           part { name: "sb_hbar_over1";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.hbar";
-                   rel2.relative: 1.0 0.5;
-                   rel2.to: "elm.dragable.hbar";
-                   image {
-                       normal: "bt_sm_hilight.png";
-                       border: 6 6 6 0;
-                   }
+               image.middle: SOLID;
+            }
+         }
+         part {
+            name: "sb_hbar_over1";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.hbar";
+               image {
+                  normal: "bt_sm_hilight.png";
+                  border: 6 6 6 0;
                }
-           }
-           part { name: "sb_hbar_over2";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               description { state: "default" 0.0;
-                   rel1.to: "elm.dragable.hbar";
-                   rel2.to: "elm.dragable.hbar";
-                   image {
-                       normal: "bt_sm_shine.png";
-                       border: 6 6 6 0;
-                   }
+            }
+         }
+         part {
+            name: "sb_hbar_over2";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.to: "elm.dragable.hbar";
+               image {
+                  normal: "bt_sm_shine.png";
+                  border: 6 6 6 0;
                }
-           }
-       }
-       programs {
-           program { name: "load";
-               signal: "load";
-               source: "";
-               script {
-                   set_state(PART:"sb_hbar_clip", "hidden", 0.0);
-                   set_state(PART:"sb_vbar_clip", "hidden", 0.0);
-                   set_int(sbvis_h, 0);
-                   set_int(sbvis_v, 0);
-                   set_int(sbalways_v, 0);
-                   set_int(sbalways_h, 0);
-                   set_int(sbvis_timer, 0);
+            }
+         }
+      }
+      programs {
+         program {
+            name: "load";
+            signal: "load";
+            source: "";
+            script {
+               set_state(PART:"sb_hbar_clip", "hidden", 0.0);
+               set_state(PART:"sb_vbar_clip", "hidden", 0.0);
+               set_int(sbvis_h, 0);
+               set_int(sbvis_v, 0);
+               set_int(sbalways_v, 0);
+               set_int(sbalways_h, 0);
+               set_int(sbvis_timer, 0);
+            }
+         }
+         program {
+            name: "vbar_show";
+            signal: "elm,action,show,vbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sb_vbar_clip_master";
+         }
+         program {
+            name: "vbar_hide";
+            signal: "elm,action,hide,vbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "sb_vbar_clip_master";
+         }
+         program {
+            name: "vbar_show_always";
+            signal: "elm,action,show_always,vbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_v);
+               v |= get_int(sbalways_v);
+               if (!v) {
+                  set_int(sbalways_v, 1);
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
                }
-           }
-
-           program { name: "vbar_show";
-               signal: "elm,action,show,vbar";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "sb_vbar_clip_master";
-           }
-           program { name: "vbar_hide";
-               signal: "elm,action,hide,vbar";
-               source: "elm";
-               action:  STATE_SET "hidden" 0.0;
-               target: "sb_vbar_clip_master";
-           }
-           program { name: "vbar_show_always";
-               signal: "elm,action,show_always,vbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbvis_v);
-                   v |= get_int(sbalways_v);
-                   if (!v) {
-                       set_int(sbalways_v, 1);
-                       emit("do-show-vbar", "");
-                       set_int(sbvis_v, 1);
-                   }
+            }
+         }
+         program {
+            name: "vbar_show_notalways";
+            signal: "elm,action,show_notalways,vbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbalways_v);
+               if (v) {
+                  set_int(sbalways_v, 0);
+                  v = get_int(sbvis_v);
+                  if (!v) {
+                     emit("do-hide-vbar", "");
+                     set_int(sbvis_v, 0);
+                  }
                }
-           }
-           program { name: "vbar_show_notalways";
-               signal: "elm,action,show_notalways,vbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbalways_v);
-                   if (v) {
-                       set_int(sbalways_v, 0);
-                       v = get_int(sbvis_v);
-                       if (!v) {
-                           emit("do-hide-vbar", "");
-                           set_int(sbvis_v, 0);
-                       }
-                   }
+            }
+         }
+         program {
+            name: "sb_vbar_show";
+            signal: "do-show-vbar";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_vbar_clip";
+         }
+         program {
+            name: "sb_vbar_hide";
+            signal: "do-hide-vbar";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_vbar_clip";
+         }
+         program {
+            name: "hbar_show";
+            signal: "elm,action,show,hbar";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sb_hbar_clip_master";
+         }
+         program {
+            name: "hbar_hide";
+            signal: "elm,action,hide,hbar";
+            source: "elm";
+            action: STATE_SET "hidden" 0.0;
+            target: "sb_hbar_clip_master";
+         }
+         program {
+            name: "hbar_show_always";
+            signal: "elm,action,show_always,hbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_h);
+               v |= get_int(sbalways_h);
+               if (!v) {
+                  set_int(sbalways_h, 1);
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
                }
-           }
-           program { name: "sb_vbar_show";
-               signal: "do-show-vbar";
-               source: "";
-               action:  STATE_SET "default" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_vbar_clip";
-           }
-           program { name: "sb_vbar_hide";
-               signal: "do-hide-vbar";
-               source: "";
-               action:  STATE_SET "hidden" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_vbar_clip";
-           }
-
-           program { name: "hbar_show";
-               signal: "elm,action,show,hbar";
-               source: "elm";
-               action:  STATE_SET "default" 0.0;
-               target: "sb_hbar_clip_master";
-           }
-           program { name: "hbar_hide";
-               signal: "elm,action,hide,hbar";
-               source: "elm";
-               action:  STATE_SET "hidden" 0.0;
-               target: "sb_hbar_clip_master";
-           }
-           program { name: "hbar_show_always";
-               signal: "elm,action,show_always,hbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbvis_h);
-                   v |= get_int(sbalways_h);
-                   if (!v) {
-                       set_int(sbalways_h, 1);
-                       emit("do-show-hbar", "");
-                       set_int(sbvis_h, 1);
-                   }
+            }
+         }
+         program {
+            name: "hbar_show_notalways";
+            signal: "elm,action,show_notalways,hbar";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbalways_h);
+               if (v) {
+                  set_int(sbalways_h, 0);
+                  v = get_int(sbvis_h);
+                  if (!v) {
+                     emit("do-hide-hbar", "");
+                     set_int(sbvis_h, 0);
+                  }
                }
-           }
-           program { name: "hbar_show_notalways";
-               signal: "elm,action,show_notalways,hbar";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbalways_h);
-                   if (v) {
-                       set_int(sbalways_h, 0);
-                       v = get_int(sbvis_h);
-                       if (!v) {
-                           emit("do-hide-hbar", "");
-                           set_int(sbvis_h, 0);
-                       }
-                   }
+            }
+         }
+         program {
+            name: "sb_hbar_show";
+            signal: "do-show-hbar";
+            source: "";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_hbar_clip";
+         }
+         program {
+            name: "sb_hbar_hide";
+            signal: "do-hide-hbar";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: LINEAR 1.0;
+            target: "sb_hbar_clip";
+         }
+         program {
+            name: "scroll";
+            signal: "elm,action,scroll";
+            source: "elm";
+            script {
+               new v;
+               v = get_int(sbvis_v);
+               v |= get_int(sbalways_v);
+               if (!v) {
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
                }
-           }
-           program { name: "sb_hbar_show";
-               signal: "do-show-hbar";
-               source: "";
-               action:  STATE_SET "default" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_hbar_clip";
-           }
-           program { name: "sb_hbar_hide";
-               signal: "do-hide-hbar";
-               source: "";
-               action:  STATE_SET "hidden" 0.0;
-               transition: LINEAR 1.0;
-               target: "sb_hbar_clip";
-           }
-
-           program { name: "scroll";
-               signal: "elm,action,scroll";
-               source: "elm";
-               script {
-                   new v;
-                   v = get_int(sbvis_v);
-                   v |= get_int(sbalways_v);
-                   if (!v) {
-                       emit("do-show-vbar", "");
-                       set_int(sbvis_v, 1);
-                   }
-                   v = get_int(sbvis_h);
-                   v |= get_int(sbalways_h);
-                   if (!v) {
-                       emit("do-show-hbar", "");
-                       set_int(sbvis_h, 1);
-                   }
-                   v = get_int(sbvis_timer);
-                   if (v > 0) cancel_timer(v);
-                   v = timer(2.0, "timer0", 0);
-                   set_int(sbvis_timer, v);
+               v = get_int(sbvis_h);
+               v |= get_int(sbalways_h);
+               if (!v) {
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
                }
-           }
-           program { name: "go1";
-               signal: "elm,state,busy,start";
-               source: "elm";
-               action: STATE_SET "active" 0.0;
-               transition: SINUSOIDAL 1.0;
-               target:  "busy_clip";
-           }
-           program { name: "go2";
-               signal: "elm,state,busy,start";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: LINEAR 0.5;
-               target: "busy";
-               after:  "go2";
-           }
-           program { name: "stop1";
-               signal: "elm,state,busy,stop";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               transition: SINUSOIDAL 1.0;
-               target: "busy_clip";
-               after: "stop2";
-           }
-         program { name: "stop2";
+               v = get_int(sbvis_timer);
+               if (v > 0) cancel_timer(v);
+               v = timer(2.0, "timer0", 0);
+               set_int(sbvis_timer, v);
+            }
+         }
+         program {
+            name: "go1";
+            signal: "elm,state,busy,start";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            transition: SINUSOIDAL 1.0;
+            target: "busy_clip";
+         }
+         program {
+            name: "go2";
+            signal: "elm,state,busy,start";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: LINEAR 0.5;
+            target: "busy";
+            after: "go2";
+         }
+         program {
+            name: "stop1";
+            signal: "elm,state,busy,stop";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: SINUSOIDAL 1.0;
+            target: "busy_clip";
+            after: "stop2";
+         }
+         program {
+            name: "stop2";
             action: ACTION_STOP;
             target: "go2";
          }
       }
    }
-   group { name: "elm/map/marker/radio/default";
-        data {
-            item: size_w 32;
-            item: size_h 32;
-            item: size_max_w 64;
-            item: size_max_h 64;
-        }
-        parts {
-            part { name: "whole";
-                description { state: "default" 0.0;
-                }
-            }
-            part { name: "base";
-                ignore_flags: ON_HOLD;
-                description { state: "default" 0.0;
-                    image.normal: "radio.png";
-                }
-            }
-            part { name: "elm.icon";
-                type: SWALLOW;
-                clip_to: "whole";
-                mouse_events:  0;
-                description { state: "default" 0.0;
-                    rel1.relative: 0.27 0.27;
-                    rel2.relative: 0.73 0.73;
-                }
-            }
-            part { name: "elm.text";
-                type:          TEXT;
-                effect:        SOFT_SHADOW;
-                mouse_events:  0;
-                scale: 1;
-                description { state: "default" 0.0;
-                    align:    0.5 0.5;
-                    color: 224 224 224 255;
-                    color3: 0 0 0 64;
-                    rel1.relative: 0.28 0.25;
-                    rel2.relative: 0.75 0.75;
-                    text {
-                        font:     "Sans,Edje-Vera";
-                        size:     10;
-                        min:      0 0;
-                        align:    0.5 0.5;
-                    }
-                }
+   group {
+      name: "elm/map/marker/radio/default";
+      data {
+         item: size_w 32;
+         item: size_h 32;
+         item: size_max_w 64;
+         item: size_max_h 64;
+      }
+      parts {
+         part {
+            name: "whole";
+            description {
+               state: "default" 0.0;
             }
-       }
-       programs {
-            program { name: "open";
-                signal: "mouse,clicked,1";
-                source: "base";
-                action: SIGNAL_EMIT "open" "elm";
+         }
+         part {
+            name: "base";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image.normal: "radio.png";
             }
-            program { name: "bringin";
-                signal: "mouse,down,1,double";
-                source: "base";
-                action: SIGNAL_EMIT "bringin" "elm";
+         }
+         part {
+            name: "elm.icon";
+            type: SWALLOW;
+            clip_to: "whole";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.27 0.27;
+               rel2.relative: 0.73 0.73;
             }
-       }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               rel1.relative: 0.28 0.25;
+               rel2.relative: 0.75 0.75;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "open";
+            signal: "mouse,clicked,1";
+            source: "base";
+            action: SIGNAL_EMIT "open" "elm";
+         }
+         program {
+            name: "bringin";
+            signal: "mouse,down,1,double";
+            source: "base";
+            action: SIGNAL_EMIT "bringin" "elm";
+         }
+      }
    }
-   group { name: "elm/map/marker/radio2/default";
-        data {
-            item: size_w 32;
-            item: size_h 32;
-            item: size_max_w 64;
-            item: size_max_h 64;
-        }
-        parts {
-            part { name: "base";
-                ignore_flags: ON_HOLD;
-                description { state: "default" 0.0;
-                    image.normal: "radio2.png";
-                }
-            }
-            part { name: "elm.text";
-                type:          TEXT;
-                effect:        SOFT_SHADOW;
-                mouse_events:  0;
-                scale: 1;
-                description { state: "default" 0.0;
-                    align:    0.5 0.5;
-                    color: 224 224 224 255;
-                    color3: 0 0 0 64;
-                    rel1.relative: 0.28 0.25;
-                    rel2.relative: 0.75 0.75;
-                    text {
-                        font:     "Sans,Edje-Vera";
-                        size:     10;
-                        min:      0 0;
-                        align:    0.5 0.5;
-                    }
-                }
+   group {
+      name: "elm/map/marker/radio2/default";
+      data {
+         item: size_w 32;
+         item: size_h 32;
+         item: size_max_w 64;
+         item: size_max_h 64;
+      }
+      parts {
+         part {
+            name: "base";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               image.normal: "radio2.png";
             }
-       }
-       programs {
-            program { name: "open";
-                signal: "mouse,clicked,1";
-                source: "base";
-                action: SIGNAL_EMIT "open" "elm";
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               rel1.relative: 0.28 0.25;
+               rel2.relative: 0.75 0.75;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "open";
+            signal: "mouse,clicked,1";
+            source: "base";
+            action: SIGNAL_EMIT "open" "elm";
+         }
+         program {
+            name: "bringin";
+            signal: "mouse,down,1,double";
+            source: "base";
+            action: SIGNAL_EMIT "bringin" "elm";
+         }
+      }
+   }
+   group {
+      name: "elm/map/marker/empty/default";
+      data {
+         item: size_w 22;
+         item: size_h 22;
+         item: size_max_w 64;
+         item: size_max_h 64;
+      }
+      parts {
+         part {
+            name: "whole";
+            description {
+               state: "default" 0.0;
             }
-            program { name: "bringin";
-                signal: "mouse,down,1,double";
-                source: "base";
-                action: SIGNAL_EMIT "bringin" "elm";
+         }
+         part {
+            name: "base";
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
             }
-       }
+         }
+         part {
+            name: "elm.icon";
+            type: SWALLOW;
+            clip_to: "whole";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+            }
+         }
+         part {
+            name: "elm.text";
+            type: TEXT;
+            effect: SOFT_SHADOW;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+               rel1.relative: 0.28 0.25;
+               rel2.relative: 0.75 0.75;
+               text {
+                  font: "Sans,Edje-Vera";
+                  size: 10;
+                  min: 0 0;
+                  align: 0.5 0.5;
+               }
+            }
+         }
+      }
+      programs {
+         program {
+            name: "open";
+            signal: "mouse,clicked,1";
+            source: "base";
+            action: SIGNAL_EMIT "open" "elm";
+         }
+         program {
+            name: "bringin";
+            signal: "mouse,down,1,double";
+            source: "base";
+            action: SIGNAL_EMIT "bringin" "elm";
+         }
+      }
    }
-   group { name: "elm/map/marker/empty/default";
-        data {
-            item: size_w 22;
-            item: size_h 22;
-            item: size_max_w 64;
-            item: size_max_h 64;
-        }
-        parts {
-            part { name: "whole";
-                description { state: "default" 0.0;
-                }
-            }
-            part { name: "base";
-                ignore_flags: ON_HOLD;
-                description { state: "default" 0.0;
-                }
-            }
-            part { name: "elm.icon";
-                type: SWALLOW;
-                clip_to: "whole";
-                mouse_events:  0;
-                description { state: "default" 0.0;
-                }
-            }
-            part { name: "elm.text";
-                type:          TEXT;
-                effect:        SOFT_SHADOW;
-                mouse_events:  0;
-                scale: 1;
-                description { state: "default" 0.0;
-                    align:    0.5 0.5;
-                    color: 224 224 224 255;
-                    color3: 0 0 0 64;
-                    rel1.relative: 0.28 0.25;
-                    rel2.relative: 0.75 0.75;
-                    text {
-                        font:     "Sans,Edje-Vera";
-                        size:     10;
-                        min:      0 0;
-                        align:    0.5 0.5;
-                    }
-                }
+   group {
+      name: "elm/map/marker_bubble/default";
+      images {
+         image: "bubble.png" COMP;
+         image: "bubble_shine.png" COMP;
+      }
+      data {
+         item: size_w 400;
+         item: size_h 100;
+      }
+      parts {
+         part {
+            name: "clipper";
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+            }
+            description {
+               state: "show" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "base0";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "bubble.png";
+                  border: 11 36 10 19;
+               }
+               image.middle: SOLID;
+               fill.smooth: 0;
             }
-       }
-       programs {
-            program { name: "open";
-                signal: "mouse,clicked,1";
-                source: "base";
-                action: SIGNAL_EMIT "open" "elm";
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1 {
+                  offset: 9 8;
+               }
+               rel2 {
+                  offset: -10 -17;
+               }
             }
-            program { name: "bringin";
-                signal: "mouse,down,1,double";
-                source: "base";
-                action: SIGNAL_EMIT "bringin" "elm";
+         }
+         part {
+            name: "shine";
+            mouse_events: 0;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "base0";
+               }
+               rel2 {
+                  to: "base0";
+                  relative: 1.0 0.5;
+               }
+               image {
+                  normal: "bubble_shine.png";
+                  border: 5 5 5 0;
+               }
+               fill.smooth: 0;
             }
-       }
-   }
-   group { name: "elm/map/marker_bubble/default";
-    images {
-      image: "bubble.png" COMP;
-      image: "bubble_shine.png" COMP;
-    }
-    data {
-            item: size_w 400;
-            item: size_h 100;
-        }
-    parts {
-    part { name: "clipper";
-        mouse_events:  1;
-        description { state: "default" 0.0;
-          color: 255 255 255 0;
-        }
-        description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-        }
-      }
-     part { name: "base0";
-        mouse_events:  0;
-        clip_to: "clipper";
-        description { state: "default" 0.0;
-          image {
-            normal: "bubble.png";
-            border: 11 36 10 19;
-          }
-          image.middle: SOLID;
-          fill.smooth: 0;
-        }
-      }
-      part { name: "elm.swallow.content";
-        type: SWALLOW;
-        clip_to: "clipper";
-        description { state: "default" 0.0;
-            align: 0.5 0.5;
-          rel1 {
-            offset: 9 8;
-          }
-          rel2 {
-            offset: -10 -17;
-          }
-        }
-      }
-      part { name: "shine";
-        mouse_events:  0;
-        clip_to: "clipper";
-        description { state:    "default" 0.0;
-          rel1 {
-            to: "base0";
-          }
-          rel2 {
-            to: "base0";
-            relative: 1.0 0.5;
-          }
-          image {
-            normal: "bubble_shine.png";
-            border: 5 5 5 0;
-          }
-          fill.smooth: 0;
-        }
-        }
-    }
-    programs {
-        program { name: "show";
+         }
+      }
+      programs {
+         program {
+            name: "show";
             signal: "show";
             action: STATE_SET "show" 0.0;
             target: "clipper";
             transition: ACCELERATE 0.5;
-        }
-    }
-  }
-
-
+         }
+      }
+   }
 
 /////////////////////////////////////////////////////////////////////////////
 // PANEL
 /////////////////////////////////////////////////////////////////////////////
-  group {
-     name: "elm/panel/base/left";
-     images
-       {
-          image: "bt_base1.png" COMP;
-          image: "bt_hilight.png" COMP;
-          image: "bt_shine.png" COMP;
-          image: "bt_glow.png" COMP;
-          image: "bt_dis_base.png" COMP;
-          image: "icon_arrow_left.png" COMP;
-          image: "icon_arrow_right.png" COMP;
-       }
-     parts
-       {
-          part
-            {
-               name: "bg";
-               type: RECT;
-               mouse_events: 0;
-               description
-                 {
-                    state: "default" 0.0;
-                    color: 255 255 255 0;
-                    rel1.offset: 30 0;
-                    rel2.relative: 0.0 1.0;
-                 }
-               description
-                 {
-                    state: "visible" 0.0;
-                    inherit: "default" 0.0;
-                    rel2.relative: 1.0 1.0;
-                 }
-            }
-          part
-            {
-               name: "base";
-               type: IMAGE;
-               mouse_events: 0;
-               description
-                 {
-                    state: "default" 0.0;
-                    rel2
-                      {
-                         offset: -20 -1;
-                         to_x: "bg";
-                      }
-                    image
-                      {
-                         normal: "bt_dis_base.png";
-                         border: 4 4 4 4;
-                      }
-                 }
-            }
-          part
-            {
-               name: "clipper";
-               type: RECT;
-               mouse_events: 0;
-               description
-                 {
-                    state: "default" 0.0;
-                    rel1
-                      {
-                         offset: 4 4;
-                         to: "base";
-                      }
-                    rel2
-                      {
-                         offset: -5 -5;
-                         to: "base";
-                      }
-                 }
-            }
-          part
-            {
-               name: "elm.swallow.content";
-               type: SWALLOW;
-               clip_to: "clipper";
-               description
-                 {
-                    state: "default" 0.0;
-                    rel1.to: "clipper";
-                    rel2.to: "clipper";
-                 }
-            }
-          part
-            {
-               name: "btn";
-               type: IMAGE;
-               mouse_events: 1;
-               description
-                 {
-                    state: "default" 0.0;
-                    max: 32 48;
-                    fixed: 1 1;
-                    align: 0.0 0.5;
-                    rel1
-                      {
-                         relative: 1.0 0.0;
-                         offset: -3 0;
-                         to_x: "base";
-                      }
-                    rel2.to_x: "bg";
-                    image
-                      {
-                         normal: "bt_base1.png";
-                         border: 0 5 4 12;
-                      }
-                    fill.smooth: 0;
-                 }
-               description
-                 {
-                    state: "clicked" 0.0;
-                    inherit: "default" 0.0;
-                 }
-            }
-          part
-            {
-               name: "btn_over";
-               type: IMAGE;
-               mouse_events: 0;
-               description
-                 {
-                    state: "default" 0.0;
-                    rel1.to: "btn";
-                    rel2
-                      {
-                         relative: 1.0 0.5;
-                         to: "btn";
-                      }
-                    image
-                      {
-                         normal: "bt_hilight.png";
-                         border: 0 7 7 0;
-                      }
-                 }
-            }
-          part
-            {
-               name: "btn_over2";
-               type: IMAGE;
-               mouse_events: 1;
-               repeat_events: 1;
-               ignore_flags: ON_HOLD;
-               description
-                 {
-                    state: "default" 0.0;
-                    rel1.to: "btn";
-                    rel2.to: "btn";
-                    image
-                      {
-                         normal: "bt_shine.png";
-                         border: 0 7 7 7;
-                    }
-                 }
-            }
-          part
-            {
-               name: "btn_over3";
-               type: IMAGE;
-               mouse_events: 1;
-               repeat_events: 1;
-               description
-                 {
-                    state: "default" 0.0;
-                    color: 255 255 255 0;
-                    rel1.to: "btn";
-                    rel2.to: "btn";
-                    image
-                      {
-                       normal: "bt_glow.png";
-                       border: 12 12 12 12;
-                    }
-                  fill.smooth: 0;
-               }
-             description
-               {
-                  state: "clicked" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-                  color: 255 255 255 255;
-               }
-            }
-          part
-            {
-               name: "btn_icon";
-               type: IMAGE;
-               repeat_events: 1;
-               description
-                 {
-                    state: "default" 0.0;
-                    rel1.to: "btn";
-                    rel2.to: "btn";
-                    align: 0.5 0.5;
-                    min: 16 16;
-                    max: 16 16;
-                    image.normal: "icon_arrow_right.png";
-                 }
-               description
-                 {
-                    state: "visible" 0.0;
-                    inherit: "default" 0.0;
-                    image.normal: "icon_arrow_left.png";
-                 }
+   group {
+      name: "elm/panel/base/left";
+      images {
+         image: "bt_base1.png" COMP;
+         image: "bt_hilight.png" COMP;
+         image: "bt_shine.png" COMP;
+         image: "bt_glow.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "icon_arrow_left.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+      }
+      parts {
+         part {
+            name: "bg";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.offset: 30 0;
+               rel2.relative: 0.0 1.0;
             }
-       }
-     programs
-       {
-          program
-            {
-               name: "show";
-               signal: "elm,action,show";
-               source: "elm";
-               action: STATE_SET "visible" 0.0;
-               target: "bg";
-               target: "btn_icon";
-               transition: LINEAR 0.5;
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               rel2.relative: 1.0 1.0;
             }
-          program
-            {
-               name: "show2";
-               signal: "show";
-               action: STATE_SET "default" 0.0;
-               target: "bg";
-               target: "btn_icon";
-               after: "show3";
-            }
-          program
-            {
-               name: "show3";
-               action: STATE_SET "visible" 0.0;
-               target: "bg";
-               target: "btn_icon";
-               transition: LINEAR 0.5;
+         }
+         part {
+            name: "base";
+            type: IMAGE;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel2 {
+                  offset: -20 -1;
+                  to_x: "bg";
+               }
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
             }
-          program
-            {
-               name: "hide";
-               signal: "elm,action,hide";
-               source: "elm";
-               action: STATE_SET "default" 0.0;
-               target: "bg";
-               target: "btn_icon";
-               transition: LINEAR 0.5;
+         }
+         part {
+            name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  offset: 4 4;
+                  to: "base";
+               }
+               rel2 {
+                  offset: -5 -5;
+                  to: "base";
+               }
             }
-          program
-            {
-               name: "btn_click";
-               signal: "mouse,down,1";
-               source: "btn_over2";
-               action: STATE_SET "clicked" 0.0;
-               target: "btn";
-            }
-          program
-            {
-               name: "btn_unclick";
-               signal: "mouse,up,1";
-               source: "btn_over2";
-               action: STATE_SET "default" 0.0;
-               target: "btn";
-            }
-          program
-            {
-               name: "btn_click2";
-               signal: "mouse,down,1";
-               source: "btn_over3";
-               action: STATE_SET "clicked" 0.0;
-               target: "btn_over3";
-            }
-          program
-            {
-               name: "btn_unclick2";
-               signal: "mouse,up,1";
-               source: "btn_over3";
-               action: STATE_SET "default" 0.0;
-               transition: DECELERATE 0.5;
-               target: "btn_over3";
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            clip_to: "clipper";
+            description {
+               state: "default" 0.0;
+               rel1.to: "clipper";
+               rel2.to: "clipper";
+            }
+         }
+         part {
+            name: "btn";
+            type: IMAGE;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               max: 32 48;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset: -3 0;
+                  to_x: "base";
+               }
+               rel2.to_x: "bg";
+               image {
+                  normal: "bt_base1.png";
+                  border: 0 5 4 12;
+               }
+               fill.smooth: 0;
             }
-          program
-            {
-               name: "btn_unclick3";
-               signal: "mouse,up,1";
-               source: "btn_over2";
-               action: SIGNAL_EMIT "elm,action,panel,toggle" "";
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
             }
-       }
-  }
+         }
+         part {
+            name: "btn_over";
+            type: IMAGE;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.to: "btn";
+               rel2 {
+                  relative: 1.0 0.5;
+                  to: "btn";
+               }
+               image {
+                  normal: "bt_hilight.png";
+                  border: 0 7 7 0;
+               }
+            }
+         }
+         part {
+            name: "btn_over2";
+            type: IMAGE;
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description {
+               state: "default" 0.0;
+               rel1.to: "btn";
+               rel2.to: "btn";
+               image {
+                  normal: "bt_shine.png";
+                  border: 0 7 7 7;
+               }
+            }
+         }
+         part {
+            name: "btn_over3";
+            type: IMAGE;
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 0;
+               rel1.to: "btn";
+               rel2.to: "btn";
+               image {
+                  normal: "bt_glow.png";
+                  border: 12 12 12 12;
+               }
+               fill.smooth: 0;
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "btn_icon";
+            type: IMAGE;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.to: "btn";
+               rel2.to: "btn";
+               align: 0.5 0.5;
+               min: 16 16;
+               max: 16 16;
+               image.normal: "icon_arrow_right.png";
+            }
+            description {
+               state: "visible" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_left.png";
+            }
+         }
+      }
+      programs {
+         program {
+            name: "show";
+            signal: "elm,action,show";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "bg";
+            target: "btn_icon";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "show2";
+            signal: "show";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "btn_icon";
+            after: "show3";
+         }
+         program {
+            name: "show3";
+            action: STATE_SET "visible" 0.0;
+            target: "bg";
+            target: "btn_icon";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "hide";
+            signal: "elm,action,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg";
+            target: "btn_icon";
+            transition: LINEAR 0.5;
+         }
+         program {
+            name: "btn_click";
+            signal: "mouse,down,1";
+            source: "btn_over2";
+            action: STATE_SET "clicked" 0.0;
+            target: "btn";
+         }
+         program {
+            name: "btn_unclick";
+            signal: "mouse,up,1";
+            source: "btn_over2";
+            action: STATE_SET "default" 0.0;
+            target: "btn";
+         }
+         program {
+            name: "btn_click2";
+            signal: "mouse,down,1";
+            source: "btn_over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "btn_over3";
+         }
+         program {
+            name: "btn_unclick2";
+            signal: "mouse,up,1";
+            source: "btn_over3";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "btn_over3";
+         }
+         program {
+            name: "btn_unclick3";
+            signal: "mouse,up,1";
+            source: "btn_over2";
+            action: SIGNAL_EMIT "elm,action,panel,toggle" "";
+         }
+      }
+   }
 
 ///////////////////////////////////////////////////////////////////////////////
-  group { name: "elm/conformant/base/default";
-     parts {
-        part { name: "elm.swallow.shelf";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              align: 0.0 0.0;
-              rel2.relative: 1.0 0.0;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.5 0.5;
-              rel1.relative: 0.0 1.0;
-              rel1.to_y: "elm.swallow.shelf";
-              rel2.relative: 1.0 0.0;
-              rel2.to_y: "elm.swallow.panel";
-           }
-        }
-        part { name: "elm.swallow.panel";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              align: 0.0 1.0;
-              rel1.relative: 0.0 1.0;
-           }
-        }
-     }
-  }
-
+   group {
+      name: "elm/conformant/base/default";
+      parts {
+         part {
+            name: "elm.swallow.shelf";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+            }
+         }
+         part {
+            name: "elm.swallow.content";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1.relative: 0.0 1.0;
+               rel1.to_y: "elm.swallow.shelf";
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "elm.swallow.panel";
+            }
+         }
+         part {
+            name: "elm.swallow.panel";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 1.0;
+               rel1.relative: 0.0 1.0;
+            }
+         }
+      }
+   }
 }