[Button]Refactoring according to E-Coding guidelines and code clean up.

Change-Id: Ic178520ceb8723d82afe601493856d7cd03852ec

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index ad4d9dd..3d7a7f4 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -45,21 +45,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_01_normal_press.png";
-               }
+               image.normal: "00_button_01_normal_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_01_normal_dim.png";
-               }
+               image.normal: "00_button_01_normal_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_01_normal_press.png";
-               }
+               image.normal: "00_button_01_normal_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -68,9 +62,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -99,9 +91,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -136,7 +126,7 @@
                   to: "padding_left_top";
                }
                rel2 {
-               relative: 1.0 0.0;
+                  relative: 1.0 0.0;
                   to_x: "padding_left_top";
                   to_y: "padding_right_bottom";
                }
@@ -156,9 +146,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                visible: 0;
@@ -170,9 +158,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
@@ -238,7 +224,6 @@
             description { state: "icononly" 0.0;
                min: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
                max: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
-               align: 0.5 0.5;
             }
          }
          part { name: "elm.text";
@@ -521,21 +506,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_04_press.png";
-               }
+               image.normal: "00_button_04_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_04_dim.png";
-               }
+               image.normal: "00_button_04_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_04_press.png";
-               }
+               image.normal: "00_button_04_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -544,9 +523,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -575,9 +552,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -632,9 +607,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                visible: 0;
@@ -646,9 +619,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
@@ -998,21 +969,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_press.png";
-               }
+               image.normal: "00_button_sweep_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_dim.png";
-               }
+               image.normal: "00_button_sweep_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_press.png";
-               }
+               image.normal: "00_button_sweep_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -1021,9 +986,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -1035,9 +998,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -1074,9 +1035,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -1090,9 +1049,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
                color: 0 0 0 0;
@@ -1802,9 +1759,6 @@
       alias: "elm/button/base/popup_button/volumebarstyle";
       alias: "elm/button/base/popup_button/customstyle";
       alias: "elm/button/base/popup_button/verticalbuttonstyle";
-      alias: "elm/button/base/popup_button/image_scroll";
-      alias: "elm/button/base/popup_button/image_slider";
-      alias: "elm/button/base/popup_button/image_list";
       images {
          image: "00_button_popup_normal.png" COMP;
          image: "00_button_popup_press.png" COMP;
@@ -1827,21 +1781,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_popup_press.png";
-               }
+               image.normal: "00_button_popup_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_popup_dim.png";
-               }
+               image.normal: "00_button_popup_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_popup_focus.png";
-               }
+               image.normal: "00_button_popup_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -1850,9 +1798,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_POPUP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -1863,9 +1809,7 @@
             scale: 1;
             description { state: "default" 0.0;
                align: 1.0 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_POPUP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -1880,9 +1824,7 @@
                   relative: 1.0 0.0;
                   to: "elm.swallow.content";
                }
-               rel2 {
-                  to: "elm.swallow.content";
-               }
+               rel2.to: "elm.swallow.content";
                fixed: 1 0;
                min: 0 0;
                visible: 0;
@@ -2194,17 +2136,13 @@
             description { state: "default" 0.0; \
                min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
                max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-               image { \
-                  normal: "00_btn_circle_bg_normal.png"; \
-               } \
+               image.normal: "00_btn_circle_bg_normal.png"; \
                color: 255 255 255 255; \
             } \
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image { \
-                  normal: "00_btn_circle_bg_press.png"; \
-               } \
+               image.normal: "00_btn_circle_bg_press.png"; \
             } \
             description { \
                state: "disabled" 0.0; \
@@ -2217,17 +2155,13 @@
             description { state: "default" 0.0; \
                min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
                max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
-               image { \
-                  normal: image_normal; \
-               } \
+               image.normal: image_normal; \
                color: 255 255 255 255; \
             } \
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image { \
-                  normal: image_press; \
-               } \
+               image.normal: image_press; \
             } \
             description { \
                state: "disabled" 0.0; \
@@ -2309,7 +2243,7 @@
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal", "00_button_reveal.png", "00_button_reveal.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("reveal", "00_button_reveal.png", "00_button_reveal_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
    BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_reveal.png", "00_button_reveal_press.png", 60, 70)
@@ -2374,7 +2308,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////
    BUTTON_CIRCLE_STYLES("send/extended", "00_button_send.png", "00_button_send_press.png", 60, 70)
 ///////////////////////////////////////////////////////////////////////////////////////
-
    group { name: "elm/button/base/circle/empty";
       images {
          image: "00_btn_circle_bg_normal.png" COMP;
@@ -2520,16 +2453,12 @@
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image { \
-                  normal: "00_button_edit_press.png"; \
-               } \
+               image.normal: "00_button_edit_press.png"; \
             } \
             description { \
                state: "disabled" 0.0; \
                inherit: "default" 0.0; \
-               image { \
-                  normal: "00_button_edit_dim.png"; \
-               } \
+               image.normal: "00_button_edit_dim.png"; \
             } \
          } \
          part { name: "button_center_part"; \
@@ -2547,9 +2476,7 @@
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image { \
-                  normal: image_press; \
-               } \
+               image.normal: image_press; \
             } \
          } \
          part { name: "over1"; \
@@ -2664,21 +2591,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_edit_press.png";
-               }
+               image.normal: "00_button_edit_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_edit_dim.png";
-               }
+               image.normal: "00_button_edit_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_edit_press.png";
-               }
+               image.normal: "00_button_edit_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -2687,9 +2608,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_CONTACT_DELETE_PADDING_LEFT_TOP_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -2701,9 +2620,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_CONTACT_DELETE_PADDING_RIGHT_BOTTOM_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -2719,9 +2636,7 @@
                   relative: 1.0 0.0;
                   to: "elm.swallow.content";
                }
-               rel2 {
-                  to: "elm.swallow.content";
-               }
+               rel2.to: "elm.swallow.content";
                fixed: 1 0;
                min: 0 0;
                visible: 0;
@@ -3057,21 +2972,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_04_press.png";
-               }
+               image.normal: "00_button_04_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_04_dim.png";
-               }
+               image.normal: "00_button_04_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_04_press.png";
-               }
+               image.normal: "00_button_04_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -3080,9 +2989,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: 2 2;
                fixed: 1 1;
                visible: 0;
@@ -3094,9 +3001,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: 2 2;
                fixed: 1 1;
                visible: 0;
@@ -3134,9 +3039,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -3150,9 +3053,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 5 0;
                color: 0 0 0 0;
@@ -3478,21 +3379,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_01_normal_press.png";
-               }
+               image.normal: "00_button_01_normal_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_01_normal_dim.png";
-               }
+               image.normal: "00_button_01_normal_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_01_normal_press.png";
-               }
+               image.normal: "00_button_01_normal_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -3501,9 +3396,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -3515,9 +3408,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -3534,9 +3425,7 @@
                   relative: 1.0 0.0;
                   to: "elm.swallow.content";
                }
-               rel2 {
-                  to: "elm.swallow.content";
-               }
+               rel2.to: "elm.swallow.content";
                fixed: 1 0;
                min: 0 0;
             }
@@ -3962,18 +3851,16 @@
 ///////////////////////////////////////////////////////////////////////////////////////
    BUTTON_COLORSELECTOR_STYLES("colorselector/right/default", "00_color_picker_btn_right.png", "00_color_picker_btn_right_press.png", "00_color_picker_btn_right_dim.png")
 ///////////////////////////////////////////////////////////////////////////////////////
-
    group { name: "elm/button/base/hidden";
       images {
          image: "00_button_sweep.png" COMP;
          image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
-   }
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_HIDDEN_BG_NORMAL_MIN_INC;
@@ -3995,58 +3882,62 @@
                image.normal: "00_button_sweep_press.png";
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: BUTTON_HIDDEN_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: BUTTON_HIDDEN_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
                min: BUTTON_HIDDEN_ICON_RECT_MIN_INC;
                fixed: 1 0;
-               rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
          }
-         part {
-            name: "padding_icon_text";
+         part { name: "padding_icon_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -4056,8 +3947,11 @@
             }
             description { state: "visible" 0.0; //when icon is visible
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_HIDDEN_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
                color: 0 0 0 0;
@@ -4066,28 +3960,47 @@
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_HIDDEN_ICON_ICONONLY_MIN_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -4096,17 +4009,23 @@
             type: TEXT;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                color: BUTTON_HIDDEN_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: BUTTON_HIDDEN_FONT_SIZE_INC;
                   min: 0 0;
-                  align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
@@ -4139,7 +4058,6 @@
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -4148,12 +4066,17 @@
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -4184,7 +4107,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -4198,12 +4121,12 @@
                new Float:vl;
                get_state(PART:"elm.swallow.content", st, 30, vl);
                if (strcmp(st, "icononly"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -4220,11 +4143,11 @@
                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:"padding_icon_text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
@@ -4238,11 +4161,11 @@
                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:"padding_icon_text", "icononly", 0.0);
-               }
-               set_state(PART:"elm.text", "default", 0.0);
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
             }
          }
          program { name: "icon_show";
@@ -4253,15 +4176,15 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"padding_icon_text", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"padding_icon_text", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -4285,9 +4208,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -4305,9 +4228,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
@@ -4354,18 +4277,14 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -4374,9 +4293,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -4388,9 +4305,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_PICKER_BAR_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -4427,9 +4342,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -4443,9 +4356,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_PICKER_BAR_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC;
                color: 0 0 0 0;
@@ -4773,18 +4684,14 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -4793,9 +4700,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -4807,9 +4712,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -4846,9 +4749,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
@@ -4862,9 +4763,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_ICON_RECT_TEXT_MIN_INC;
                color: 0 0 0 0;
@@ -5177,12 +5076,17 @@
       }
       parts {
          part { name: "button_image";
-                type: RECT;
-            mouse_events: 1;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               rel1 { to_x: "padding.left"; to_y: "elm.text"; }
-               rel2 { to_x: "padding.right"; to_y: "elm.text"; }
+               rel1 {
+                  to_x: "padding.left";
+                  to_y: "elm.text";
+               }
+               rel2 {
+                  to_x: "padding.right";
+                  to_y: "elm.text";
+               }
                min: BUTTON_CONTACT_BG_NORMAL_MIN_INC;
                color: BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC;
             }
@@ -5205,9 +5109,11 @@
                min: BUTTON_CONTACT_PADDING_MIN_INC;
                fixed: 1 0;
                color: 0 0 0 0;
-               rel1.relative: 0 0;
-               rel2 { relative: 0.0 1.0; to_x: "elm.text"; }
-               align: 1 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+               }
+               align: 1.0 0.0;
             }
          }
          part { name: "padding.right";
@@ -5218,9 +5124,11 @@
                min: BUTTON_CONTACT_PADDING_MIN_INC;
                fixed: 1 0;
                color: 0 0 0 0;
-               rel1 { relative: 1.0 0.0; to_x: "elm.text"; }
-               rel2.relative: 1.0 1.0;
-               align: 0 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.text";
+               }
+               align: 0.0 0.0;
             }
          }
          part {   name: "elm.text";
@@ -5230,13 +5138,11 @@
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               align: 0.5 0.5;
                color: BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: BUTTON_CONTACT_FONT_SIZE_INC;
                   min: 1 1;
-                  align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
@@ -5274,20 +5180,18 @@
             }
          }
          part { name: "over2";
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
+               rel1.to: "button_image";
+               rel2.to: "button_image";
             }
          }
          part { name: "over3";
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
@@ -5328,12 +5232,12 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-               {
-                  emit("elm,action,default,text,set", "");
-                  set_state(PART:"elm.text", "visible", 0.0);
-               }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -5346,7 +5250,7 @@
             signal: "elm,state,text,visible";
             source: "elm";
             script {
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
@@ -5358,7 +5262,6 @@
             action: STATE_SET "default" 0.0;
             target: "elm.text";
          }
-
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
@@ -5373,9 +5276,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -5393,9 +5296,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
@@ -5419,8 +5322,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe/back_btn/default";
-       alias: "elm/button/base/naviframe/prev_btn/default";
-       alias: "elm/button/base/naviframe/end_btn/default";
+      alias: "elm/button/base/naviframe/prev_btn/default";
+      alias: "elm/button/base/naviframe/end_btn/default";
       images {
          image: "00_winset_Back_btn_normal.png" COMP;
          image: "00_winset_Back_btn_press.png" COMP;
@@ -5459,14 +5362,8 @@
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to: "button_image";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to: "button_image";
-               }
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                image.normal: "00_winset_Back.png";
             }
             description { state: "clicked" 0.0;
@@ -5582,18 +5479,14 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -5602,9 +5495,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -5616,9 +5507,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -5638,15 +5527,11 @@
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               image {
-                  normal: "00_picker_arrow_left.png";
-               }
+               image.normal: "00_picker_arrow_left.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_arrow_left_press.png";
-               }
+               image.normal: "00_picker_arrow_left_press.png";
             }
          }
          part { name: "over2";
@@ -5770,18 +5655,14 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_btn_press.png";
-               }
+               image.normal: "00_picker_btn_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -5790,9 +5671,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -5804,9 +5683,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -5826,15 +5703,11 @@
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               image {
-                  normal: "00_picker_arrow_right.png";
-               }
+               image.normal: "00_picker_arrow_right.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_picker_arrow_right_press.png";
-               }
+               image.normal: "00_picker_arrow_right_press.png";
             }
          }
          part { name: "over2";
@@ -5934,26 +5807,28 @@
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-      group { name: "elm/button/base/naviframe_control/default";
-         alias: "elm/button/base/naviframe_control/center";
+   group { name: "elm/button/base/naviframe_control/default";
+      alias: "elm/button/base/naviframe_control/center";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
-      images.image: "00_Option_header_bt.png" COMP;
-      images.image: "00_Option_header_bt_dim.png" COMP;
-      images.image: "00_Option_header_bt_press.png" COMP;
+      images {
+         image: "00_Option_header_bt.png" COMP;
+         image: "00_Option_header_bt_dim.png" COMP;
+         image: "00_Option_header_bt_press.png" COMP;
+      }
       parts {
          part { name: "button_image";
-            type: IMAGE;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
                color: 0 0 0 0;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
-               image.normal: "00_Option_header_bt.png";
-               image.border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
+               image {
+                  normal: "00_Option_header_bt.png";
+                  border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
+               }
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -5965,54 +5840,61 @@
                image.normal: "00_Option_header_bt_press.png";
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
                min: 0 0;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                min: BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -6020,24 +5902,28 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_after_icon";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                color: 0 0 0 0;
@@ -6046,15 +5932,22 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_before_text";
+         part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
                min: BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
                color: 0 0 0 0;
@@ -6067,28 +5960,46 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -6100,16 +6011,21 @@
             clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
-                  align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
@@ -6130,7 +6046,6 @@
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -6139,7 +6054,6 @@
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -6184,7 +6098,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -6202,8 +6116,8 @@
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -6220,11 +6134,11 @@
                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:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                set_state(PART:"elm.text", "visible", 0.0);
             }
          }
@@ -6236,11 +6150,11 @@
                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:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -6252,17 +6166,17 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -6333,9 +6247,11 @@
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
-      images.image: "00_Option_header_bt.png" COMP;
-      images.image: "00_Option_header_bt_dim.png" COMP;
-      images.image: "00_Option_header_bt_press.png" COMP;
+      images {
+         image: "00_Option_header_bt.png" COMP;
+         image: "00_Option_header_bt_dim.png" COMP;
+         image: "00_Option_header_bt_press.png" COMP;
+      }
       styles{
          style { name: "btn_multiline_naviframe_controlbar_style";
             base: "font=SLP:style=Medium font_size="BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed";
@@ -6346,15 +6262,15 @@
       }
       parts {
          part { name: "button_image";
-            type: IMAGE;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
-               image.normal: "00_Option_header_bt.png";
-               image.border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
+               image {
+                  normal: "00_Option_header_bt.png";
+                  border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
+               }
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -6366,40 +6282,31 @@
                image.normal: "00_Option_header_bt_press.png";
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1 {
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
@@ -6420,8 +6327,7 @@
                align: 0.0 0.5;
             }
          }
-         part {
-            name: "padding_icon_text";
+         part { name: "padding_icon_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
@@ -6475,7 +6381,6 @@
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 0.0 0.5;
@@ -6490,7 +6395,6 @@
                }
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
                rel1 {
@@ -6501,7 +6405,6 @@
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               align: 0.5 0.5;
             }
          }
          part { name: "elm.text";
@@ -6520,7 +6423,6 @@
                    relative: 0.0 0.0;
                    to: "padding_right_bottom";
                }
-               align: 0.5 0.5;
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                text {
                   style: "btn_multiline_naviframe_controlbar_style";
@@ -6547,7 +6449,6 @@
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -6556,7 +6457,6 @@
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -6619,7 +6519,7 @@
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
@@ -6941,7 +6841,6 @@
             description { state: "icononly" 0.0;
                min: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
-               align: 0.5 0.5;
             }
          }
          part { name: "elm.text";
@@ -7241,14 +7140,8 @@
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to: "button_image";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to: "button_image";
-               }
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                image.normal: "00_winset_more.png";
             }
             description { state: "clicked" 0.0;
@@ -7357,7 +7250,6 @@
       parts {
          part { name: "button_image";
             type: RECT;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: 20 30;
@@ -7367,29 +7259,25 @@
                visible: 0;
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: 10 8;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
@@ -7401,20 +7289,32 @@
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
                min: 0 0;
                fixed: 0 1;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "padding_left_top";
+               }
                align: 0.5 0.0;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 0 1;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "padding_left_top";
+               }
                align: 0.5 0.0;
                color: 0 0 0 0;
             }
@@ -7422,24 +7322,28 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_after_icon";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 0.0 1.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 0 1;
                min: 0 0;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                align: 0.0 0.0;
-               rel1 { relative: 0.0 1.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 0 1;
                min: 0 0;
                color: 0 0 0 0;
@@ -7448,15 +7352,22 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_before_text";
+         part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.5 1.0;
-               rel1 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "elm.text"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right_bottom"; to_y: "elm.text"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "elm.text";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "elm.text";
+               }
                fixed: 0 1;
                min: 0 0;
                color: 0 0 0 0;
@@ -7469,28 +7380,44 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.5 0.0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "padding_left_top";
+               }
                fixed: 0 1;
             }
             description { state: "visible" 0.0;
                fixed: 0 1;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
-               align: 0.5 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_right_bottom"; to_y: "padding_before_text"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "padding_before_text";
+               }
                aspect: 1.0 1.0;
                aspect_preference: HORIZONTAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: HORIZONTAL;
             }
@@ -7502,9 +7429,15 @@
             clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_left_top"; to_y: "padding_after_icon"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_after_icon";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                fixed: 1 1;
                text {
@@ -7578,7 +7511,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -7596,8 +7529,8 @@
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -7614,11 +7547,11 @@
                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:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                set_state(PART:"elm.text", "visible", 0.0);
             }
          }
@@ -7630,11 +7563,11 @@
                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:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -7646,17 +7579,17 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -7682,7 +7615,7 @@
                set_int(button_state, BUTTON_STATE_DISABLED);
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -7700,7 +7633,7 @@
                set_int(button_state, BUTTON_STATE_ENABLED);
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -7722,13 +7655,12 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/controlbar/horizontal_center";
-   script {
+      script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
             type: RECT;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: 20 30;
@@ -7742,54 +7674,61 @@
                visible: 1;
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
                min: 0 0;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -7798,24 +7737,28 @@
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
             }
          }
-         part {
-            name: "padding_after_icon";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 6 0;
                color: 0 0 0 0;
@@ -7824,15 +7767,22 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_before_text";
+         part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
                min: 6 0;
                color: 0 0 0 0;
@@ -7845,28 +7795,46 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -7878,16 +7846,21 @@
             clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: BUTTON_CONTROLBAR_ITEM_BUTTON_TEXT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
-                  align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
@@ -7953,7 +7926,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -7971,8 +7944,8 @@
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -7989,11 +7962,11 @@
                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:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                set_state(PART:"elm.text", "visible", 0.0);
             }
          }
@@ -8005,11 +7978,11 @@
                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:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -8021,17 +7994,17 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -8057,7 +8030,7 @@
                set_int(button_state, BUTTON_STATE_DISABLED);
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -8075,7 +8048,7 @@
                set_int(button_state, BUTTON_STATE_ENABLED);
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -8095,7 +8068,7 @@
       }
    }
 
-   ///////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/controlbar/horizontal_left";
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -8103,7 +8076,6 @@
       parts {
          part { name: "button_image";
             type: RECT;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: 20 30;
@@ -8117,54 +8089,61 @@
                visible: 1;
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
                min: 0 0;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -8172,24 +8151,28 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_after_icon";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 6 0;
                color: 0 0 0 0;
@@ -8198,15 +8181,22 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_before_text";
+         part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
                min: 6 0;
                color: 0 0 0 0;
@@ -8219,28 +8209,46 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -8252,8 +8260,15 @@
             clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                text {
@@ -8282,7 +8297,6 @@
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -8291,7 +8305,6 @@
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -8325,7 +8338,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -8343,8 +8356,8 @@
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -8361,11 +8374,11 @@
                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:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                set_state(PART:"elm.text", "visible", 0.0);
             }
          }
@@ -8377,11 +8390,11 @@
                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:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -8393,17 +8406,17 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -8473,7 +8486,6 @@
       parts {
          part { name: "button_image";
             type: RECT;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: 20 30;
@@ -8487,54 +8499,61 @@
                visible: 1;
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               visible: 1;
                min: 0 0;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                fixed: 1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: 0 0 0 0;
             }
@@ -8542,24 +8561,28 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_after_icon";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                color: 0 0 0 0;
             }
             description { state: "visible" 0.0;
-               visible: 1;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 6 0;
                color: 0 0 0 0;
@@ -8568,15 +8591,22 @@
                inherit: "default" 0.0;
             }
          }
-         part {
-            name: "padding_before_text";
+         part { name: "padding_before_text";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0; //when only icon or no icon is there
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
                min: 6 0;
                color: 0 0 0 0;
@@ -8589,28 +8619,46 @@
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                align: 1.0 0.5;
-               rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               visible: 1;
                min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
                max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
-               align: 0.5 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
@@ -8622,8 +8670,15 @@
             clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                align: 1.0 0.5;
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                text {
@@ -8652,7 +8707,6 @@
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -8661,7 +8715,6 @@
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -8695,7 +8748,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -8713,8 +8766,8 @@
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
                  }
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-                  set_state(PART:"button_image", "default", 0.0);
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
             after: button_unpress;
          }
@@ -8731,11 +8784,11 @@
                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:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                set_state(PART:"elm.text", "visible", 0.0);
             }
          }
@@ -8747,11 +8800,11 @@
                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:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
                set_state(PART:"elm.text", "default", 0.0);
             }
          }
@@ -8763,17 +8816,17 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-               {
-                  set_state(PART:"elm.swallow.content", "visible", 0.0);
-                  set_state(PART:"icon_rect", "visible", 0.0);
-                  set_state(PART:"padding_after_icon", "visible", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
                else
-               {
-                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                  set_state(PART:"icon_rect", "icononly", 0.0);
-                  set_state(PART:"padding_after_icon", "icononly", 0.0);
-               }
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "icononly", 0.0);
+                 }
             }
          }
          program { name: "icon_hide";
@@ -8857,21 +8910,15 @@
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_06_press.png";
-               }
+               image.normal: "00_button_06_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_06_dim.png";
-               }
+               image.normal: "00_button_06_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_06_press.png";
-               }
+               image.normal: "00_button_06_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -8880,9 +8927,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 0.0;
-               }
+               rel2.relative: 0.0 0.0;
                min: BUTTON_TICKERNOTI_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -8911,9 +8956,7 @@
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 1.0 1.0;
                min: BUTTON_TICKERNOTI_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
@@ -8948,7 +8991,7 @@
                   to: "padding_left_top";
                }
                rel2 {
-               relative: 1.0 0.0;
+                  relative: 1.0 0.0;
                   to_x: "padding_left_top";
                   to_y: "padding_right_bottom";
                }
@@ -8968,9 +9011,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
                visible: 0;
@@ -8982,9 +9023,7 @@
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
@@ -9050,7 +9089,6 @@
             description { state: "icononly" 0.0;
                min: BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC;
                max: BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC;
-               align: 0.5 0.5;
             }
          }
          part { name: "elm.text";
@@ -9326,7 +9364,6 @@
       }
       parts {
          part { name: "button_image";
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
@@ -9350,36 +9387,31 @@
                image.normal: "00_button_05_press.png";
             }
          }
-         part {
-            name: "padding_left_top";
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
                min: BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "padding_right_bottom";
+         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               rel2.relative: 1.0 1.0;
                min: BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part {
-            name: "icon_rect";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
             mouse_events: 0;
@@ -9388,14 +9420,20 @@
                min: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND__MIN_MAX_INC;
                max: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND__MIN_MAX_INC;
                fixed: 1 0;
-               rel1 { relative: 0.0 1.0; to_x: "padding_right_bottom"; to_y: "padding_left_top"; }
-               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                align: 1.0 0.5;
                color: 0 0 0 0;
             }
          }
-         part {
-            name: "arrow_expand";
+         part { name: "arrow_expand";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
@@ -9403,8 +9441,8 @@
                min: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND__MIN_MAX_INC;
                max: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND__MIN_MAX_INC;
                fixed: 0 0;
-               rel1 { relative: 0.0 0.0; to: "icon_rect"; }
-               rel2 { relative: 1.0 1.0; to: "icon_rect"; }
+               rel1.to: "icon_rect";
+               rel2.to: "icon_rect";
                image.normal:"00_arrow_expand.png";
             }
             description { state: "clicked" 0.0;
@@ -9421,12 +9459,18 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 1;
                min: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
                max: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
                fixed:1 0;
-               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
-               rel2 { relative: 1.0 1.0; to_x:"padding_left_top"; to_y:"padding_right_bottom"; }
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x:"padding_left_top";
+                  to_y:"padding_right_bottom";
+               }
                align: 0.0 0.5;
                color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
                text {
@@ -9435,16 +9479,13 @@
                   min: 0 0;
                   fit: 1 1;
                   size_range: 14 20;
-                  align: 0.5 0.5;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
                color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
@@ -9454,17 +9495,14 @@
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               visible: 1;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
                color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
@@ -9473,7 +9511,6 @@
          }
          part { name: "over3";
             type: RECT;
-            mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -9510,7 +9547,7 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "clicked", 0.0);
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_unpress";
@@ -9520,12 +9557,12 @@
             signal: "mouse,up,1";
             source: "over3";
             script {
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
-               {
-                  set_state(PART:"button_image", "default", 0.0);
-                  set_state(PART:"elm.text", "visible", 0.0);
-                  set_state(PART:"arrow_expand", "default", 0.0);
-               }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"button_image", "default", 0.0);
+                    set_state(PART:"elm.text", "visible", 0.0);
+                    set_state(PART:"arrow_expand", "default", 0.0);
+                 }
             }
             after: button_unpress;
          }
@@ -9538,7 +9575,7 @@
             signal: "elm,state,text,visible";
             source: "elm";
             script {
-               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
                  set_state(PART:"elm.text", "disabled_visible", 0.0);
@@ -9565,9 +9602,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "visible"))
-                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
                else
-                  set_state(PART:"elm.text", "disabled", 0.0);
+                 set_state(PART:"elm.text", "disabled", 0.0);
                set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
@@ -9585,9 +9622,9 @@
                new Float:vl;
                get_state(PART:"elm.text", st, 30, vl);
                if (!strcmp(st, "disabled_visible"))
-                  set_state(PART:"elm.text", "visible", 0.0);
+                 set_state(PART:"elm.text", "visible", 0.0);
                else
-                  set_state(PART:"elm.text", "default", 0.0);
+                 set_state(PART:"elm.text", "default", 0.0);
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }