entry: refactoring entry theme with LazEDC syntax

Change-Id: I5a97175e04032c8be6c7c13a98bfabf5ea9ad9cb

1 files changed, 1732 insertions, 2058 deletions

diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc
index c7a39484..fec4e3c1 100644
--- a/mobile/widgets/entry.edc
+++ b/mobile/widgets/entry.edc
@@ -26,75 +26,59 @@
 
 #define MAGNIFIER_SCALE 1.5
 
-#define ENTRY_SOUND_PROGRAM \
-   program { name: "touch_snd"; \
-      signal: "mouse,clicked,1"; \
-      source: "elm.text"; \
-      script { \
-         new st[31]; \
-         new Float:vl; \
-         get_state(PART:"elm.text", st, 30, vl); \
-         if (strcmp(st, "disabled")) \
-            run_program(PROGRAM:"touch_sound"); \
-      } \
-   } \
-   program { name: "touch_sound"; \
-      action: RUN_PLUGIN "touch_sound"; \
-   }
-
-group { name: "elm/entry/emoticon/angry/default"; images.image:
-   "emo-angry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/angry/default"; images.image:
+   "emo-angry.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-angry.png"; } } } }
-group { name: "elm/entry/emoticon/angry-shout/default"; images.image:
-   "emo-angry-shout.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/angry-shout/default"; images.image:
+   "emo-angry-shout.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-angry-shout.png"; } } } }
-group { name: "elm/entry/emoticon/guilty/default"; images.image:
-   "emo-guilty.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/guilty/default"; images.image:
+   "emo-guilty.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-guilty.png"; } } } }
-group { name: "elm/entry/emoticon/haha/default"; images.image:
-   "emo-haha.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/haha/default"; images.image:
+   "emo-haha.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-haha.png"; } } } }
-group { name: "elm/entry/emoticon/half-smile/default"; images.image:
-   "emo-half-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/half-smile/default"; images.image:
+   "emo-half-smile.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-half-smile.png"; } } } }
-group { name: "elm/entry/emoticon/happy/default"; images.image:
-   "emo-happy.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/happy/default"; images.image:
+   "emo-happy.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-happy.png"; } } } }
-group { name: "elm/entry/emoticon/kiss/default"; images.image:
-   "emo-kiss.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/kiss/default"; images.image:
+   "emo-kiss.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-kiss.png"; } } } }
-group { name: "elm/entry/emoticon/little-bit-sorry/default"; images.image:
-   "emo-little-bit-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/little-bit-sorry/default"; images.image:
+   "emo-little-bit-sorry.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-little-bit-sorry.png"; } } } }
-group { name: "elm/entry/emoticon/love/default"; images.image:
-   "emo-love.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/love/default"; images.image:
+   "emo-love.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-love.png"; } } } }
-group { name: "elm/entry/emoticon/minimal-smile/default"; images.image:
-   "emo-minimal-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/minimal-smile/default"; images.image:
+   "emo-minimal-smile.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-minimal-smile.png"; } } } }
-group { name: "elm/entry/emoticon/omg/default"; images.image:
-   "emo-omg.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/omg/default"; images.image:
+   "emo-omg.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-omg.png"; } } } }
-group { name: "elm/entry/emoticon/smile/default"; images.image:
-   "emo-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/smile/default"; images.image:
+   "emo-smile.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-smile.png"; } } } }
-group { name: "elm/entry/emoticon/sorry/default"; images.image:
-   "emo-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/sorry/default"; images.image:
+   "emo-sorry.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-sorry.png"; } } } }
-group { name: "elm/entry/emoticon/surprised/default"; images.image:
-   "emo-surprised.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/surprised/default"; images.image:
+   "emo-surprised.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-surprised.png"; } } } }
-group { name: "elm/entry/emoticon/tongue-dangling/default"; images.image:
-   "emo-tongue-dangling.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/tongue-dangling/default"; images.image:
+   "emo-tongue-dangling.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-tongue-dangling.png"; } } } }
-group { name: "elm/entry/emoticon/very-sorry/default"; images.image:
-   "emo-very-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/very-sorry/default"; images.image:
+   "emo-very-sorry.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-very-sorry.png"; } } } }
-group { name: "elm/entry/emoticon/wink/default"; images.image:
-   "emo-wink.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/wink/default"; images.image:
+   "emo-wink.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-wink.png"; } } } }
-group { name: "elm/entry/emoticon/worried/default"; images.image:
-   "emo-worried.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+group { "elm/entry/emoticon/worried/default"; images.image:
+   "emo-worried.png" COMP; parts { image { "icon"; nomouse; desc { "default"; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-worried.png"; } } } }
 
 #define ENTRY_DEFAULT_TAGS \
@@ -119,171 +103,971 @@ group { name: "elm/entry/emoticon/worried/default"; images.image:
    tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC; \
    tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
 
-#define ENTRY_DEFAULT_PROGRAMS \
-   script { \
-      public focused = 0; \
-      public disabled = 0; \
-      public guide_disabled = 0; \
-   } \
-   programs { \
-      program { name: "action_focus"; \
-         signal: "elm,action,focus"; \
-         source: "elm"; \
-         script { \
-            set_int(focused, 1); \
-            if (get_int(disabled) == 0) { \
-              set_state(PART:"elm.text", "focused", 0.0); \
-              if (get_int(guide_disabled) == 0) \
-                set_state(PART:"elm.guide", "focused", 0.0); \
-            } \
-         } \
-      } \
-      program { name: "action_unfocus"; \
-         signal: "elm,action,unfocus"; \
-         source: "elm"; \
-         script { \
-            set_int(focused, 0); \
-            if (get_int(disabled) == 0) { \
-               set_state(PART:"elm.text", "default", 0.0); \
-               if (get_int(guide_disabled) == 0) \
-                  set_state(PART:"elm.guide", "default", 0.0); \
-            } \
-         } \
-      } \
-      program { name: "focus"; \
-         signal: "load"; \
-         source: ""; \
-         action: FOCUS_SET; \
-         target: "elm.text"; \
-      } \
-      program { name: "disable"; \
-         signal: "elm,state,disabled"; \
-         source: "elm"; \
-         script { \
-            set_int(disabled, 1); \
-            set_state(PART:"elm.text", "disabled", 0.0); \
-            if (get_int(guide_disabled) == 0) \
-               set_state(PART:"elm.guide", "disabled", 0.0); \
-         } \
-      } \
-      program { name: "enable"; \
-         signal: "elm,state,enabled"; \
-         source: "elm"; \
-         script { \
-            set_int(disabled, 0); \
-            if (get_int(focused)) \
-               set_state(PART:"elm.text", "focused", 0.0); \
-            else \
-               set_state(PART:"elm.text", "default", 0.0); \
-            if (get_int(guide_disabled) == 0) { \
-               if (get_int(focused)) \
-                  set_state(PART:"elm.guide", "focused", 0.0); \
-               else \
-                  set_state(PART:"elm.guide", "default", 0.0); \
-            } \
-         } \
-      } \
-      program { name: "gdisable"; \
-         signal: "elm,guide,disabled"; \
-         source: "elm"; \
-         script { \
-            set_int(guide_disabled, 1); \
-            set_state(PART:"elm.guide", "hidden", 0.0); \
-         } \
-      } \
-      program { name: "genable"; \
-         signal: "elm,guide,enabled"; \
-         source: "elm"; \
-         script { \
-            set_int(guide_disabled, 0); \
-            if (get_int(disabled)) \
-               set_state(PART:"elm.guide", "disabled", 0.0); \
-            else if (get_int(focused)) \
-               set_state(PART:"elm.guide", "focused", 0.0); \
-            else \
-               set_state(PART:"elm.guide", "default", 0.0); \
-         } \
-      } \
-      ENTRY_SOUND_PROGRAM \
+styles {
+   style { "entry_textblock_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/edit-text-normal";
+      ENTRY_DEFAULT_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_textblock_focused_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/edit-text-focused";
+      ENTRY_DEFAULT_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_textblock_disabled_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/edit-text-disabled";
+      ENTRY_DEFAULT_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_textblock_guide_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/guide-text-normal";
+      ENTRY_DEFAULT_TAGS
+   }
+   style { "entry_textblock_guide_focused_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/guide-text-focused";
+      ENTRY_DEFAULT_TAGS
+   }
+   style { "entry_textblock_guide_disabled_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/guide-text-disabled";
+      ENTRY_DEFAULT_TAGS
+   }
+   style { "entry_textblock_char_wrap_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/edit-text-normal";
+      ENTRY_DEFAULT_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_textblock_char_wrap_focused_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/edit-text-focused";
+      ENTRY_DEFAULT_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_textblock_char_wrap_disabled_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/edit-text-disabled";
+      ENTRY_DEFAULT_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_textblock_char_wrap_guide_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/guide-text-normal";
+      ENTRY_DEFAULT_TAGS
+   }
+   style { "entry_textblock_char_wrap_guide_focused_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/guide-text-focused";
+      ENTRY_DEFAULT_TAGS
+   }
+   style { "entry_textblock_char_wrap_guide_disabled_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/guide-text-disabled";
+      ENTRY_DEFAULT_TAGS
+   }
+   style { "entry_single_textblock_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/edit-text-normal";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_textblock_focused_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/edit-text-focused";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_textblock_disabled_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/edit-text-disabled";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_textblock_guide_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/guide-text-normal";
+      ENTRY_SINGLELINE_TAGS
+   }
+   style { "entry_single_textblock_guide_focused_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/guide-text-focused";
+      ENTRY_SINGLELINE_TAGS
+   }
+   style { "entry_single_textblock_guide_disabled_style";
+      base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/guide-text-disabled";
+      ENTRY_SINGLELINE_TAGS
+   }
+   style { "entry_single_spinner_textblock_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_textblock_focused_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_textblock_disabled_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_textblock_guide_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
+      ENTRY_SINGLELINE_TAGS
+   }
+   style { "entry_single_spinner_vertical_textblock_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_vertical_textblock_focused_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_vertical_textblock_disabled_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_vertical_textblock_guide_style";
+      base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
+      ENTRY_SINGLELINE_TAGS
+   }
+   style { "entry_single_spinner_vertical_date_picker_textblock_style";
+      base: "font=Tizen:weight=Light font_size=85 color=#000000ff align=center text_class=tizen";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_vertical_date_picker_textblock_focused_style";
+      base: "font=Tizen:weight=Light font_size=85 color=#000000ff align=center text_class=tizen";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
+      base: "font=Tizen:weight=Light font_size=85 color=#000000a3 align=center text_class=tizen";
+      ENTRY_SINGLELINE_TAGS
+      ENTRY_PREEDIT_TAGS
+   }
+   style { "entry_single_spinner_vertical_date_picker_textblock_guide_style";
+      base: "font=Tizen:weight=Light font_size=85 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
+      ENTRY_SINGLELINE_TAGS
    }
+}
 
-group { name: "elm/entry/base/default";
-   alias: "elm/entry/base-mixedwrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data.item: "focus_highlight" "on";
-   styles {
-      style { name: "entry_textblock_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/edit-text-normal";
-         ENTRY_DEFAULT_TAGS
-         ENTRY_PREEDIT_TAGS
+group { "elm/entry/event/default";
+   inherit_only: 1;
+   parts {
+      rect { "event";
+         mouse;
+         repeat;
+         desc { "default";
+            color: 0 0 0 0;
+         }
+         desc { "disabled";
+            inherit: "default";
+            hid;
+         }
       }
-      style { name: "entry_textblock_focused_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/edit-text-focused";
-         ENTRY_DEFAULT_TAGS
-         ENTRY_PREEDIT_TAGS
+   }
+   programs {
+      program { "clicked";
+         signal: "mouse,clicked,1";
+         source: "event";
+         after: "on_clicked";
       }
-      style { name: "entry_textblock_disabled_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/edit-text-disabled";
-         ENTRY_DEFAULT_TAGS
-         ENTRY_PREEDIT_TAGS
+      program { "load";
+         signal: "load";
+         source: "";
+         after: "on_load";
       }
-      style { name: "entry_textblock_guide_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/guide-text-normal";
-         ENTRY_DEFAULT_TAGS
+      program { "disabled";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled";
+         target: "event";
+         after: "on_disabled";
       }
-      style { name: "entry_textblock_guide_focused_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/guide-text-focused";
-         ENTRY_DEFAULT_TAGS
+      program { "enabled";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "default";
+         target: "event";
+         after: "on_enabled";
       }
-      style { name: "entry_textblock_guide_disabled_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry color_class=entry/default/guide-text-disabled";
-         ENTRY_DEFAULT_TAGS
+      program { "focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         after: "on_focus";
+      }
+      program { "unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         after: "on_unfocus";
+      }
+      program { "disabled_guide";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         after: "on_disabled_guide";
+      }
+      program { "enabled_guide";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         after: "on_enabled_guide";
       }
    }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+}
+
+group { "elm/entry/base/template";
+   inherit_only: 1;
+   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+   data.item: "focus_highlight" "on";
+   data.item: context_menu_orientation "horizontal";
    parts {
       /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      rect { "bg";
+         nomouse;
+         scale;
+         desc{ "default";
             color_class: "elm/widget/entry/default/bg-default";
          }
       }
       ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
+            text.style: "entry_textblock_guide_style";
+         }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_guide_focused_style";
+         }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_guide_disabled_style";
+         }
+         desc { "hidden";
+            inherit: "default";
+            hid;
+         }
+      }
+      textblock { "elm.text";
+         mouse;
+         scale;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         desc { "default";
+            text.style: "entry_textblock_style";
+         }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
+         }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
+         }
+      }
+   }
+   inherit: "elm/entry/event/default";
+   script {
+      public focused = 0;
+      public disabled = 0;
+      public guide_disabled = 0;
+   }
+   programs {
+      program { "on_load";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { "on_clicked";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program { "on_focus";
+         script {
+            set_int(focused, 1);
+            if (get_int(disabled) == 0) {
+               set_state(PART:"elm.text", "focused", 0.0);
+               if (get_int(guide_disabled) == 0)
+                  set_state(PART:"elm.guide", "focused", 0.0);
+            }
+         }
+      }
+      program { "on_unfocus";
+         script {
+            set_int(focused, 0);
+            if (get_int(disabled) == 0) {
+               set_state(PART:"elm.text", "default", 0.0);
+               if (get_int(guide_disabled) == 0)
+                  set_state(PART:"elm.guide", "default", 0.0);
+            }
+         }
+      }
+      program { "on_disabled";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"elm.text", "disabled", 0.0);
+            if (get_int(guide_disabled) == 0)
+               set_state(PART:"elm.guide", "disabled", 0.0);
+         }
+      }
+      program { "on_enabled";
+         script {
+            set_int(disabled, 0);
+            if (get_int(focused))
+               set_state(PART:"elm.text", "focused", 0.0);
+            else
+               set_state(PART:"elm.text", "default", 0.0);
+            if (get_int(guide_disabled) == 0) {
+               if (get_int(focused))
+                  set_state(PART:"elm.guide", "focused", 0.0);
+               else
+                  set_state(PART:"elm.guide", "default", 0.0);
+            }
+         }
+      }
+      program { "on_disabled_guide";
+         script {
+            set_int(guide_disabled, 1);
+            set_state(PART:"elm.guide", "hidden", 0.0);
+         }
+      }
+      program { "on_enabled_guide";
+         script {
+            set_int(guide_disabled, 0);
+            if (get_int(disabled))
+               set_state(PART:"elm.guide", "disabled", 0.0);
+            else if (get_int(focused))
+               set_state(PART:"elm.guide", "focused", 0.0);
+            else
+               set_state(PART:"elm.guide", "default", 0.0);
+         }
+      }
+   }
+}
+
+group { "elm/entry/cursor/event/default";
+   inherit_only: 1;
+   programs {
+      program { "selection_start";
+         signal: "selection,start";
+         source: "elm.text";
+         after: "on_selection_start";
+      }
+      program { "selection_cleared";
+         signal: "selection,cleared";
+         source: "elm.text";
+         after: "on_selection_cleared";
+      }
+      program { "focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         after: "on_focus";
+      }
+      program { "unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         after: "on_unfocus";
+      }
+      program { "show_cursor";
+         signal: "elm,action,show,cursor";
+         source: "elm";
+         after: "on_show_cursor";
+      }
+   }
+}
+
+group { "elm/entry/cursor/template";
+   inherit: "elm/entry/cursor/event/default";
+   inherit_only: 1;
+   parts {
+      rect { "cursor";
+         clip: "clipper";
+         desc { "default";
+            hid;
+         }
+         desc { "visible";
+            inherit: "default";
+            vis;
+         }
+      }
+      rect { "clipper";
+         desc { "default";
+         }
+         desc { "hidden";
+            inherit: "default";
+            hid;
+         }
+      }
+   }
+   programs {
+      program { "on_selection_start";
+         action: STATE_SET "hidden";
+         target: "clipper";
+      }
+      program { "on_selection_cleared";
+         action: STATE_SET "default";
+         target: "clipper";
+      }
+      program { "on_focus";
+         action: ACTION_STOP;
+         target: "cursor_visible";
+         target: "cursor_hidden";
+         target: "cursor_visible_timer";
+         target: "cursor_hidden_timer";
+         after: "cursor_visible";
+      }
+      program { "on_unfocus";
+         action: ACTION_STOP;
+         target: "cursor_visible";
+         target: "cursor_hidden";
+         target: "cursor_visible_timer";
+         target: "cursor_hidden_timer";
+         after: "cursor_hidden_stop";
+      }
+      program { "on_show_cursor";
+         action: ACTION_STOP;
+         target: "cursor_visible";
+         target: "cursor_hidden";
+         target: "cursor_visible_timer";
+         target: "cursor_hidden_timer";
+         after: "cursor_visible";
+      }
+      program { "cursor_hidden_stop";
+         action: STATE_SET "default";
+         target: "cursor";
+      }
+      program { "cursor_visible";
+         action: STATE_SET "visible";
+         target: "cursor";
+         after: "cursor_visible_timer";
+      }
+      program { "cursor_hidden";
+         action: STATE_SET "default";
+         target: "cursor";
+         after: "cursor_hidden_timer";
+      }
+      program { "cursor_visible_timer";
+         in: 0.6 0.0;
+         after: "cursor_hidden";
+      }
+      program { "cursor_hidden_timer";
+         in: 0.6 0.0;
+         after: "cursor_visible";
+      }
+   }
+}
+
+group { "elm/entry/cursor_handle/event/default";
+   inherit_only: 1;
+   parts {
+      rect { "event";
+         mouse;
+         desc { "default";
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program { "pressed";
+         signal: "mouse,down,1";
+         source: "event";
+         after: "on_pressed";
+      }
+      program { "unpressed";
+         signal: "mouse,up,1";
+         source: "event";
+         after: "on_unpressed";
+      }
+      program { "edje_focus_in";
+         signal: "edje,focus,in";
+         source: "edje";
+         after: "on_edje_focus_in";
+      }
+      program { "edje_focus_out";
+         signal: "edje,focus,out";
+         source: "edje";
+         after: "on_edje_focus_out";
+      }
+      program { "edje_cursor_handle_show";
+         signal: "edje,cursor,handle,show";
+         source: "edje";
+         after: "on_edje_cursor_handle_show";
+      }
+      program { "edje_cursor_handle_hide";
+         signal: "edje,cursor,handle,hide";
+         source: "edje";
+         after: "on_edje_cursor_handle_hide";
+      }
+      program { "edje_cursor_handle_top";
+         signal: "edje,cursor,handle,top";
+         source: "edje";
+         after: "on_edje_cursor_handle_hide";
+      }
+   }
+}
+
+group { "elm/entry/cursor_handle/template";
+   inherit_only: 1;
+   parts {
+      image { "handle";
+         nomouse;
+         desc { "default";
+            hid;
+         }
+         desc { "visible";
+            inherit: "default";
+            vis;
+         }
+         desc { "top";
+            inherit: "visible";
+         }
+         desc { "zoom";
+            inherit: "visible";
+         }
+         desc { "zoom_top";
+            inherit: "top";
+         }
+      }
+   }
+   inherit: "elm/entry/cursor_handle/event/default";
+   parts {
+      rect { "event";
+         mouse;
+         desc { "default";
+            rel.to: "handle";
+            color: 0 0 0 0;
+         }
+      }
+   }
+   script {
+      public on_top = 0;
+      public zoomed = 0;
+   }
+   programs {
+      program { "on_pressed";
+         script {
+            set_int(zoomed, 1);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "visible"))
+               run_program(PROGRAM:"pressed_show");
+            else if (!strcmp(st, "top"))
+               run_program(PROGRAM:"pressed_top");
+         }
+      }
+      program { "on_unpressed";
+         script {
+            set_int(zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom"))
+               run_program(PROGRAM:"unpressed_show");
+            else if (!strcmp(st, "zoom_top"))
+               run_program(PROGRAM:"unpressed_top");
+         }
+         after: "unpressed_next";
+      }
+      program { "on_edje_focus_in";
+         script {
+            new on_top_val = get_int(on_top);
+            if (on_top_val)
+               set_state(PART:"handle", "top", 0.0);
+            else
+               set_state(PART:"handle", "visible", 0.0);
+         }
+      }
+      program { "on_edje_focus_out";
+         script {
+            set_state(PART:"handle", "default", 0.0);
+         }
+      }
+      program { "on_edje_cursor_handle_show";
+         script {
+            set_int(on_top, 0);
+            new zoomed_val = get_int(zoomed);
+            if (zoomed_val)
+               set_state(PART:"handle", "zoom", 0.0);
+            else
+               set_state(PART:"handle", "visible", 0.0);
+         }
+      }
+      program { "on_edje_cursor_handle_hide";
+         script {
+            set_state(PART:"handle", "default", 0.0);
+         }
+      }
+      program { "on_edje_cursor_handle_top";
+         script {
+            set_int(on_top, 1);
+            new zoomed_val = get_int(zoomed);
+            if (zoomed_val)
+               set_state(PART:"handle", "zoom_top", 0.0);
+            else
+               set_state(PART:"handle", "top", 0.0);
+         }
+      }
+      program { "unpressed_next";
+         in: 0.3 0.0;
+         script {
+            set_int(zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom"))
+               run_program(PROGRAM:"unpressed_show");
+            else if (!strcmp(st, "zoom_top"))
+               run_program(PROGRAM:"unpressed_top");
+         }
+      }
+      program { "pressed_show";
+         action: STATE_SET "zoom";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "pressed_top";
+         action: STATE_SET "zoom_top";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_show";
+         action: STATE_SET "visible";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_top";
+         action: STATE_SET "top";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+   }
+}
+
+group { "elm/entry/handler/event/default";
+   inherit_only: 1;
+   parts {
+      rect { "event";
+         mouse;
+         desc { "default";
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program { "edje_focus_in";
+         signal: "edje,focus,in";
+         source: "edje";
+         after: "on_edje_focus_in";
+      }
+      program { "edje_focus_out";
+         signal: "edje,focus,out";
+         source: "edje";
+         after: "on_edje_focus_out";
+      }
+      program { "pressed";
+         signal: "mouse,down,1";
+         source: "event";
+         after: "on_pressed";
+      }
+      program { "unpressed";
+         signal: "mouse,up,1";
+         source: "event";
+         after: "on_unpressed";
+      }
+      program { "top";
+         signal: "elm,state,top";
+         source: "elm";
+         after: "on_top";
+      }
+      program { "bottom";
+         signal: "elm,state,bottom";
+         source: "elm";
+         after: "on_bottom";
+      }
+      program { "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
+         source: "elm";
+         after: "on_bottom_reversed";
+      }
+      program { "top_reversed";
+         signal: "elm,state,top,reversed";
+         source: "elm";
+         after: "on_top_reversed";
+      }
+      program { "disable_handler";
+         signal: "app,selection,handler,disable";
+         source: "app";
+         after: "on_disable_handler";
+      }
+      program { "enable_handler";
+         signal: "app,selection,handler,enable";
+         source: "app";
+         after: "on_enable_handler";
+      }
+   }
+}
+
+group { "elm/entry/handler/template";
+   inherit_only: 1;
+   data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+   data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC;
+   parts {
+      image { "handle";
+         nomouse;
+         desc { "default";
+            hid;
+         }
+         desc { "visible";
+            inherit: "default";
+            vis;
+         }
+         desc { "top";
+            inherit: "visible";
+         }
+         desc { "bottom_reversed";
+            inherit: "visible";
+         }
+         desc { "top_reversed";
+            inherit: "visible";
+         }
+         desc { "zoom";
+            inherit: "visible";
+         }
+         desc { "zoom_top";
+            inherit: "top";
+         }
+         desc { "zoom_bottom_reversed";
+            inherit: "bottom_reversed";
+         }
+         desc { "zoom_top_reversed";
+            inherit: "top_reversed";
+         }
+      }
+   }
+   inherit: "elm/entry/handler/event/default";
+   parts {
+      rect { "event";
+         mouse;
+         desc { "default";
+            rel.to: "handle";
+            color: 0 0 0 0;
+         }
+      }
+   }
+   script {
+      public handler_on_top = 0;
+      public handler_focused = 0;
+      public handler_disabled = 0;
+      public handler_zoomed = 0;
+   }
+   programs {
+      program { "on_edje_focus_in";
+         script {
+            set_int(handler_focused, 1);
+         }
+      }
+      program { "on_edje_focus_out";
+         script {
+            set_int(handler_focused, 0);
+            set_state(PART:"handle", "default", 0.0);
+         }
+      }
+      program { "on_pressed";
+         script {
+            set_int(handler_zoomed, 1);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "visible"))
+               run_program(PROGRAM:"pressed_show");
+            else if (!strcmp(st, "top"))
+               run_program(PROGRAM:"pressed_top");
+            else if (!strcmp(st, "bottom_reversed"))
+               run_program(PROGRAM:"pressed_bottom_reversed");
+            else if (!strcmp(st, "top_reversed"))
+               run_program(PROGRAM:"pressed_top_reversed");
+         }
+      }
+      program { "on_unpressed";
+         script {
+            set_int(handler_zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom"))
+               run_program(PROGRAM:"unpressed_show");
+            else if (!strcmp(st, "zoom_top"))
+               run_program(PROGRAM:"unpressed_top");
+            else if (!strcmp(st, "zoom_bottom_reversed"))
+               run_program(PROGRAM:"unpressed_bottom_reversed");
+            else if (!strcmp(st, "zoom_top_reversed"))
+               run_program(PROGRAM:"unpressed_top_reversed");
+         }
+         after: "unpressed_next";
+      }
+      program { "on_top";
+         script {
+            new focused, disabled, zoomed;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_on_top, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               zoomed = get_int(handler_zoomed);
+               if (zoomed)
+                  set_state(PART:"handle", "zoom_top", 0.0);
+               else
+                  set_state(PART:"handle", "top", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { "on_bottom";
+         script {
+            new focused, disabled, zoomed;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            zoomed = get_int(handler_zoomed);
+            set_int(handler_on_top, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               if (zoomed)
+                  set_state(PART:"handle", "zoom", 0.0);
+               else
+                  set_state(PART:"handle", "visible", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { "on_bottom_reversed";
+         script {
+            new disabled, zoomed;
+            disabled = get_int(handler_disabled);
+            zoomed = get_int(handler_zoomed);
+            if (disabled == 0) {
+               if (zoomed)
+                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
+               else
+                  set_state(PART:"handle", "bottom_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { "on_top_reversed";
+         script {
+            new disabled, zoomed;
+            disabled = get_int(handler_disabled);
+            zoomed = get_int(handler_zoomed);
+            if (disabled == 0) {
+               if (zoomed)
+                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
+               else
+                  set_state(PART:"handle", "top_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { "on_disable_handler";
+         script {
+            set_int(handler_disabled, 1);
+         }
+      }
+      program { "on_enable_handler";
+         script {
+            set_int(handler_disabled, 0);
+         }
+      }
+      program { "pressed_show";
+         action: STATE_SET "zoom";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "pressed_top";
+         action: STATE_SET "zoom_top";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "pressed_bottom_reversed";
+         action: STATE_SET "zoom_bottom_reversed";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "pressed_top_reversed";
+         action: STATE_SET "zoom_top_reversed";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_show";
+         action: STATE_SET "visible";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_top";
+         action: STATE_SET "top";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_bottom_reversed";
+         action: STATE_SET "bottom_reversed";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_top_reversed";
+         action: STATE_SET "top_reversed";
+         target: "handle";
+         transition: GLIDE_EASE_OUT(0.3);
+      }
+      program { "unpressed_next";
+         in: 0.3 0.0;
+         script {
+            set_int(handler_zoomed, 0);
+            new st[31];
+            new Float:vl;
+            get_state(PART:"handle", st, 30, vl);
+            if (!strcmp(st, "zoom"))
+               run_program(PROGRAM:"unpressed_show");
+            else if (!strcmp(st, "zoom_top"))
+               run_program(PROGRAM:"unpressed_top");
+            else if (!strcmp(st, "zoom_bottom_reversed"))
+               run_program(PROGRAM:"unpressed_bottom_reversed");
+            else if (!strcmp(st, "zoom_top_reversed"))
+               run_program(PROGRAM:"unpressed_top_reversed");
+         }
+      }
+   }
+}
+
+group { "elm/entry/base/default";
+   inherit: "elm/entry/base/template";
+   alias: "elm/entry/base-mixedwrap/default";
+   parts {
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -291,7 +1075,7 @@ group { name: "elm/entry/base/default";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_style";
@@ -299,15 +1083,15 @@ group { name: "elm/entry/base/default";
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text {
                style: "entry_textblock_focused_style";
                min: 0 1;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text {
                style: "entry_textblock_disabled_style";
                min: 0 1;
@@ -315,19 +1099,16 @@ group { name: "elm/entry/base/default";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base/vcenter_align";
+group { "elm/entry/base/vcenter_align";
    alias: "elm/entry/base-mixedwrap/vcenter_align";
-   inherit: "elm/entry/base/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
@@ -336,15 +1117,14 @@ group { name: "elm/entry/base/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -352,7 +1132,7 @@ group { name: "elm/entry/base/vcenter_align";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_style";
@@ -360,15 +1140,15 @@ group { name: "elm/entry/base/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text {
                style: "entry_textblock_focused_style";
                min: 0 1;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text {
                style: "entry_textblock_disabled_style";
                min: 0 1;
@@ -378,82 +1158,37 @@ group { name: "elm/entry/base/vcenter_align";
    }
 }
 
-group { name: "elm/entry/base-charwrap/default";
+group { "elm/entry/base-charwrap/default";
    alias: "elm/entry/base/char_wrap";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   styles {
-      style { name: "entry_textblock_char_wrap_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/edit-text-normal";
-         ENTRY_DEFAULT_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_textblock_char_wrap_focused_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/edit-text-focused";
-         ENTRY_DEFAULT_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/edit-text-disabled";
-         ENTRY_DEFAULT_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_textblock_char_wrap_guide_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/guide-text-normal";
-         ENTRY_DEFAULT_TAGS
-      }
-      style { name: "entry_textblock_char_wrap_guide_focused_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/guide-text-focused";
-         ENTRY_DEFAULT_TAGS
-      }
-      style { name: "entry_textblock_char_wrap_guide_disabled_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=char text_class=entry color_class=entry/default/guide-text-disabled";
-         ENTRY_DEFAULT_TAGS
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_char_wrap_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -461,7 +1196,7 @@ group { name: "elm/entry/base-charwrap/default";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_char_wrap_style";
@@ -469,15 +1204,15 @@ group { name: "elm/entry/base-charwrap/default";
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text {
                style: "entry_textblock_char_wrap_focused_style";
                min: 0 1;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text {
                style: "entry_textblock_char_wrap_disabled_style";
                min: 0 1;
@@ -485,19 +1220,16 @@ group { name: "elm/entry/base-charwrap/default";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-charwrap/vcenter_align";
+group { "elm/entry/base-charwrap/vcenter_align";
    alias: "elm/entry/base/vcenter_align";
-   inherit: "elm/entry/base-charwrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
@@ -506,23 +1238,22 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -530,7 +1261,7 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_char_wrap_style";
@@ -538,15 +1269,15 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text {
                style: "entry_textblock_char_wrap_focused_style";
                min: 0 1;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text {
                style: "entry_textblock_char_wrap_disabled_style";
                min: 0 1;
@@ -556,52 +1287,36 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
    }
 }
 
-group { name: "elm/entry/base-nowrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-nowrap/default";
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -609,22 +1324,22 @@ group { name: "elm/entry/base-nowrap/default";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_textblock_style";
                min: 1 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text {
                style: "entry_textblock_focused_style";
                min: 1 1;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text {
                style: "entry_textblock_disabled_style";
                min: 0 1;
@@ -632,43 +1347,38 @@ group { name: "elm/entry/base-nowrap/default";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-nowrap/vcenter_align";
-   inherit: "elm/entry/base-nowrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+group { "elm/entry/base-nowrap/vcenter_align";
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -676,22 +1386,22 @@ group { name: "elm/entry/base-nowrap/vcenter_align";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_textblock_style";
                min: 1 1;
                align: 0.0 0.5;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text {
                style: "entry_textblock_focused_style";
                min: 1 1;
             }
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text {
                style: "entry_textblock_disabled_style";
                min: 0 1;
@@ -701,60 +1411,15 @@ group { name: "elm/entry/base-nowrap/vcenter_align";
    }
 }
 
-group { name: "elm/entry/base-single/default";
-   alias: "elm/entry/base-single/vcenter_align";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   styles {
-      style { name: "entry_single_textblock_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/edit-text-normal";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_textblock_focused_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/edit-text-focused";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_textblock_disabled_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/edit-text-disabled";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_textblock_guide_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/guide-text-normal";
-         ENTRY_SINGLELINE_TAGS
-      }
-      style { name: "entry_single_textblock_guide_focused_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/guide-text-focused";
-         ENTRY_SINGLELINE_TAGS
-      }
-      style { name: "entry_single_textblock_guide_disabled_style";
-         base: "font=Tizen:weight=Light font_size="ENTRY_FONT_SIZE_INC" color=#fff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=none text_class=entry color_class=entry/default/guide-text-disabled";
-         ENTRY_SINGLELINE_TAGS
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-single/default";
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel.to: "elm.text";
             text {
                style: "entry_single_textblock_guide_style";
                min: 0 1;
@@ -762,23 +1427,22 @@ group { name: "elm/entry/base-single/default";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -786,7 +1450,7 @@ group { name: "elm/entry/base-single/default";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_single_textblock_style";
                min: 1 1;
@@ -794,59 +1458,29 @@ group { name: "elm/entry/base-single/default";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-single/spinner/default";
+group { "elm/entry/base-single/spinner/default";
+   inherit: "elm/entry/base/template";
    alias: "elm/entry/base-single/spinner/horizontal";
    data.item: "default_font_size" "106";
-   styles {
-      style { name: "entry_single_spinner_textblock_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_textblock_focused_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_textblock_disabled_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_textblock_guide_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
-         ENTRY_SINGLELINE_TAGS
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel.to: "elm.text";
             text {
                style: "entry_single_spinner_textblock_guide_style";
                min: 0 1;
@@ -854,21 +1488,20 @@ group { name: "elm/entry/base-single/spinner/default";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -876,7 +1509,7 @@ group { name: "elm/entry/base-single/spinner/default";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_single_spinner_textblock_style";
                min: 1 1;
@@ -884,81 +1517,50 @@ group { name: "elm/entry/base-single/spinner/default";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_spinner_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_spinner_textblock_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-single/spinner/vertical";
+group { "elm/entry/base-single/spinner/vertical";
+   inherit: "elm/entry/base/template";
    alias: "elm/entry/base-single/spinner/vertical_time_picker";
    alias: "elm/entry/base-single/spinner/datetime";
    data.item: "default_font_size" "106";
-   styles {
-      style { name: "entry_single_spinner_vertical_textblock_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_vertical_textblock_focused_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000ff align=center";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_vertical_textblock_disabled_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_vertical_textblock_guide_style";
-         base: "font=Tizen:weight=Light font_size=106 color=#000000a3 align=center";
-         ENTRY_SINGLELINE_TAGS
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel.to: "elm.text";
             text {
                style: "entry_single_spinner_vertical_textblock_guide_style";
                min: 0 1;
-               max: 0 0;
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -966,83 +1568,53 @@ group { name: "elm/entry/base-single/spinner/vertical";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_single_spinner_vertical_textblock_style";
                min: 1 1;
-               max: 0 0;
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_vertical_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_spinner_vertical_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_vertical_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_spinner_vertical_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-single/spinner/vertical_date_picker";
-   inherit: "elm/entry/base-single/spinner/vertical";
+group { "elm/entry/base-single/spinner/vertical_date_picker";
+   inherit: "elm/entry/base/template";
    data.item: "default_font_size" "85";
-   styles {
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_style";
-         base: "font=Tizen:weight=Light font_size=85 color=#000000ff align=center text_class=tizen";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
-         base: "font=Tizen:weight=Light font_size=85 color=#000000ff align=center text_class=tizen";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
-         base: "font=Tizen:weight=Light font_size=85 color=#000000a3 align=center text_class=tizen";
-         ENTRY_SINGLELINE_TAGS
-         ENTRY_PREEDIT_TAGS
-      }
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
-         base: "font=Tizen:weight=Light font_size=85 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         ENTRY_SINGLELINE_TAGS
-      }
-   }
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             text {
                style: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
                min: 0 1;
-               max: 0 0;
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -1050,66 +1622,57 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC;
             text {
                style: "entry_single_spinner_vertical_date_picker_textblock_style";
+               min: 1 1;
+               align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-single/multibuttonentry";
-   inherit: "elm/entry/base-single/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-single/multibuttonentry";
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel.to: "elm.text";
             text {
                style: "entry_single_textblock_guide_style";
                min: 0 1;
                max: 0 1;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: EDITABLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -1117,160 +1680,119 @@ group { name: "elm/entry/base-single/multibuttonentry";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_textblock_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-single-noedit/default";
+group { "elm/entry/base-single-noedit/default";
+   inherit: "elm/entry/base/template";
    alias: "elm/entry/base-single-noedit/vcenter_align";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel.to: "elm.text";
             text {
                style: "entry_single_textblock_guide_style";
                min: 0 1;
                max: 0 1;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-noedit/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-noedit/default";
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_style";
@@ -1278,64 +1800,55 @@ group { name: "elm/entry/base-noedit/default";
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-noedit/vcenter_align";
-   inherit: "elm/entry/base-noedit/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+group { "elm/entry/base-noedit/vcenter_align";
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_style";
@@ -1343,140 +1856,111 @@ group { name: "elm/entry/base-noedit/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-noedit-charwrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-noedit-charwrap/default";
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_char_wrap_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_char_wrap_style";
                min: 0 1;
-            align: 0.0 0.0;
+               align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_char_wrap_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_char_wrap_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
-   inherit: "elm/entry/base-noedit-charwrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+group { "elm/entry/base-noedit-charwrap/vcenter_align";
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_char_wrap_guide_style";
                min: 0 1;
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_char_wrap_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_char_wrap_style";
@@ -1484,75 +1968,56 @@ group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_char_wrap_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_char_wrap_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-noedit-mixedwrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-noedit-mixedwrap/default";
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
+      part { "elm.guide";
          type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_style";
@@ -1560,32 +2025,25 @@ group { name: "elm/entry/base-noedit-mixedwrap/default";
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
-   inherit: "elm/entry/base-noedit-mixedwrap/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+group { "elm/entry/base-noedit-mixedwrap/vcenter_align";
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
@@ -1594,30 +2052,29 @@ group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 0;
             text {
                style: "entry_textblock_style";
@@ -1625,209 +2082,161 @@ group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
                align: 0.0 0.5;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-nowrap-noedit/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { "elm/entry/base-nowrap-noedit/default";
+   inherit: "elm/entry/base/template";
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
+      textblock { "elm.guide";
          type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_textblock_style";
                min: 1 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
-   inherit: "elm/entry/base-nowrap-noedit/default";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
+group { "elm/entry/base-nowrap-noedit/vcenter_align";
+   inherit: "elm/entry/base/template";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
+            rel.to: "elm.text";
             text {
                style: "entry_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_textblock_style";
                min: 1 1;
                align: 0.0 0.0;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_textblock_disabled_style";
          }
       }
    }
 }
 
-group { name: "elm/entry/base-password/default";
+group { "elm/entry/base-password/default";
+   inherit: "elm/entry/base/template";
    alias: "elm/entry/base-password/vcenter_align";
-   data.item: "default_font_size" ENTRY_FONT_SIZE_INC;
-   data {
-      item: context_menu_orientation "horizontal";
-   }
    parts {
-      /// for C# temporarily
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "elm/widget/entry/default/bg-default";
-         }
-      }
-      ///
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      textblock { "elm.guide";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel.to: "elm.text";
             text {
                style: "entry_single_textblock_guide_style";
                min: 0 1;
                max: 0 1;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
+         desc { "focused";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
+         desc { "disabled";
+            inherit: "default";
             text.style: "entry_single_textblock_guide_disabled_style";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
+      textblock { "elm.text";
+         mouse;
+         scale;
          entry_mode: PASSWORD;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
@@ -1835,7 +2244,7 @@ group { name: "elm/entry/base-password/default";
          source: "elm/entry/selection/default"; // selection under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
+         desc { "default";
             text {
                style: "entry_single_textblock_style";
                repch: "•";
@@ -1843,977 +2252,277 @@ group { name: "elm/entry/base-password/default";
                max: 0 1;
             }
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_focused_style";
-            }
+         desc { "focused";
+            inherit: "default";
+            text.style: "entry_single_textblock_focused_style";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_style";
-            }
+         desc { "disabled";
+            inherit: "default";
+            text.style: "entry_single_textblock_disabled_style";
          }
       }
    }
-   ENTRY_DEFAULT_PROGRAMS
 }
 
-group { name: "elm/entry/cursor/default";
+group { "elm/entry/cursor/default";
+   inherit: "elm/entry/cursor/template";
    parts {
-      part { name: "cursor";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
+      rect { "cursor";
+         nomouse;
+         scale;
+         clip: "clipper";
+         desc { "default";
             min: ENTRY_CURSOR_SIZE_INC;
             color_class: "entry/default/cursor";
-            visible: 0;
+            hid;
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
       }
-      part { name: "clipper"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "cursor";
-            rel2.to: "cursor";
+      rect { "clipper";
+         desc { "default";
+            rel.to: "cursor";
             fixed: 1 1;
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
    }
-   programs {
-      program {
-         signal: "selection,start";
-         source: "elm.text";
-         action: STATE_SET "hidden" 0.0;
-         target: "clipper";
-      }
-      program {
-         signal: "selection,cleared";
-         source: "elm.text";
-         action: STATE_SET "default" 0.0;
-         target: "clipper";
-      }
-      program {
-         signal: "elm,action,focus";
-         source: "elm";
-         action: ACTION_STOP;
-         target: "cursor_show";
-         target: "cursor_hide";
-         target: "cursor_show_timer";
-         target: "cursor_hide_timer";
-         after: "cursor_show";
-      }
-      program {
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: ACTION_STOP;
-         target: "cursor_show";
-         target: "cursor_hide";
-         target: "cursor_show_timer";
-         target: "cursor_hide_timer";
-         after: "cursor_hide_stop";
-      }
-      program {
-         signal: "elm,action,show,cursor";
-         source: "elm";
-         action: ACTION_STOP;
-         target: "cursor_show";
-         target: "cursor_hide";
-         target: "cursor_show_timer";
-         target: "cursor_hide_timer";
-         after: "cursor_show";
-      }
-      program { name: "cursor_hide_stop";
-         action: STATE_SET "default" 0.0;
-         target: "cursor";
-      }
-      program { name: "cursor_show";
-         action: STATE_SET "visible" 0.0;
-         target: "cursor";
-         after: "cursor_show_timer";
-      }
-      program { name: "cursor_hide";
-         action: STATE_SET "default" 0.0;
-         target: "cursor";
-         after: "cursor_hide_timer";
-      }
-      program { name: "cursor_show_timer";
-         in: 0.6 0.0;
-         after: "cursor_hide";
-      }
-      program { name: "cursor_hide_timer";
-         in: 0.6 0.0;
-         after: "cursor_show";
-      }
-   }
 }
 
-group { name: "elm/entry/selection/default";
+group { "elm/entry/selection/default";
    parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
+      rect { "bg";
+         scale;
+         nomouse;
+         desc { "default";
             color: 0 221 255 153;
          }
       }
    }
 }
 
-group { name: "elm/entry/handler/start/default";
+group { "elm/entry/handler/start/default";
+   inherit: "elm/entry/handler/template";
    alias: "elm/entry/selection/block_handle_left";
-   data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-   data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC;
    images {
       image: "copy&paste_handler_bottom_l.png" COMP;
       image: "copy&paste_handler_bottom_r.png" COMP;
       image: "copy&paste_handler_top_l.png" COMP;
       image: "copy&paste_handler_top_r.png" COMP;
    }
-   script {
-      public handler_on_top = 0;
-      public handler_focused = 0;
-      public handler_disabled = 0;
-      public handler_zoomed = 0;
-   }
    parts {
-      part { name: "handle";
-         mouse_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
+      image { "handle";
+         desc { "default";
+            hid;
             fixed: 1 1;
-            align: 1.0 0;
+            align: 1.0 0.0;
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-            image {
-               normal: "copy&paste_handler_bottom_l.png";
-            }
+            image.normal: "copy&paste_handler_bottom_l.png";
          }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            align: 1.0 1;
-            image {
-               normal: "copy&paste_handler_top_l.png";
-            }
+         desc { "top";
+            inherit: "visible";
+            align: 1.0 1.0;
+            image.normal: "copy&paste_handler_top_l.png";
          }
-         description { state: "bottom_reversed" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            align: 0 0;
-            image {
-               normal: "copy&paste_handler_bottom_r.png";
-            }
+         desc { "bottom_reversed";
+            inherit: "visible";
+            align: 0.0 0.0;
+            image.normal: "copy&paste_handler_bottom_r.png";
          }
-         description { state: "top_reversed" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            align: 0.0 1;
-            image {
-               normal: "copy&paste_handler_top_r.png";
-            }
+         desc { "top_reversed";
+            inherit: "visible";
+            align: 0.0 1.0;
+            image.normal: "copy&paste_handler_top_r.png";
          }
-         description { state: "zoom_show" 0.0;
-            inherit: "show" 0.0;
+         desc { "zoom";
+            inherit: "visible";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_top" 0.0;
-            inherit: "top" 0.0;
+         desc { "zoom_top";
+            inherit: "top";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_bottom_reversed" 0.0;
-            inherit: "bottom_reversed" 0.0;
+         desc { "zoom_bottom_reversed";
+            inherit: "bottom_reversed";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_top_reversed" 0.0;
-            inherit: "top_reversed" 0.0;
+         desc { "zoom_top_reversed";
+            inherit: "top_reversed";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
       }
    }
-   programs {
-      program { name: "focused";
-         signal: "edje,focus,in";
-         source: "edje";
-         script {
-            set_int(handler_focused, 1);
-         }
-      }
-      program { name: "unfocused";
-         signal: "edje,focus,out";
-         source: "edje";
-         script {
-            set_int(handler_focused, 0);
-            set_state(PART:"handle", "default", 0.0);
-         }
-      }
-      program { name: "pressed_show";
-         action: STATE_SET "zoom_show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top";
-         action: STATE_SET "zoom_top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_bottom_reversed";
-         action: STATE_SET "zoom_bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top_reversed";
-         action: STATE_SET "zoom_top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_show";
-         action: STATE_SET "show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top";
-         action: STATE_SET "top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_bottom_reversed";
-         action: STATE_SET "bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top_reversed";
-         action: STATE_SET "top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed";
-         signal: "mouse,down,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 1);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "show"))
-              {
-                 run_program(PROGRAM:"pressed_show");
-              }
-            else if (!strcmp(st, "top"))
-              {
-                 run_program(PROGRAM:"pressed_top");
-              }
-            else if (!strcmp(st, "bottom_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_bottom_reversed");
-              }
-            else if (!strcmp(st, "top_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_top_reversed");
-              }
-         }
-      }
-      program { name: "released";
-         signal: "mouse,up,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-         after: "released2";
-      }
-      program { name: "released2";
-         in: 0.3 0.0;
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-      }
-      program { name: "top";
-         signal: "elm,state,top";
-         source: "elm";
-         script {
-            new focused, disabled, zoomed;
-            focused = get_int(handler_focused);
-            disabled = get_int(handler_disabled);
-            set_int(handler_on_top, 1);
-            if ((focused == 1) && (disabled == 0)) {
-               zoomed = get_int(handler_zoomed);
-               if (zoomed) {
-                    set_state(PART:"handle", "zoom_top", 0.0);
-                 } else {
-                    set_state(PART:"handle", "top", 0.0);
-                 }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "bottom";
-         signal: "elm,state,bottom";
-         source: "elm";
-         script {
-            new focused, disabled, zoomed;
-            focused = get_int(handler_focused);
-            disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            set_int(handler_on_top, 0);
-            if ((focused == 1) && (disabled == 0)) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_show", 0.0);
-               } else {
-                  set_state(PART:"handle", "show", 0.0);
-               }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "bottom_reversed";
-         signal: "elm,state,bottom,reversed";
-         source: "elm";
-         script {
-            new disabled, zoomed;
-            disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "bottom_reversed", 0.0);
-               }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "top_reversed";
-         signal: "elm,state,top,reversed";
-         source: "elm";
-         script {
-            new disabled, zoomed;
-            disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "top_reversed", 0.0);
-               }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "disabled";
-         signal: "app,selection,handler,disable";
-         source: "app";
-         script {
-            set_int(handler_disabled, 1);
-         }
-      }
-      program { name: "enabled";
-         signal: "app,selection,handler,enable";
-         source: "app";
-         script {
-            set_int(handler_disabled, 0);
-         }
-      }
-   }
 }
 
-group { name: "elm/entry/handler/end/default";
+group { "elm/entry/handler/end/default";
+   inherit: "elm/entry/handler/template";
    alias: "elm/entry/selection/block_handle_right";
-   data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-   data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WEIGHT_INC;
    images {
       image: "copy&paste_handler_bottom_l.png" COMP;
       image: "copy&paste_handler_bottom_r.png" COMP;
       image: "copy&paste_handler_top_l.png" COMP;
       image: "copy&paste_handler_top_r.png" COMP;
    }
-   script {
-      public handler_on_top = 0;
-      public handler_focused = 0;
-      public handler_disabled = 0;
-      public handler_zoomed = 0;
-   }
    parts {
-      part { name: "handle";
-         mouse_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
+      image { "handle";
+         desc { "default";
+            hid;
             fixed: 1 1;
-            align: 0 0;
+            align: 0.0 0.0;
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-            image {
-               normal: "copy&paste_handler_bottom_r.png";
-            }
+            image.normal: "copy&paste_handler_bottom_r.png";
          }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            align: 0 1;
-            image {
-               normal: "copy&paste_handler_top_r.png";
-            }
+         desc { "top";
+            inherit: "visible";
+            align: 0.0 1.0;
+            image.normal: "copy&paste_handler_top_r.png";
          }
-         description { state: "bottom_reversed" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            align: 1 0;
-            image {
-               normal: "copy&paste_handler_bottom_l.png";
-            }
+         desc { "bottom_reversed";
+            inherit: "visible";
+            align: 1.0 0.0;
+            image.normal: "copy&paste_handler_bottom_l.png";
          }
-         description { state: "top_reversed" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            align: 1 1;
-            image {
-               normal: "copy&paste_handler_top_l.png";
-            }
+         desc { "top_reversed";
+            inherit: "visible";
+            align: 1.0 1.0;
+            image.normal: "copy&paste_handler_top_l.png";
          }
-         description { state: "zoom_show" 0.0;
-            inherit: "show" 0.0;
+         desc { "zoom";
+            inherit: "visible";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_top" 0.0;
-            inherit: "top" 0.0;
+         desc { "zoom_top";
+            inherit: "top";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_bottom_reversed" 0.0;
-            inherit: "bottom_reversed" 0.0;
+         desc { "zoom_bottom_reversed";
+            inherit: "bottom_reversed";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_top_reversed" 0.0;
-            inherit: "top_reversed" 0.0;
+         desc { "zoom_top_reversed";
+            inherit: "top_reversed";
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
       }
    }
-   programs {
-      program { name: "focused";
-         signal: "edje,focus,in";
-         source: "edje";
-         script {
-            set_int(handler_focused, 1);
-         }
-      }
-      program { name: "unfocused";
-         signal: "edje,focus,out";
-         source: "edje";
-         script {
-            set_int(handler_focused, 0);
-            set_state(PART:"handle", "default", 0.0);
-         }
-      }
-      program { name: "pressed_show";
-         action: STATE_SET "zoom_show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top";
-         action: STATE_SET "zoom_top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_bottom_reversed";
-         action: STATE_SET "zoom_bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top_reversed";
-         action: STATE_SET "zoom_top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_show";
-         action: STATE_SET "show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top";
-         action: STATE_SET "top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_bottom_reversed";
-         action: STATE_SET "bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top_reversed";
-         action: STATE_SET "top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed";
-         signal: "mouse,down,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 1);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "show"))
-              {
-                 run_program(PROGRAM:"pressed_show");
-              }
-            else if (!strcmp(st, "top"))
-              {
-                 run_program(PROGRAM:"pressed_top");
-              }
-            else if (!strcmp(st, "bottom_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_bottom_reversed");
-              }
-            else if (!strcmp(st, "top_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_top_reversed");
-              }
-         }
-      }
-      program { name: "released";
-         signal: "mouse,up,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-         after: "released2";
-      }
-      program { name: "released2";
-         in: 0.3 0.0;
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-      }
-      program { name: "top";
-         signal: "elm,state,top";
-         source: "elm";
-         script {
-            new focused, disabled, zoomed;
-            focused = get_int(handler_focused);
-            disabled = get_int(handler_disabled);
-            set_int(handler_on_top, 1);
-            if ((focused == 1) && (disabled == 0)) {
-                 zoomed = get_int(handler_zoomed);
-                 if (zoomed) {
-                      set_state(PART:"handle", "zoom_top", 0.0);
-                 } else {
-                      set_state(PART:"handle", "top", 0.0);
-                 }
-            } else {
-                 set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "bottom";
-         signal: "elm,state,bottom";
-         source: "elm";
-         script {
-            new focused, disabled, zoomed;
-            focused = get_int(handler_focused);
-            disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            set_int(handler_on_top, 0);
-            if ((focused == 1) && (disabled == 0)) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_show", 0.0);
-               } else {
-                  set_state(PART:"handle", "show", 0.0);
-               }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "bottom_reversed";
-         signal: "elm,state,bottom,reversed";
-         source: "elm";
-         script {
-            new disabled, zoomed;
-            disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "bottom_reversed", 0.0);
-               }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "top_reversed";
-         signal: "elm,state,top,reversed";
-         source: "elm";
-         script {
-            new disabled, zoomed;
-            disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "top_reversed", 0.0);
-               }
-            } else {
-               set_state(PART:"handle", "default", 0.0);
-            }
-         }
-      }
-      program { name: "disabled";
-         signal: "app,selection,handler,disable";
-         source: "app";
-         script {
-            set_int(handler_disabled, 1);
-         }
-      }
-      program { name: "enabled";
-         signal: "app,selection,handler,enable";
-         source: "app";
-         script {
-            set_int(handler_disabled, 0);
-         }
-      }
-   }
 }
 
-group { name: "elm/entry/handler/start/spinner/vertical";
+group { "elm/entry/handler/start/spinner/vertical";
    alias: "elm/entry/handler/start/spinner/datetime";
    alias: "elm/entry/handler/start/spinner/vertical_date_picker";
    alias: "elm/entry/handler/start/spinner/vertical_time_picker";
 }
 
-group { name: "elm/entry/handler/end/spinner/vertical";
+group { "elm/entry/handler/end/spinner/vertical";
    alias: "elm/entry/handler/end/spinner/datetime";
    alias: "elm/entry/handler/end/spinner/vertical_date_picker";
    alias: "elm/entry/handler/end/spinner/vertical_time_picker";
 }
 
-group { name: "elm/entry/cursor_handle/default";
+group { "elm/entry/cursor_handle/default";
+   inherit: "elm/entry/cursor_handle/template";
    images {
       image: "copy&paste_handler_bottom_center.png" COMP;
       image: "copy&paste_handler_top_center.png" COMP;
    }
    parts {
-      part { name: "handle";
-         scale: 1;
-         mouse_events: 1;
-         description { state: "default" 0.0;
+      image { "handle";
+         scale;
+         nomouse;
+         desc { "default";
             min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
-            align: 0 0;
-            visible: 0;
-            align: 0.5 0;
+            hid;
+            align: 0.5 0.0;
             rel1.offset: -2 0;
             image {
                normal: "copy&paste_handler_bottom_center.png";
+               middle: SOLID;
             }
-            image.middle: SOLID;
          }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "top";
+            inherit: "visible";
             align: 0.5 1.0;
-            image {
-               normal: "copy&paste_handler_top_center.png";
-            }
+            image.normal: "copy&paste_handler_top_center.png";
          }
-         description { state: "zoom_show" 0.0;
-            inherit: "show" 0.0;
+         desc { "zoom";
+            inherit: "visible";
             min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
-         description { state: "zoom_top" 0.0;
-            inherit: "top" 0.0;
+         desc { "zoom_top";
+            inherit: "top";
             min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
             max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
       }
    }
-   script {
-      public on_top = 0;
-      public zoomed = 0;
-   }
-   programs {
-      program { name: "pressed_show";
-         action: STATE_SET "zoom_show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top";
-         action: STATE_SET "zoom_top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_show";
-         action: STATE_SET "show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top";
-         action: STATE_SET "top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed";
-         signal: "mouse,down,1";
-         source: "handle";
-         script {
-            set_int(zoomed, 1);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "show"))
-              {
-                 run_program(PROGRAM:"pressed_show");
-              }
-            else if (!strcmp(st, "top"))
-              {
-                 run_program(PROGRAM:"pressed_top");
-              }
-         }
-      }
-      program { name: "released";
-         signal: "mouse,up,1";
-         source: "handle";
-         script {
-            set_int(zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-         }
-         after: "released2";
-      }
-      program { name: "released2";
-         in: 0.3 0.0;
-         script {
-            set_int(zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-         }
-      }
-      program { name: "focused";
-         signal: "edje,focus,in";
-         source: "edje";
-         script {
-            new on_top_val = get_int(on_top);
-            if (on_top_val) {
-               set_state(PART:"handle", "top", 0.0);
-            } else {
-               set_state(PART:"handle", "show", 0.0);
-            }
-         }
-      }
-      program { name: "unfocused";
-         signal: "edje,focus,out";
-         source: "edje";
-         script {
-            set_state(PART:"handle", "default", 0.0);
-         }
-      }
-      program { name: "show";
-         signal: "edje,cursor,handle,show";
-         source: "edje";
-         script {
-            set_int(on_top, 0);
-            new zoomed_val = get_int(zoomed);
-            if (zoomed_val) {
-                 set_state(PART:"handle", "zoom_show", 0.0);
-            } else {
-                 set_state(PART:"handle", "show", 0.0);
-            }
-         }
-      }
-      program { name: "hide";
-         signal: "edje,cursor,handle,hide";
-         source: "edje";
-         script {
-            set_state(PART:"handle", "default", 0.0);
-         }
-      }
-      program { name: "top";
-         signal: "edje,cursor,handle,top";
-         source: "edje";
-         script {
-            set_int(on_top, 1);
-            new zoomed_val = get_int(zoomed);
-            if (zoomed_val) {
-                 set_state(PART:"handle", "zoom_top", 0.0);
-            } else {
-                 set_state(PART:"handle", "top", 0.0);
-            }
-         }
-      }
-   }
 }
 
-group { name: "elm/entry/handler/edge/start/default";
+group { "elm/entry/handler/edge/start/default";
    parts {
-      part { name: "align";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
+      spacer { "align";
+         scale;
+         desc { "default";
             min: 0 0;
             max: 0 0;
-            align: 0 0;
+            align: 0.0 0.0;
          }
       }
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
+      rect { "bg";
+         scale;
+         nomouse;
+         desc { "default";
             fixed: 1 0;
             color: 0 184 230 255;
             min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
             max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
             rel2 { relative: 0 1; to_x: "align"; }
             align: 0.5 0;
-            visible: 0;
+            hid;
          }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
       }
    }
    programs {
-      program { name: "show";
+      program { "edje_focus_in";
          signal: "edje,focus,in";
          source: "edje";
          script {
-            set_state(PART:"bg", "show", 0.0);
+            set_state(PART:"bg", "visible", 0.0);
          }
       }
-      program { name: "hide";
+      program { "edje_focus_out";
          signal: "edje,focus,out";
          source: "edje";
          script {
@@ -2823,56 +2532,54 @@ group { name: "elm/entry/handler/edge/start/default";
    }
 }
 
-group { name: "elm/entry/handler/edge/start/spinner/vertical";
+group { "elm/entry/handler/edge/start/spinner/vertical";
    alias: "elm/entry/handler/edge/start/spinner/datetime";
    alias: "elm/entry/handler/edge/start/spinner/vertical_date_picker";
    alias: "elm/entry/handler/edge/start/spinner/vertical_time_picker";
 }
 
-group { name: "elm/entry/handler/edge/end/spinner/vertical";
+group { "elm/entry/handler/edge/end/spinner/vertical";
    alias: "elm/entry/handler/edge/end/spinner/datetime";
    alias: "elm/entry/handler/edge/end/spinner/vertical_date_picker";
    alias: "elm/entry/handler/edge/end/spinner/vertical_time_picker";
 }
 
-group { name: "elm/entry/handler/edge/end/default";
+group { "elm/entry/handler/edge/end/default";
    parts {
-      part { name: "align";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
+      spacer { "align";
+         scale;
+         desc { "default";
             min: 0 0;
             max: 0 0;
             align: 0 0;
          }
       }
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
+      rect { "bg";
+         scale;
+         nomouse;
+         desc { "default";
             color: 0 184 230 255;
             min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
             max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
             rel2 { relative: 0 1; to_x: "align"; }
-            align: 0.5 0;
-            visible: 0;
+            align: 0.5 0.0;
+            hid;
          }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
       }
    }
    programs {
-      program { name: "show";
+      program { "edje_focus_in";
          signal: "edje,focus,in";
          source: "edje";
          script {
-            set_state(PART:"bg", "show", 0.0);
+            set_state(PART:"bg", "visible", 0.0);
          }
       }
-      program { name: "hide";
+      program { "edje_focus_out";
          signal: "edje,focus,out";
          source: "edje";
          script {
@@ -2882,29 +2589,26 @@ group { name: "elm/entry/handler/edge/end/default";
    }
 }
 
-group { name: "elm/entry/anchor/default";
+group { "elm/entry/anchor/default";
    parts {
-      part { name: "bg";
-         type: SPACER;
-         description { state: "default" 0.0;
-         }
+      spacer { "bg";
+         desc { "default"; }
       }
    }
 }
 
-group { name: "elm/entry/preedit/default";
+group { "elm/entry/preedit/default";
    parts {
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
+      rect { "bg";
+         nomouse;
+         desc { "default";
             color: 128 128 128 255;
          }
       }
    }
 }
 
-group { name: "elm/entry/magnifier/fixed-size";
+group { "elm/entry/magnifier/fixed-size";
    data.item: "height" MAGNIFIER_HEIGHT_MIN;
    data.item: "scale" MAGNIFIER_SCALE;
    data.item: "arrow" MAGNIFIER_ARROW_HEIGHT_INC;
@@ -2913,24 +2617,24 @@ group { name: "elm/entry/magnifier/fixed-size";
       image: "copy&paste_magnifier_mask.#.png" COMP;
    }
    parts {
-      part { name: "bg_mask";
-         scale: 1;
-         description { state: "default" 0.0;
+      image { "bg_mask";
+         scale;
+         desc { "default";
             rel1.to: "bg";
             rel2.to: "bg";
             image.normal: "copy&paste_magnifier_mask.#.png";
             image.border: 8 8 8 8;
             color: 255 255 255 255;
          }
-         description { state: "custom_cc" 0.0;
-            inherit: "default" 0.0;
+         desc { "custom_cc";
+            inherit: "default";
             color_class: "mgf_custom_cc";
          }
       }
-      part { name: "bg";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      image { "bg";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
             min: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MIN;
             max: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MAX;
@@ -2940,11 +2644,10 @@ group { name: "elm/entry/magnifier/fixed-size";
             align: 0.0 0.0;
          }
       }
-      part { name: "left_offset";
-         type: SPACER;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      spacer { "left_offset";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
             min: MAGNIFIER_LEFT_OFFSET_INC;
             max: MAGNIFIER_LEFT_OFFSET_INC;
@@ -2955,11 +2658,10 @@ group { name: "elm/entry/magnifier/fixed-size";
             align: 0.0 0.0;
          }
       }
-      part { name: "right_offset";
-         type: SPACER;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      spacer { "right_offset";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
             min: MAGNIFIER_RIGHT_OFFSET_INC;
             max: MAGNIFIER_RIGHT_OFFSET_INC;
@@ -2974,11 +2676,10 @@ group { name: "elm/entry/magnifier/fixed-size";
             align: 1.0 1.0;
          }
       }
-      part { name: "swallow";
-         type: SWALLOW;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
+      swallow { "swallow";
+         nomouse;
+         scale;
+         desc { "default";
             fixed: 1 1;
             align: 0.0 0.0;
             rel1 {
@@ -3009,11 +2710,9 @@ group { name: "elm/entry/magnifier/fixed-size";
    }
 }
 
-group { name: "elm/scroller/entry/default";
+group { "elm/scroller/entry/default";
    alias: "elm/scroller/entry_single/default";
-   data {
-      item: "focus_highlight" "off";
-   }
+   data.item: "focus_highlight" "off";
    script {
       public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
       public timer0(val) {
@@ -3043,78 +2742,64 @@ group { name: "elm/scroller/entry/default";
       image: "core_scroll_bar_h.#.png" COMP;
    }
    parts {
-      part { name: "bg";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-         }
+      spacer { "bg";
+         scale;
+         desc { "default"; }
       }
-      part { name: "clipper";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+      rect { "clipper";
+         scale;
+         nomouse;
+         desc { "default";
+            rel.to: "bg";
          }
       }
-      part { name: "elm.swallow.icon";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
+      swallow { "elm.swallow.icon";
+         scale;
+         clip: "clipper";
+         desc { "default";
             align: 0.0 0.5;
             fixed: 1 1;
-            rel1 {
-               to: "bg";
-               relative: 0.0 0.0;
-            }
+            rel1.to: "bg";
             rel2 {
                to: "bg";
                relative: 0.0 1.0;
             }
-            visible: 0;
+            hid;
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
       }
-      part { name: "elm.swallow.end";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
+      swallow { "elm.swallow.end";
+         scale;
+         clip: "clipper";
+         desc { "default";
             align: 1.0 0.5;
             fixed: 1 1;
             rel1 {
                to: "bg";
                relative: 1.0 0.0;
             }
-            rel2 {
-               to: "bg";
-               relative: 1.0 1.0;
-            }
-            visible: 0;
+            rel2.to: "bg";
+            hid;
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+         desc { "visible";
+            inherit: "default";
+            vis;
          }
       }
-      part { name: "content_clipper";
-         scale: 1;
-         type: RECT;
-         description { state: "default" 0.0;
+      rect { "clipper_elm.swallow.content";
+         scale;
+         desc { "default";
             rel1.to: "elm.swallow.content";
             rel2.to: "elm.swallow.content";
          }
       }
-      part { name: "elm.swallow.content";
-         clip_to: "content_clipper";
-         scale: 1;
-         type: SWALLOW;
-         description { state: "default" 0.0;
+      swallow { "elm.swallow.content";
+         clip: "clipper_elm.swallow.content";
+         scale;
+         desc { "default";
             rel1 {
                to_x: "elm.swallow.icon";
                to_y: "bg";
@@ -3127,37 +2812,32 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      part { name: "sb_vbar_clip_master";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+      rect { "clipper_clipper_sb_vbar";
+         scale;
+         nomouse;
+         desc { "default";
+            rel.to: "bg";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "sb_vbar_clip";
-         clip_to: "sb_vbar_clip_master";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+      rect { "clipper_sb_vbar";
+         clip: "clipper_clipper_sb_vbar";
+         scale;
+         nomouse;
+         desc { "default";
+            rel.to: "bg";
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+         desc { "hidden";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "sb_vbar";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
+      spacer { "sb_vbar";
+         scale;
+         desc { "default";
             fixed: 1 1;
             min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
             align: 1.0 0.0;
@@ -3172,16 +2852,16 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      part { name: "elm.dragable.vbar";
-         scale: 1;
-         clip_to: "sb_vbar_clip";
-         mouse_events: 0;
+      image { "elm.dragable.vbar";
+         scale;
+         clip: "clipper_sb_vbar";
+         nomouse;
          dragable {
             x: 0 0 0;
             y: 1 1 0;
             confine: "sb_vbar";
          }
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 1;
             min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
             max: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC;
@@ -3200,32 +2880,27 @@ group { name: "elm/scroller/entry/default";
             color: 61 184 204 178;
          }
       }
-      part { name: "sb_hbar_clip_master";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            visible: 0;
+      rect { "clipper_clipper_sb_hbar";
+         scale;
+         nomouse;
+         desc { "default"; }
+         desc { "hidden";
+            hid;
          }
       }
-      part { name: "sb_hbar_clip";
-         clip_to: "sb_hbar_clip_master";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            visible: 0;
+      rect { "clipper_sb_hbar";
+         clip: "clipper_clipper_sb_hbar";
+         scale;
+         nomouse;
+         desc { "default"; }
+         desc { "hidden";
+            hid;
             color: 255 255 255 0;
          }
       }
-      part { name: "sb_hbar";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
+      spacer { "sb_hbar";
+         scale;
+         desc { "default";
             fixed: 1 1;
             min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
             align: 0.0 1.0;
@@ -3241,16 +2916,16 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      part { name: "elm.dragable.hbar";
-         scale: 1;
-         clip_to: "sb_hbar_clip";
-         mouse_events: 0;
+      image { "elm.dragable.hbar";
+         scale;
+         clip: "clipper_sb_hbar";
+         nomouse;
          dragable {
             x: 1 1 0;
             y: 0 0 0;
             confine: "sb_hbar";
          }
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 1 1;
             min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
             max: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC;
@@ -3271,12 +2946,12 @@ group { name: "elm/scroller/entry/default";
       }
    }
    programs {
-      program { name: "load";
+      program { "load";
          signal: "load";
          source: "";
          script {
-            set_state(PART:"sb_hbar_clip", "hidden", 0.0);
-            set_state(PART:"sb_vbar_clip", "hidden", 0.0);
+            set_state(PART:"clipper_sb_hbar", "hidden", 0.0);
+            set_state(PART:"clipper_sb_vbar", "hidden", 0.0);
             set_int(sbvis_h, 0);
             set_int(sbvis_v, 0);
             set_int(sbalways_v, 0);
@@ -3285,50 +2960,50 @@ group { name: "elm/scroller/entry/default";
             emit("reload", "elm");
          }
       }
-      program { name: "icon_show";
+      program { "icon_show";
          signal: "elm,action,show,icon";
          source: "elm";
-         action: STATE_SET "visible" 0.0;
+         action: STATE_SET "visible";
          target: "elm.swallow.icon";
       }
-      program { name: "icon_hide";
+      program { "icon_hide";
          signal: "elm,action,hide,icon";
          source: "elm";
-         action: STATE_SET "default" 0.0;
+         action: STATE_SET "default";
          target: "elm.swallow.icon";
       }
-      program { name: "end_show";
+      program { "end_show";
          signal: "elm,action,show,end";
          source: "elm";
-         action: STATE_SET "visible" 0.0;
+         action: STATE_SET "visible";
          target: "elm.swallow.end";
       }
-      program { name: "end_hide";
+      program { "end_hide";
          signal: "elm,action,hide,end";
          source: "elm";
-         action: STATE_SET "default" 0.0;
+         action: STATE_SET "default";
          target: "elm.swallow.end";
       }
-      program { name: "vbar_show";
+      program { "vbar_show";
          signal: "elm,action,show,vbar";
          source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "sb_vbar_clip_master";
+         action:  STATE_SET "default";
+         target: "clipper_clipper_sb_vbar";
       }
-      program { name: "vbar_hide";
+      program { "vbar_hide";
          signal: "elm,action,hide,vbar";
          source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "sb_vbar_clip_master";
+         action:  STATE_SET "hidden";
+         target: "clipper_clipper_sb_vbar";
       }
-      program { name: "vbar_show_always";
+      program { "vbar_show_always";
          signal: "elm,action,show_always,vbar";
          source: "elm";
          script {
             new v;
             v = get_int(sbalways_v);
             if (!v) {
-               set_int(sbalways_v, 1);\
+               set_int(sbalways_v, 1);
                v = get_int(sbvis_v);
                if (!v) {
                   emit("do-show-vbar", "");
@@ -3337,7 +3012,7 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      program { name: "vbar_show_notalways";
+      program { "vbar_show_notalways";
          signal: "elm,action,show_notalways,vbar";
          source: "elm";
          script {
@@ -3353,33 +3028,33 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      program { name: "sb_vbar_show";
+      program { "sb_vbar_show";
          signal: "do-show-vbar";
          source: "";
-         action:  STATE_SET "default" 0.0;
+         action:  STATE_SET "default";
          transition: LINEAR 0.5;
-         target: "sb_vbar_clip";
+         target: "clipper_sb_vbar";
       }
-      program { name: "sb_vbar_hide";
+      program { "sb_vbar_hide";
          signal: "do-hide-vbar";
          source: "";
-         action:  STATE_SET "hidden" 0.0;
+         action:  STATE_SET "hidden";
          transition: LINEAR 0.5;
-         target: "sb_vbar_clip";
+         target: "clipper_sb_vbar";
       }
-      program { name: "hbar_show";
+      program { "hbar_show";
          signal: "elm,action,show,hbar";
          source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "sb_hbar_clip_master";
+         action:  STATE_SET "default";
+         target: "clipper_clipper_sb_hbar";
       }
-      program { name: "hbar_hide";
+      program { "hbar_hide";
          signal: "elm,action,hide,hbar";
          source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "sb_hbar_clip_master";
+         action:  STATE_SET "hidden";
+         target: "clipper_clipper_sb_hbar";
       }
-      program { name: "hbar_show_always";
+      program { "hbar_show_always";
          signal: "elm,action,show_always,hbar";
          source: "elm";
          script {
@@ -3395,7 +3070,7 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      program { name: "hbar_show_notalways";
+      program { "hbar_show_notalways";
          signal: "elm,action,show_notalways,hbar";
          source: "elm";
          script {
@@ -3411,21 +3086,21 @@ group { name: "elm/scroller/entry/default";
             }
          }
       }
-      program { name: "sb_hbar_show";
+      program { "sb_hbar_show";
          signal: "do-show-hbar";
          source: "";
-         action:  STATE_SET "default" 0.0;
+         action:  STATE_SET "default";
          transition: LINEAR 0.5;
-         target: "sb_hbar_clip";
+         target: "clipper_sb_hbar";
       }
-      program { name: "sb_hbar_hide";
+      program { "sb_hbar_hide";
          signal: "do-hide-hbar";
          source: "";
-         action:  STATE_SET "hidden" 0.0;
+         action:  STATE_SET "hidden";
          transition: LINEAR 0.5;
-         target: "sb_hbar_clip";
+         target: "clipper_sb_hbar";
       }
-      program { name: "scroll";
+      program { "scroll";
          signal: "elm,action,scroll";
          source: "elm";
          script {
@@ -3450,4 +3125,3 @@ group { name: "elm/scroller/entry/default";
       }
    }
 }
-