tabs: not on my watch.
authordiscomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 17 Feb 2011 09:04:53 +0000 (09:04 +0000)
committerdiscomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 17 Feb 2011 09:04:53 +0000 (09:04 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@57115 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

data/themes/default.edc

index 9ab27de..8b79b30 100644 (file)
@@ -246,68 +246,68 @@ collections {
    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.rectangle";
-           type: SWALLOW;
-           description { state: "default" 0.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 -9;
-              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;
-           }
-        }
+            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.rectangle";
+            type: SWALLOW;
+            description { state: "default" 0.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 -9;
+               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;
+            }
+         }
       }
    }
 
@@ -325,77 +325,77 @@ collections {
       }
 
       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: "shelf_inset.png" COMP;
+         image: "bt_sm_base2.png" COMP;
+         image: "bt_sm_shine.png" COMP;
+         image: "bt_sm_hilight.png" COMP;
          image: "sl_bt2_2.png" COMP;
       }
       parts {
          part { name: "bg";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel1.offset: 2 2;
-              rel2.offset: -3 -3;
-              color: 255 255 255 0;
-           }
-        }
-        part { name: "clipper";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "bg";
-              rel2.to: "bg";
-              rel1.offset: 2 2;
-              rel2.offset: -3 -3;
-           }
-        }
-        part { name: "elm.swallow.content";
-           clip_to: "clipper";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.to: "bg";
-              rel2.to: "bg";
-              rel1.offset: 2 2;
-              rel2.offset: -3 -3;
-           }
-        }
-        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;
-           }
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
+               color: 255 255 255 0;
+            }
+         }
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
+            }
+         }
+         part { name: "elm.swallow.content";
+            clip_to: "clipper";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
+            }
+         }
+         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;
+            }
             description { state: "enabled" 0.0;
                inherit: "default" 0.0;
                color: 200 155 0 255;
@@ -419,833 +419,246 @@ collections {
                color: 200 155 0 255;
             }
          }
-        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";
+         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: 10 17;
-              align: 1.0 0.0;
-              rel1 {
-                 relative: 1.0 0.0;
-                 offset:   0 2;
-                 to_y:     "elm.swallow.content";
+            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: 10 17;
+               align: 1.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  offset:   0 2;
+                  to_y:     "elm.swallow.content";
                   to_x:     "elm.swallow.content";
-              }
-              rel2 {
-                 relative: 1.0 0.0;
-                 offset:   -1 -1;
-                 to_y:     "sb_hbar";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  offset:   -1 -1;
+                  to_y:     "sb_hbar";
                   to_x:     "elm.swallow.content";
-              }
-           }
-        }
-        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: 10 17;
-               max: 10 99999;
-              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;
-                  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 10;
-              align: 0.0 1.0;
-              rel1 {
-                 relative: 0.0 1.0;
-                 offset:   2 0;
-                 to_x:     "elm.swallow.content";
-                  to_y:     "elm.swallow.content";
-              }
-              rel2 {
-                 relative: 0.0 1.0;
-                 offset:   -1 -1;
-                 to_x:     "sb_vbar";
-                  to_y:     "elm.swallow.content";
-              }
-           }
-        }
-        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 10;
-               max: 99999 10;
-              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: 4 4 4 4;
-                  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: 4 4 4 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: 4 4 4 0;
-              }
-           }
-        }
-        part { name: "disabler";
-           type: RECT;
-           description { state: "default" 0.0;
-               rel1.to: "clipper";
-               rel2.to: "clipper";
-              color: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-               color: 128 128 128 128;
-           }
-        }
-      }
-      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_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: "elm.dragable.vbar";
+            clip_to: "sb_vbar_clip";
+            mouse_events: 0;
+            dragable {
+               x: 0 0 0;
+               y: 1 1 0;
+               confine: "sb_vbar";
             }
-        }
-        program { name: "sb_vbar_show";
-           signal: "do-show-vbar";
-           source: "";
-           action:  STATE_SET "default" 0.0;
-           transition: LINEAR 0.5;
-           target: "sb_vbar_clip";
-        }
-        program { name: "sb_vbar_hide";
-           signal: "do-hide-vbar";
-           source: "";
-           action:  STATE_SET "hidden" 0.0;
-           transition: LINEAR 0.5;
-           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);
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: 10 17;
+               max: 10 99999;
+               rel1 {
+                  relative: 0.5  0.5;
+                  offset:   0    0;
+                  to: "sb_vbar";
                }
-            }
-        }
-        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);
-                  }
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset:   0    0;
+                  to: "sb_vbar";
+               }
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
+                  middle: SOLID;
                }
             }
-        }
-        program { name: "sb_hbar_show";
-           signal: "do-show-hbar";
-           source: "";
-           action:  STATE_SET "default" 0.0;
-           transition: LINEAR 0.5;
-           target: "sb_hbar_clip";
-        }
-        program { name: "sb_hbar_hide";
-           signal: "do-hide-hbar";
-           source: "";
-           action:  STATE_SET "hidden" 0.0;
-           transition: LINEAR 0.5;
-           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(1.0, "timer0", 0);
-              set_int(sbvis_timer, v);
-           }
-        }
-
-         program { name: "highlight_show";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "enabled" 0.0;
-            transition: ACCELERATE 0.3;
-            target: "focus_highlight";
-            target: "conf_over";
          }
-         program { name: "highlight_hide";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.3;
-            target: "focus_highlight";
-            target: "conf_over";
+         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: "disable";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-           target: "disabler";
+         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;
+               }
+            }
          }
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "disabler";
-        }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/scroller/entry/default";
 
-      data {
-         item: "focus_highlight" "on";
-      }
-
-      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: "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 10;
+               align: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset:   2 0;
+                  to_x:     "elm.swallow.content";
+                  to_y:     "elm.swallow.content";
                }
-           }
-           v = get_int(sbvis_h);
-           if (v) {
-               v = get_int(sbalways_h);
-               if (!v) {
-                  emit("do-hide-hbar", "");
-                  set_int(sbvis_h, 0);
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset:   -1 -1;
+                  to_x:     "sb_vbar";
+                  to_y:     "elm.swallow.content";
                }
-           }
-           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: "sl_bt2_2.png" COMP;
-      }
-      parts {
-         part { name: "bg";
-           type: RECT;
-           description { state: "default" 0.0;
-              rel1.offset: 2 2;
-              rel2.offset: -3 -3;
-           }
-        }
-        part { name: "clipper";
-           type: RECT;
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "bg";
-              rel2.to: "bg";
-              rel1.offset: 2 2;
-              rel2.offset: -3 -3;
-           }
-        }
-        part { name: "contentclipper";
-           type: RECT;
-           mouse_events: 0;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.icon";
-              rel1.relative: 1.0 0.0;
-              rel2.to: "elm.swallow.end";
-              rel2.relative: 0.0 1.0;
-           }
-        }
-        part { name: "elm.swallow.icon";
-           type: SWALLOW;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              rel1 {
-                 to: "bg";
-                 relative: 0.0 0.0;
-                 offset: 0 0;
-              }
-              rel2 {
-                 to: "bg";
-                 relative: 0.0 1.0;
-                 offset: -1 -1;
-              }
-              visible: 0;
-           }
-           description { state: "visible" 0.0;
-              fixed: 1 1;
-              align: 0.0 1.0;
-              rel1 {
-                 to: "bg";
-                 relative: 0.0 0.0;
-                 offset: 0 0;
-              }
-              rel2 {
-                 to: "bg";
-                 relative: 0.0 1.0;
-                 offset: -1 -1;
-              }
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.end";
-           type: SWALLOW;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              rel1 {
-                 to: "bg";
-                 relative: 1.0 0.0;
-                 offset: 0 0;
-              }
-              rel2 {
-                 to: "bg";
-                 relative: 1.0 1.0;
-                 offset: -1 -1;
-              }
-              visible: 0;
-           }
-           description { state: "visible" 0.0;
-              fixed: 1 1;
-              align: 1.0 1.0;
-              rel1 {
-                 to: "bg";
-                 relative: 1.0 0.0;
-                 offset: 0 0;
-              }
-              rel2 {
-                 to: "bg";
-                 relative: 1.0 1.0;
-                 offset: -1 -1;
-              }
-              visible: 1;
-           }
-        }
-        part { name: "elm.swallow.content";
-           clip_to: "contentclipper";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1 {
-               to: "elm.swallow.icon";
-               relative: 1.0 0.0;
-               offset: 4 4;
-              }
-              rel2 {
-               to: "elm.swallow.end";
-               relative: 0.0 1.0;
-               offset: -5 -5;
-              }
-           }
-        }
-        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;
-           }
-            description { state: "enabled" 0.0;
-               inherit: "default" 0.0;
-               color: 200 155 0 255;
             }
          }
-         part { name: "focus_highlight";
+         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 10;
+               max: 99999 10;
+               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: 4 4 4 4;
+                  middle: SOLID;
+               }
+            }
+         }
+         part { name: "sb_hbar_over1";
+            clip_to: "sb_hbar_clip";
             mouse_events: 0;
             description { state: "default" 0.0;
-               rel1.offset: -1 -1;
-               rel2.offset: 0 0;
+               rel1.to: "elm.dragable.hbar";
+               rel2.relative: 1.0 0.5;
+               rel2.to: "elm.dragable.hbar";
                image {
-                  normal: "sl_bt2_2.png";
-                  border: 7 7 7 7;
-                  middle: 0;
+                  normal: "bt_sm_hilight.png";
+                  border: 4 4 4 0;
                }
-               fill.smooth : 0;
-               color: 200 155 0 0;
             }
-            description { state: "enabled" 0.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: 4 4 4 0;
+               }
+            }
+         }
+          part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1.to: "clipper";
+               rel2.to: "clipper";
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 200 155 0 255;
+               visible: 1;
+               color: 128 128 128 128;
             }
-        }
-        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: 10 17;
-              align: 1.0 0.0;
-              rel1 {
-                 relative: 0.0 0.0;
-                 offset:   -2 2;
-                 to_y:     "elm.swallow.content";
-                 to_x:     "elm.swallow.end";
-              }
-              rel2 {
-                 relative: 0.0 0.0;
-                 offset:   -2 -1;
-                 to_y:     "sb_hbar";
-                 to_x:     "elm.swallow.end";
-              }
-           }
-        }
-        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: 10 17;
-               max: 10 99999;
-              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;
-                  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 10;
-              align: 0.0 1.0;
-              rel1 {
-                 relative: 0.0 1.0;
-                 offset:   2 0;
-                 to_x:     "elm.swallow.content";
-                  to_y:     "elm.swallow.content";
-              }
-              rel2 {
-                 relative: 0.0 1.0;
-                 offset:   -1 -1;
-                 to_x:     "sb_vbar";
-                  to_y:     "elm.swallow.content";
-              }
-           }
-        }
-        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 10;
-               max: 99999 10;
-              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: 4 4 4 4;
-                  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: 4 4 4 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: 4 4 4 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: "icon_show";
-           signal: "elm,action,show,icon";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "elm.swallow.icon";
-        }
-        program { name: "icon_hide";
-           signal: "elm,action,hide,icon";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.swallow.icon";
-        }
-        program { name: "end_show";
-           signal: "elm,action,show,end";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-           target: "elm.swallow.end";
-        }
-        program { name: "end_hide";
-           signal: "elm,action,hide,end";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.swallow.end";
-        }
-        program { name: "vbar_show";
-           signal: "elm,action,show,vbar";
-           source: "elm";
+         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";
+         }
+         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";
+         }
+         program { name: "vbar_show_always";
+            signal: "elm,action,show_always,vbar";
+            source: "elm";
             script {
                new v;
                v = get_int(sbvis_v);
@@ -1256,10 +669,10 @@ collections {
                   set_int(sbvis_v, 1);
                }
             }
-        }
-        program { name: "vbar_show_notalways";
-           signal: "elm,action,show_notalways,vbar";
-           source: "elm";
+         }
+         program { name: "vbar_show_notalways";
+            signal: "elm,action,show_notalways,vbar";
+            source: "elm";
             script {
                new v;
                v = get_int(sbalways_v);
@@ -1272,37 +685,37 @@ collections {
                   }
                }
             }
-        }
-        program { name: "sb_vbar_show";
-           signal: "do-show-vbar";
-           source: "";
-           action:  STATE_SET "default" 0.0;
-           transition: LINEAR 0.5;
-           target: "sb_vbar_clip";
-        }
-        program { name: "sb_vbar_hide";
-           signal: "do-hide-vbar";
-           source: "";
-           action:  STATE_SET "hidden" 0.0;
-           transition: LINEAR 0.5;
-           target: "sb_vbar_clip";
-        }
-
-        program { name: "hbar_show";
-           signal: "elm,action,show,hbar";
-           source: "elm";
+         }
+         program { name: "sb_vbar_show";
+            signal: "do-show-vbar";
+            source: "";
+            action:  STATE_SET "default" 0.0;
+            transition: LINEAR 0.5;
+            target: "sb_vbar_clip";
+         }
+         program { name: "sb_vbar_hide";
+            signal: "do-hide-vbar";
+            source: "";
+            action:  STATE_SET "hidden" 0.0;
+            transition: LINEAR 0.5;
+            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";
+         }
+         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";
+         }
+         program { name: "hbar_show_always";
+            signal: "elm,action,show_always,hbar";
+            source: "elm";
             script {
                new v;
                v = get_int(sbvis_h);
@@ -1313,10 +726,10 @@ collections {
                   set_int(sbvis_h, 1);
                }
             }
-        }
-        program { name: "hbar_show_notalways";
-           signal: "elm,action,show_notalways,hbar";
-           source: "elm";
+         }
+         program { name: "hbar_show_notalways";
+            signal: "elm,action,show_notalways,hbar";
+            source: "elm";
             script {
                new v;
                v = get_int(sbalways_h);
@@ -1329,45 +742,45 @@ collections {
                   }
                }
             }
-        }
-        program { name: "sb_hbar_show";
-           signal: "do-show-hbar";
-           source: "";
-           action:  STATE_SET "default" 0.0;
-           transition: LINEAR 0.5;
-           target: "sb_hbar_clip";
-        }
-        program { name: "sb_hbar_hide";
-           signal: "do-hide-hbar";
-           source: "";
-           action:  STATE_SET "hidden" 0.0;
-           transition: LINEAR 0.5;
-           target: "sb_hbar_clip";
-        }
-
-        program { name: "scroll";
-           signal: "elm,action,scroll";
-           source: "elm";
-           script {
-              new v;
-              v = get_int(sbvis_v);
+         }
+         program { name: "sb_hbar_show";
+            signal: "do-show-hbar";
+            source: "";
+            action:  STATE_SET "default" 0.0;
+            transition: LINEAR 0.5;
+            target: "sb_hbar_clip";
+         }
+         program { name: "sb_hbar_hide";
+            signal: "do-hide-hbar";
+            source: "";
+            action:  STATE_SET "hidden" 0.0;
+            transition: LINEAR 0.5;
+            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) {
+               if (!v) {
                   emit("do-show-vbar", "");
                   set_int(sbvis_v, 1);
-              }
-              v = get_int(sbvis_h);
+               }
+               v = get_int(sbvis_h);
                v |= get_int(sbalways_h);
-              if (!v) {
+               if (!v) {
                   emit("do-show-hbar", "");
                   set_int(sbvis_h, 1);
-              }
-              v = get_int(sbvis_timer);
-              if (v > 0) cancel_timer(v);
-              v = timer(1.0, "timer0", 0);
-              set_int(sbvis_timer, v);
-           }
-        }
+               }
+               v = get_int(sbvis_timer);
+               if (v > 0) cancel_timer(v);
+               v = timer(1.0, "timer0", 0);
+               set_int(sbvis_timer, v);
+            }
+         }
 
          program { name: "highlight_show";
             signal: "elm,action,focus_highlight,show";
@@ -1385,3321 +798,3908 @@ collections {
             target: "focus_highlight";
             target: "conf_over";
          }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disabler";
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disabler";
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-#define TEXT_SLIDE_DURATION     10
+   group { name: "elm/scroller/entry/default";
 
-   group { name: "elm/label/base/default";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      styles {
-         style { name: "textblock_style";
-            base: "font=Sans font_size=10 color=#000 wrap=word text_class=label";
-            tag:  "br" "\n";
-            tag:  "ps" "ps";
-            tag:  "hilight" "+ font=Sans:style=Bold";
-            tag:  "b" "+ font=Sans:style=Bold";
-            tag:  "tab" "\t";
-          }
-       }
-      parts {
-        part { name: "label.swallow.background";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               visible: 1;
-           }
-         }
-        part { name: "label.text.clip";
-            type: RECT;
-           description { state: "default" 0.0;
-               rel1 { relative: 0 0; to: "label.swallow.background"; }
-               rel2 { relative: 1 1; to: "label.swallow.background"; }
-           }
-        }
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "label.text.clip";
-           description { state: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-               text {
-                  style: "textblock_style";
-                  min: 1 1;
-               }
-           }
-        }
+      data {
+         item: "focus_highlight" "on";
       }
-   }
 
-   group { name: "elm/label/base_wrap/default";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      parts {
-         part { name: "label.swallow.background";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0 0; to: "elm.text"; }
-               rel2 { relative: 1 1; to: "elm.text"; }
+      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;
          }
-        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_wrap_ellipsis/default";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      parts {
-        part { name: "label.swallow.background";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0 0; to: "elm.text"; }
-               rel2 { relative: 1 1; to: "elm.text"; }
-           }
-         }
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           multiline: 1;
-           description { state: "default" 0.0;
-              fixed: 0 1; 
-              text {
-                 style: "textblock_style";
-                 min: 0 1;
-              }
-           }
-        }
       }
-   }
-
-   group { name: "elm/label/base/marker";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      styles {
-         style { name: "textblock_style2";
-          base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word text_class=label";
-           tag:  "br" "\n";
-           tag:  "ps" "ps";
-          tag:  "hilight" "+ color=#ffff";
-          tag:  "b" "+ color=#ffff";
-          tag:  "tab" "\t";
-        }
+      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: "sl_bt2_2.png" COMP;
       }
       parts {
-         part { name: "label.swallow.background";
-            type: SWALLOW;
+         part { name: "bg";
+            type: RECT;
             description { state: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0 0; to: "elm.text"; }
-               rel2 { relative: 1 1; to: "elm.text"; }
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
             }
          }
-        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";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      parts {
-         part { name: "label.swallow.background";
-            type: SWALLOW;
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
-               rel1 { relative: 0 0; to: "elm.text"; }
-               rel2 { relative: 1 1; to: "elm.text"; }
+               rel1.to: "bg";
+               rel2.to: "bg";
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
             }
          }
-         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/label/base/slide_long";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      
-      script {
-        public g_duration, g_stopslide, g_timer_id, g_anim_id;
-          
-        public message(Msg_Type:type, id, ...) {
-           if ((type == MSG_FLOAT_SET) && (id == 0)) {
-              new Float:duration;
-              duration = getarg(2);
-              set_float(g_duration, duration);
-           }
-        }
-        public slide_to_end_anim(val, Float:pos) {
-           new stopflag;
-           new id;
-           stopflag = get_int(g_stopslide);
-           if (stopflag == 1) return;
-           set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0);
-           if (pos >= 1.0) {
-              id = timer(0.5, "slide_to_begin", 1);
-              set_int(g_timer_id, id);
-           }
-        }
-        public slide_to_end() {
-           new stopflag;
-           new id;
-           new Float:duration;
-           stopflag = get_int(g_stopslide);
-           if (stopflag == 1) return;
-           duration = get_float(g_duration);
-           id = anim(duration, "slide_to_end_anim", 1);
-           set_int(g_anim_id, id);
-        }
-        public slide_to_begin() {
-           new stopflag;
-           new id;
-           stopflag = get_int(g_stopslide);
-           if (stopflag == 1) return;
-           set_state(PART:"elm.text", "slide_begin", 0.0);
-           id = timer(0.5, "slide_to_end", 1);
-           set_int(g_timer_id, id);
-        }
-        public start_slide() {
-           set_int(g_stopslide, 0);
-           set_state(PART:"elm.text", "slide_begin", 0.0);
-           slide_to_end();
-        }
-        public stop_slide() {
-           new id;
-           set_int(g_stopslide, 1);
-           id = get_int(g_anim_id);
-           cancel_anim(id);
-           id = get_int(g_timer_id);
-           cancel_timer(id);
-           set_state(PART:"elm.text", "default", 0.0);
-        }
-      }
-       
-      parts {
-        part { name: "label.swallow.background";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-               visible: 1;
-           }
-         }
-        part { name: "label.text.clip";
+         part { name: "contentclipper";
             type: RECT;
-           description { state: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               rel1 { relative: 0 0; to: "label.swallow.background"; }
-               rel2 { relative: 1 1; to: "label.swallow.background"; }
-           }
-        }
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "label.text.clip";
-           description { state: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-               align: 0.0 0.0;
-               text {
-                  style: "textblock_style";
-                  min: 1 1;
-               }
-           }
-            description { state: "slide_end" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 0.0;
+            mouse_events: 0;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               rel1.to: "elm.swallow.icon";
+               rel1.relative: 1.0 0.0;
+               rel2.to: "elm.swallow.end";
                rel2.relative: 0.0 1.0;
-               align: 1.0 0.0;
             }
-            description { state: "slide_begin" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-               align: 0.0 0.0;
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  to: "bg";
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "bg";
+                  relative: 0.0 1.0;
+                  offset: -1 -1;
+               }
+               visible: 0;
             }
-        }
-       }
-       programs {
-          program { name: "start_slide";
-             source: "elm";
-             signal: "elm,state,slide,start";
-             script
-               {
-                  start_slide();
+            description { state: "visible" 0.0;
+               fixed: 1 1;
+               align: 0.0 1.0;
+               rel1 {
+                         to: "bg";
+                         relative: 0.0 0.0;
+                         offset: 0 0;
                }
-          }
-          program { name: "stop_slide";
-             source: "elm";
-             signal: "elm,state,slide,stop";
-             script
-               {
-                  stop_slide();
+               rel2 {
+                  to: "bg";
+                  relative: 0.0 1.0;
+                  offset: -1 -1;
                }
-          }
-       }
-   }
-   
-
-   group { name: "elm/label/base/slide_short";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-
-      script {
-         public g_duration, g_stopslide, g_timer_id, g_anim_id;
-         
-         public message(Msg_Type:type, id, ...) {
-            if ((type == MSG_FLOAT_SET) && (id == 0)) {
-               new Float:duration;
-               duration = getarg(2);
-               set_float(g_duration, duration);
+               visible: 1;
             }
          }
-         public slide_to_end_anim(val, Float:pos) {
-            new stopflag;
-            new id;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0);
-            if (pos >= 1.0) {
-               id = timer(0.5, "slide_to_begin", 1);
-               set_int(g_timer_id, id);
-            }
-         }
-         public slide_to_end() {
-            new stopflag;
-            new id;
-            new Float:duration;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            duration = get_float(g_duration);
-            id = anim(duration, "slide_to_end_anim", 1);
-            set_int(g_anim_id, id);
-         }
-         public slide_to_begin() {
-            new stopflag;
-            new id;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            set_state(PART:"elm.text", "slide_begin", 0.0);
-            id = timer(0.5, "slide_to_end", 1);
-            set_int(g_timer_id, id);
-         }
-         public start_slide() {
-            set_int(g_stopslide, 0);
-            set_state(PART:"elm.text", "slide_begin", 0.0);
-            slide_to_end();
-         }
-         public stop_slide() {
-            new id;
-            set_int(g_stopslide, 1);
-            id = get_int(g_anim_id);
-            cancel_anim(id);
-            id = get_int(g_timer_id);
-            cancel_timer(id);
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-
-      parts {
-        part { name: "label.swallow.background";
-           type: SWALLOW;
-           description { state: "default" 0.0;
+         part { name: "elm.swallow.end";
+            type: SWALLOW;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  to: "bg";
+                  relative: 1.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "bg";
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
+               }
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 1;
+               align: 1.0 1.0;
+               rel1 {
+                  to: "bg";
+                  relative: 1.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "bg";
+                  relative: 1.0 1.0;
+                  offset: -1 -1;
+               }
                visible: 1;
-           }
+            }
          }
-        part { name: "label.text.clip";
-            type: RECT;
-           description { state: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               rel1 { relative: 0 0; to: "label.swallow.background"; }
-               rel2 { relative: 1 1; to: "label.swallow.background"; }
-           }
-        }
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "label.text.clip";
-           description { state: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-               align: 0.0 0.0;
-               text {
-                  style: "textblock_style";
-                  min: 1 1;
+         part { name: "elm.swallow.content";
+            clip_to: "contentclipper";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1 {
+                       to: "elm.swallow.icon";
+                       relative: 1.0 0.0;
+                       offset: 4 4;
+               }
+               rel2 {
+                to: "elm.swallow.end";
+                relative: 0.0 1.0;
+                offset: -5 -5;
                }
-           }
-            description { state: "slide_end" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-               align: 1.0 0.0;
             }
-            description { state: "slide_begin" 0.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;
+            }
+            description { state: "enabled" 0.0;
                inherit: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-               align: 0.0 0.0;
+               color: 200 155 0 255;
             }
-        }
-      }
-      programs {
-         program { name: "start_slide";
-            source: "elm";
-            signal: "elm,state,slide,start";
-            script
-              {
-                 start_slide();
-              }
-         }
-         program { name: "stop_slide";
-            source: "elm";
-            signal: "elm,state,slide,stop";
-            script
-              {
-                 stop_slide();
-              }
          }
-      }
-   }
-
-   group { name: "elm/label/base/slide_bounce";
-      data.item: "default_font_size" "10";
-      data.item: "min_font_size" "6";
-      data.item: "max_font_size" "60";
-      
-      script {
-         public g_duration, g_stopslide, g_timer_id, g_anim_id;
-         
-         public message(Msg_Type:type, id, ...) {
-            if ((type == MSG_FLOAT_SET) && (id == 0)) {
-               new Float:duration;
-               duration = getarg(2);
-               set_float(g_duration, duration);
+         part { name: "focus_highlight";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.offset: -1 -1;
+               rel2.offset: 0 0;
+               image {
+                  normal: "sl_bt2_2.png";
+                  border: 7 7 7 7;
+                  middle: 0;
+               }
+               fill.smooth : 0;
+               color: 200 155 0 0;
             }
-         }
-         public slide_to_end_anim(val, Float:pos) {
-            new stopflag;
-            new id;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0);
-            if (pos >= 1.0) {
-               id = timer(0.5, "slide_to_begin", 1);
-               set_int(g_timer_id, id);
+            description { state: "enabled" 0.0;
+               inherit: "default" 0.0;
+               color: 200 155 0 255;
             }
          }
-         public slide_to_end() {
-            new stopflag;
-            new id;
-            new Float:duration;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            duration = get_float(g_duration);
-            id = anim(duration, "slide_to_end_anim", 1);
-            set_int(g_anim_id, id);
-         }
-         public slide_to_begin_anim(val, Float:pos) {
-            new stopflag;
-            new id;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            set_tween_state(PART:"elm.text", pos, "slide_end", 0.0, "slide_begin", 0.0);
-            if (pos >= 1.0) {
-               id = timer(0.5, "slide_to_end", 1);
-               set_int(g_timer_id, id);
+         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;
             }
          }
-         public slide_to_begin() {
-            new stopflag;
-            new id;
-            new Float:duration;
-            stopflag = get_int(g_stopslide);
-            if (stopflag == 1) return;
-            duration = get_float(g_duration);
-            id = anim(duration, "slide_to_begin_anim", 1);
-            set_int(g_anim_id, id);
-         }
-         public start_slide() {
-            set_int(g_stopslide, 0);
-            set_state(PART:"elm.text", "slide_begin", 0.0);
-            slide_to_end();
-         }
-         public stop_slide() {
-            new id;
-            set_int(g_stopslide, 1);
-            id = get_int(g_anim_id);
-            cancel_anim(id);
-            id = get_int(g_timer_id);
-            cancel_timer(id);
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-
-      parts {
-        part { name: "label.swallow.background";
-            type: SWALLOW;
-           description { state: "default" 0.0;
-               visible: 1;
-           }
-         }
-        part { name: "label.text.clip";
+         part { name: "sb_vbar_clip";
+            clip_to: "sb_vbar_clip_master";
             type: RECT;
-           description { state: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               rel1 { relative: 0 0; to: "label.swallow.background"; }
-               rel2 { relative: 1 1; to: "label.swallow.background"; }
-           }
-        }
-        part { name: "elm.text";
-           type: TEXTBLOCK;
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "label.text.clip";
-           description { state: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-               align: 0.0 0.0;
-               text {
-                  style: "textblock_style";
-                  min: 1 1;
-               }
-           }
-            description { state: "slide_end" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-               align: 1.0 0.0;
+            mouse_events: 0;
+            description { state: "default" 0.0;
             }
-            description { state: "slide_begin" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-               align: 0.0 0.0;
+            description { state: "hidden" 0.0;
+               visible: 0;
+               color: 255 255 255 0;
             }
-        }
-      }
-      programs {
-         program { name: "start_slide";
-            source: "elm";
-            signal: "elm,state,slide,start";
-            script
-              {
-                 start_slide();
-              }
          }
-         program { name: "stop_slide";
-            source: "elm";
-            signal: "elm,state,slide,stop";
-            script
-              {
-                 stop_slide();
-              }
+         part { name: "sb_vbar";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: 10 17;
+               align: 1.0 0.0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset:   -2 2;
+                  to_y:     "elm.swallow.content";
+                  to_x:     "elm.swallow.end";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset:   -2 -1;
+                  to_y:     "sb_hbar";
+                  to_x:     "elm.swallow.end";
+               }
+            }
          }
-      }
-   }
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-   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;
-          min: 15 15;
-              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;
-                  text_class: "button";
-              }
-           }
-           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;
+         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;
-               color: 255 255 255 0;
+               fixed: 1 1;
+               min: 10 17;
+               max: 10 99999;
+               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_glow.png";
-                  border: 12 12 12 12;
+                  normal: "bt_sm_base2.png";
+                  border: 6 6 6 6;
+                  middle: SOLID;
                }
-              fill.smooth : 0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               color: 255 255 255 255;
+         }
+         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: "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: "over3";
-           action: SIGNAL_EMIT "elm,action,unpress" "";
-           after: "button_unclick_anim";
-        }
-        program {
-           name:   "button_pressed_anim";
-           signal: "elm,anim,activate";
-           source: "elm";
-           action: STATE_SET "clicked" 0.0;
-           target: "button_image";
-           target: "over3";
-           after: "button_unpressed_anim";
-        }
-        program {
-           name:   "button_unpressed_anim";
-           action: STATE_SET "default" 0.0;
-           transition: DECELERATE 0.5;
-           target: "button_image";
-           target: "over3";
-        }
-        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,clicked,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_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/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;
-                  relative: 1.0 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 10;
+               align: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  offset:   2 0;
+                  to_x:     "elm.swallow.content";
+                  to_y:     "elm.swallow.content";
                }
-              rel2 {
-                  to_x: "arrow";
-                  offset: 1 -5;
-                  relative: 1.0 1.0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset:   -1 -1;
+                  to_x:     "sb_vbar";
+                  to_y:     "elm.swallow.content";
                }
-           }
-           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;
+            }
+         }
+         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 10;
+               max: 99999 10;
                rel1 {
-                  to_x: "button_image";
-                  offset: -5 -5;
-                  relative: 1.0 1.0;
+                  relative: 0.5  0.5;
+                  offset:   0    0;
+                  to: "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;
-                  text_class: "button";
-              }
-           }
-           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;
+               rel2 {
+                  relative: 0.5  0.5;
+                  offset:   0    0;
+                  to: "sb_hbar";
+               }
+               image {
+                  normal: "bt_sm_base2.png";
+                  border: 4 4 4 4;
+                  middle: SOLID;
+               }
+            }
+         }
+         part { name: "sb_hbar_over1";
+            clip_to: "sb_hbar_clip";
+            mouse_events: 0;
             description { state: "default" 0.0;
-               color: 255 255 255 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: 4 4 4 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: 4 4 4 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: 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);
-           }
+         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);
+            }
          }
-      }
-   }
-
-   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;
-                  text_class: "button";
-              }
-           }
-           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;
-          min: 15 15;
-           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";
-               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;
-                  text_class: "button";
-              }
-           }
-           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;
-               image {
-                  normal: "bt_glow.png";
-                  border: 12 12 12 12;
+         program { name: "icon_show";
+            signal: "elm,action,show,icon";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.icon";
+         }
+         program { name: "icon_hide";
+            signal: "elm,action,hide,icon";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.icon";
+         }
+         program { name: "end_show";
+            signal: "elm,action,show,end";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.end";
+         }
+         program { name: "end_hide";
+            signal: "elm,action,hide,end";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.end";
+         }
+         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);
                }
-              fill.smooth : 0;
             }
-            description { state: "clicked" 0.0;
-               inherit:  "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+         }
+         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: "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: "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: "sb_vbar_show";
+            signal: "do-show-vbar";
+            source: "";
+            action:  STATE_SET "default" 0.0;
+            transition: LINEAR 0.5;
+            target: "sb_vbar_clip";
+         }
+         program { name: "sb_vbar_hide";
+            signal: "do-hide-vbar";
+            source: "";
+            action:  STATE_SET "hidden" 0.0;
+            transition: LINEAR 0.5;
+            target: "sb_vbar_clip";
          }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   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_on.png" COMP;
-        image: "tog_base_off.png" COMP;
-        image: "tog_dis_base_on.png" COMP;
-        image: "tog_dis_base_off.png" COMP;
-      }
-      script {
-         public is_rtl;
-      }
-      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: IMAGE;
-           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.5 1.0;
-              image.normal: "tog_base_on.png";
-           }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "tog_dis_base_on.png";
-            }
-        }
-         part { name: "offrect";
-           type: IMAGE;
-           scale: 1;
-           clip_to: "clipper";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              rel1.to: "button";
-              rel1.relative: 0.5 0.0;
-              rel2.to: "button";
-              rel2.relative: 6.0 1.0;
-              image.normal: "tog_base_off.png";
-           }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "tog_dis_base_off.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: "button";
-               rel1.relative: 1.0 0.0;
-              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: "button";
-              rel2.offset: 0 0;
-               rel2.relative: 0.0 1.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;
-              visible: 1;
-              aspect: 1.0 1.0;
-              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;
-              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;
-              text.min: 1 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);
-                }
-              else
-                {
-                   set_drag(PART:"button", 0.0, 0.0);
-                }
-               if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
-                   (get_int(is_rtl) == 0) && (dx > 0.5)) {
-                  emit("elm,action,toggle,on", "");
-               }
-               else {
-                  emit("elm,action,toggle,off", "");
-               }
-                   
-           }
-        }
-        program { name: "toggle_on";
-           signal: "elm,state,toggle,on";
-           source: "elm";
-           script {
-               new Float:drag;
-               if (get_int(is_rtl) == 0) {
-                  drag = 100.0;
-               }
-               else {
-                  drag = 0.0;
-               }
-              set_drag(PART:"button", drag, 0.0);
-           }
-        }
-        program { name: "toggle_off";
-           signal: "elm,state,toggle,off";
-           source: "elm";
-           script {
-               new Float:drag;
-               if (get_int(is_rtl) == 0) {
-                  drag = 0.0;
-               }
-               else {
-                  drag = 100.0;
-               }
-              set_drag(PART:"button", drag, 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: "elm.offtext";
-           target: "elm.ontext";
-            target: "onrect";
-            target: "offrect";
-           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";
-            target: "onrect";
-            target: "offrect";
-            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);
-           }
+         program { name: "hbar_show";
+            signal: "elm,action,show,hbar";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "sb_hbar_clip_master";
          }
-         program { name: "to_rtl";
-            signal: "edje,state,rtl";
-            source: "edje";
-            script {
-               set_int(is_rtl, 1);
-            }
+         program { name: "hbar_hide";
+            signal: "elm,action,hide,hbar";
+            source: "elm";
+            action:  STATE_SET "hidden" 0.0;
+            target: "sb_hbar_clip_master";
          }
-         program { name: "to_ltr";
-            signal: "edje,state,ltr";
-            source: "edje";
+         program { name: "hbar_show_always";
+            signal: "elm,action,show_always,hbar";
+            source: "elm";
             script {
-               set_int(is_rtl, 0);
+               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);
+               }
             }
          }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////
-   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;
-      }
-      script {
-        public v0_cur, v0_pre, v0_lock, v0_next;
+         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 0.5;
+            target: "sb_hbar_clip";
+         }
+         program { name: "sb_hbar_hide";
+            signal: "do-hide-hbar";
+            source: "";
+            action:  STATE_SET "hidden" 0.0;
+            transition: LINEAR 0.5;
+            target: "sb_hbar_clip";
+         }
 
-       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;
-              }
-           }
-        }
-        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;
-              visible: 0;
-              rel1.to: "base";
-              rel1.relative: 0.0 0.5;
-              rel2.to: "base";
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "t";
-           type: RECT;
-           mouse_events: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1.to: "base";
-              rel2.to: "base";
-              rel2.relative: 1.0 0.5;
-              color: 0 0 0 0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        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;
-           }
-        }
-      }
-      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";
-           target: "t";
-           target: "b";
-        }
-        program { name: "edit_off";
-            signal: "elm,state,edit,off";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "atop";
-           target: "abot";
-           target: "t";
-           target: "b";
-        }
-        program { name: "up";
-           signal: "mouse,down,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up,start" "";
-        }
-        program { name: "up,stop";
-           signal: "mouse,up,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up,stop" "";
-        }
-        program { name: "down";
-           signal: "mouse,down,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down,start" "";
-        }
-        program { name: "down,stop";
-           signal: "mouse,up,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down,stop" "";
-        }
+         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(1.0, "timer0", 0);
+               set_int(sbvis_timer, v);
+            }
+         }
+
+         program { name: "highlight_show";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "enabled" 0.0;
+            transition: ACCELERATE 0.3;
+            target: "focus_highlight";
+            target: "conf_over";
+         }
+         program { name: "highlight_hide";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.3;
+            target: "focus_highlight";
+            target: "conf_over";
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/clock/flipampm/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;
+#define TEXT_SLIDE_DURATION     10
+
+   group { name: "elm/label/base/default";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
+      styles {
+         style { name: "textblock_style";
+            base: "font=Sans font_size=10 color=#000 wrap=word text_class=label";
+            tag:  "br" "\n";
+            tag:  "ps" "ps";
+            tag:  "hilight" "+ font=Sans:style=Bold";
+            tag:  "b" "+ font=Sans:style=Bold";
+            tag:  "tab" "\t";
+           }
+        }
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               text {
+                  style: "textblock_style";
+                  min: 1 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_wrap/default";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "elm.text"; }
+               rel2 { relative: 1 1; to: "elm.text"; }
+            }
+         }
+         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_wrap_ellipsis/default";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
       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;
-           }
-        }
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "elm.text"; }
+               rel2 { relative: 1 1; to: "elm.text"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            multiline: 1;
+            description { state: "default" 0.0;
+               fixed: 0 1; 
+               text {
+                  style: "textblock_style";
+                  min: 0 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,start" "";
-        }
-        program { name: "up,stop";
-           signal: "mouse,up,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up,stop" "";
-        }
-        program { name: "down";
-           signal: "mouse,down,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down,start" "";
-        }
-        program { name: "down,stop";
-           signal: "mouse,up,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down,stop" "";
-        }
+   }
+
+   group { name: "elm/label/base/marker";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
+      styles {
+         style { name: "textblock_style2";
+           base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word text_class=label";
+           tag:  "br" "\n";
+           tag:  "ps" "ps";
+           tag:  "hilight" "+ color=#ffff";
+           tag:  "b" "+ color=#ffff";
+           tag:  "tab" "\t";
+         }
+      }
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "elm.text"; }
+               rel2 { relative: 1 1; to: "elm.text"; }
+            }
+         }
+         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/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;
-               }
-               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;
-                   }
-                   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;
+   group { name: "elm/label/base_wrap/marker";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1 { relative: 0 0; to: "elm.text"; }
+               rel2 { relative: 1 1; to: "elm.text"; }
+            }
+         }
+         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/label/base/slide_long";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
+      
+      script {
+        public g_duration, g_stopslide, g_timer_id, g_anim_id;
+          
+        public message(Msg_Type:type, id, ...) {
+           if ((type == MSG_FLOAT_SET) && (id == 0)) {
+              new Float:duration;
+              duration = getarg(2);
+              set_float(g_duration, duration);
            }
-           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;
-                       text_class: "menu_item";
-                   }
-               }
-               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;
-               }
+        }
+        public slide_to_end_anim(val, Float:pos) {
+           new stopflag;
+           new id;
+           stopflag = get_int(g_stopslide);
+           if (stopflag == 1) return;
+           set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0);
+           if (pos >= 1.0) {
+              id = timer(0.5, "slide_to_begin", 1);
+              set_int(g_timer_id, id);
            }
-           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;
-                   }
+        }
+        public slide_to_end() {
+           new stopflag;
+           new id;
+           new Float:duration;
+           stopflag = get_int(g_stopslide);
+           if (stopflag == 1) return;
+           duration = get_float(g_duration);
+           id = anim(duration, "slide_to_end_anim", 1);
+           set_int(g_anim_id, id);
+        }
+        public slide_to_begin() {
+           new stopflag;
+           new id;
+           stopflag = get_int(g_stopslide);
+           if (stopflag == 1) return;
+           set_state(PART:"elm.text", "slide_begin", 0.0);
+           id = timer(0.5, "slide_to_end", 1);
+           set_int(g_timer_id, id);
+        }
+        public start_slide() {
+           set_int(g_stopslide, 0);
+           set_state(PART:"elm.text", "slide_begin", 0.0);
+           slide_to_end();
+        }
+        public stop_slide() {
+           new id;
+           set_int(g_stopslide, 1);
+           id = get_int(g_anim_id);
+           cancel_anim(id);
+           id = get_int(g_timer_id);
+           cancel_timer(id);
+           set_state(PART:"elm.text", "default", 0.0);
+        }
+      }
+       
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               align: 0.0 0.0;
+               text {
+                  style: "textblock_style";
+                  min: 1 1;
                }
-               description { state: "visible" 0.0;
-                   inherit:  "default" 0.0;
-                   color: 255 255 255 255;
+            }
+            description { state: "slide_end" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+               align: 1.0 0.0;
+            }
+            description { state: "slide_begin" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+               align: 0.0 0.0;
+            }
+         }
+       }
+       programs {
+          program { name: "start_slide";
+             source: "elm";
+             signal: "elm,state,slide,start";
+             script
+               {
+                  start_slide();
                }
-               description { state: "disabled" 0.0;
-                   inherit:  "default" 0.0;
+          }
+          program { name: "stop_slide";
+             source: "elm";
+             signal: "elm,state,slide,stop";
+             script
+               {
+                  stop_slide();
                }
-           }
-           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;
-           }
-           //
+   group { name: "elm/label/base/slide_short";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
 
-           //
-           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);
+      script {
+         public g_duration, g_stopslide, g_timer_id, g_anim_id;
+         
+         public message(Msg_Type:type, id, ...) {
+            if ((type == MSG_FLOAT_SET) && (id == 0)) {
+               new Float:duration;
+               duration = getarg(2);
+               set_float(g_duration, duration);
+            }
+         }
+         public slide_to_end_anim(val, Float:pos) {
+            new stopflag;
+            new id;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0);
+            if (pos >= 1.0) {
+               id = timer(0.5, "slide_to_begin", 1);
+               set_int(g_timer_id, id);
+            }
+         }
+         public slide_to_end() {
+            new stopflag;
+            new id;
+            new Float:duration;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            duration = get_float(g_duration);
+            id = anim(duration, "slide_to_end_anim", 1);
+            set_int(g_anim_id, id);
+         }
+         public slide_to_begin() {
+            new stopflag;
+            new id;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            set_state(PART:"elm.text", "slide_begin", 0.0);
+            id = timer(0.5, "slide_to_end", 1);
+            set_int(g_timer_id, id);
+         }
+         public start_slide() {
+            set_int(g_stopslide, 0);
+            set_state(PART:"elm.text", "slide_begin", 0.0);
+            slide_to_end();
+         }
+         public stop_slide() {
+            new id;
+            set_int(g_stopslide, 1);
+            id = get_int(g_anim_id);
+            cancel_anim(id);
+            id = get_int(g_timer_id);
+            cancel_timer(id);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
 
-                   if (v==1 && d==0)
-                        run_program(PROGRAM:"visible_text");
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               align: 0.0 0.0;
+               text {
+                  style: "textblock_style";
+                  min: 1 1;
                }
-           }
-           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;
-           }
-           //
+            }
+            description { state: "slide_end" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+               align: 1.0 0.0;
+            }
+            description { state: "slide_begin" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+               align: 0.0 0.0;
+            }
+         }
+      }
+      programs {
+         program { name: "start_slide";
+            source: "elm";
+            signal: "elm,state,slide,start";
+            script
+              {
+                 start_slide();
+              }
+         }
+         program { name: "stop_slide";
+            source: "elm";
+            signal: "elm,state,slide,stop";
+            script
+              {
+                 stop_slide();
+              }
+         }
+      }
+   }
 
-           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";
+   group { name: "elm/label/base/slide_bounce";
+      data.item: "default_font_size" "10";
+      data.item: "min_font_size" "6";
+      data.item: "max_font_size" "60";
+      
+      script {
+         public g_duration, g_stopslide, g_timer_id, g_anim_id;
+         
+         public message(Msg_Type:type, id, ...) {
+            if ((type == MSG_FLOAT_SET) && (id == 0)) {
+               new Float:duration;
+               duration = getarg(2);
+               set_float(g_duration, duration);
+            }
+         }
+         public slide_to_end_anim(val, Float:pos) {
+            new stopflag;
+            new id;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            set_tween_state(PART:"elm.text", pos, "slide_begin", 0.0, "slide_end", 0.0);
+            if (pos >= 1.0) {
+               id = timer(0.5, "slide_to_begin", 1);
+               set_int(g_timer_id, id);
+            }
+         }
+         public slide_to_end() {
+            new stopflag;
+            new id;
+            new Float:duration;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            duration = get_float(g_duration);
+            id = anim(duration, "slide_to_end_anim", 1);
+            set_int(g_anim_id, id);
+         }
+         public slide_to_begin_anim(val, Float:pos) {
+            new stopflag;
+            new id;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            set_tween_state(PART:"elm.text", pos, "slide_end", 0.0, "slide_begin", 0.0);
+            if (pos >= 1.0) {
+               id = timer(0.5, "slide_to_end", 1);
+               set_int(g_timer_id, id);
+            }
+         }
+         public slide_to_begin() {
+            new stopflag;
+            new id;
+            new Float:duration;
+            stopflag = get_int(g_stopslide);
+            if (stopflag == 1) return;
+            duration = get_float(g_duration);
+            id = anim(duration, "slide_to_begin_anim", 1);
+            set_int(g_anim_id, id);
+         }
+         public start_slide() {
+            set_int(g_stopslide, 0);
+            set_state(PART:"elm.text", "slide_begin", 0.0);
+            slide_to_end();
+         }
+         public stop_slide() {
+            new id;
+            set_int(g_stopslide, 1);
+            id = get_int(g_anim_id);
+            cancel_anim(id);
+            id = get_int(g_timer_id);
+            cancel_timer(id);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+
+      parts {
+         part { name: "label.swallow.background";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "label.text.clip";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+               rel1 { relative: 0 0; to: "label.swallow.background"; }
+               rel2 { relative: 1 1; to: "label.swallow.background"; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "label.text.clip";
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               align: 0.0 0.0;
+               text {
+                  style: "textblock_style";
+                  min: 1 1;
+               }
+            }
+            description { state: "slide_end" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+               align: 1.0 0.0;
+            }
+            description { state: "slide_begin" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+               align: 0.0 0.0;
+            }
+         }
+      }
+      programs {
+         program { name: "start_slide";
+            source: "elm";
+            signal: "elm,state,slide,start";
+            script
+              {
+                 start_slide();
+              }
+         }
+         program { name: "stop_slide";
+            source: "elm";
+            signal: "elm,state,slide,stop";
+            script
+              {
+                 stop_slide();
+              }
+         }
+      }
+   }
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+   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;
+          min: 15 15;
+               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;
+                  text_class: "button";
+               }
+            }
+            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;
+            }
+            description { state: "clicked" 0.0;
+               inherit:  "default" 0.0;
+               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: "over3";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
+         }
+         program {
+            name:   "button_pressed_anim";
+            signal: "elm,anim,activate";
+            source: "elm";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            target: "over3";
+            after: "button_unpressed_anim";
+         }
+         program {
+            name:   "button_unpressed_anim";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "button_image";
+            target: "over3";
+         }
+         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,clicked,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;
+               }
+               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;
+                  relative: 1.0 0.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;
+               }
+               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;
+                  text_class: "button";
+               }
+            }
+            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;
+            }
+            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;
+                  text_class: "button";
+               }
+            }
+            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;
+          min: 15 15;
+           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";
+               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;
+                  text_class: "button";
+               }
+            }
+            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;
+               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:   "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/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_on.png" COMP;
+         image: "tog_base_off.png" COMP;
+         image: "tog_dis_base_on.png" COMP;
+         image: "tog_dis_base_off.png" COMP;
+      }
+      script {
+         public is_rtl;
+      }
+      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: IMAGE;
+            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.5 1.0;
+               image.normal: "tog_base_on.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "tog_dis_base_on.png";
+            }
+         }
+         part { name: "offrect";
+            type: IMAGE;
+            scale: 1;
+            clip_to: "clipper";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "button";
+               rel1.relative: 0.5 0.0;
+               rel2.to: "button";
+               rel2.relative: 6.0 1.0;
+               image.normal: "tog_base_off.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "tog_dis_base_off.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: "button";
+               rel1.relative: 1.0 0.0;
+               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: "button";
+               rel2.offset: 0 0;
+               rel2.relative: 0.0 1.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;
+               visible: 1;
+               aspect: 1.0 1.0;
+               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;
+               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;
+               text.min: 1 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);
+                 }
+               else
+                 {
+                    set_drag(PART:"button", 0.0, 0.0);
+                 }
+               if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
+                   (get_int(is_rtl) == 0) && (dx > 0.5)) {
+                  emit("elm,action,toggle,on", "");
+               }
+               else {
+                  emit("elm,action,toggle,off", "");
+               }
+                   
+            }
+         }
+         program { name: "toggle_on";
+            signal: "elm,state,toggle,on";
+            source: "elm";
+            script {
+               new Float:drag;
+               if (get_int(is_rtl) == 0) {
+                  drag = 100.0;
+               }
+               else {
+                  drag = 0.0;
+               }
+               set_drag(PART:"button", drag, 0.0);
+            }
+         }
+         program { name: "toggle_off";
+            signal: "elm,state,toggle,off";
+            source: "elm";
+            script {
+               new Float:drag;
+               if (get_int(is_rtl) == 0) {
+                  drag = 0.0;
+               }
+               else {
+                  drag = 100.0;
+               }
+               set_drag(PART:"button", drag, 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: "elm.offtext";
+            target: "elm.ontext";
+            target: "onrect";
+            target: "offrect";
+            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";
+            target: "onrect";
+            target: "offrect";
+            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);
+            }
+         }
+         program { name: "to_rtl";
+            signal: "edje,state,rtl";
+            source: "edje";
+            script {
+               set_int(is_rtl, 1);
+            }
+         }
+         program { name: "to_ltr";
+            signal: "edje,state,ltr";
+            source: "edje";
+            script {
+               set_int(is_rtl, 0);
+            }
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   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;
+      }
+      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;
+               }
+            }
+         }
+         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;
+               visible: 0;
+               rel1.to: "base";
+               rel1.relative: 0.0 0.5;
+               rel2.to: "base";
+               color: 0 0 0 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "t";
+            type: RECT;
+            mouse_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to: "base";
+               rel2.to: "base";
+               rel2.relative: 1.0 0.5;
+               color: 0 0 0 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         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;
+            }
+         }
+      }
+      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";
+            target: "t";
+            target: "b";
+         }
+         program { name: "edit_off";
+            signal: "elm,state,edit,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "atop";
+            target: "abot";
+            target: "t";
+            target: "b";
+         }
+         program { name: "up";
+            signal: "mouse,down,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up,start" "";
+         }
+         program { name: "up,stop";
+            signal: "mouse,up,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up,stop" "";
+         }
+         program { name: "down";
+            signal: "mouse,down,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down,start" "";
+         }
+         program { name: "down,stop";
+            signal: "mouse,up,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down,stop" "";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/clock/flipampm/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);
+          }
+       }
+      }
+      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,start" "";
+         }
+         program { name: "up,stop";
+            signal: "mouse,up,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up,stop" "";
+         }
+         program { name: "down";
+            signal: "mouse,down,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down,start" "";
+         }
+         program { name: "down,stop";
+            signal: "mouse,up,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down,stop" "";
+         }
+      }
+   }
+
+   ///////////////////////////////////////////////////////////////////////////////
+   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;
+               }
+               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;
+                   }
+                   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;
+                       text_class: "menu_item";
+                   }
+               }
+               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";
            }
@@ -4908,7 +4908,7 @@ collections {
                    color: 0 0 0 128;
                }
            }
-           part {        name: "over1";
+           part {          name: "over1";
                mouse_events: 0;
                description { state: "default" 0.0;
                    color: 255 255 255 0;
@@ -5191,294 +5191,294 @@ collections {
 ///////////////////////////////////////////////////////////////////////////////
    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;
-           }
-        }
+         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;
+            }
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
    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;
-           }
-        }
+         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;
+            }
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////
    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;
-           }
-        }
+         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/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;
-           }
-        }
+         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;
+            }
+         }
       }
    }
 
@@ -6283,573 +6283,573 @@ collections {
    /* TODO: replicate diagonal swallow slots to the other hover styles */
    group { name: "elm/hover/base/default";
       images {
-        image: "shad_circ.png" COMP;
+         image: "shad_circ.png" COMP;
       }
       parts {
-        part { name: "elm.swallow.offset";
+         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";
+            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;
-           }
-        }
+            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;
+            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";
+            }
+         }
+         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.top-left";
+            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.top-left";
             type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 1.0 1.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 0.0 0.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 0.0 0.0;
-              rel2.offset: -1 -1;
-           }
-        }
-        part { name: "elm.swallow.slot.top";
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 0.0 0.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 0.0 0.0;
+               rel2.offset: -1 -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.top-right";
+            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.top-right";
             type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 1.0;
-              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 0.0;
-              rel2.offset: -1 -1;
-           }
-        }
-        part { name: "elm.swallow.slot.right";
+            description { state: "default" 0.0;
+               align: 0.0 1.0;
+               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 0.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.bottom-right";
+            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.bottom-right";
             type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 0.0 0.0;
-              rel1.to: "elm.swallow.slot.middle";
-              rel1.relative: 1.0 1.0;
-              rel1.offset: 0 0;
-              rel2.to: "elm.swallow.slot.middle";
-              rel2.relative: 1.0 1.0;
-              rel2.offset: -1 -1;
-           }
-        }
-        part { name: "elm.swallow.slot.bottom";
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "elm.swallow.slot.middle";
+               rel1.relative: 1.0 1.0;
+               rel1.offset: 0 0;
+               rel2.to: "elm.swallow.slot.middle";
+               rel2.relative: 1.0 1.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.bottom-left";
+            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.bottom-left";
             type: SWALLOW;
-           description { state: "default" 0.0;
-              align: 1.0 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: 0.0 1.0;
-              rel2.offset: -1 0;
-           }
-        }
-        part { name: "elm.swallow.slot.middle";
+            description { state: "default" 0.0;
+               align: 1.0 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: 0.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";
-           }
-        }
+            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: "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;
+         image: "shad_circ.png" COMP;
+         image: "bt_dis_base.png" COMP;
+         image: "bt_dis_hilight.png" COMP;
       }
       parts {
-        part { name: "elm.swallow.offset";
+         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";
+            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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.slot.left";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            }
+            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;
-           }
-        }
+            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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.slot.right";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            }
+            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;
-           }
-        }
+            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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.slot.top";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            }
+            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;
-           }
-        }
+            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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.slot.bottom";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            }
+            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;
-           }
-        }
+            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;
-              }
-           }
-        }
+            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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.slot.middle";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
                image.middle: SOLID;
-           }
-        }
-        part { name: "elm.swallow.slot.middle";
+            }
+         }
+         part { name: "elm.swallow.slot.middle";
             type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.size";
-              rel2.to: "elm.swallow.size";
-           }
-        }
+            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;
-              }
-           }
-        }
+            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: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
 
-        program { name: "show";
+         program { name: "show";
             signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
+            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";
-        }
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+//            transition: DECELERATE 0.5;
+            target: "base";
+         }
 
-        program { name: "leftshow";
+         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";
+            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";
+            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";
+            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";
+            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";
+            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";
+            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";
+            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";
-        }
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.5;
+            target: "bottom";
+            target: "elm.swallow.slot.bottom";
+         }
       }
    }
 
@@ -6982,14 +6982,14 @@ collections {
                signal: "elm,action,show";
                source: "elm";
                action: STATE_SET "visible" 0.0;
-                       //          transition: DECELERATE 0.5;
+                       //            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;
+                       //            transition: DECELERATE 0.5;
                target: "base";
            }
            program { name: "bottomshow";
@@ -7137,14 +7137,14 @@ collections {
                signal: "elm,action,show";
                source: "elm";
                action: STATE_SET "visible" 0.0;
-                       //          transition: DECELERATE 0.5;
+                       //            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;
+                       //            transition: DECELERATE 0.5;
                target: "base";
            }
            program { name: "bottomshow";
@@ -7169,298 +7169,298 @@ collections {
    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;
+//         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";
+         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";
+            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;
-           }
-        }
+            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;
+            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";
+         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.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 {
+                  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";
+            }
+            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.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 {
+                  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;
+            }
+         }
+
+         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";
+            }
+         }
+         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;
+            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";
+            }
+         }
+         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;
+            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;
+               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;
+            description { state: "default" 0.0;
                rel1.to: "button_image";
                rel2.to: "button_image";
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-        }
+               image {
+                  normal: "bt_shine.png";
+                  border: 7 7 7 7;
+               }
+            }
+         }
          part { name: "edge_top";
-           mouse_events:  0;
-           description { state: "default" 0.0;
+            mouse_events:  0;
+            description { state: "default" 0.0;
                visible: 0;
-              rel1 {
+               rel1 {
                   to: "elm.swallow.size";
                   offset: 0 -10;
                }
-              rel2 {
+               rel2 {
                   to: "elm.swallow.size";
                }
-              image.normal: "outdent-bottom.png";
+               image.normal: "outdent-bottom.png";
                image.border: 0 0 13 0;
                fill.smooth: 0;
-           }
-           description { state: "visible" 0.0;
+            }
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-           }
-        }
+            }
+         }
          part { name: "edge_bottom";
-           mouse_events:  0;
-           description { state: "default" 0.0;
+            mouse_events:  0;
+            description { state: "default" 0.0;
                visible: 0;
-              rel1 {
+               rel1 {
                   to: "elm.swallow.size";
                }
-              rel2 {
+               rel2 {
                   to: "elm.swallow.size";
                   offset: -1 9;
                }
-              image.normal: "outdent-top.png";
+               image.normal: "outdent-top.png";
                image.border: 0 0 0 13;
                fill.smooth: 0;
-           }
-           description { state: "visible" 0.0;
+            }
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-           }
-        }
-        part { name: "elm.swallow.slot.middle";
+            }
+         }
+         part { name: "elm.swallow.slot.middle";
             type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.to: "elm.swallow.size";
-              rel2.to: "elm.swallow.size";
-           }
-        }
+            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: "end";
+            signal: "mouse,up,1";
+            source: "base";
+            action: SIGNAL_EMIT "elm,action,dismiss" "";
+         }
 
-        program { name: "show";
+         program { name: "show";
             signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
+            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";
+            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";
+            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";
+         }
+         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";
+            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";
+            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";
+         }
+         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";
+            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";
+         }
+         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";
+            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";
+            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";
-        }
+         }
+         program { name: "bottomhide2";
+            action: STATE_SET "default" 0.0;
+            target: "edge_bottom";
+         }
       }
    }
 ///////////////////////////////////////////////////////////////////////////////
@@ -7702,7 +7702,7 @@ collections {
                set_int(sbvis_v, 0);
                set_int(sbvis_h, 0);
                set_int(sbalways_v, 0);
-                                  set_int(sbalways_h, 0);
+                                   set_int(sbalways_h, 0);
                set_int(sbvis_timer, 0);
             }
          } 
@@ -7949,7 +7949,7 @@ collections {
          image: "icon_arrow_down.png" COMP;
       }
       parts { 
-                       part { name: "ctxpopup_arrow";
+                        part { name: "ctxpopup_arrow";
             type: IMAGE;
             scale: 1;
             description {
@@ -7972,7 +7972,7 @@ collections {
                fixed: 1 1;
                align: 1.0 0.5;
                image { normal: "icon_arrow_right.png";                
-                                       }
+                                        }
             }
             description { state: "top" 0.0;
                min: 40 40;
@@ -8020,8 +8020,8 @@ collections {
 ///////////////////////////////////////////////////////////////////////////////
    group { 
       name: "elm/ctxpopup/icon_text_style_item/default";
-          alias: "elm/ctxpopup/text_style_item/default";
-          alias: "elm/ctxpopup/icon_style_item/default";
+           alias: "elm/ctxpopup/text_style_item/default";
+           alias: "elm/ctxpopup/icon_style_item/default";
       images {
          image: "hoversel_entry_bg.png" COMP;
       }
@@ -8057,7 +8057,7 @@ collections {
                align: 0 0.5;     
                aspect: 1.0 1.0;
                rel1 { offset: 10 10; }              
-                                       rel2 { offset: 0 -10; }
+                                        rel2 { offset: 0 -10; }
             }
          }       
          part { name: "elm.text";
@@ -8084,7 +8084,7 @@ collections {
                color: 0 0 0 255;
             }
          } 
-                       part { name: "over1";
+                        part { name: "over1";
             mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
@@ -8125,7 +8125,7 @@ collections {
                color: 0 0 0 0;
             }
          }
-               }
+                }
       programs {
          program {
             name: "item_unclick";
@@ -8159,7 +8159,7 @@ collections {
             signal: "mouse,up,1";
             source: "over2";
             script { 
-                                       set_state(PART:"elm.text", "default", 0.0);
+                                        set_state(PART:"elm.text", "default", 0.0);
                set_state(PART:"bg", "default", 0.0);
             }  
          }
@@ -9896,335 +9896,335 @@ collections {
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/photo/base/default";
       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;
          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";
+            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;
+                  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: "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;
+            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";
-           }
-        }
+               image.normal: "head.png";
+            }
+         }
          part { name: "clip";
-           mouse_events:  0;
+            mouse_events:  0;
             type: RECT;
-           description { state:    "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
+            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;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             clip_to: "clip";
-           description { state: "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-           }
-        }
+            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;
-           }
-        }
+            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/photo/base/shadow";
-       images {
-                       image: "shadow.png" COMP;
-                       image: "black.png" COMP;
-       }
-       script {
-       public message(Msg_Type:type, id, ...) {
-               if( (type==MSG_INT_SET) && (id==0) )
-               {
-               new w;
-               new h;
+              images {
+                        image: "shadow.png" COMP;
+                        image: "black.png" COMP;
+              }
+              script {
+              public message(Msg_Type:type, id, ...) {
+                if( (type==MSG_INT_SET) && (id==0) )
+                {
+                    new w;
+                    new h;
            
-               custom_state(PART:"size", "default", 0.0);
-
-               w = getarg(2);
-               h = getarg(3);
-               set_state_val(PART:"size", STATE_REL1_OFFSET, - w/2, - h/2);
-               set_state_val(PART:"size", STATE_REL2_OFFSET, w/2 + 1, h/2 + 1);
-               set_state(PART:"size", "custom", 0.0);
-               }
-       }
-       }
-       parts {
-       part { name: "size";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-                       rel1.relative: 0.5 0.5;
-                       rel2.relative: 0.5 0.5;
-               }
-               }
-       part {
-               name: "shadow";
-               type: IMAGE;
-               repeat_events: 1;
-               description {
-               state: "default" 0.0;
-               rel1.to: "size";
-               rel2.to: "size";
-               rel1.relative: -0.06 -0.06;
-               rel2.relative: 1.07 1.07;
-               image.normal: "shadow.png";
-               }
-       }
-       
-       
-               part { name: "elm.swallow.content";
-               type: SWALLOW;
-               description { state: "default" 0.0;
-               rel1.offset: 3 3;
-               rel2.offset: -3 -3;
-                       fixed: 1 1;
-               }
-               }
-               
-               part {
-               name: "border";
-               type: IMAGE;
-               repeat_events: 1;
-               description {
-               state: "default" 0.0;
-               visible: 1;
-               color: 0 0 0 255;
-               rel1.to: "size";
-               rel2.to: "size";
-               image.normal: "black.png";
-               image.border: 1 1 1 1;
-               image.middle: 0;
-               }
-       }
-               }
+                    custom_state(PART:"size", "default", 0.0);
+
+                    w = getarg(2);
+                    h = getarg(3);
+                    set_state_val(PART:"size", STATE_REL1_OFFSET, - w/2, - h/2);
+                    set_state_val(PART:"size", STATE_REL2_OFFSET, w/2 + 1, h/2 + 1);
+                    set_state(PART:"size", "custom", 0.0);
+                }
+            }
+            }
+              parts {
+              part { name: "size";
+                    type: SWALLOW;
+                    description { state: "default" 0.0;
+                            rel1.relative: 0.5 0.5;
+                            rel2.relative: 0.5 0.5;
+                    }
+                 }
+              part {
+                name: "shadow";
+                type: IMAGE;
+                repeat_events: 1;
+                description {
+                    state: "default" 0.0;
+                    rel1.to: "size";
+                    rel2.to: "size";
+                    rel1.relative: -0.06 -0.06;
+                    rel2.relative: 1.07 1.07;
+                    image.normal: "shadow.png";
+                }
+            }
+              
+            
+                 part { name: "elm.swallow.content";
+                    type: SWALLOW;
+                    description { state: "default" 0.0;
+                    rel1.offset: 3 3;
+                    rel2.offset: -3 -3;
+                            fixed: 1 1;
+                    }
+                 }
+                 
+                 part {
+                name: "border";
+                type: IMAGE;
+                repeat_events: 1;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 0 0 0 255;
+                    rel1.to: "size";
+                    rel2.to: "size";
+                    image.normal: "black.png";
+                    image.border: 1 1 1 1;
+                    image.middle: 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;
+         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";
-           }
-        }
+         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/thumb/base/noframe";
       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;
+         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.swallow.content";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              rel1.offset: 4 4;
-              rel2.offset: -5 -5;
-           }
-        }
-        part { name: "progress";
-           mouse_events: 0;
-           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;
-              }
-           }
-        }
-        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";
-           }
-        }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
+         part { name: "progress";
+            mouse_events: 0;
+            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;
+               }
+            }
+         }
+         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";
+            }
+         }
       }
    }
 
@@ -10232,119 +10232,119 @@ collections {
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/icon/home/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_home.png"; } } } }
    group { name: "elm/icon/close/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_close.png"; } } } }
    group { name: "elm/icon/apps/default"; alias: "elm/icon/toolbar/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"; } } } }
+         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"; alias: "elm/icon/toolbar/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"; } } } }
+         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";
            alias: "elm/icon/toolbar/arrow_down/default";
            alias: "elm/icon/toolbar/more_menu/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"; } } } }
+         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"; alias: "elm/icon/toolbar/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"; } } } }
+         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"; alias: "elm/icon/toolbar/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"; } } } }
+         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"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_chat.png"; } } } }
    group { name: "elm/icon/clock/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_clock.png"; } } } }
    group { name: "elm/icon/delete/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_delete.png"; } } } }
    group { name: "elm/icon/edit/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_edit.png"; } } } }
    group { name: "elm/icon/refresh/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_refresh.png"; } } } }
    group { name: "elm/icon/folder/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_folder.png"; } } } }
    group { name: "elm/icon/file/default"; alias: "elm/icon/toolbar/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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_file.png"; } } } }
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/icon/menu/home/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_home.png"; } } } }
    group { name: "elm/icon/menu/close/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_close.png"; } } } }
    group { name: "elm/icon/menu/apps/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_apps.png"; } } } }
    group { name: "elm/icon/menu/arrow_up/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_arrow_up.png"; } } } }
    group { name: "elm/icon/menu/arrow_down/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_arrow_down.png"; } } } }
    group { name: "elm/icon/menu/arrow_left/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_arrow_left.png"; } } } }
    group { name: "elm/icon/menu/arrow_right/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_arrow_right.png"; } } } }
    group { name: "elm/icon/menu/chat/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_chat.png"; } } } }
    group { name: "elm/icon/menu/clock/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_clock.png"; } } } }
    group { name: "elm/icon/menu/delete/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_delete.png"; } } } }
    group { name: "elm/icon/menu/edit/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_edit.png"; } } } }
    group { name: "elm/icon/menu/refresh/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_refresh.png"; } } } }
    group { name: "elm/icon/menu/folder/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_folder.png"; } } } }
    group { name: "elm/icon/menu/file/default"; min: 24 24; max: 24 24;
       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"; } } } }
+         description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "icon_file.png"; } } } }
 
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/toolbar/base/default";
@@ -10924,16 +10924,16 @@ collections {
             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;
-              }
-           }
-        }
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               image {
+                  normal: "toolbar_separator_v.png";
+               }
+               fill {
+                  smooth: 0;
+               }
+            }
+         }
       }
    }
 
@@ -10948,14 +10948,14 @@ collections {
                }
            }
        }
-          programs {
-                  program {
-                               name: "block_clicked";
-                               signal: "mouse,clicked,1";
-                               source: "block_events";
-                               action: SIGNAL_EMIT "elm,action,clicked" "elm";
-                  }
-          }
+           programs {
+                   program {
+                                name: "block_clicked";
+                                signal: "mouse,clicked,1";
+                                source: "block_events";
+                                action: SIGNAL_EMIT "elm,action,clicked" "elm";
+                   }
+           }
    }
    group { name: "elm/notify/top/default";
        //this group is a design similar to the inwin group
@@ -11807,7 +11807,7 @@ collections {
       }
       parts {
          part { name: "whole";
-               type: RECT;
+                 type: RECT;
             description {
                state: "default" 0.0;
                visible: 1;
@@ -12011,8 +12011,8 @@ collections {
          }
       }
       programs {
-       //Substyle
-       program { name: "layout_fullscreen";
+              //Substyle
+              program { name: "layout_fullscreen";
             signal: "layout,fullscreen";
             source: "slideshow";
             action: STATE_SET "default" 0.0;
@@ -12028,7 +12028,7 @@ collections {
             target: "elm.swallow.2";
             transition: SINUSOIDAL 1.0;
          } 
-        //
+               //
          program { name: "fade_next";
             signal: "fade,next";
             source: "slideshow";
@@ -12184,8 +12184,8 @@ collections {
             action: SIGNAL_EMIT "end" "slideshow";
          }
          program { name: "end_signal";
-           signal: "anim,end";
-           source: "slideshow";
+            signal: "anim,end";
+            source: "slideshow";
             action: STATE_SET "default" 0.0;
             target: "image_1_whole";
             target: "image_2_whole";
@@ -12196,246 +12196,246 @@ collections {
 ///////////////////////////////////////////////////////////////////////////////
    group { name: "elm/win/inwin/default";
       images {
-        image: "shad_circ.png" COMP;
-        image: "bt_dis_base.png" COMP;
-        image: "bt_dis_hilight.png" COMP;
+         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: "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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.content";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            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;
+            description { state: "default" 0.0;
                rel1.relative: 0.1 0.1;
                rel2.relative: 0.9 0.9;
-           }
-        }
+            }
+         }
       }
       programs {
-        program { name: "show";
+         program { name: "show";
             signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
+            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";
-        }
+            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;
+         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: "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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.content";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            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;
+            description { state: "default" 0.0;
                fixed: 1 1;
                rel1.relative: 0.5 0.5;
                rel2.relative: 0.5 0.5;
-           }
-        }
+            }
+         }
       }
       programs {
-        program { name: "show";
+         program { name: "show";
             signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
+            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";
-        }
+            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;
+         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: "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;
+            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";
+            }
+         }
+         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.to: "elm.swallow.content";
                rel2.offset: 4 4;
                image {
-                 normal: "bt_dis_base.png";
-                 border: 4 4 4 4;
-              }
+                  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";
+            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;
+            description { state: "default" 0.0;
                fixed: 1 1;
                rel1.relative: 0.1 0.5;
                rel2.relative: 0.9 0.5;
-           }
-        }
+            }
+         }
       }
       programs {
-        program { name: "show";
+         program { name: "show";
             signal: "elm,action,show";
-           source: "elm";
-           action: STATE_SET "visible" 0.0;
-//         transition: DECELERATE 0.5;
-           target: "base";
-        }
-        program { name: "hide";
+            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";
-        }
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+//            transition: DECELERATE 0.5;
+            target: "base";
+         }
       }
    }
 
@@ -14075,8 +14075,8 @@ collections {
    group { name: "elm/slider/horizontal/default";
            alias: "elm/slider/horizontal/disabled";
       images {
-        image: "sl_bg.png" COMP;
-        image: "sl_bg_over.png" COMP;
+         image: "sl_bg.png" COMP;
+         image: "sl_bg_over.png" COMP;
 
          image: "sl_units.png" COMP;
       }
@@ -14165,129 +14165,129 @@ collections {
             }
          }
          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;
+            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 {
+            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 {
+               rel2 {
                   to_x: "elm.units";
                   relative: 0.0 1.0;
                   offset: -10 -1;
                }
-           }
-        }
-        part { name: "elm.swallow.icon";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              visible: 0;
-              align: 0.0 0.5;
-              rel1 {
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
                   offset: 4 0;
                   to_y: "elm.swallow.bar";
                }
-              rel2 {
+               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;
-           }
-        }
+            }
+            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;
+            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.icon";
-              rel1.relative: 1.0 0.0;
+               rel1.to_x: "elm.swallow.icon";
+               rel1.relative: 1.0 0.0;
                rel1.offset: -1 4;
-              rel2.to_x: "elm.swallow.icon";
-              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;
+               rel2.to_x: "elm.swallow.icon";
+               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;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 255 128 128 128;
-              visible: 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 {
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 128 128 128;
+               visible: 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: "elm.swallow.end";
             type: SWALLOW;
-           description {
+            description {
                state: "default" 0.0;
-              visible: 0;
-              align: 1.0 0.5;
-              rel1 {
+               visible: 0;
+               align: 1.0 0.5;
+               rel1 {
                   offset: -4 0;
                   relative: 1.0 0.0;
                   to_y: "elm.swallow.bar";
                }
-              rel2 {
+               rel2 {
                   offset: -3 -1;
                   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;
-           }
-        }
+            }
+            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: "units";
             mouse_events: 0;
             description { state: "default" 0.0;
-              visible: 0;
+               visible: 0;
                rel1 {
                   to_x: "elm.units";
                   offset: 0 5;
@@ -14302,54 +14302,54 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            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;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
                fixed: 1 1;
-              align: 1.0 0.5;
-              rel1.to_x: "elm.swallow.end";
-              rel1.relative: 0.0 0.0;
+               align: 1.0 0.5;
+               rel1.to_x: "elm.swallow.end";
+               rel1.relative: 0.0 0.0;
                rel1.offset: 0 8;
-              rel2.to_x: "elm.swallow.end";
-              rel2.relative: 0.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;
+               rel2.to_x: "elm.swallow.end";
+               rel2.relative: 0.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;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 255 128 128 128;
-              visible: 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;
-           }
-        }
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: -5 0;
+               rel2.offset: -5 -1;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 128 128 128;
+               visible: 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: "elm.dragable.slider";
             type: GROUP;
             source: "elm/slider/horizontal/indicator/default";
@@ -14376,90 +14376,90 @@ collections {
                color: 255 0 0 100;
             }
          }
-        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;
-           }
-        }
+          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: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.icon";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.icon";
-        }
-        program { name: "end_show";
-           signal: "elm,state,end,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.end";
-        }
-        program { name: "end_hide";
-           signal: "elm,state,end,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.end";
-        }
-        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: "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.icon";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.swallow.icon";
+         }
+          program { name: "end_show";
+            signal: "elm,state,end,visible";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.swallow.end";
+         }
+         program { name: "end_hide";
+            signal: "elm,state,end,hidden";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.swallow.end";
+         }
+         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:    "go_disabled";
             signal:  "elm,state,disabled";
             source:  "elm";
             action:  STATE_SET "disabled" 0.0;
-//         target: "button0";
-           target: "disabler";
+//            target: "button0";
+            target: "disabler";
             after: "disable_text";
          }
          program { name: "disable_text";
@@ -14495,8 +14495,8 @@ collections {
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-//         target: "button0";
-           target: "disabler";
+//            target: "button0";
+            target: "disabler";
             after: "enable_text";
          }
          program { name: "enable_text";
@@ -14533,8 +14533,8 @@ collections {
 
    group { name: "elm/slider/vertical/default";
       images {
-        image: "slv_bg.png" COMP;
-        image: "slv_bg_over.png" COMP;
+         image: "slv_bg.png" COMP;
+         image: "slv_bg_over.png" COMP;
 
          image: "slv_units.png" COMP;
       }
@@ -14624,129 +14624,129 @@ collections {
             }
          }
          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;
+            type: RECT;
+            mouse_events: 0;
             scale: 1;
-           description { state: "default" 0.0;
-              min: 24 48;
-              max: 24 9999;
-              align: 0.5 1.0;
-              rel1 {
+            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;
                }
-              rel2 {
+               rel2 {
                   to_y: "elm.units";
                   relative: 1.0 0.0;
                   offset: -1 -8;
                }
-           }
-        }
-        part { name: "elm.swallow.icon";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              visible: 0;
-              align: 0.5 0.0;
-              rel1 {
+            }
+         }
+         part { name: "elm.swallow.icon";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.5 0.0;
+               rel1 {
                   offset: 0 4;
                   to_x: "elm.swallow.bar";
                }
-              rel2 {
+               rel2 {
                   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;
-           }
-        }
+            }
+            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;
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
                fixed: 0 1;
                align: 0.5 0.0;
-              rel1.to_y: "elm.swallow.icon";
-              rel1.relative: 0.0 1.0;
+               rel1.to_y: "elm.swallow.icon";
+               rel1.relative: 0.0 1.0;
                rel1.offset: 0 -1;
-              rel2.to_y: "elm.swallow.icon";
-              rel2.relative: 1.0 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;
+               rel2.to_y: "elm.swallow.icon";
+               rel2.relative: 1.0 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;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 255 128 128 128;
-              visible: 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 {
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 128 128 128;
+               visible: 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: "elm.swallow.end";
             type: SWALLOW;
-           description {
+            description {
                state: "default" 0.0;
-              visible: 0;
-              align: 0.5 1.0;
-              rel1 {
+               visible: 0;
+               align: 0.5 1.0;
+               rel1 {
                   offset: 0 -4;
                   relative: 0.0 1.0;
                   to_x: "elm.swallow.bar";
                }
-              rel2 {
+               rel2 {
                   offset: -1 -3;
                   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;
-           }
-        }
+            }
+            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: "units";
             mouse_events: 0;
             description { state: "default" 0.0;
-              visible: 0;
+               visible: 0;
                rel1 {
                   to: "elm.units";
                   offset: -8 0;
@@ -14761,58 +14761,58 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            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;
+            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 0.0;
+               rel1.to_y: "elm.swallow.end";
+               rel1.offset: 8 0;
+               rel2.relative: 1.0 0.0;
+               rel2.to_y: "elm.swallow.end";
+               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;
-              align: 0.5 1.0;
-              rel1.relative: 0.0 0.0;
-              rel1.to_y: "elm.swallow.end";
-              rel1.offset: 8 0;
-              rel2.relative: 1.0 0.0;
-              rel2.to_y: "elm.swallow.end";
-              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;
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 8 -9;
+               rel2.offset: -9 -9;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color:  0 0 0 128;
+               color3: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
                fixed: 1 1;
-              visible: 1;
-              text.min: 1 1;
-              rel1.offset: 8 -9;
-              rel2.offset: -9 -9;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color:  0 0 0 128;
-              color3: 0 0 0 0;
-              visible: 0;
-           }
-           description { state: "disabled_visible" 0.0;
-              inherit: "default" 0.0;
-              fixed: 1 1;
-              visible: 1;
-              text.min: 1 1;
-              rel1.offset: 8 -9;
-              rel2.offset: -9 -9;
-              color: 0 0 0 128;
-              color3: 0 0 0 0;
-           }
-        }
+               visible: 1;
+               text.min: 1 1;
+               rel1.offset: 8 -9;
+               rel2.offset: -9 -9;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+         }
          part { name: "elm.dragable.slider";
             type: GROUP;
             source: "elm/slider/vertical/indicator/default";
@@ -14839,160 +14839,160 @@ collections {
                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;
-               }
-            }
-         }
+              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: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.icon";
-        }
-        program { name: "icon_hide";
-           signal: "elm,state,icon,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.icon";
-        }
-        program { name: "end_show";
-           signal: "elm,state,end,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "elm.swallow.end";
-        }
-        program { name: "end_hide";
-           signal: "elm,state,end,hidden";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "elm.swallow.end";
-        }
-        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:   "go_disabled";
-           signal: "elm,state,disabled";
-           source: "elm";
-           action: STATE_SET "disabled" 0.0;
-//         target: "button0";
-           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.units", st, 30, vl);
-              if (!strcmp(st, "visible")) 
-                 set_state(PART:"elm.units", "disabled_visible", 0.0);
-              else 
-                 set_state(PART:"elm.units", "disabled", 0.0);
-
-              get_state(PART:"level2", st, 30, vl);
-              if (!strcmp(st, "inverted")) 
+         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.icon";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.swallow.icon";
+         }
+         program { name: "end_show";
+            signal: "elm,state,end,visible";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.swallow.end";
+         }
+         program { name: "end_hide";
+            signal: "elm,state,end,hidden";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.swallow.end";
+         }
+         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:   "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+//            target: "button0";
+            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.units", st, 30, vl);
+               if (!strcmp(st, "visible")) 
+                  set_state(PART:"elm.units", "disabled_visible", 0.0);
+               else 
+                  set_state(PART:"elm.units", "disabled", 0.0);
+
+               get_state(PART:"level2", st, 30, vl);
+               if (!strcmp(st, "inverted")) 
                {
-                 set_state(PART:"level", "disabled_inverted", 0.0);
-                 set_state(PART:"level2", "disabled_inverted", 0.0);
+                  set_state(PART:"level", "disabled_inverted", 0.0);
+                  set_state(PART:"level2", "disabled_inverted", 0.0);
                }
-              else 
+               else 
                {
-                 set_state(PART:"level", "disabled", 0.0);
-                 set_state(PART:"level2", "disabled", 0.0);
-               }
-           }
-        }
-
-        program { name: "enable";
-           signal: "elm,state,enabled";
-           source: "elm";
-           action: STATE_SET "default" 0.0;
-//         target: "button0";
-           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.units", st, 30, vl);
-              if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.units", "visible", 0.0);
-              else
-                 set_state(PART:"elm.units", "default", 0.0);
+                  set_state(PART:"level", "disabled", 0.0);
+                  set_state(PART:"level2", "disabled", 0.0);
+               }
+            }
+         }
+
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+//            target: "button0";
+            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.units", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.units", "visible", 0.0);
+               else
+                  set_state(PART:"elm.units", "default", 0.0);
      
-              get_state(PART:"level2", st, 30, vl);
-              if (!strcmp(st, "disabled_inverted"))
+               get_state(PART:"level2", st, 30, vl);
+               if (!strcmp(st, "disabled_inverted"))
                {
-                 set_state(PART:"level", "inverted", 0.0);
-                 set_state(PART:"level2", "inverted", 0.0);
+                  set_state(PART:"level", "inverted", 0.0);
+                  set_state(PART:"level2", "inverted", 0.0);
                }
-              else
+               else
                {
-                 set_state(PART:"level", "default", 0.0);
-                 set_state(PART:"level2", "default", 0.0);
+                  set_state(PART:"level", "default", 0.0);
+                  set_state(PART:"level2", "default", 0.0);
                }
-           }
-        }
+            }
+         }
       }
    }
    group { name: "elm/slider/horizontal/indicator/default";
@@ -15000,15 +15000,15 @@ collections {
            alias: "elm/slider/vertical/indicator/default";
            alias: "elm/slider/vertical/indicator/disabled";
       images {
-        image: "sl_bt_0.png" COMP;
-        image: "sl_bt_1.png" COMP;
-        image: "sl_bt_2.png" COMP;
-        image: "sl_bt_3.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_bt_0.png" COMP;
+         image: "sl_bt_1.png" COMP;
+         image: "sl_bt_2.png" COMP;
+         image: "sl_bt_3.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;
       }
       script {
          public value_hide = 0;
@@ -15046,16 +15046,16 @@ collections {
       }
       parts {
          part { name: "button_events";
-           type: RECT;
+            type: RECT;
             mouse_events: 1;
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                fixed: 1 1;
                min: 16 16;
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
-              color: 0 0 0 0;
-           }
-        }
+               color: 0 0 0 0;
+            }
+         }
          part { name: "button0";
             mouse_events: 0;
             description { state: "default" 0.0;
@@ -15107,7 +15107,7 @@ collections {
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
-              visible: 0;
+               visible: 0;
                min: 8 32;
                align: 1.0 0.5;
                rel1 {
@@ -15127,15 +15127,15 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part { name: "button4";
             mouse_events: 0;
             description { state: "default" 0.0;
-              visible: 0;
+               visible: 0;
                max: 15 999;
                min: 15 32;
                rel1 {
@@ -15150,16 +15150,16 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part { name: "button5";
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
-              visible: 0;
+               visible: 0;
                min: 8 32;
                align: 0.0 0.5;
                rel1 {
@@ -15179,51 +15179,51 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part { name: "elm.indicator";
-           type: TEXT;
-           mouse_events: 0;
+            type: TEXT;
+            mouse_events: 0;
             effect: SOFT_SHADOW;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
                fixed: 1 1;
                align: 0.5 1.0;
-              rel1 {
+               rel1 {
                   to: "button0";
                   relative: 0.0 -0.25;
                   offset: 0 0;
                }
-              rel2 {
+               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;
+               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";
             mouse_events: 0;
             description { state: "default" 0.0;
-              visible: 0;
+               visible: 0;
                rel1.to: "button3";
                rel2 {
                   to: "button5";
@@ -15236,15 +15236,15 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part { name: "button7";
             mouse_events: 0;
             description { state: "default" 0.0;
-              visible: 0;
+               visible: 0;
                rel1.to: "button3";
                rel2.to: "button5";
                image {
@@ -15254,42 +15254,42 @@ collections {
                }
                fill.smooth: 0;
             }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
       }
       programs {
-        program { name: "set_val_show";
-           signal: "elm,state,val,show";
-           source: "elm";
-           script {
+         program { name: "set_val_show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            script {
                set_value_show();
-           }
-        }
-        program { name: "set_val_hide";
-           signal: "elm,state,val,hide";
-           source: "elm";
-           script {
+            }
+         }
+         program { name: "set_val_hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            script {
                set_value_hide();
-           }
-        }
-        program { name: "val_show";
-           signal: "mouse,down,*";
-           source: "button_events";
-           script {
+            }
+         }
+         program { name: "val_show";
+            signal: "mouse,down,*";
+            source: "button_events";
+            script {
                thumb_down();
-           }
+            }
 
-        }
-        program { name: "val_hide";
-           signal: "mouse,up,*";
-           source: "button_events";
-           script {
+         }
+         program { name: "val_hide";
+            signal: "mouse,up,*";
+            source: "button_events";
+            script {
                thumb_up();
-           }
-        }
+            }
+         }
       }
    }
 
@@ -15487,21 +15487,21 @@ collections {
          }
       }
       programs {
-        program { name: "elm.drag_button,mouse,up";
-           signal: "mouse,up,1";
-           source: "elm.drag_button";
+         program { name: "elm.drag_button,mouse,up";
+            signal: "mouse,up,1";
+            source: "elm.drag_button";
             action: SIGNAL_EMIT "elm.drag_button,mouse,up" "";
-        }
-        program { name: "elm.drag_button,mouse,down";
-           signal: "mouse,down,1";
-           source: "elm.drag_button";
+         }
+         program { name: "elm.drag_button,mouse,down";
+            signal: "mouse,down,1";
+            source: "elm.drag_button";
             action: SIGNAL_EMIT "elm.drag_button,mouse,down" "";
-        }
-        program { name: "elm.drag_button,mouse,move";
-           signal: "mouse,move";
-           source: "elm.drag_button_base";
+         }
+         program { name: "elm.drag_button,mouse,move";
+            signal: "mouse,move";
+            source: "elm.drag_button_base";
             action: SIGNAL_EMIT "elm.drag_button,mouse,move" "";
-        }
+         }
       }
    }
 
@@ -15710,21 +15710,21 @@ collections {
          }
       }
       programs {
-        program { name: "elm.drag_button,mouse,up";
-           signal: "mouse,up,1";
-           source: "elm.drag_button";
+         program { name: "elm.drag_button,mouse,up";
+            signal: "mouse,up,1";
+            source: "elm.drag_button";
             action: SIGNAL_EMIT "elm.drag_button,mouse,up" "";
-        }
-        program { name: "elm.drag_button,mouse,down";
-           signal: "mouse,down,1";
-           source: "elm.drag_button";
+         }
+         program { name: "elm.drag_button,mouse,down";
+            signal: "mouse,down,1";
+            source: "elm.drag_button";
             action: SIGNAL_EMIT "elm.drag_button,mouse,down" "";
-        }
-        program { name: "elm.drag_button,mouse,move";
-           signal: "mouse,move";
-           source: "elm.drag_button_base";
+         }
+         program { name: "elm.drag_button,mouse,move";
+            signal: "mouse,move";
+            source: "elm.drag_button_base";
             action: SIGNAL_EMIT "elm.drag_button,mouse,move" "";
-        }
+         }
       }
    }
 
@@ -16132,51 +16132,327 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.end";
+         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: 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  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: -1.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            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: "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";
+            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";
+         }
+         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_compress/message/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "labels" "elm.title.1 elm.title.2 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;
+      }
+      styles {
+        style { name: "genlist_textblock_style";
+          base: "font=Sans font_size=10 color=#000 wrap=char text_class=list_item";
+          tag:  "br" "\n";
+          tag:  "ps" "ps";
+          tag:  "tab" "\t";
+        }
+        style { name: "genlist_textblock_style2";
+          base: "font=Sans font_size=10 color=#fff wrap=char text_class=list_item";
+          tag:  "br" "\n";
+          tag:  "ps" "ps";
+          tag:  "tab" "\t";
+        }
+      }
+     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;
+               }
+               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;
+               }
+            }
+         }
+         part { name: "elm.title.1";
             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;
+            type:           TEXT;
+            effect:         SOFT_SHADOW;
+            mouse_events:   0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 0 1;
+//               min: 16 16;
                rel1 {
-                  relative: 1.0 0.0;
-                  offset: -5 4;
+                  relative: 0.0  0.0;
+                  offset:   4 4;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: -5 -5;
+                  relative: 1.0  0.0;
+                  offset:   -5 4;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               align: 0.0 0.0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 0 1;
+//                  min: 1 1;
+                  align: 0.0 0.0;
+                  text_class: "list_item";
                }
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
          }
-         part { name: "elm.text";
+         part { name: "elm.title.2";
             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;
+               fixed: 0 1;
 //               min: 16 16;
                rel1 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset: 0 4;
+                  to_y:     "elm.title.1";
+                  relative: 0.0  1.0;
+                  offset:   4 0;
                }
                rel2 {
-                  to_x: "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset: -1 -5;
+                  to_y:     "elm.title.1";
+                  relative: 1.0  1.0;
+                  offset:   -5 0;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
+               align: 0.0 0.0;
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: -1.0 0.5;
+                  min: 0 1;
+//                  min: 1 1;
+                  align: 0.0 0.0;
                   text_class: "list_item";
                }
             }
@@ -16186,6 +16462,39 @@ collections {
                color3: 0 0 0 64;
             }
          }
+         part { name: "elm.text";
+            clip_to: "disclip";
+            type:           TEXTBLOCK;
+            mouse_events:   0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+//               fixed: 0 1;
+//               min: 16 16;
+               rel1 {
+                  to_y:     "elm.title.2";
+                  relative: 0.0  1.0;
+                  offset:   4 0;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset:   -5 -5;
+               }
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_textblock_style";
+                  min: 0 1;
+//                  min: 1 1;
+                  align: 0.0 0.0;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "genlist_textblock_style2";
+               }
+            }
+         }
          part { name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
@@ -16251,6 +16560,8 @@ collections {
             target:  "bg";
             target:  "fg1";
             target:  "fg2";
+            target:  "elm.title.1";
+            target:  "elm.title.2";
             target:  "elm.text";
          }
          program {
@@ -16261,6 +16572,8 @@ collections {
             target:  "bg";
             target:  "fg1";
             target:  "fg2";
+            target:  "elm.title.1";
+            target:  "elm.title.2";
             target:  "elm.text";
             transition: LINEAR 0.1;
          }
@@ -16280,8 +16593,8 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress/message/default";
-      data.item: "stacking" "above";
+   group { name: "elm/genlist/item_compress_odd/message/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.title.1 elm.title.2 elm.text";
 //      data.item: "icons" "elm.swallow.icon elm.swallow.end";
@@ -16291,27 +16604,11 @@ collections {
          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;
-      }
-      styles {
-        style { name: "genlist_textblock_style";
-          base: "font=Sans font_size=10 color=#000 wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-        }
-        style { name: "genlist_textblock_style2";
-          base: "font=Sans font_size=10 color=#fff wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-        }
+         image: "ilist_2.png" COMP;
       }
-     parts {
-         part {
-            name:           "event";
-            type:           RECT;
+      parts {
+         part { name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -16319,36 +16616,12 @@ 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;
@@ -16593,22 +16866,24 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/message/default";
-      data.item: "stacking" "below";
+   group { name: "elm/genlist/item_compress/default/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.title.1 elm.title.2 elm.text";
-//      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+      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;
       }
       parts {
-         part { name: "event";
-            type: RECT;
+         part {
+            name:           "event";
+            type:           RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -16616,12 +16891,36 @@ 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;
@@ -16661,43 +16960,58 @@ collections {
                }
             }
          }
-         part { name: "elm.title.1";
-            clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               fixed: 0 1;
-//               min: 16 16;
+         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;
+                  offset:   4    4;
                }
                rel2 {
+                  relative: 0.0  1.0;
+                  offset:   4   -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:   -5 4;
+                  offset:   -1    4;
                }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               align: 0.0 0.0;
-               text {
-                  font: "Sans";
-                  size: 10;
-                  min: 0 1;
-//                  min: 1 1;
-                  align: 0.0 0.0;
-                  text_class: "list_item";
+               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;
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
             }
          }
-         part { name: "elm.title.2";
+         part { name: "elm.text";
             clip_to: "disclip";
             type:           TEXT;
             effect:         SOFT_SHADOW;
@@ -16705,27 +17019,25 @@ collections {
             scale: 1;
             description {
                state: "default" 0.0;
-               fixed: 0 1;
 //               min: 16 16;
                rel1 {
-                  to_y:     "elm.title.1";
-                  relative: 0.0  1.0;
-                  offset:   4 0;
+                  to_x:     "elm.swallow.icon";
+                  relative: 1.0  0.0;
+                  offset:   0 4;
                }
                rel2 {
-                  to_y:     "elm.title.1";
-                  relative: 1.0  1.0;
-                  offset:   -5 0;
+                  to_x:     "elm.swallow.end";
+                  relative: 0.0  1.0;
+                  offset:   -1 -5;
                }
                color: 0 0 0 255;
                color3: 0 0 0 0;
-               align: 0.0 0.0;
                text {
                   font: "Sans";
                   size: 10;
                   min: 0 1;
 //                  min: 1 1;
-                  align: 0.0 0.0;
+                  align: 0.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -16735,39 +17047,6 @@ collections {
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type:           TEXTBLOCK;
-            mouse_events:   0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-//               fixed: 0 1;
-//               min: 16 16;
-               rel1 {
-                  to_y:     "elm.title.2";
-                  relative: 0.0  1.0;
-                  offset:   4 0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5 -5;
-               }
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_textblock_style";
-                  min: 0 1;
-//                  min: 1 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "genlist_textblock_style2";
-               }
-            }
-         }
          part { name: "fg1";
             clip_to: "disclip";
             mouse_events: 0;
@@ -16833,8 +17112,6 @@ collections {
             target:  "bg";
             target:  "fg1";
             target:  "fg2";
-            target:  "elm.title.1";
-            target:  "elm.title.2";
             target:  "elm.text";
          }
          program {
@@ -16845,8 +17122,6 @@ collections {
             target:  "bg";
             target:  "fg1";
             target:  "fg2";
-            target:  "elm.title.1";
-            target:  "elm.title.2";
             target:  "elm.text";
             transition: LINEAR 0.1;
          }
@@ -16866,8 +17141,8 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress/default/default";
-      data.item: "stacking" "above";
+   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";
@@ -16877,13 +17152,11 @@ collections {
          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;
+         part { name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -16891,36 +17164,12 @@ 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;
@@ -16995,10 +17244,10 @@ collections {
          }
          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 {
@@ -17019,7 +17268,7 @@ collections {
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
+//               min:      16 16;
                rel1 {
                   to_x:     "elm.swallow.icon";
                   relative: 1.0  0.0;
@@ -17035,9 +17284,9 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-                  min: 0 1;
-//                  min: 1 1;
-                  align: 0.0 0.5;
+                  min: 1 1;
+//                  min: 0 1;
+                  align: -1.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -17141,7 +17390,7 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_odd/default/default";
+   group { name: "elm/genlist/item_compress_odd/default/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
@@ -17284,9 +17533,9 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: -1.0 0.5;
+                  min: 0 1;
+//                  min: 1 1;
+                  align: 0.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -17390,8 +17639,9 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/default/default";
-      data.item: "stacking" "below";
+
+   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";
@@ -17401,11 +17651,16 @@ collections {
          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_left.png" COMP;
+         image: "icon_arrow_right.png" COMP;
+         image: "icon_arrow_down.png" COMP;
       }
       parts {
-         part { name: "event";
-            type: RECT;
+         part {
+            name:           "event";
+            type:           RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -17413,12 +17668,36 @@ 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;
@@ -17473,12 +17752,13 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
+            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;
@@ -17489,14 +17769,45 @@ collections {
                   relative: 1.0  1.0;
                   offset:   -1   -5;
                }
+               image.normal: "icon_arrow_right.png";
+            }
+            description { state: "default" 0.1;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_left.png";
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "icon_arrow_down.png";
+            }
+            description { state: "active" 0.1;
+               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";
             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 {
@@ -17517,7 +17828,7 @@ collections {
             scale: 1;
             description {
                state: "default" 0.0;
-//               min:      16 16;
+//               min: 16 16;
                rel1 {
                   to_x:     "elm.swallow.icon";
                   relative: 1.0  0.0;
@@ -17533,9 +17844,9 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-                  min: 0 1;
-//                  min: 1 1;
-                  align: 0.0 0.5;
+                  min: 1 1;
+//                  min: 0 1;
+                  align: -1.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -17630,17 +17941,68 @@ collections {
             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:    "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";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"arrow", st, 30, vl);
+               set_state(PART:"arrow", "active", vl);
+            }
+         }
+         program {
+            name:    "go_contracted";
+            signal:  "elm,state,contracted";
+            source:  "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"arrow", st, 30, vl);
+               set_state(PART:"arrow", "default", vl);
+            }
+         }
+         program { name: "to_rtl";
+            signal: "edje,state,rtl";
+            source: "edje";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"arrow", st, 30, vl);
+               if (vl == 0.0) {
+                  set_state(PART:"arrow", st, 0.1);
+               }
+            }
+         }
+         program { name: "to_ltr";
+            signal: "edje,state,ltr";
+            source: "edje";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"arrow", st, 30, vl);
+               if (vl == 0.1) {
+                  set_state(PART:"arrow", st, 0.0);
+               }
+            }
          }
       }
    }
-
-   group { name: "elm/genlist/tree/default/default";
+   group { name: "elm/genlist/tree_compress/default/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
@@ -17844,9 +18206,9 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: -1.0 0.5;
+//                  min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -18002,8 +18364,8 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/tree_compress/default/default";
-      data.item: "stacking" "above";
+   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";
@@ -18013,8 +18375,7 @@ collections {
          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_left.png" COMP;
          image: "icon_arrow_right.png" COMP;
          image: "icon_arrow_down.png" COMP;
@@ -18030,36 +18391,12 @@ 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;
@@ -18206,9 +18543,9 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-//                  min: 1 1;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  min: 1 1;
+//                  min: 0 1;
+                  align: -1.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -18364,7 +18701,7 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/tree_odd/default/default";
+   group { name: "elm/genlist/tree_compress_odd/default/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
@@ -18543,9 +18880,9 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-                  min: 1 1;
-//                  min: 0 1;
-                  align: -1.0 0.5;
+//                  min: 1 1;
+                  min: 0 1;
+                  align: 0.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -18685,380 +19022,562 @@ collections {
                if (vl == 0.0) {
                   set_state(PART:"arrow", st, 0.1);
                }
-            }
-         }
-         program { name: "to_ltr";
-            signal: "edje,state,ltr";
-            source: "edje";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"arrow", st, 30, vl);
-               if (vl == 0.1) {
-                  set_state(PART:"arrow", st, 0.0);
+            }
+         }
+         program { name: "to_ltr";
+            signal: "edje,state,ltr";
+            source: "edje";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"arrow", st, 30, vl);
+               if (vl == 0.1) {
+                  set_state(PART:"arrow", st, 0.0);
+               }
+            }
+         }
+      }
+   }
+
+   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 text_class=list_item";
+               tag:  "br" "\n";
+               tag:  "ps" "ps";
+               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 text_class=list_item";
+               tag:  "br" "\n";
+               tag:  "ps" "ps";
+               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;
+               }
+           }
+           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_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;
+                   }
+                   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;
+                   }
+               }
+           }
+           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.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.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;
+               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;
+                   }
                }
-            }
-         }
-      }
-   }
-   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" "";
-      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_left.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;
-               image {
-                  normal: "ilist_2.png";
-                  border: 2 2 2 2;
+               description { state: "selected" 0.0;
+                   inherit: "default" 0.0;
+                   text {
+                       style: "genlist_selected_style";
+                   }
                }
-               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: "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: 4 4;
+               description { state: "selected" 0.0;
+                   inherit: "default" 0.0;
+                   visible: 1;
+                   color: 255 255 255 255;
                }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
+           }
+           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;
+                   }
                }
-               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;
                }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
+           }
+           part { name: "disclip";
+               type: RECT;
+               description { state: "default" 0.0;
+                   rel1.to: "bg";
+                   rel2.to: "bg";
                }
-            }
-         }
-         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;
+               description { state: "disabled" 0.0;
+                   inherit: "default" 0.0;
+                   color: 255 255 255 64;
                }
-               rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+           }
+       }
+       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_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;
                }
-            }
-         }
-         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: "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 {
-                  to_x: "elm.swallow.pad";
-                  relative: 1.0  1.0;
-                  offset:   -1   -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;
                }
-               image.normal: "icon_arrow_right.png";
-            }
-            description { state: "default" 0.1;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_left.png";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "icon_arrow_down.png";
-            }
-            description { state: "active" 0.1;
-               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;
+               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 {
-                  to_x: "arrow";
-                  relative: 1.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;
+                   }
+                   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;
+           }
+           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: 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;
+                   }
+                   rel2 {
+                       relative: 1.0  1.0;
+                       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;
+           }
+           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.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+               description { state: "selected" 0.0;
+                   inherit: "default" 0.0;
+                   text {
+                       style: "genlist_selected_style";
+                   }
                }
-               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;
-                  text_class: "list_item";
+           }
+           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: "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: "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;
                }
-            }
-            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;
+           }
+           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";
-         }
-         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";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"arrow", st, 30, vl);
-               set_state(PART:"arrow", "active", vl);
-            }
-         }
-         program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"arrow", st, 30, vl);
-               set_state(PART:"arrow", "default", vl);
-            }
-         }
-         program { name: "to_rtl";
-            signal: "edje,state,rtl";
-            source: "edje";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"arrow", st, 30, vl);
-               if (vl == 0.0) {
-                  set_state(PART:"arrow", st, 0.1);
+               description { state: "selected" 0.0;
+                   inherit: "default" 0.0;
+                   visible: 1;
+                   color: 255 255 255 255;
                }
-            }
-         }
-         program { name: "to_ltr";
-            signal: "edje,state,ltr";
-            source: "edje";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"arrow", st, 30, vl);
-               if (vl == 0.1) {
-                  set_state(PART:"arrow", st, 0.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;
                }
-            }
-         }
-      }
-   }
-
-   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 text_class=list_item";
-               tag:  "br" "\n";
-               tag:  "ps" "ps";
-               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 text_class=list_item";
-               tag:  "br" "\n";
-               tag:  "ps" "ps";
-               tag:  "hilight" "+ font=Sans:style=Bold";
-               tag:  "b" "+ font=Sans:style=Bold";
-               tag:  "tab" "\t";
+       }
+       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/tree/default_style/default";
        data.item: "stacking" "above";
        data.item: "selectraise" "on";
        data.item: "labels" "elm.text";
@@ -19070,6 +19589,8 @@ collections {
            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 {
@@ -19167,12 +19688,13 @@ collections {
                    }
                }
            }
-           part { name: "elm.swallow.icon";
+           part { name: "arrow";
                clip_to: "disclip";
-               type: SWALLOW;
+               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;
@@ -19183,6 +19705,29 @@ collections {
                        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;
+                   }
                }
            }
            part { name: "elm.swallow.end";
@@ -19205,21 +19750,22 @@ collections {
            }
            part { name: "elm.text";
                clip_to: "disclip";
-               type: TEXTBLOCK;
-               mouse_events: 0;
+               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_x:     "elm.swallow.icon";
                        to_y: "base";
                        relative: 1.0  0.5;
                        offset:   0 4;
                    }
                    rel2 {
-                       to_x: "elm.swallow.end";
+                       to_x:     "elm.swallow.end";
                        to_y: "base";
                        relative: 0.0  0.5;
                        offset:   -1 -5;
@@ -19326,11 +19872,31 @@ collections {
                signal:  "elm,state,enabled";
                source:  "elm";
                action:  STATE_SET "default" 0.0;
-               target:  "disclip";
+               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";
+   group { name: "elm/genlist/tree_odd/default_style/default";
        data.item: "stacking" "below";
        data.item: "selectraise" "on";
        data.item: "labels" "elm.text";
@@ -19341,10 +19907,13 @@ collections {
            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;
+           part {
+               name:           "event";
+               type:           RECT;
                repeat_events: 1;
                description {
                    state: "default" 0.0;
@@ -19413,12 +19982,13 @@ collections {
                    }
                }
            }
-           part { name: "elm.swallow.icon";
+           part { name: "arrow";
                clip_to: "disclip";
-               type: SWALLOW;
+               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;
@@ -19429,14 +19999,37 @@ collections {
                        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;
+                   }
                }
            }
            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 {
@@ -19452,6 +20045,7 @@ collections {
            part { name: "elm.text";
                clip_to: "disclip";
                type:           TEXTBLOCK;
+               effect:         SOFT_SHADOW;
                mouse_events:   0;
                scale: 1;
                description {
@@ -19459,13 +20053,13 @@ collections {
                    align: 0.0 0.5;
                    fixed: 0 1;
                    rel1 {
-                       to_x: "elm.swallow.icon";
+                       to_x:     "elm.swallow.icon";
                        to_y: "base";
                        relative: 1.0  0.5;
                        offset:   0 4;
                    }
                    rel2 {
-                       to_x: "elm.swallow.end";
+                       to_x:     "elm.swallow.end";
                        to_y: "base";
                        relative: 0.0  0.5;
                        offset:   -1 -5;
@@ -19574,626 +20168,656 @@ collections {
                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_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/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";
                }
-           }
-           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;
+               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;
+               }
+               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;
+               }
+            }
+         }
+         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.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;
-                   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 {
+                  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;
-                   }
-                   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;
                }
-           }
-           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:   -5   -5;
                }
-               description { state: "active" 0.0;
-                   inherit: "default" 0.0;
-                   image.normal: "icon_arrow_down.png";
+            }
+         }
+         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: "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.end";
+                  relative: 0.0  0.5;
+                  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;
-                   }
+               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;
+                  text_class: "list_item";
                }
-           }
-           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;
-                   }
+            }
+            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;
-                   text {
-                       style: "genlist_selected_style";
-                   }
+               rel2 {
+                  to_x:     "elm.swallow.end";
+                  relative: 0.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;
-                   }
+               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;
+                  text_class: "list_item";
                }
-               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;
+               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;
                }
-           }
-           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: "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;
+            }
+            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_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: "disclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
+               rel2 {
+                  to: "base";
+                  relative: 1.0 1.0;
+                  offset: -1 0;
                }
-               description { state: "disabled" 0.0;
-                   inherit: "default" 0.0;
-                   color: 255 255 255 64;
+               image {
+                  normal: "ilist_item_shadow.png";
                }
-           }
-       }
-       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/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;
+               fill.smooth: 0;
+            }
+         }
+         part {
+            name: "base";
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               image {
+                  normal: "ilist_1.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;
                }
-               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;
+               }
+               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;
+                  text_class: "list_item";
+               }
+            }
+            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;
                }
-           }
-           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  1.0;
+                  offset:   -1 -5;
                }
-               description { state: "selected" 0.0;
-                   inherit: "default" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
+               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;
+                  text_class: "list_item";
                }
-           }
-           part { name: "disclip";
-               type: RECT;
-               description { state: "default" 0.0;
-                   rel1.to: "bg";
-                   rel2.to: "bg";
+            }
+            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_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";
@@ -20201,43 +20825,17 @@ collections {
 //      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;
+         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 {
@@ -20246,7 +20844,7 @@ collections {
             description {
                state: "default" 0.0;
                image {
-                  normal: "ilist_1.png";
+                  normal: "ilist_2.png";
                   border: 2 2 2 2;
                }
                fill.smooth: 0;
@@ -20321,10 +20919,10 @@ collections {
          }
          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 {
@@ -20504,8 +21102,8 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress/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";
@@ -20515,13 +21113,11 @@ collections {
          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;
+         part { name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -20529,36 +21125,12 @@ 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;
@@ -20633,10 +21205,10 @@ collections {
          }
          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 {
@@ -20816,8 +21388,9 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_odd/double_label/default";
-      data.item: "stacking" "below";
+
+   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";
@@ -20827,11 +21400,15 @@ collections {
          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;
+         part {
+            name:           "event";
+            type:           RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -20839,12 +21416,36 @@ 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;
@@ -20899,12 +21500,13 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
+            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;
@@ -20915,14 +21517,37 @@ collections {
                   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;
+               }
             }
          }
          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 {
@@ -21100,10 +21725,30 @@ collections {
             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";
-      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";
@@ -21113,11 +21758,15 @@ collections {
          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;
+         part {
+            name:           "event";
+            type:           RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -21125,12 +21774,36 @@ 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;
@@ -21185,12 +21858,13 @@ collections {
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
+            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;
@@ -21201,14 +21875,37 @@ collections {
                   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;
+               }
             }
          }
          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 {
@@ -21386,11 +22083,30 @@ collections {
             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";
-      data.item: "stacking" "above";
+   }
+   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";
@@ -21400,8 +22116,7 @@ collections {
          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;
       }
@@ -21416,36 +22131,12 @@ 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;
@@ -21747,11 +22438,12 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/tree_compress/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" "";
       images {
@@ -21760,8 +22452,6 @@ collections {
          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 {
@@ -21853,21 +22543,20 @@ collections {
                   offset:   4    4;
                }
                rel2 {
-                  relative: 0.0  1.0;
-                  offset:   4   -5;
+                  relative: 1.0  1.0;
+                  offset:   -4   -5;
                }
             }
          }
-         part { name: "arrow";
+         part { name: "elm.swallow.icon";
             clip_to: "disclip";
-            ignore_flags: ON_HOLD;
+            type: SWALLOW;
             description { state: "default" 0.0;
                fixed: 1 0;
-               align: 0.0 0.5;
-               aspect: 1.0 1.0;
+               align: 0.5 0.5;
                rel1 {
                   to_x: "elm.swallow.pad";
-                  relative: 1.0  0.0;
+                  relative: 0.0  0.0;
                   offset:   -1    4;
                }
                rel2 {
@@ -21875,47 +22564,6 @@ collections {
                   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;
-               }
-            }
-         }
-         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";
@@ -21928,23 +22576,22 @@ collections {
                state: "default" 0.0;
 //               min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
+                  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;
+                  min: 1 1;
+//                  min: 0 1;
+                  align: 0.5 0.5;
                   text_class: "list_item";
                }
             }
@@ -21954,41 +22601,6 @@ collections {
                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;
-                  text_class: "list_item";
-               }
-            }
-            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;
@@ -22055,7 +22667,6 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text";
-            target:  "elm.text.sub";
          }
          program {
             name:    "go_passive";
@@ -22066,7 +22677,6 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text";
-            target:  "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
@@ -22083,33 +22693,13 @@ collections {
             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_odd/double_label/default";
+   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" "";
       images {
@@ -22117,13 +22707,10 @@ collections {
          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;
+         part { name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -22186,33 +22773,9 @@ collections {
                   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;
+                  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";
@@ -22220,106 +22783,52 @@ collections {
             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";
-            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:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-//               min: 16 16;
+               align: 0.5 0.5;
                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;
+                  to_x: "elm.swallow.pad";
+                  relative: 0.0  0.0;
+                  offset:   -1    4;
                }
-               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;
-                  text_class: "list_item";
+               rel2 {
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset:   -1   -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";
+         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;
+//               min:      16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.5;
+                  to_y:     "elm.swallow.icon";
+                  relative: 0.0  1.0;
                   offset:   0 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
-                  offset:   -1 -5;
+                  relative: 1.0  1.0;
+                  offset:   -5 -5;
                }
-               color: 0 0 0 128;
+               color: 0 0 0 255;
                color3: 0 0 0 0;
                text {
                   font: "Sans";
-                  size: 8;
+                  size: 10;
                   min: 1 1;
 //                  min: 0 1;
-                  align: 0.0 0.5;
+                  align: 0.5 0.5;
                   text_class: "list_item";
                }
             }
             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";
@@ -22388,7 +22897,6 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text";
-            target:  "elm.text.sub";
          }
          program {
             name:    "go_passive";
@@ -22399,7 +22907,6 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text";
-            target:  "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
@@ -22416,30 +22923,10 @@ collections {
             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/icon_top_text_bottom/default";
+   group { name: "elm/genlist/tree/icon_top_text_bottom/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
@@ -22452,6 +22939,8 @@ collections {
          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 {
@@ -22543,20 +23032,21 @@ collections {
                   offset:   4    4;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -4   -5;
+                  relative: 0.0  1.0;
+                  offset:   4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                fixed: 1 0;
-               align: 0.5 0.5;
+               align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
-                  relative: 0.0  0.0;
+                  relative: 1.0  0.0;
                   offset:   -1    4;
                }
                rel2 {
@@ -22564,6 +23054,28 @@ collections {
                   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.5 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset:   4    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset:   -4   -5;
+               }
             }
          }
          part { name: "elm.text";
@@ -22693,9 +23205,29 @@ collections {
             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";
+   group { name: "elm/genlist/tree_odd/icon_top_text_bottom/default";
       data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text";
@@ -22707,10 +23239,13 @@ collections {
          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;
+         part {
+            name:           "event";
+            type:           RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -22773,20 +23308,21 @@ collections {
                   offset:   4    4;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -4   -5;
+                  relative: 0.0  1.0;
+                  offset:   4   -5;
                }
             }
          }
-         part { name: "elm.swallow.icon";
+         part { name: "arrow";
             clip_to: "disclip";
-            type: SWALLOW;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                fixed: 1 0;
-               align: 0.5 0.5;
+               align: 0.0 0.5;
+               aspect: 1.0 1.0;
                rel1 {
                   to_x: "elm.swallow.pad";
-                  relative: 0.0  0.0;
+                  relative: 1.0  0.0;
                   offset:   -1    4;
                }
                rel2 {
@@ -22794,6 +23330,28 @@ collections {
                   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.5 0.5;
+               rel1 {
+                  to_x: "arrow";
+                  relative: 1.0  0.0;
+                  offset:   4    4;
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  offset:   -4   -5;
+               }
             }
          }
          part { name: "elm.text";
@@ -22804,7 +23362,7 @@ collections {
             scale: 1;
             description {
                state: "default" 0.0;
-//               min:      16 16;
+//               min: 16 16;
                rel1 {
                   to_y:     "elm.swallow.icon";
                   relative: 0.0  1.0;
@@ -22923,315 +23481,501 @@ collections {
             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/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/check/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: "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_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";
+         part { name: "bg";
             mouse_events: 0;
-            description {
-               state: "default" 0.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_1.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;
+            scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 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;
-               }
+            }
+            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.pad";
+         part { name: "elm.swallow.content";
             type: SWALLOW;
             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;
-               }
+          rel1.to_x: "bg";
+               rel1.relative: 1.0 0.0;
+               rel1.offset: 1 1;
+          rel2.to_x: "bg";
+               rel2.offset: 1 -2;
+               rel2.relative: 1.0 1.0;
             }
-         }
-         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 0;
+               visible: 1;
                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;
+            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;
+          fixed: 1 0;
+               visible: 1;
+               aspect: 1.0 1.0;
             }
          }
          part { name: "elm.text";
-            clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
+            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;
-               }
+            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;
-               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;
-                  text_class: "list_item";
+                  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;
+            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);
+            }
+         }
+      }
+   }
+///////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/radio/base/default";
+      images {
+         image: "radio_base.png" COMP;
+         image: "radio.png" COMP;
+         image: "radio2.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: "fg1";
-            clip_to: "disclip";
+         part { name: "radio";
             mouse_events: 0;
+            scale: 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: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
-               }
+               visible: 0;
+               image.normal: "radio.png";
             }
-            description { state: "selected" 0.0;
+            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;
                visible: 1;
                color: 255 255 255 255;
+               aspect: 1.0 1.0;
+            }
+            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;
+               aspect: 1.0 1.0;
             }
          }
-         part { name: "fg2";
-            clip_to: "disclip";
+         part { name: "elm.text";
+            type: TEXT;
             mouse_events: 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;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               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;
-               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";
+         program { 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";
+         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:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
+            target: "radio";
          }
-         program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.text";
          }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            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";
+            target: "elm.text";
          }
-         program {
-            name:    "go_expanded";
-            signal:  "elm,state,expanded";
-            source:  "elm";
-            action:  STATE_SET "active" 0.0;
-            target:  "arrow";
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
          }
-         program {
-            name:    "go_contracted";
-            signal:  "elm,state,contracted";
-            source:  "elm";
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
             action:  STATE_SET "default" 0.0;
-            target:  "arrow";
+            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);
+            }
          }
       }
    }
-   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" "";
       images {
@@ -23342,15 +24086,34 @@ collections {
             type: SWALLOW;
             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;
+               }
+               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 {
-                  to_x: "arrow";
                   relative: 1.0  0.0;
-                  offset:   4    4;
+                  offset:   -5    4;
                }
                rel2 {
                   relative: 1.0  1.0;
-                  offset:   -4   -5;
+                  offset:   -5   -5;
                }
             }
          }
@@ -23364,22 +24127,23 @@ collections {
                state: "default" 0.0;
 //               min: 16 16;
                rel1 {
-                  to_y:     "elm.swallow.icon";
-                  relative: 0.0  1.0;
+                  to_x:     "elm.swallow.icon";
+                  relative: 1.0  0.0;
                   offset:   0 4;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5 -5;
+                  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;
                   text_class: "list_item";
                }
             }
@@ -23389,6 +24153,41 @@ collections {
                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;
+                  text_class: "list_item";
+               }
+            }
+            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;
@@ -23455,6 +24254,7 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text";
+            target:  "elm.text.sub";
          }
          program {
             name:    "go_passive";
@@ -23465,6 +24265,7 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text";
+            target:  "elm.text.sub";
             transition: LINEAR 0.1;
          }
          program {
@@ -23504,487 +24305,17 @@ collections {
       }
    }
 
-
-///////////////////////////////////////////////////////////////////////////////
-   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;
-              align: 0.0 0.5;
-          rel1.to_x: "bg";
-              rel1.relative: 1.0 0.0;
-              rel1.offset: 1 1;
-          rel2.to_x: "bg";
-              rel2.offset: 1 -2;
-              rel2.relative: 1.0 1.0;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-          fixed: 1 0;
-              visible: 1;
-              aspect: 1.0 1.0;
-           }
-           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 0;
-              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 1;
-                 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);
-           }
-         }
-      }
-   }
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/radio/base/default";
-      images {
-         image: "radio_base.png" COMP;
-        image: "radio.png" COMP;
-        image: "radio2.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;
-               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;
-              visible: 1;
-               color: 255 255 255 255;
-              aspect: 1.0 1.0;
-           }
-           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;
-              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,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);
-           }
-         }
-      }
-   }
-   group { name: "elm/genlist/tree_compress_odd/double_label/default";
-      data.item: "stacking" "below";
+   group { name: "elm/genlist/item_compress/media/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.title elm.text.album-artist";
       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;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
       }
       parts {
          part {
@@ -23997,12 +24328,36 @@ 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;
@@ -24028,96 +24383,36 @@ collections {
                }
                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.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";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
                rel1 {
-                  to_x: "arrow";
-                  relative: 1.0  0.0;
-                  offset:   4    4;
+                  relative: 0.0 0.0;
+                  offset: -2 -2;
                }
                rel2 {
-                  to_x: "arrow";
-                  relative: 1.0  1.0;
-                  offset:   4   -5;
+                  relative: 1.0 1.0;
+                  offset: 1 1;
                }
             }
          }
-         part { name: "elm.swallow.end";
-            clip_to: "disclip";
+         part { name: "elm.swallow.pad";
             type: SWALLOW;
             description { state: "default" 0.0;
                fixed: 1 0;
-               align: 1.0 0.5;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -5    4;
+                  relative: 0.0  0.0;
+                  offset:   4    4;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -5   -5;
+                  relative: 0.0  1.0;
+                  offset:   4   -5;
                }
             }
          }
-         part { name: "elm.text";
+         part { name: "elm.text.title";
             clip_to: "disclip";
             type:           TEXT;
             effect:         SOFT_SHADOW;
@@ -24125,15 +24420,12 @@ collections {
             scale: 1;
             description {
                state: "default" 0.0;
-//               min: 16 16;
                rel1 {
-                  to_x:     "elm.swallow.icon";
-                  relative: 1.0  0.0;
-                  offset:   0 4;
+                  relative: 0.0  0.0;
+                  offset:   4 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  0.5;
+                  relative: 1.0  0.5;
                   offset:   -1 -5;
                }
                color: 0 0 0 255;
@@ -24141,10 +24433,8 @@ collections {
                text {
                   font: "Sans";
                   size: 10;
-//                  min: 1 1;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -24153,22 +24443,19 @@ collections {
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.sub";
+         part { name: "elm.text.album-artist";
             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;
+                  relative: 0.0  0.5;
+                  offset:   4 4;
                }
                rel2 {
-                  to_x:     "elm.swallow.end";
-                  relative: 0.0  1.0;
+                  relative: 1.0  1.0;
                   offset:   -1 -5;
                }
                color: 0 0 0 128;
@@ -24176,10 +24463,8 @@ collections {
                text {
                   font: "Sans";
                   size: 8;
-//                  min: 1 1;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -24253,8 +24538,8 @@ collections {
             target:  "bg";
             target:  "fg1";
             target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            target:  "elm.text.title";
+            target:  "elm.text.album-artist";
          }
          program {
             name:    "go_passive";
@@ -24264,8 +24549,8 @@ collections {
             target:  "bg";
             target:  "fg1";
             target:  "fg2";
-            target:  "elm.text";
-            target:  "elm.text.sub";
+            target:  "elm.text.title";
+            target:  "elm.text.album-artist";
             transition: LINEAR 0.1;
          }
          program {
@@ -24282,31 +24567,10 @@ collections {
             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/media/default";
-      data.item: "stacking" "above";
+   group { name: "elm/genlist/item_compress_odd/media/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text.title elm.text.album-artist";
       data.item: "treesize" "20";
@@ -24314,13 +24578,11 @@ collections {
          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;
+         part { name: "event";
+            type: RECT;
             repeat_events: 1;
             description {
                state: "default" 0.0;
@@ -24328,36 +24590,12 @@ 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;
@@ -24569,19 +24807,26 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/media/default";
-      data.item: "stacking" "below";
+
+   group { name: "elm/genlist/item_compress/media-album/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.title elm.text.album-artist";
+      data.item: "labels" "elm.text.title elm.text.trackno elm.text.length";
+      data.item: "states" "elm.state.trackno";
       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: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
+      }
+      script {
+         public dot_visible;
       }
       parts {
-         part { name: "event";
+         part {
+            name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -24590,12 +24835,36 @@ 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;
@@ -24613,40 +24882,131 @@ collections {
                }
                rel2 {
                   relative: 1.0 1.0;
-                  offset: 4 4;
+                  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;
+               }
+            }
+         }
+         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.text.trackno";
+            type: TEXT;
+            scale: 1;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+               align: 0.0 0.0;
+               fixed: 1 0;
+               rel1 {
+                  to_y: "elm.text.title";
+                  relative: 0.0 0.0;
+                  offset: 5 0;
+               }
+               rel2 {
+                  to_y: "elm.text.title";
+                  relative: 0.0 1.0;
+                  offset: 20 0;
+               }
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  align: 1.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: 224 224 224 255;
+               color3: 0 0 0 64;
+            }
+         }
+         part {
+            name: "dot";
+            type: TEXT;
+            scale: 1;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+               visible: 0;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               rel1 {
+                  to_x: "elm.text.trackno";
+                  to_y: "elm.text.title";
+                  relative: 1.0 0.0;
+                  offset: 1 0;
+               }
+               rel2 {
+                  to_x: "elm.text.trackno";
+                  to_y: "elm.text.title";
+                  relative: 1.0 1.0;
+                  offset: 1 0;
+
                }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
+               color: 0 0 0 255;
+               color3: 0 0 0 0;
+               text {
+                  font: "Sans";
+                  size: 10;
+                  min: 1 1;
+                  align: 0.0 0.5;
+                  text: ".";
                }
-               image.middle: SOLID;
+            }
+            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;
                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: 0.0  1.0;
-                  offset:   4   -5;
+         programs {
+            program {
+               signal: "elm,state,elm.state.trackno,active";
+               source: "elm";
+               script {
+                  set_state(PART:"dot", "visible", 0.0);
+                  set_int(dot_visible, 1);
                }
             }
          }
@@ -24659,6 +25019,7 @@ collections {
             description {
                state: "default" 0.0;
                rel1 {
+                  to_x: "dot";
                   relative: 0.0  0.0;
                   offset:   4 4;
                }
@@ -24681,7 +25042,7 @@ collections {
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.album-artist";
+         part { name: "elm.text.length";
             clip_to: "disclip";
             type:           TEXT;
             mouse_events:   0;
@@ -24777,7 +25138,16 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text.title";
-            target:  "elm.text.album-artist";
+            target:  "elm.text.trackno";
+            target:  "elm.text.length";
+            after:   "dot_active";
+         }
+         program {
+            name: "dot_active";
+            script {
+               if (get_int(dot_visible) == 1)
+                  set_state(PART:"dot", "selected", 0.0);
+            }
          }
          program {
             name:    "go_passive";
@@ -24788,8 +25158,17 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text.title";
-            target:  "elm.text.album-artist";
+            target:  "elm.text.length";
+            target:  "elm.text.trackno";
             transition: LINEAR 0.1;
+            after:   "dot_passive";
+         }
+         program {
+            name: "dot_passive";
+            script {
+               if (get_int(dot_visible) == 1)
+                  set_state(PART:"dot", "visible", 0.0);
+            }
          }
          program {
             name:    "go_disabled";
@@ -24807,9 +25186,8 @@ collections {
          }
       }
    }
-
-   group { name: "elm/genlist/item_compress/media-album/default";
-      data.item: "stacking" "above";
+   group { name: "elm/genlist/item_compress_odd/media-album/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text.title elm.text.trackno elm.text.length";
       data.item: "states" "elm.state.trackno";
@@ -24818,15 +25196,13 @@ collections {
          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;
       }
       script {
          public dot_visible;
       }
       parts {
-         part {
-            name: "event";
+         part { name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -24835,36 +25211,12 @@ 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;
@@ -25020,7 +25372,7 @@ collections {
                state: "default" 0.0;
                rel1 {
                   to_x: "dot";
-                  relative: 0.0  0.0;
+                  relative: 1.0  0.0;
                   offset:   4 4;
                }
                rel2 {
@@ -25138,8 +25490,8 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text.title";
-            target:  "elm.text.trackno";
             target:  "elm.text.length";
+            target:  "elm.text.trackno";
             after:   "dot_active";
          }
          program {
@@ -25186,23 +25538,23 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/media-album/default";
-      data.item: "stacking" "below";
+
+   group { name: "elm/genlist/item_compress/media-preview/default";
+      data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.title elm.text.trackno elm.text.length";
-      data.item: "states" "elm.state.trackno";
+      data.item: "labels" "elm.text.title elm.text.artist";
+      data.item: "icons" "elm.swallow.preview";
       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;
-      }
-      script {
-         public dot_visible;
+         image: "ilist_1.png" COMP;
+         image: "ilist_item_shadow.png" COMP;
       }
       parts {
-         part { name: "event";
+         part {
+            name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -25211,12 +25563,36 @@ 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;
@@ -25271,94 +25647,23 @@ collections {
                }
             }
          }
-         part {
-            name: "elm.text.trackno";
-            type: TEXT;
-            scale: 1;
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               color: 255 255 255 255;
-               align: 0.0 0.0;
+         part { name: "elm.swallow.preview";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description { state: "default" 0.0;
                fixed: 1 0;
+               align: 0.0 0.5;
+               min: 68 68;
+               max: 68 68;
                rel1 {
-                  to_y: "elm.text.title";
-                  relative: 0.0 0.0;
-                  offset: 5 0;
-               }
-               rel2 {
-                  to_y: "elm.text.title";
-                  relative: 0.0 1.0;
-                  offset: 20 0;
-               }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 10;
-                  min: 1 1;
-                  align: 1.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
-            }
-         }
-         part {
-            name: "dot";
-            type: TEXT;
-            scale: 1;
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               color: 255 255 255 255;
-               visible: 0;
-               fixed: 1 1;
-               align: 0.0 0.0;
-               rel1 {
-                  to_x: "elm.text.trackno";
-                  to_y: "elm.text.title";
-                  relative: 1.0 0.0;
-                  offset: 1 0;
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  0.0;
+                  offset:   -1    4;
                }
                rel2 {
-                  to_x: "elm.text.trackno";
-                  to_y: "elm.text.title";
-                  relative: 1.0 1.0;
-                  offset: 1 0;
-
-               }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 10;
-                  min: 1 1;
-                  align: 0.0 0.5;
-                  text: ".";
-               }
-            }
-            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;
-               visible: 1;
-            }
-         }
-         programs {
-            program {
-               signal: "elm,state,elm.state.trackno,active";
-               source: "elm";
-               script {
-                  set_state(PART:"dot", "visible", 0.0);
-                  set_int(dot_visible, 1);
+                  to_x: "elm.swallow.pad";
+                  relative: 1.0  1.0;
+                  offset:   -1   -5;
                }
             }
          }
@@ -25371,7 +25676,7 @@ collections {
             description {
                state: "default" 0.0;
                rel1 {
-                  to_x: "dot";
+                  to_x:     "elm.swallow.preview";
                   relative: 1.0  0.0;
                   offset:   4 4;
                }
@@ -25394,7 +25699,7 @@ collections {
                color3: 0 0 0 64;
             }
          }
-         part { name: "elm.text.length";
+         part { name: "elm.text.artist";
             clip_to: "disclip";
             type:           TEXT;
             mouse_events:   0;
@@ -25402,7 +25707,8 @@ collections {
             description {
                state: "default" 0.0;
                rel1 {
-                  relative: 0.0  0.5;
+                  to_x:     "elm.swallow.preview";
+                  relative: 1.0  0.5;
                   offset:   4 4;
                }
                rel2 {
@@ -25490,16 +25796,7 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text.title";
-            target:  "elm.text.length";
-            target:  "elm.text.trackno";
-            after:   "dot_active";
-         }
-         program {
-            name: "dot_active";
-            script {
-               if (get_int(dot_visible) == 1)
-                  set_state(PART:"dot", "selected", 0.0);
-            }
+            target:  "elm.text.artist";
          }
          program {
             name:    "go_passive";
@@ -25510,17 +25807,8 @@ collections {
             target:  "fg1";
             target:  "fg2";
             target:  "elm.text.title";
-            target:  "elm.text.length";
-            target:  "elm.text.trackno";
+            target:  "elm.text.artist";
             transition: LINEAR 0.1;
-            after:   "dot_passive";
-         }
-         program {
-            name: "dot_passive";
-            script {
-               if (get_int(dot_visible) == 1)
-                  set_state(PART:"dot", "visible", 0.0);
-            }
          }
          program {
             name:    "go_disabled";
@@ -25538,9 +25826,8 @@ collections {
          }
       }
    }
-
-   group { name: "elm/genlist/item_compress/media-preview/default";
-      data.item: "stacking" "above";
+   group { name: "elm/genlist/item_compress_odd/media-preview/default";
+      data.item: "stacking" "below";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text.title elm.text.artist";
       data.item: "icons" "elm.swallow.preview";
@@ -25549,12 +25836,10 @@ collections {
          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";
+         part { name: "event";
             type: RECT;
             repeat_events: 1;
             description {
@@ -25563,36 +25848,12 @@ 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;
@@ -25826,750 +26087,489 @@ collections {
          }
       }
    }
-   group { name: "elm/genlist/item_compress_odd/media-preview/default";
-      data.item: "stacking" "below";
-      data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.title elm.text.artist";
-      data.item: "icons" "elm.swallow.preview";
-      data.item: "treesize" "20";
+
+///////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/pager/base/default";
+      data.item: "onshow" "raise";
+// other options
+//      data.item: "onhide" "lower";
+//      data.item: "onshow" "lower";
       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: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
       }
       parts {
-         part { name: "event";
+         part { name: "clip";
             type: RECT;
-            repeat_events: 1;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
+            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: "base";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               image {
-                  normal: "ilist_2.png";
-                  border: 2 2 2 2;
+         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";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
                }
-               fill.smooth: 0;
             }
          }
-         part { name: "bg";
-            clip_to: "disclip";
-            mouse_events: 0;
+         part { name: "base";
+            mouse_events:  0;
+            clip_to: "clip";
             description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 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;
+            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;
+                  normal: "frame_1.png";
+                  border: 2 2 28 22;
+                  middle: 0;
                }
-               image.middle: SOLID;
+               fill.smooth : 0;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
+         }
+         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: "push_start";
+            signal: "elm,action,push";
+            source: "elm";
+            action:  STATE_SET "hidden" 0.0;
+            target: "base";
+            target: "clip";
+            after: "show_start2";
+         }
+         program { name: "show_start";
+            signal: "elm,action,show";
+            source: "elm";
+            action:  STATE_SET "hidden" 0.0;
+            target: "base";
+            target: "clip";
+            after: "show_start2";
+         }
+         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: "pop_start";
+            signal: "elm,action,pop";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "base";
+            target: "clip";
+            after: "hide_start2";
+         }
+         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/slide";
+      images {
+         image: "frame_1.png" COMP;
+         image: "frame_2.png" COMP;
+         image: "dia_grad.png" COMP;
+      }
+      parts {
+         part { name: "clip";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
                rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
+                  to: "base";
+                  offset: -9999 -9999;
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
+                  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;
+            }
+            description { state: "hidden2" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
             }
          }
-         part { name: "elm.swallow.pad";
-            type: SWALLOW;
+         part { name: "base0";
+            mouse_events:  0;
+            clip_to: "clip";
             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.normal: "dia_grad.png";
+               rel1.to: "over";
+               rel2.to: "over";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 1.0;
+                     offset: 64 0;
+                  }
                }
             }
          }
-         part { name: "elm.swallow.preview";
-            clip_to: "disclip";
-            type: SWALLOW;
+         part { name: "base";
+            mouse_events:  0;
+            clip_to: "clip";
             description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               min: 68 68;
-               max: 68 68;
-               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: "frame_2.png";
+                  border: 5 5 32 26;
+                  middle: 0;
                }
+               fill.smooth : 0;
             }
-         }
-         part { name: "elm.text.title";
-            clip_to: "disclip";
-            type:           TEXT;
-            effect:         SOFT_SHADOW;
-            mouse_events:   0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to_x:     "elm.swallow.preview";
-                  relative: 1.0  0.0;
-                  offset:   4 4;
-               }
-               rel2 {
-                  relative: 1.0  0.5;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 10;
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               rel1.relative: -1.0 0.0;
+               rel2.relative: 0.0 1.0;
             }
-            description { state: "selected" 0.0;
+            description { state: "hidden2" 0.0;
                inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.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: "elm.text.artist";
-            clip_to: "disclip";
-            type:           TEXT;
-            mouse_events:   0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
+         part { name: "over";
+            mouse_events:  0;
+            clip_to: "clip";
+            description { state:    "default" 0.0;
                rel1 {
-                  to_x:     "elm.swallow.preview";
-                  relative: 1.0  0.5;
-                  offset:   4 4;
+                  to: "base";
+                  offset: 4 4;
                }
                rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -1 -5;
-               }
-               color: 0 0 0 128;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 8;
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  to: "base";
+                  offset: -5 -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;
+                  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: "fg2";
-            clip_to: "disclip";
-            mouse_events: 0;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            clip_to: "clip";
             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: "base";
+                  offset: 8 8;
+               }
+               rel2 {
+                  to: "base";
+                  offset: -9 -9;
                }
-            }
-            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.title";
-            target:  "elm.text.artist";
+         program { name: "push_start";
+            signal: "elm,action,push";
+            source: "elm";
+            action:  STATE_SET "hidden2" 0.0;
+            target: "base";
+            target: "clip";
+            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.title";
-            target:  "elm.text.artist";
-            transition: LINEAR 0.1;
+         program { name: "show_start";
+            signal: "elm,action,show";
+            source: "elm";
+            action:  STATE_SET "hidden" 0.0;
+            target: "base";
+            target: "clip";
+            after: "show_start2";
+         }
+         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: "pop_start";
+            signal: "elm,action,pop";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "base";
+            target: "clip";
+            after: "pop_start2";
+         }
+         program { name: "pop_start2";
+            action:  STATE_SET "hidden2" 0.0;
+            transition: DECELERATE 0.5;
+            target: "base";
+            target: "clip";
+            after: "hide_end";
+         }
+         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:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
+         program { name: "hide_end";
+            action: SIGNAL_EMIT "elm,action,hide,finished" "";
          }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
+         program { name: "reset";
+            signal: "elm,action,reset";
+            source: "elm";
             action:  STATE_SET "default" 0.0;
-            target:  "disclip";
+            target: "base";
+            target: "clip";
          }
       }
    }
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/pager/base/default";
-      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;
-      }
+   group { name: "elm/pager/base/slide_invisible";
       parts {
          part { name: "clip";
             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 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";
-               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: "frame_2.png";
-                 border: 5 5 32 26;
-                 middle: 0;
-              }
-              fill.smooth : 0;
-           }
-           description { state: "hidden" 0.0;
+            }
+            description { state: "hidden2" 0.0;
                inherit: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+         }
+         part { name: "base";
+            type: RECT;
+            mouse_events:  0;
+            clip_to: "clip";
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description { state: "hidden" 0.0;
+               color: 0 0 0 0;
                rel1.relative: -1.0 0.0;
                rel2.relative: 0.0 1.0;
-           }
-           description { state: "visible" 0.0;
-               inherit: "default" 0.0;
+            }
+            description { state: "hidden2" 0.0;
+               color: 0 0 0 0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+            description { state: "visible" 0.0;
+               color: 0 0 0 0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.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;
+            }
+         }
+         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;
-               }
-           }
-        }
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
       }
       programs {
-        program { name: "push_start";
-           signal: "elm,action,push";
-           source: "elm";
-           action:  STATE_SET "hidden" 0.0;
-           target: "base";
-           target: "clip";
+         program { name: "push_start";
+            signal: "elm,action,push";
+            source: "elm";
+            action:  STATE_SET "hidden2" 0.0;
+            target: "base";
+            target: "clip";
             after: "show_start2";
-        }
+         }
          program { name: "show_start";
-           signal: "elm,action,show";
-           source: "elm";
-           action:  STATE_SET "hidden" 0.0;
-           target: "base";
-           target: "clip";
+            signal: "elm,action,show";
+            source: "elm";
+            action:  STATE_SET "hidden" 0.0;
+            target: "base";
+            target: "clip";
             after: "show_start2";
-        }
+         }
          program { name: "show_start2";
-           action:  STATE_SET "visible" 0.0;
+            action:  STATE_SET "visible" 0.0;
             transition: DECELERATE 0.5;
-           target: "base";
-           target: "clip";
+            target: "base";
+            target: "clip";
             after: "show_end";
-        }
+         }
          program { name: "show_end";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
-        }
+         }
          program { name: "pop_start";
-           signal: "elm,action,pop";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "base";
-           target: "clip";
-            after: "hide_start2";
-        }
+            signal: "elm,action,pop";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "base";
+            target: "clip";
+            after: "pop_start2";
+         }
+         program { name: "pop_start2";
+            action:  STATE_SET "hidden2" 0.0;
+            transition: DECELERATE 0.5;
+            target: "base";
+            target: "clip";
+            after: "hide_end";
+         }
          program { name: "hide_start";
-           signal: "elm,action,hide";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "base";
-           target: "clip";
+            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;
+            action:  STATE_SET "hidden" 0.0;
             transition: DECELERATE 0.5;
-           target: "base";
-           target: "clip";
+            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/slide";
-      images {
-        image: "frame_1.png" COMP;
-        image: "frame_2.png" COMP;
-        image: "dia_grad.png" COMP;
-      }
-      parts {
-        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;
-           }
-           description { state: "hidden2" 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";
-              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: "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: "hidden2" 0.0;
-              inherit: "default" 0.0;
-              rel1.relative: 1.0 0.0;
-              rel2.relative: 2.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;
-           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: "push_start";
-           signal: "elm,action,push";
-           source: "elm";
-           action:  STATE_SET "hidden2" 0.0;
-           target: "base";
-           target: "clip";
-           after: "show_start2";
-        }
-        program { name: "show_start";
-           signal: "elm,action,show";
-           source: "elm";
-           action:  STATE_SET "hidden" 0.0;
-           target: "base";
-           target: "clip";
-           after: "show_start2";
-        }
-        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: "pop_start";
-           signal: "elm,action,pop";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "base";
-           target: "clip";
-           after: "pop_start2";
-        }
-        program { name: "pop_start2";
-           action:  STATE_SET "hidden2" 0.0;
-           transition: DECELERATE 0.5;
-           target: "base";
-           target: "clip";
-           after: "hide_end";
-        }
-        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/slide_invisible";
-      parts {
-        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;
-           }
-           description { state: "hidden2" 0.0;
-              inherit: "default" 0.0;
-              color: 255 255 255 0;
-              visible: 0;
-           }
-        }
-        part { name: "base";
-           type: RECT;
-           mouse_events:  0;
-           clip_to: "clip";
-           description { state: "default" 0.0;
-              color: 0 0 0 0;
-           }
-           description { state: "hidden" 0.0;
-              color: 0 0 0 0;
-              rel1.relative: -1.0 0.0;
-              rel2.relative: 0.0 1.0;
-           }
-           description { state: "hidden2" 0.0;
-              color: 0 0 0 0;
-              rel1.relative: 1.0 0.0;
-              rel2.relative: 2.0 1.0;
-           }
-           description { state: "visible" 0.0;
-              color: 0 0 0 0;
-              rel1.relative: 0.0 0.0;
-              rel2.relative: 1.0 1.0;
-           }
-        }
-        part { name: "elm.swallow.content";
-           type: SWALLOW;
-           clip_to: "clip";
-           description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-           }
-        }
-      }
-      programs {
-        program { name: "push_start";
-           signal: "elm,action,push";
-           source: "elm";
-           action:  STATE_SET "hidden2" 0.0;
-           target: "base";
-           target: "clip";
-           after: "show_start2";
-        }
-        program { name: "show_start";
-           signal: "elm,action,show";
-           source: "elm";
-           action:  STATE_SET "hidden" 0.0;
-           target: "base";
-           target: "clip";
-           after: "show_start2";
-        }
-        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: "pop_start";
-           signal: "elm,action,pop";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "base";
-           target: "clip";
-           after: "pop_start2";
-        }
-        program { name: "pop_start2";
-           action:  STATE_SET "hidden2" 0.0;
-           transition: DECELERATE 0.5;
-           target: "base";
-           target: "clip";
-           after: "hide_end";
-        }
-        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";
-        }
+            signal: "elm,action,reset";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "base";
+            target: "clip";
+         }
       }
    }
 
@@ -28119,7 +28119,7 @@ collections {
                    }
                }
            }
-           part {        name: "left_over1";
+           part {          name: "left_over1";
                mouse_events: 0;
                description { state: "default" 0.0;
                    rel1.to: "left_bt";
@@ -29213,7 +29213,7 @@ collections {
                    }
                }
            }
-           part {      name: "over1";
+           part {        name: "over1";
                mouse_events: 0;
                clip_to: "clip";
                description { state: "default" 0.0;
@@ -29579,7 +29579,7 @@ collections {
                   offset:   0    -10;
                }
                rel2 {
-                 to_y: "elm.text";
+                  to_y: "elm.text";
                   relative: 0.0  0.0;
                   offset:   -1   -1;
                }
@@ -31641,7 +31641,7 @@ collections {
             item: size_max_h 58;
         }
         images {
-               image: "map_item.png" COMP;
+                image: "map_item.png" COMP;
         }
         parts {
             part { name: "whole";
@@ -31704,7 +31704,7 @@ collections {
             item: size_max_h 58;
         }
         images {
-               image: "map_item_2.png" COMP;
+                image: "map_item_2.png" COMP;
         }
         parts {
             part { name: "base";
@@ -31890,13 +31890,13 @@ collections {
   group {
      name: "elm/panes/vertical/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: "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;
          image: "arrow_left.png" COMP;
       }
@@ -31967,73 +31967,73 @@ collections {
                  }
             }
          //BAR
-        part { name: "elm.bar";
-           mouse_events: 1;
+         part { name: "elm.bar";
+            mouse_events: 1;
             dragable {
                confine: "whole";
                x: 1 1 1;
                y: 0 0 0;
             }
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                max: 15 9999;
                min: 15 100;
                rel1.relative: 0.0 0.5;
                rel2.relative: 1.0 0.5;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
+               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";
+            }
+            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: "over1";
-           mouse_events: 0;
-           description { state: "default" 0.0;
+            }
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+            }
+         }
+         part {          name: "over1";
+            mouse_events: 0;
+            description { state: "default" 0.0;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
-              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;
+               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;
+            description { state: "default" 0.0;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              visible: 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;
@@ -32045,7 +32045,7 @@ collections {
                   normal: "bt_glow.png";
                   border: 12 12 12 12;
                }
-              fill.smooth : 0;
+               fill.smooth : 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
@@ -32057,7 +32057,7 @@ collections {
          //Arrow
          part {
             name: "arrow_right";
-           repeat_events: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
                 min: 45 45;
                 max: 45 45;
@@ -32108,7 +32108,7 @@ collections {
          }
         part {
             name: "arrow_left";
-           repeat_events: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
                 min: 45 45;
                 max: 45 45;
@@ -32160,59 +32160,59 @@ collections {
 
        }
         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";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,press" "";
+            after: "button_click_anim";
             after: "arrow_anim_start";
-        }
-        program {
-           name:   "button_click_anim";
-           action: STATE_SET "clicked" 0.0;
-           target: "elm.bar";
-        }
-        program {
-           name:   "button_unclick";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,unpress" "";
-           after: "button_unclick_anim";
+         }
+         program {
+            name:   "button_click_anim";
+            action: STATE_SET "clicked" 0.0;
+            target: "elm.bar";
+         }
+         program {
+            name:   "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
             after: "arrow_anim_stop";
-        }
-        program {
-           name:   "button_unclick_anim";
-           action: STATE_SET "default" 0.0;
-           target: "elm.bar";
-        }
-        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;
+         }
+         program {
+            name:   "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "elm.bar";
+         }
+         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" "";
-        }
+            target: "over3";
+         }
+         program {
+            name:   "button_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
          program {
-           name:   "button_down_double";
-           signal: "mouse,down,1,double";
-           source: "over3";
+            name:   "button_down_double";
+            signal: "mouse,down,1,double";
+            source: "over3";
             action: SIGNAL_EMIT "elm,action,click,double" "";
-        }
+         }
 
          //arrows animation
          program {
@@ -32358,13 +32358,13 @@ collections {
   group {
      name: "elm/panes/horizontal/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: "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_up.png" COMP;
          image: "arrow_down.png" COMP;
       }
@@ -32435,73 +32435,73 @@ collections {
                  }
             }
          //BAR
-        part { name: "elm.bar";
-           mouse_events: 1;
+         part { name: "elm.bar";
+            mouse_events: 1;
             dragable {
                confine: "whole";
                x: 0 0 0;
                y: 1 1 1;
             }
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                max: 999 15;
                min: 100 15;
                rel1.relative: 0.5 0.0;
                rel2.relative: 0.5 1.0;
-              image {
-                 normal: "bt_base2.png";
-                 border: 7 7 7 7;
-              }
+               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";
+            }
+            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: "over1";
-           mouse_events: 0;
-           description { state: "default" 0.0;
+            }
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               image {
+                  normal: "bt_dis_base.png";
+                  border: 4 4 4 4;
+               }
+            }
+         }
+         part {          name: "over1";
+            mouse_events: 0;
+            description { state: "default" 0.0;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
-              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;
+               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;
+            description { state: "default" 0.0;
             rel1.to: "elm.bar";
             rel2.to: "elm.bar";
-              image {
-                 normal: "bt_shine.png";
-                 border: 7 7 7 7;
-              }
-           }
-           description { state: "disabled" 0.0;
-              inherit:  "default" 0.0;
-              visible: 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;
@@ -32513,7 +32513,7 @@ collections {
                   normal: "bt_glow.png";
                   border: 12 12 12 12;
                }
-              fill.smooth : 0;
+               fill.smooth : 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
@@ -32525,7 +32525,7 @@ collections {
          //Arrow
          part {
             name: "arrow_right";
-           repeat_events: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
                 min: 45 45;
                 max: 45 45;
@@ -32592,59 +32592,59 @@ collections {
 
        }
         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";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,press" "";
+            after: "button_click_anim";
             after: "arrow_anim_start";
-        }
-        program {
-           name:   "button_click_anim";
-           action: STATE_SET "clicked" 0.0;
-           target: "elm.bar";
-        }
-        program {
-           name:   "button_unclick";
-           signal: "mouse,up,1";
-           source: "over2";
-           action: SIGNAL_EMIT "elm,action,unpress" "";
-           after: "button_unclick_anim";
+         }
+         program {
+            name:   "button_click_anim";
+            action: STATE_SET "clicked" 0.0;
+            target: "elm.bar";
+         }
+         program {
+            name:   "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
             after: "arrow_anim_stop";
-        }
-        program {
-           name:   "button_unclick_anim";
-           action: STATE_SET "default" 0.0;
-           target: "elm.bar";
-        }
-        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;
+         }
+         program {
+            name:   "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "elm.bar";
+         }
+         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" "";
-        }
+            target: "over3";
+         }
+         program {
+            name:   "button_unclick3";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
          program {
-           name:   "button_down_double";
-           signal: "mouse,down,1,double";
-           source: "over3";
+            name:   "button_down_double";
+            signal: "mouse,down,1,double";
+            source: "over3";
             action: SIGNAL_EMIT "elm,action,click,double" "";
-        }
+         }
 
          //arrows animation
          program {
@@ -33361,27 +33361,27 @@ collections {
 // CALENDAR
 /////////////////////////////////////////////////////////////////////////////
 #define CH(_pos) \
-        part { name: "ch_"#_pos".base"; \
-           type: RECT; \
-           description { state: "default" 0.0; \
-              rel1 { \
-                 relative: (_pos % 7 * 7 / 8 / 6) 0; \
-                 to: "header"; \
-              } \
-              rel2 { \
-                 relative: (_pos % 7 * 7 / 8 / 6 + 1 / 8) 1; \
-                 to: "header"; \
-              } \
+         part { name: "ch_"#_pos".base"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               rel1 { \
+                  relative: (_pos % 7 * 7 / 8 / 6) 0; \
+                  to: "header"; \
+               } \
+               rel2 { \
+                  relative: (_pos % 7 * 7 / 8 / 6 + 1 / 8) 1; \
+                  to: "header"; \
+               } \
                color: 0 0 0 0; \
                visible: 0; \
-           } \
-        } \
+            } \
+         } \
          part { name: "ch_"#_pos".text"; \
             type: TEXT; \
             effect: SOFT_SHADOW; \
             mouse_events: 0; \
             scale: 1; \
-           clip_to: "ch_"#_pos".clipper"; \
+            clip_to: "ch_"#_pos".clipper"; \
             description { \
                state: "default" 0.0; \
                rel1.to: "ch_"#_pos".base"; \
@@ -33395,33 +33395,33 @@ collections {
                   align: 0.5 0.5; \
                } \
             } \
-        } \
-        part { name: "ch_"#_pos".clipper"; \
-           type: RECT; \
-           description { state: "default" 0.0; \
-              rel1.to: "ch_"#_pos".base"; \
-              rel2.to: "ch_"#_pos".base"; \
-           } \
-        }
+         } \
+         part { name: "ch_"#_pos".clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               rel1.to: "ch_"#_pos".base"; \
+               rel2.to: "ch_"#_pos".base"; \
+            } \
+         }
 
 #define CIT(_pos) \
-        part { name: "cit_"#_pos".rect"; \
-           type: RECT; \
-           description { state: "default" 0.0; \
-              rel1 { \
-                 relative: (_pos % 7 * 7 / 8 / 6) \
-                           (_pos / 8 / 5 - _pos % 7 / 8 / 5); \
-                 to: "base"; \
-              } \
-              rel2 { \
-                 relative: (_pos % 7 * 7 / 8 / 6 + 1 / 8) \
-                           (_pos / 8 / 5 - _pos % 7 / 8 / 5 + 1 / 8); \
-                 to: "base"; \
-              } \
+         part { name: "cit_"#_pos".rect"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               rel1 { \
+                  relative: (_pos % 7 * 7 / 8 / 6) \
+                            (_pos / 8 / 5 - _pos % 7 / 8 / 5); \
+                  to: "base"; \
+               } \
+               rel2 { \
+                  relative: (_pos % 7 * 7 / 8 / 6 + 1 / 8) \
+                            (_pos / 8 / 5 - _pos % 7 / 8 / 5 + 1 / 8); \
+                  to: "base"; \
+               } \
                color: 0 0 0 0; \
                visible: 0; \
-           } \
-        } \
+            } \
+         } \
          part { \
             name: "cit_"#_pos".event"; \
             type: RECT; \
@@ -33434,9 +33434,9 @@ collections {
             } \
          } \
          part { name: "cit_"#_pos".shelf"; \
-           type: RECT; \
-           mouse_events: 0; \
-           description { state: "default" 0.0; \
+            type: RECT; \
+            mouse_events: 0; \
+            description { state: "default" 0.0; \
                rel1 { \
                   to: "cit_"#_pos".bg"; \
                   offset: -1 -1; \
@@ -33445,12 +33445,12 @@ collections {
                   to: "cit_"#_pos".bg"; \
                } \
                color: 200 200 200 255; \
-           } \
-        } \
+            } \
+         } \
          part { name: "cit_"#_pos".hd"; \
-           type: RECT; \
-           mouse_events: 0; \
-           description { state: "default" 0.0; \
+            type: RECT; \
+            mouse_events: 0; \
+            description { state: "default" 0.0; \
                rel1 { \
                   to: "cit_"#_pos".bg"; \
                   offset: -1 -1; \
@@ -33460,12 +33460,12 @@ collections {
                } \
                visible: 0; \
                color: 160 0 0 255; \
-           } \
-           description { state: "visible" 0.0; \
+            } \
+            description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
             } \
-        } \
+         } \
          part { \
             name: "cit_"#_pos".base_sh"; \
             mouse_events: 0; \
@@ -33598,8 +33598,8 @@ collections {
             } \
          } \
          part { name: "cit_"#_pos".check"; \
-           mouse_events: 0; \
-           description { state: "default" 0.0; \
+            mouse_events: 0; \
+            description { state: "default" 0.0; \
                rel1 { \
                   to: "cit_"#_pos".bg"; \
                   relative: 0.7 0.6; \
@@ -33614,12 +33614,12 @@ collections {
                visible: 0; \
                color: 255 0 0 255; \
                image.normal: "check.png"; \
-           } \
-           description { state: "visible" 0.0; \
+            } \
+            description { state: "visible" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
             } \
-        } \
+         } \
       programs { \
          program { \
             name:    "cit_"#_pos".go_active"; \
@@ -33659,7 +33659,7 @@ collections {
             source: "cit_"#_pos".clicked"; \
             signal: "mouse,clicked,1"; \
             source: "cit_"#_pos".event"; \
-           action: SIGNAL_EMIT "elm,action,selected" #_pos; \
+            action: SIGNAL_EMIT "elm,action,selected" #_pos; \
          } \
          program { \
             name:    "cit_"#_pos".clear"; \
@@ -33722,9 +33722,9 @@ collections {
                    min: 24 24;
                    max: 999999 24;
                    rel1.to: "bg";
-                  rel1.offset: 6 6;
+                   rel1.offset: 6 6;
                    rel2.to: "bg";
-                  rel2.offset: -7 -7;
+                   rel2.offset: -7 -7;
                    color: 255 255 255 0;
                    align: 0.0 0.0;
                }
@@ -33733,9 +33733,9 @@ collections {
                mouse_events:  0;
                description { state: "default" 0.0;
                    rel1.to: "spinner-base";
-                  rel1.offset: -3 -3;
+                   rel1.offset: -3 -3;
                    rel2.to: "spinner-base";
-                  rel2.offset: 2 2;
+                   rel2.offset: 2 2;
                    image {
                        normal: "shelf_inset.png";
                        border: 7 7 7 7;
@@ -33751,10 +33751,10 @@ collections {
                    min: 256 220;
                    rel1.to_x: "bg";
                    rel1.to_y: "spinner-base";
-                  rel1.offset: 6 6;
-                  rel1.relative: 0 1;
+                   rel1.offset: 6 6;
+                   rel1.relative: 0 1;
                    rel2.to: "bg";
-                  rel2.offset: -7 -7;
+                   rel2.offset: -7 -7;
                    color: 255 255 255 0;
                }
            }
@@ -33762,9 +33762,9 @@ collections {
                mouse_events:  0;
                description { state: "default" 0.0;
                    rel1.to: "table-base";
-                  rel1.offset: -3 -3;
+                   rel1.offset: -3 -3;
                    rel2.to: "table-base";
-                  rel2.offset: 2 2;
+                   rel2.offset: 2 2;
                    image {
                        normal: "shelf_inset.png";
                        border: 7 7 7 7;
@@ -33778,9 +33778,9 @@ collections {
                mouse_events: 0;
                description { state: "default" 0.0;
                    rel1.to: "table-base";
-                  rel1.relative: 0 0;
+                   rel1.relative: 0 0;
                    rel2.to: "table-base";
-                  rel2.relative: 1 0.1;
+                   rel2.relative: 1 0.1;
                    color: 255 255 255 0;
                }
            }
@@ -33790,10 +33790,10 @@ collections {
                description { state: "default" 0.0;
                    rel1.to_x: "table-base";
                    rel1.to_y: "header";
-                  rel1.relative: 0 1;
-                  rel1.offset: 3 0;
+                   rel1.relative: 0 1;
+                   rel1.offset: 3 0;
                    rel2.to: "table-base";
-                  rel2.offset: -3 0;
+                   rel2.offset: -3 0;
                    color: 255 255 255 0;
                }
            }
@@ -33991,13 +33991,13 @@ collections {
                    }
                }
            }
-          CH(0)   CH(1)   CH(2)   CH(3)   CH(4)   CH(5)   CH(6)
-          CIT(0)  CIT(1)  CIT(2)  CIT(3)  CIT(4)  CIT(5)  CIT(6)
-          CIT(7)  CIT(8)  CIT(9)  CIT(10) CIT(11) CIT(12) CIT(13)
-          CIT(14) CIT(15) CIT(16) CIT(17) CIT(18) CIT(19) CIT(20)
-          CIT(21) CIT(22) CIT(23) CIT(24) CIT(25) CIT(26) CIT(27)
-          CIT(28) CIT(29) CIT(30) CIT(31) CIT(32) CIT(33) CIT(34)
-          CIT(35) CIT(36) CIT(37) CIT(38) CIT(39) CIT(40) CIT(41)
+           CH(0)   CH(1)   CH(2)   CH(3)   CH(4)   CH(5)   CH(6)
+           CIT(0)  CIT(1)  CIT(2)  CIT(3)  CIT(4)  CIT(5)  CIT(6)
+           CIT(7)  CIT(8)  CIT(9)  CIT(10) CIT(11) CIT(12) CIT(13)
+           CIT(14) CIT(15) CIT(16) CIT(17) CIT(18) CIT(19) CIT(20)
+           CIT(21) CIT(22) CIT(23) CIT(24) CIT(25) CIT(26) CIT(27)
+           CIT(28) CIT(29) CIT(30) CIT(31) CIT(32) CIT(33) CIT(34)
+           CIT(35) CIT(36) CIT(37) CIT(38) CIT(39) CIT(40) CIT(41)
        }
        programs {
            program { name: "dec_start";
@@ -34609,7 +34609,7 @@ collections {
 
       //FIXME: quick successive clicks on, say, up, lead to nastiness
       script {
-        public cur, prev, next, lock;
+         public cur, prev, next, lock;
 
          public animator_bottom_down(val, Float:pos) {
             new tmp[FLIP_PICKER_MAX_LEN];
@@ -34757,76 +34757,76 @@ collections {
       }
 
       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 {
+         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;
-              min: 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;
-           }
-           description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 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;
-           }
-           description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-           }
-        }
-
-        part { name: "bottom_sheet_static";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "flip_b.png";
-           }
-         }
-
-        part { name: "bottom_b";
-           mouse_events: 0;
+                  border: 8 8 8 8;
+               }
+            }
+         }
+
+         part { name: "base";
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+               min: 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;
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 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;
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+
+         part { name: "bottom_sheet_static";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "flip_b.png";
+            }
+         }
+
+         part { name: "bottom_b";
+            mouse_events: 0;
             clip_to: "bottom_clipper";
             type: TEXT;
             scale: 1;
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                rel1.to: "base";
                rel2.to: "base";
                color: 0 0 0 255;
@@ -34840,45 +34840,45 @@ collections {
             }
          }
 
-        part { name: "shadow";
-           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: "bottom_sheet";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "b";
-              rel2.to: "b";
-              image.normal: "flip_b.png";
-           }
-           description { state: "shrink" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel2.relative: 1.0 0.0;
-           }
-         }
-
-        part { name: "bottom";
-           mouse_events: 0;
+         part { name: "shadow";
+            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: "bottom_sheet";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.to: "b";
+               rel2.to: "b";
+               image.normal: "flip_b.png";
+            }
+            description { state: "shrink" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               rel2.relative: 1.0 0.0;
+            }
+         }
+
+         part { name: "bottom";
+            mouse_events: 0;
             clip_to: "bottom_clipper";
             type: TEXT;
             scale: 1;
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                rel1.to: "base";
                rel2.to: "base";
                color: 0 0 0 255;
@@ -34890,30 +34890,30 @@ collections {
                   align: 0.5 0.5;
                }
             }
-           description { state: "shrink" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel2.relative: 1.0 0.5; /* FIXME: same visual effect? --> MAP! */
-           }
+            description { state: "shrink" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel2.relative: 1.0 0.5; /* FIXME: same visual effect? --> MAP! */
+            }
          }
 
-        part { name: "top_sheet_static";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "flip_t.png";
-           }
+         part { name: "top_sheet_static";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "flip_t.png";
+            }
          }
 
-        part { name: "top_b";
-           mouse_events: 0;
+         part { name: "top_b";
+            mouse_events: 0;
             clip_to: "top_clipper";
             type: TEXT;
             scale: 1;
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                rel1.to: "base";
                rel2.to: "base";
                color: 0 0 0 255;
@@ -34928,28 +34928,28 @@ collections {
             }
          }
 
-        part { name: "top_sheet";
-           mouse_events: 0;
-           description { state: "default" 0.0;
-              visible: 1;
-              rel1.to: "t";
-              rel2.to: "t";
-              image.normal: "flip_t.png";
-           }
-           description { state: "shrink" 0.0;
-              inherit: "default" 0.0;
-              color: 128 128 128 255;
-              visible: 0;
-              rel1.relative: 0.0 1.0;
-           }
+         part { name: "top_sheet";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 1;
+               rel1.to: "t";
+               rel2.to: "t";
+               image.normal: "flip_t.png";
+            }
+            description { state: "shrink" 0.0;
+               inherit: "default" 0.0;
+               color: 128 128 128 255;
+               visible: 0;
+               rel1.relative: 0.0 1.0;
+            }
          }
 
-        part { name: "top";
-           mouse_events: 0;
+         part { name: "top";
+            mouse_events: 0;
             clip_to: "top_clipper";
             type: TEXT;
             scale: 1;
-           description { state: "default" 0.0;
+            description { state: "default" 0.0;
                rel1.to: "base";
                rel2.to: "base";
                color: 0 0 0 255;
@@ -34961,45 +34961,45 @@ collections {
                   align: 0.5 0.5;
                }
             }
-           description { state: "shrink" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-              rel1.relative: 0.0 0.5;
-           }
-         }
-
-        part { name: "arrow_top";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.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: "hidden" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-           }
-        }
-        part { name: "arrow_bottom";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.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: "hidden" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-           }
-        }
+            description { state: "shrink" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+               rel1.relative: 0.0 0.5;
+            }
+         }
+
+         part { name: "arrow_top";
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.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: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "arrow_bottom";
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.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: "hidden" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
 
          part {
             type: RECT;
@@ -35027,16 +35027,16 @@ collections {
       }
 
       programs {
-        program { name: "load";
-           signal: "load";
-           source: "";
-           script {
-              append_str(cur, "");
-              append_str(prev, "");
-              append_str(next, "");
-              set_int(lock, 0);
-           }
-        }
+         program { name: "load";
+            signal: "load";
+            source: "";
+            script {
+               append_str(cur, "");
+               append_str(prev, "");
+               append_str(next, "");
+               set_int(lock, 0);
+            }
+         }
 
          program { name: "hide_arrows";
             signal: "elm,state,button,hidden";
@@ -35058,26 +35058,26 @@ collections {
             target: "b";
          }
 
-        program { name: "up";
-           signal: "mouse,down,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up,start" "";
-        }
-        program { name: "up,stop";
-           signal: "mouse,up,1";
-           source: "t";
-           action: SIGNAL_EMIT "elm,action,up,stop" "";
-        }
-        program { name: "down";
-           signal: "mouse,down,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down,start" "";
-        }
-        program { name: "down,stop";
-           signal: "mouse,up,1";
-           source: "b";
-           action: SIGNAL_EMIT "elm,action,down,stop" "";
-        }
+         program { name: "up";
+            signal: "mouse,down,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up,start" "";
+         }
+         program { name: "up,stop";
+            signal: "mouse,up,1";
+            source: "t";
+            action: SIGNAL_EMIT "elm,action,up,stop" "";
+         }
+         program { name: "down";
+            signal: "mouse,down,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down,start" "";
+         }
+         program { name: "down,stop";
+            signal: "mouse,up,1";
+            source: "b";
+            action: SIGNAL_EMIT "elm,action,down,stop" "";
+         }
       }
    }