mobile/entry: Remove unused styles and fix indentation.

Change-Id: I8b5a28b58d20cbc3516af71eb67a4fa6cf9d08ce

1 files changed, 1325 insertions, 3995 deletions

diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc
index f208bbab..8981214b 100644
--- a/mobile/widgets/entry.edc
+++ b/mobile/widgets/entry.edc
@@ -24,405 +24,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define ENTRY_BLOCK_HANDLE_SOURCE7 "elm/entry/selection/block_handle_left"
-#define ENTRY_BLOCK_HANDLE_SOURCE8 "elm/entry/selection/block_handle_right"
-#define ENTRY_CURSOR_HANDLE_SOURCE9 "elm/entry/cursor_handle/default"
-#define ENTRY_BLOCK_HANDLE_SOURCE10 "elm/entry/selection/block_handle_edge_left"
-#define ENTRY_BLOCK_HANDLE_SOURCE11 "elm/entry/selection/block_handle_edge_right"
-
-#define ENTRY_EDITFIELD_FOCUS_DATA \
-   data.item: "focus_highlight" "on";
-
-#define ENTRY_TOP_BOTTOM_PADDING( SIZE1, SIZE2 ) \
-   part { name: "top_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: SIZE1; \
-         max: SIZE1; \
-         align: 0.5 0.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 0.0; \
-      } \
-   } \
-   part { name: "bottom_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: SIZE2; \
-         max: SIZE2; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 1.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   }
-
-#define ENTRY_TOP_BOTTOM_REL \
-   rel1 { \
-      to_y: "top_padding"; \
-      relative: 0.0 1.0; \
-   } \
-   rel2 { \
-      to_y: "bottom_padding"; \
-      relative: 1.0 0.0; \
-   }
-
-#define ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL \
-   rel1 { \
-      to_x: "left_padding"; \
-      to_y: "top_padding"; \
-      relative: 1.0 1.0; \
-   } \
-   rel2 { \
-      to_x: "right_padding"; \
-      to_y: "bottom_padding"; \
-      relative: 0.0 0.0; \
-   }
-
-#define ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC \
-   script { \
-      public scroll_enabled; \
-   }
-
-#define ENTRY_EDITFIELD_SWALLOW_PARTS \
-   part { name: "clear_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1 { \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            relative: 0.0 1.0; \
-         } \
-      } \
-      description { state: "visible" 0.0; \
-         inherit: "default" 0.0; \
-         min: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC; \
-         max: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC; \
-      } \
-   } \
-   part { name: "elm.swallow.clear"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 1; \
-         rel1 { \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            relative: 0.0 1.0; \
-         } \
-         visible: 0; \
-      } \
-      description { state: "visible" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS \
-   ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT_MULTILINE, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT_MULTILINE) \
-   part { name: "focus_underline_bottom_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_MULTILINE; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 1.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   } \
-   part { name: "left_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         fixed: 1 0; \
-         align: 0.0 0.5; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 0.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "right_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1.relative: 1.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "focus_underline"; \
-      type: RECT; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1 { \
-            relative: 1.0 0.0; \
-            to_x: "left_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         rel2 { \
-            relative: 0.0 0.0; \
-            to_x: "right_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-         visible: 1; \
-      } \
-      description { state: "focused" 0.0; \
-         inherit: "default" 0.0; \
-         color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/ \
-      } \
-      description { state: "disabled" 0.0; \
-         inherit: "default" 0.0; \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 0; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_FOCUS_PARTS \
-   ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT) \
-   part { name: "focus_underline_bottom_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_INC; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 1.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   } \
-   part { name: "left_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         fixed: 1 0; \
-         align: 0.0 0.5; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 0.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "right_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1.relative: 1.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "focus_underline"; \
-      type: RECT; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1 { \
-            relative: 1.0 0.0; \
-            to_x: "left_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         rel2 { \
-            relative: 0.0 0.0; \
-            to_x: "right_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-         visible: 1; \
-      } \
-      description { state: "focused" 0.0; \
-         inherit: "default" 0.0; \
-         color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/ \
-      } \
-      description { state: "disabled" 0.0; \
-         inherit: "default" 0.0; \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 0; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART \
-   part { name: "event_rect"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-         visible: 1; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM \
-   program { name: "event_rect_touch_snd"; \
-      signal: "mouse,clicked,1"; \
-      source: "event_rect"; \
-   }
-
-#define ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PART \
-   part { name: "scroller_event_rect"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-         visible: 1; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PROGRAM \
-   program { name: "scroller_event_rect_touch_snd"; \
-      signal: "mouse,clicked,1"; \
-      source: "scroller_event_rect"; \
-	}
-
-#define ENTRY_EDITFIELD_SWALLOW_PROGRAMS \
-   program { name: "scroll_enabled"; \
-      signal: "elm,state,scroll,enabled"; \
-      source: "*"; \
-      script { \
-         set_int(scroll_enabled, 1); \
-         set_state(PART:"focus_underline", "hidden", 0.0); \
-         set_state(PART:"top_padding", "hidden", 0.0); \
-         set_state(PART:"bottom_padding", "hidden", 0.0); \
-         set_state(PART:"left_padding", "hidden", 0.0); \
-         set_state(PART:"right_padding", "hidden", 0.0); \
-      } \
-   } \
-   program { name: "scroll_disabled"; \
-      signal: "elm,state,scroll,disabled"; \
-      source: "*"; \
-      script { \
-         set_int(scroll_enabled, 0); \
-         set_state(PART:"focus_underline", "default", 0.0); \
-         set_state(PART:"top_padding", "default", 0.0); \
-         set_state(PART:"bottom_padding", "default", 0.0); \
-         set_state(PART:"left_padding", "default", 0.0); \
-         set_state(PART:"right_padding", "default", 0.0); \
-      } \
-   } \
-   program { name: "clear_show"; \
-      signal: "elm,state,clear,visible"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.clear", "visible", 0.0); \
-            set_state(PART:"clear_padding", "visible", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "clear_hide"; \
-      signal: "elm,state,clear,hidden"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.clear", "default", 0.0); \
-            set_state(PART:"clear_padding", "default", 0.0); \
-         } \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_FOCUS_PROGRAMS \
-   program { name: "action_focus"; \
-      signal: "elm,state,focus,on"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "focused", 0.0); \
-         } \
-         set_state(PART:"elm.text", "focused", 0.0); \
-      } \
-   } \
-   program { name: "action_unfocus"; \
-      signal: "elm,state,focus,off"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "default", 0.0); \
-         } \
-         set_state(PART:"elm.text", "default", 0.0); \
-      } \
-   } \
-   program { name: "enable_focus_bg"; \
-      signal: "elm,state,enabled"; \
-      source: "elm"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "default", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "disable_focus_bg"; \
-      signal: "elm,state,disabled"; \
-      source: "elm"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "disabled", 0.0); \
-         } \
-      } \
-   }
+#define MAGNIFIER_SCALE 1.5
 
 #define ENTRY_SOUND_PROGRAM \
    program { name: "touch_snd"; \
@@ -441,58 +43,58 @@
    }
 
 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; image.normal:
+   "emo-angry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-angry-shout.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-guilty.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-haha.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-half-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-happy.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-kiss.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "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:
             "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; image.normal:
+   "emo-love.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-minimal-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-omg.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-surprised.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-tongue-dangling.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-very-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-wink.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; 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; image.normal:
+   "emo-worried.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
             "emo-worried.png"; } } } }
 
 
@@ -504,7 +106,7 @@ group { name: "elm/entry/base/default";
    data.item: "focus_highlight" "on";
    styles {
       style { name: "entry_textblock_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -517,7 +119,7 @@ group { name: "elm/entry/base/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -530,7 +132,7 @@ group { name: "elm/entry/base/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
@@ -543,7 +145,7 @@ group { name: "elm/entry/base/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -577,21 +179,12 @@ group { name: "elm/entry/base/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             fixed: 1 0;
             text {
@@ -690,21 +283,12 @@ group { name: "elm/entry/base/vcenter_align";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             fixed: 1 0;
             text {
@@ -738,7 +322,7 @@ group { name: "elm/entry/base-charwrap/default";
    data.item: "max_font_size" "60";
    styles {
       style { name: "entry_textblock_char_wrap_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -751,7 +335,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_char_wrap_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -764,7 +348,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
@@ -777,7 +361,7 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -811,21 +395,12 @@ group { name: "elm/entry/base-charwrap/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             fixed: 1 0;
             text {
@@ -924,21 +499,12 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             fixed: 1 0;
             text {
@@ -965,7 +531,6 @@ group { name: "elm/entry/base-charwrap/vcenter_align";
    }
 }
 
-
 group { name: "elm/entry/base-nowrap/default";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
@@ -997,20 +562,12 @@ group { name: "elm/entry/base-nowrap/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
                style: "entry_textblock_style";
@@ -1107,20 +664,12 @@ group { name: "elm/entry/base-nowrap/vcenter_align";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
                style: "entry_textblock_style";
@@ -1146,20 +695,14 @@ group { name: "elm/entry/base-nowrap/vcenter_align";
    }
 }
 
-group { name: "elm/entry/base/editfield";
-   alias: "elm/entry/base-mixedwrap/editfield";
-   alias: "elm/entry/base/editfield/default";
-   alias: "elm/entry/base/editfield/lighting";
-   alias: "elm/entry/base/editfield/multiline";
-   alias: "elm/entry/base/editfield/multiline/default";
-   alias: "elm/entry/base/editfield/multiline/lighting";
-   alias: "elm/entry/base/editfield/searchbar/default";
+group { name: "elm/entry/base-single/default";
+   alias: "elm/entry/base-single/vcenter_align";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
    styles {
-      style { name: "editfield_textblock_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+      style { name: "entry_single_textblock_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1171,8 +714,8 @@ group { name: "elm/entry/base/editfield";
          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;
       }
-      style { name: "editfield_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+      style { name: "entry_single_textblock_focused_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1184,11 +727,11 @@ group { name: "elm/entry/base/editfield";
          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;
       }
-      style { name: "editfield_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+      style { name: "entry_single_textblock_disabled_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";
          tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
          tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
@@ -1197,8 +740,8 @@ group { name: "elm/entry/base/editfield";
          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;
       }
-      style { name: "editfield_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
+      style { name: "entry_single_textblock_guide_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry ellipsis=1.0";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1208,20 +751,20 @@ group { name: "elm/entry/base/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_EDITFIELD_FOCUS_DATA
    parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
+            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_textblock_guide_style";
+               style: "entry_single_textblock_guide_style";
                min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;
@@ -1234,51 +777,47 @@ group { name: "elm/entry/base/editfield";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 1;
+         multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            fixed: 1 0;
             text {
-            style: "editfield_textblock_style";
-               min: 0 1;
-               max: 0 1;
+               style: "entry_single_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_focused_style";
-               min: 0 1;
-               max: 0 1;
+               style: "entry_single_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_disabled_style";
-               min: 0 1;
-               max: 0 1;
+               style: "entry_single_textblock_disabled_style";
             }
          }
       }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
       program { name: "focus";
          signal: "load";
          source: "";
@@ -1310,41 +849,18 @@ group { name: "elm/entry/base/editfield";
          target: "elm.guide";
       }
       ENTRY_SOUND_PROGRAM
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit/editfield";
-   alias: "elm/entry/base-noedit-mixedwrap/editfield";
-   alias: "elm/entry/base-noedit/editfield/default";
-   alias: "elm/entry/base-noedit/editfield/lighting";
-   alias: "elm/entry/base-noedit/editfield/multiline";
-   alias: "elm/entry/base-noedit/editfield/multiline/default";
-   alias: "elm/entry/base-noedit/editfield/multiline/lighting";
-   inherit: "elm/entry/base/editfield";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base/editfield/fixed_size";
-   alias: "elm/entry/base-mixedwrap/editfield/fixed_size";
-   alias: "elm/entry/base/editfield/multiline/fixed_size";
+group { name: "elm/entry/base-single/spinner/default";
+   alias: "elm/entry/base-single/spinner/horizontal";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
+   // FIXME: SamsungNum3L has to be applied.
    styles {
-      style { name: "editfield_textblock_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+      style { name: "entry_single_spinner_textblock_style";
+         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1356,8 +872,8 @@ group { name: "elm/entry/base/editfield/fixed_size";
          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;
       }
-      style { name: "editfield_textblock_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+      style { name: "entry_single_spinner_textblock_focused_style";
+         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1369,11 +885,11 @@ group { name: "elm/entry/base/editfield/fixed_size";
          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;
       }
-      style { name: "editfield_textblock_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
+      style { name: "entry_single_spinner_textblock_disabled_style";
+         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";
          tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
          tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
@@ -1382,8 +898,8 @@ group { name: "elm/entry/base/editfield/fixed_size";
          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;
       }
-      style { name: "editfield_textblock_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
+      style { name: "entry_single_spinner_textblock_guide_style";
+         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1393,20 +909,20 @@ group { name: "elm/entry/base/editfield/fixed_size";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_EDITFIELD_FOCUS_DATA
    parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
+            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_textblock_fixed_size_guide_style";
+               style: "entry_single_spinner_textblock_guide_style";
                min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;
@@ -1419,48 +935,47 @@ group { name: "elm/entry/base/editfield/fixed_size";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 1;
+         multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            fixed: 1 0;
             text {
-            style: "editfield_textblock_fixed_size_style";
-               min: 0 1;
+               style: "entry_single_spinner_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_fixed_size_focused_style";
-               min: 0 1;
+               style: "entry_single_spinner_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_fixed_size_disabled_style";
-               min: 0 1;
+               style: "entry_single_spinner_textblock_disabled_style";
             }
          }
       }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
       program { name: "focus";
          signal: "load";
          source: "";
@@ -1492,103 +1007,44 @@ group { name: "elm/entry/base/editfield/fixed_size";
          target: "elm.guide";
       }
       ENTRY_SOUND_PROGRAM
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit/editfield/fixed_size";
-   alias: "elm/entry/base-noedit-mixedwrap/editfield/fixed_size";
-   alias: "elm/entry/base-noedit/editfield/multiline/fixed_size";
-   inherit: "elm/entry/base/editfield/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base-charwrap/editfield";
-   alias: "elm/entry/base/editfield/char_wrap";
-   alias: "elm/entry/base/editfield/default/char_wrap";
-   alias: "elm/entry/base/editfield/lighting/char_wrap";
-   alias: "elm/entry/base/editfield/multiline/char_wrap";
-   alias: "elm/entry/base/editfield/multiline/default/char_wrap";
-   alias: "elm/entry/base/editfield/multiline/lighting/char_wrap";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+group { name: "elm/entry/base-single/spinner/vertical";
+   alias: "elm/entry/base-single/spinner/vertical_time_picker";
+   alias: "elm/entry/base-single/spinner/datetime";
+   // FIXME: SamsungNum3L has to be applied.
    styles {
-      style { name: "editfield_textblock_char_wrap_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
+      style { name: "entry_single_spinner_vertical_textblock_style";
+         base: "font=Tizen:style=Light font_size=106 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
       }
-      style { name: "editfield_textblock_char_wrap_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
+      style { name: "entry_single_spinner_vertical_textblock_focused_style";
+         base: "font=Tizen:style=Light font_size=106 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
       }
-      style { name: "editfield_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
+      style { name: "entry_single_spinner_vertical_textblock_disabled_style";
+         base: "font=Tizen:style=Light font_size=106 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
       }
-      style { name: "editfield_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
+      style { name: "entry_single_spinner_vertical_textblock_guide_style";
+         base: "font=Tizen:style=Light font_size=106 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
       }
    }
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_EDITFIELD_FOCUS_DATA
    parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
+            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_textblock_char_wrap_guide_style";
+               style: "entry_single_spinner_vertical_textblock_guide_style";
                min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;
@@ -1601,48 +1057,47 @@ group { name: "elm/entry/base-charwrap/editfield";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 1;
+         multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            fixed: 1 0;
             text {
-               style: "editfield_textblock_char_wrap_style";
-               min: 0 1;
+               style: "entry_single_spinner_vertical_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_char_wrap_focused_style";
-               min: 0 1;
+               style: "entry_single_spinner_vertical_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_char_wrap_disabled_style";
-               min: 0 1;
+               style: "entry_single_spinner_vertical_textblock_disabled_style";
             }
          }
       }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
       program { name: "focus";
          signal: "load";
          source: "";
@@ -1674,103 +1129,36 @@ group { name: "elm/entry/base-charwrap/editfield";
          target: "elm.guide";
       }
       ENTRY_SOUND_PROGRAM
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/editfield";
-   alias: "elm/entry/base-noedit/editfield/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/default/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/lighting/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/multiline/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/multiline/default/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/multiline/lighting/char_wrap";
-   inherit: "elm/entry/base-charwrap/editfield";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base-charwrap/editfield/fixed_size";
-   alias: "elm/entry/base/editfield/char_wrap/fixed_size";
-   alias: "elm/entry/base/editfield/multiline/char_wrap/fixed_size";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
+group { name: "elm/entry/base-single/spinner/vertical_date_picker";
+   inherit: "elm/entry/base-single/spinner/vertical";
    styles {
-      style { name: "editfield_textblock_char_wrap_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_style";
+         base: "font=Tizen:style=Regular font_size=68 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
       }
-      style { name: "editfield_textblock_char_wrap_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
+         base: "font=Tizen:style=Regular font_size=68 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
       }
-      style { name: "editfield_textblock_char_wrap_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
+         base: "font=Tizen:style=Regular font_size=68 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
       }
-      style { name: "editfield_textblock_char_wrap_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
+         base: "font=Tizen:style=Regular font_size=68 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
       }
    }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
    parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
             text {
-               style: "editfield_textblock_char_wrap_fixed_size_guide_style";
+               style: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
                min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;
@@ -1783,152 +1171,70 @@ group { name: "elm/entry/base-charwrap/editfield/fixed_size";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 1;
+         multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            fixed: 1 0;
+            min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC;
             text {
-               style: "editfield_textblock_char_wrap_fixed_size_style";
-               min: 0 1;
+               style: "entry_single_spinner_vertical_date_picker_textblock_style";
+               size: 68;
+               size_range: 50 68;
+               fit: 1 0;
             }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_char_wrap_fixed_size_focused_style";
-               min: 0 1;
+               style: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_textblock_char_wrap_fixed_size_disabled_style";
-               min: 0 1;
+               style: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
             }
          }
       }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_SOUND_PROGRAM
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/editfield/fixed_size";
-   alias: "elm/entry/base-noedit/editfield/char_wrap/fixed_size";
-   alias: "elm/entry/base-noedit/editfield/multiline/char_wrap/fixed_size";
-   inherit: "elm/entry/base-charwrap/editfield/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base-single/editfield";
-   alias: "elm/entry/base-single/editfield/default";
-   alias: "elm/entry/base-single/editfield/lighting";
-   alias: "elm/entry/base-single/editfield/singleline";
-   alias: "elm/entry/base-single/editfield/singleline/default";
-   alias: "elm/entry/base-single/editfield/singleline/lighting";
+group { name: "elm/entry/base-single/multibuttonentry";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
    styles {
-      style { name: "editfield_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_single_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
+      style { name: "multibuttonentry_single_textblock_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
          tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
          tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
          tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
          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;
       }
-      style { name: "editfield_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=entry";
+      style { name: "multibuttonentry_single_textblock_disabled_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
          tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
          tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
          tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
          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;
       }
-      style { name: "editfield_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
+      style { name: "multibuttonentry_single_textblock_guide_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
@@ -1938,10 +1244,7 @@ group { name: "elm/entry/base-single/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_EDITFIELD_FOCUS_DATA
    parts {
-      ENTRY_EDITFIELD_FOCUS_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1951,7 +1254,7 @@ group { name: "elm/entry/base-single/editfield";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_single_textblock_guide_style";
+               style: "multibuttonentry_single_textblock_guide_style";
                min: 0 1;
                max: 0 1;
             }
@@ -1964,47 +1267,29 @@ group { name: "elm/entry/base-single/editfield";
       part { name: "elm.text";
          type: TEXTBLOCK;
          mouse_events: 1;
-         repeat_events:1;
          scale: 1;
          entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: ; // selection over
-         //source3: ; // cursor under
          source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
-               style: "editfield_single_textblock_style";
+               style: "multibuttonentry_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_focused_style";
-            }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_single_textblock_disabled_style";
+               style: "multibuttonentry_single_textblock_disabled_style";
             }
          }
       }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -2037,91 +1322,18 @@ group { name: "elm/entry/base-single/editfield";
          target: "elm.guide";
       }
       ENTRY_SOUND_PROGRAM
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield";
-   alias: "elm/entry/base-single-noedit/editfield/default";
-   alias: "elm/entry/base-single-noedit/editfield/lighting";
-   alias: "elm/entry/base-single-noedit/editfield/singleline";
-   alias: "elm/entry/base-single-noedit/editfield/singleline/default";
-   alias: "elm/entry/base-single-noedit/editfield/singleline/lighting";
-   inherit: "elm/entry/base-single/editfield";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base-single/editfield/fixed_size";
-   alias: "elm/entry/base-single/editfield/singleline/fixed_size";
+group { name: "elm/entry/base-single-noedit/default";
+   alias: "elm/entry/base-single-noedit/vcenter_align";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_single_textblock_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_single_textblock_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_single_textblock_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_single_textblock_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_EDITFIELD_FOCUS_DATA
    parts {
-      ENTRY_EDITFIELD_FOCUS_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -2131,7 +1343,7 @@ group { name: "elm/entry/base-single/editfield/fixed_size";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_single_textblock_fixed_size_guide_style";
+               style: "entry_single_textblock_guide_style";
                min: 0 1;
                max: 0 1;
             }
@@ -2145,46 +1357,46 @@ group { name: "elm/entry/base-single/editfield/fixed_size";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: ; // selection over
-         //source3: ; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
-               style: "editfield_single_textblock_fixed_size_style";
+               style: "entry_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_single_textblock_fixed_size_focused_style";
+               style: "entry_single_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_single_textblock_fixed_size_disabled_style";
+               style: "entry_single_textblock_disabled_style";
             }
          }
       }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
       program { name: "focus";
          signal: "load";
          source: "";
@@ -2215,114 +1427,28 @@ group { name: "elm/entry/base-single/editfield/fixed_size";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
-      ENTRY_SOUND_PROGRAM
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield/fixed_size";
-   alias: "elm/entry/base-single-noedit/editfield/singleline/fixed_size";
-   inherit: "elm/entry/base-single/editfield/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base-single/editfield/searchbar/default";
+group { name: "elm/entry/base-noedit/default";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
    data {
       item: context_menu_orientation "horizontal";
    }
-   styles {
-      style { name: "editfield_searchbar_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_searchbar_single_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_searchbar_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_searchbar_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-      style { name: "editfield_searchbar_single_textblock_disabled_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   script {
-      public guide_hidden;
-      public disabled;
-   }
    parts {
-      ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_searchbar_single_textblock_guide_style";
+               style: "entry_textblock_guide_style";
                min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_disabled_guide_style";
+               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -2334,44 +1460,47 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            ENTRY_TOP_BOTTOM_REL
+            fixed: 1 0;
             text {
-               style: "editfield_searchbar_single_textblock_style";
-               min: 1 1;
-               max: 0 1;
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.0;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_searchbar_single_textblock_focused_style";
+               style: "entry_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_searchbar_single_textblock_disabled_style";
+               style: "entry_textblock_disabled_style";
             }
          }
       }
    }
    programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
       program { name: "focus";
          signal: "load";
          source: "";
@@ -2381,151 +1510,44 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
       program { name: "disable";
          signal: "elm,state,disabled";
          source: "elm";
-         script {
-            set_int(disabled, 1);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            }
-            set_state(PART:"elm.text", "disabled", 0.0);
-         }
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
       }
       program { name: "enable";
          signal: "elm,state,enabled";
          source: "elm";
-         script {
-            set_int(disabled, 0);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-            set_state(PART:"elm.text", "default", 0.0);
-         }
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
       }
       program { name: "gdisable";
          signal: "elm,guide,disabled";
          source: "elm";
-         script {
-            set_int(guide_hidden, 1);
-            set_state(PART:"elm.guide", "hidden", 0.0);
-         }
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
       }
       program { name: "genable";
          signal: "elm,guide,enabled";
          source: "elm";
-         script {
-            set_int(guide_hidden, 0);
-            if (get_int(disabled)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            } else {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-         }
-      }
-      ENTRY_SOUND_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield/searchbar/default";
-   inherit: "elm/entry/base-single/editfield/searchbar/default";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
       }
    }
 }
 
-group { name: "elm/entry/base-single/editfield/searchbar/fixed_size";
-   alias: "elm/entry/base-single/editfield/popup";
-   alias: "elm/entry/base-single/editfield/password/popup";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   styles {
-      style { name: "editfield_searchbar_single_textblock_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff color_class=T1064 wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_disabled_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   script {
-      public guide_hidden;
-      public disabled;
-   }
+group { name: "elm/entry/base-noedit/vcenter_align";
+   inherit: "elm/entry/base-noedit/default";
    parts {
-      ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_searchbar_single_textblock_fixed_size_guide_style";
+               style: "entry_textblock_guide_style";
                min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_fixed_size_disabled_guide_style";
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;
@@ -2537,165 +1559,40 @@ group { name: "elm/entry/base-single/editfield/searchbar/fixed_size";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            ENTRY_TOP_BOTTOM_REL
+            fixed: 1 0;
             text {
-               style: "editfield_searchbar_single_textblock_fixed_size_style";
-               min: 1 1;
-               max: 0 1;
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.5;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_searchbar_single_textblock_fixed_size_focused_style";
+               style: "entry_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_searchbar_single_textblock_fixed_size_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      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);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            }
-            set_state(PART:"elm.text", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(disabled, 0);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         script {
-            set_int(guide_hidden, 1);
-            set_state(PART:"elm.guide", "hidden", 0.0);
-         }
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         script {
-            set_int(guide_hidden, 0);
-            if (get_int(disabled)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            } else {
-               set_state(PART:"elm.guide", "default", 0.0);
+               style: "entry_textblock_disabled_style";
             }
          }
       }
-      ENTRY_SOUND_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield/searchbar/fixed_size";
-   alias: "elm/entry/base-single-noedit/editfield/popup";
-   alias: "elm/entry/base-single-noedit/editfield/password/popup";
-   inherit: "elm/entry/base-single/editfield/searchbar/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
    }
 }
 
-group { name: "elm/entry/base-single/default";
-   alias: "elm/entry/base-single/vcenter_align";
+group { name: "elm/entry/base-noedit-charwrap/default";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
-   styles {
-      style { name: "entry_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "entry_single_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "entry_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "entry_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -2705,14 +1602,12 @@ group { name: "elm/entry/base-single/default";
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "entry_single_textblock_guide_style";
+               style: "entry_textblock_char_wrap_guide_style";
                min: 0 1;
-               max: 0 0;
-               align: 0.0 0.5;
+               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -2724,39 +1619,30 @@ group { name: "elm/entry/base-single/default";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
+            fixed: 1 0;
             text {
-               style: "entry_single_textblock_style";
-               min: 1 1;
-               max: 0 0;
-               align: 0.0 0.5;
+               style: "entry_textblock_char_wrap_style";
+               min: 0 1;
+            align: 0.0 0.0;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_textblock_focused_style";
+               style: "entry_textblock_char_wrap_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_textblock_disabled_style";
+               style: "entry_textblock_char_wrap_disabled_style";
             }
          }
       }
@@ -2804,80 +1690,22 @@ group { name: "elm/entry/base-single/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
-      ENTRY_SOUND_PROGRAM
    }
 }
 
-group { name: "elm/entry/base-single/spinner/default";
-   alias: "elm/entry/base-single/spinner/horizontal";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   // FIXME: SamsungNum3L has to be applied.
-   styles {
-      style { name: "entry_single_spinner_textblock_style";
-         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "entry_single_spinner_textblock_focused_style";
-         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "entry_single_spinner_textblock_disabled_style";
-         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "entry_single_spinner_textblock_guide_style";
-         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
+   inherit: "elm/entry/base-noedit-charwrap/default";
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "entry_single_spinner_textblock_guide_style";
+               style: "entry_textblock_char_wrap_guide_style";
                min: 0 1;
-               max: 0 0;
                align: 0.0 0.5;
             }
          }
@@ -2890,108 +1718,40 @@ group { name: "elm/entry/base-single/spinner/default";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
+            fixed: 1 0;
             text {
-               style: "entry_single_spinner_textblock_style";
-               min: 1 1;
-               max: 0 0;
+               style: "entry_textblock_char_wrap_style";
+               min: 0 1;
                align: 0.0 0.5;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_spinner_textblock_focused_style";
+               style: "entry_textblock_char_wrap_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_spinner_textblock_disabled_style";
+               style: "entry_textblock_char_wrap_disabled_style";
             }
          }
       }
    }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_SOUND_PROGRAM
-   }
 }
 
-group { name: "elm/entry/base-single/spinner/vertical";
-   alias: "elm/entry/base-single/spinner/vertical_time_picker";
-   alias: "elm/entry/base-single/spinner/datetime";
-   // FIXME: SamsungNum3L has to be applied.
-   styles {
-      style { name: "entry_single_spinner_vertical_textblock_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-      }
-      style { name: "entry_single_spinner_vertical_textblock_focused_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-      }
-      style { name: "entry_single_spinner_vertical_textblock_disabled_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-      }
-      style { name: "entry_single_spinner_vertical_textblock_guide_style";
-         base: "font=Tizen:style=Light font_size=106 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-      }
-   }
+group { name: "elm/entry/base-noedit-mixedwrap/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -3001,14 +1761,12 @@ group { name: "elm/entry/base-single/spinner/vertical";
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "entry_single_spinner_vertical_textblock_guide_style";
+               style: "entry_textblock_guide_style";
                min: 0 1;
-               max: 0 0;
-               align: 0.0 0.5;
+               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -3020,31 +1778,30 @@ group { name: "elm/entry/base-single/spinner/vertical";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
          description { state: "default" 0.0;
+            fixed: 1 0;
             text {
-               style: "entry_single_spinner_vertical_textblock_style";
-               min: 1 1;
-               max: 0 0;
-               align: 0.0 0.5;
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.0;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_spinner_vertical_textblock_focused_style";
+               style: "entry_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_spinner_vertical_textblock_disabled_style";
+               style: "entry_textblock_disabled_style";
             }
          }
       }
@@ -3092,36 +1849,22 @@ group { name: "elm/entry/base-single/spinner/vertical";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
-      ENTRY_SOUND_PROGRAM
    }
 }
 
-group { name: "elm/entry/base-single/spinner/vertical_date_picker";
-   inherit: "elm/entry/base-single/spinner/vertical";
-   styles {
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_style";
-         base: "font=Tizen:style=Regular font_size=68 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-      }
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=68 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-      }
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=68 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-      }
-      style { name: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=68 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-      }
-   }
+group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
+   inherit: "elm/entry/base-noedit-mixedwrap/default";
    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";
             text {
-               style: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
+               style: "entry_textblock_guide_style";
                min: 0 1;
-               max: 0 0;
                align: 0.0 0.5;
             }
          }
@@ -3134,79 +1877,40 @@ group { name: "elm/entry/base-single/spinner/vertical_date_picker";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
          description { state: "default" 0.0;
-            min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC;
+            fixed: 1 0;
             text {
-               style: "entry_single_spinner_vertical_date_picker_textblock_style";
-               size: 68;
-               size_range: 50 68;
-               fit: 1 0;
+               style: "entry_textblock_style";
+               min: 0 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";
+               style: "entry_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
+               style: "entry_textblock_disabled_style";
             }
          }
       }
    }
 }
 
-group { name: "elm/entry/base-single/multibuttonentry";
-
+group { name: "elm/entry/base-nowrap-noedit/default";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
-
-   styles {
-      style { name: "multibuttonentry_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "multibuttonentry_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=entry";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         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;
-      }
-      style { name: "multibuttonentry_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=40 color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
    data {
       item: context_menu_orientation "horizontal";
    }
@@ -3216,13 +1920,12 @@ group { name: "elm/entry/base-single/multibuttonentry";
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "multibuttonentry_single_textblock_guide_style";
+               style: "entry_textblock_guide_style";
                min: 0 1;
-               max: 0 1;
+               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -3234,37 +1937,46 @@ group { name: "elm/entry/base-single/multibuttonentry";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PLAIN;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
-               style: "multibuttonentry_single_textblock_style";
+               style: "entry_textblock_style";
                min: 1 1;
-               max: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "multibuttonentry_single_textblock_disabled_style";
+               style: "entry_textblock_disabled_style";
             }
          }
       }
    }
    programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
       program { name: "focus";
          signal: "load";
          source: "";
@@ -3295,31 +2007,23 @@ group { name: "elm/entry/base-single/multibuttonentry";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
-      ENTRY_SOUND_PROGRAM
    }
 }
 
-group { name: "elm/entry/base-single-noedit/default";
-   alias: "elm/entry/base-single-noedit/vcenter_align";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
+group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
+   inherit: "elm/entry/base-nowrap-noedit/default";
    parts {
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "entry_single_textblock_guide_style";
+               style: "entry_textblock_guide_style";
                min: 0 1;
-               max: 0 1;
+               align: 0.0 0.0;
             }
          }
          description { state: "hidden" 0.0;
@@ -3332,87 +2036,36 @@ group { name: "elm/entry/base-single-noedit/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 0;
+         multiline: 1;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
             text {
-               style: "entry_single_textblock_style";
+               style: "entry_textblock_style";
                min: 1 1;
-               max: 0 1;
+               align: 0.0 0.0;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_textblock_focused_style";
+               style: "entry_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_single_textblock_disabled_style";
+               style: "entry_textblock_disabled_style";
             }
          }
       }
    }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
 }
 
-group { name: "elm/entry/base-noedit/default";
+group { name: "elm/entry/base-password/default";
+   alias: "elm/entry/base-password/vcenter_align";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
@@ -3425,12 +2078,13 @@ group { name: "elm/entry/base-noedit/default";
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
+            fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "entry_textblock_guide_style";
+               style: "entry_single_textblock_guide_style";
                min: 0 1;
-               align: 0.0 0.0;
+               max: 0 1;
             }
          }
          description { state: "hidden" 0.0;
@@ -3442,38 +2096,31 @@ group { name: "elm/entry/base-noedit/default";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
+         entry_mode: PASSWORD;
          select_mode: EXPLICIT;
          cursor_mode: BEFORE;
-         multiline: 1;
+         multiline: 0;
          source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
+         source4: "elm/entry/cursor/default"; // cursorover
          source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            fixed: 1 0;
             text {
-               style: "entry_textblock_style";
-               min: 0 1;
-               align: 0.0 0.0;
+               style: "entry_single_textblock_style";
+               repch: "•";
+               min: 1 1;
+               max: 0 1;
             }
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_textblock_focused_style";
+               style: "entry_single_textblock_focused_style";
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "entry_textblock_disabled_style";
+               style: "entry_single_textblock_disabled_style";
             }
          }
       }
@@ -3521,2524 +2168,1207 @@ group { name: "elm/entry/base-noedit/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      ENTRY_SOUND_PROGRAM
    }
 }
 
-group { name: "elm/entry/base-noedit/vcenter_align";
-   inherit: "elm/entry/base-noedit/default";
+group { name: "elm/entry/cursor/default";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
+      part { name: "clip2";
+         type: RECT;
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
+            rel1.to: "clip";
+            rel2.to: "clip";
             visible: 0;
          }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
+            visible: 1;
          }
       }
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
+      part { name: "clip";
+         type: RECT;
          mouse_events: 0;
          scale: 1;
+         clip_to: "clip2";
          description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_char_wrap_guide_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
+            rel1.offset: -10 0;
+            rel2.offset: 9 9;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
+      part { name: "base";
+         type: RECT;
+         mouse_events: 0;
          scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            min: ENTRY_CURSOR_SIZE_INC;
+            align: 0.5 1.0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "glow";
+         type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "clip2";
          description { state: "default" 0.0;
+            min: ENTRY_CURSOR_SIZE_INC;
             fixed: 1 0;
-            text {
-               style: "entry_textblock_char_wrap_style";
-               min: 0 1;
-            align: 0.0 0.0;
+            align: 0.5 0.5;
+            rel1 {
+               relative: 0.0  0.0;
+               offset: 0 -2;
             }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
+            rel2 {
+               relative: 0.0  1.0;
+               offset: 0 -2;
             }
+            color: 2 61 132 255; /*(Changeable UI) color_class: "F052";*/
+            visible: 1;
          }
-         description { state: "disabled" 0.0;
+         description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-            }
+            visible: 0;
          }
       }
    }
    programs {
-      program { name: "action_focus";
+      program { name: "show";
+         action: STATE_SET "hidden" 0.0;
+         in: 0.6 0.0;
+         target: "glow";
+         after: "show4";
+      }
+      program { name: "show4";
+         action: STATE_SET "default" 0.0;
+         in: 0.6 0.0;
+         target: "glow";
+         after: "show";
+      }
+      program { name: "focused";
          signal: "elm,action,focus";
          source: "elm";
          action: STATE_SET "focused" 0.0;
-         target: "elm.text";
+         target: "clip2";
+         after: "show4";
       }
-      program { name: "action_unfocus";
+      program { name: "unfocused";
          signal: "elm,action,unfocus";
          source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "elm.text";
+         target: "clip2";
+         after: "stop_glow";
+      }
+      program { name: "stop_glow";
+         action: ACTION_STOP;
+         target: "show";
+         target: "show4";
+      }
+      program { name: "show_cursor";
+         signal: "elm,action,show,cursor";
+         source: "elm";
+         action: ACTION_STOP;
+         target: "show";
+         target: "show4";
+         after: "show_cursor1";
+      }
+      program { name: "show_cursor1";
+         action: STATE_SET "default" 0.0;
+         target: "glow";
+         after: "show";
       }
-      program { name: "focus";
-        signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-     program { name: "gdisable";
-        signal: "elm,guide,disabled";
-        source: "elm";
-        action: STATE_SET "hidden" 0.0;
-        target: "elm.guide";
-     }
-     program { name: "genable";
-        signal: "elm,guide,enabled";
-        source: "elm";
-        action: STATE_SET "default" 0.0;
-        target: "elm.guide";
-     }
    }
 }
 
-group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
-   inherit: "elm/entry/base-noedit-charwrap/default";
+group { name: "elm/entry/selection/default";
    parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
+      part { name: "bg";
+         type: RECT;
          scale: 1;
+         mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_char_wrap_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+            color: 0 103 229 127;
          }
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
+   }
+}
+
+group { name: "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_left_bottom.png" COMP;
+      image: "copy&paste_handler_left_top.png" COMP;
+   }
+   parts {
+      part { name: "handle";
          mouse_events: 1;
          scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
          description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_char_wrap_style";
-               min: 0 1;
-               align: 0.0 0.5;
+            visible: 0;
+            fixed: 1 1;
+            align: 1 0;
+            rel2.offset: 4 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;
+            color: 38 107 191 191;
+            image {
+               normal: "copy&paste_handler_left_bottom.png";
+               border: 0 0 0 0;
             }
          }
-         description { state: "focused" 0.0;
+         description { state: "show" 0.0;
             inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
+            visible: 1;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_left_top.png";
             }
          }
-         description { state: "disabled" 0.0;
+         description { state: "bottom_reversed" 0.0;
             inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
+            visible: 1;
+            align: 0.5 0;
+         }
+         description { state: "top_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_left_top.png";
             }
          }
       }
    }
-}
-
-   group { name: "elm/entry/base-noedit-mixedwrap/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      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";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+   script {
+      public handler_ontop;
+      public handler_focused;
+      public handler_disabled;
+   }
+   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: "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "bottom_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PLAIN;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 1;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               text {
-                  style: "entry_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
+      }
+      program { name: "top_reversed";
+         signal: "elm,state,top,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "top_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_focused_style";
-               }
+         }
+      }
+      program { name: "top";
+         signal: "elm,state,top";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "top", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_disabled_style";
-               }
+         }
+      }
+      program { name: "bottom";
+         signal: "elm,state,bottom";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "show", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
          }
       }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "elm.text";
+      program { name: "disabled";
+         signal: "app,selection,handler,disable";
+         source: "app";
+         script {
+            set_int(handler_disabled, 1);
          }
-         program { name: "action_unfocus";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
+      }
+      program { name: "enabled";
+         signal: "app,selection,handler,enable";
+         source: "app";
+         script {
+            set_int(handler_disabled, 0);
          }
-         program { name: "focus";
-            signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
+      }
+   }
+}
+
+group { name: "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_right_bottom.png" COMP;
+      image: "copy&paste_handler_right_top.png" COMP;
+   }
+   parts {
+      part { name: "handle";
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1.offset: -5 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;
+            color: 38 107 191 191;
+            image {
+               normal: "copy&paste_handler_right_bottom.png";
+               border: 0 0 0 0;
+            }
          }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_right_top.png";
+            }
          }
-         program { name: "gdisable";
-            signal: "elm,guide,disabled";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "elm.guide";
+         description { state: "bottom_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 0;
          }
-         program { name: "genable";
-            signal: "elm,guide,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.guide";
+         description { state: "top_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_right_top.png";
+            }
          }
       }
    }
-
-   group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
-      inherit: "elm/entry/base-noedit-mixedwrap/default";
-      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";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+   script {
+      public handler_ontop;
+      public handler_focused;
+      public handler_disabled;
+   }
+   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: "top";
+         signal: "elm,state,top";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "top", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PLAIN;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 1;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               text {
-                  style: "entry_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
+      }
+      program { name: "bottom";
+         signal: "elm,state,bottom";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "show", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_focused_style";
-               }
+         }
+      }
+      program { name: "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "bottom_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_disabled_style";
-               }
+         }
+      }
+      program { name: "top_reversed";
+         signal: "elm,state,top,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               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/base-nowrap-noedit/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      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";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-	 part { name: "elm.text";
-	    type: TEXTBLOCK;
-	    mouse_events: 1;
-	    scale: 1;
-	    entry_mode: PLAIN;
-//	    select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-	    cursor_mode: BEFORE;
-	    multiline: 1;
-	    source: "elm/entry/selection/default"; // selection under
-	    //source2: "X"; // selection over
-	    //source3: "X"; // cursor under
-	    source5: "elm/entry/anchor/default"; // anchor under
-//	    source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//	    source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//	    source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//	    source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//	    source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-	    description { state: "default" 0.0;
-	       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";
-	       }
-	    }
-	    description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-	       text {
-		  style: "entry_textblock_disabled_style";
-	       }
-	    }
-	 }
+group { name: "elm/entry/cursor_handle/default";
+   images {
+      set {
+         name: "copy&paste_handler_center_circle";
+         image {
+            image: SMALL"images/Copy_Paste/copy&paste_handler_center.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Copy_Paste/copy&paste_handler_center.png" COMP;
+         }
       }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "elm.text";
+   }
+   parts {
+      part { name: "sens";
+         type: RECT;
+         scale: 1;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 0 0 0 0;
+            rel1 { relative: -0.25 0.0; to: "handle";}
+            rel2 { relative: 1.25 1.0; to: "handle";}
          }
-         program { name: "action_unfocus";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-	 program { name: "focus";
-            signal: "load";
-	    source: "";
-	    action: FOCUS_SET;
-	    target: "elm.text";
-	 }
-	 program { name: "disable";
-	    signal: "elm,state,disabled";
-	    source: "elm";
-	    action: STATE_SET "disabled" 0.0;
-	    target: "elm.text";
-	 }
-	 program { name: "enable";
-	    signal: "elm,state,enabled";
-	    source: "elm";
-	    action: STATE_SET "default" 0.0;
-	    target: "elm.text";
-	 }
-         program { name: "gdisable";
-            signal: "elm,guide,disabled";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "elm.guide";
+      }
+      part { name: "handle";
+         scale: 1;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            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;
+            color: 38 107 191 191;
+            image {
+               normal: "copy&paste_handler_center_circle";
+               border: 0 0 0 0;
+            }
+            image.middle: SOLID;
+            fill.smooth: 0;
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-         program { name: "genable";
-            signal: "elm,guide,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.guide";
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1.0;
          }
       }
    }
-
-   group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
-      inherit: "elm/entry/base-nowrap-noedit/default";
-      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";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+   script {
+      public on_top;
+   }
+   programs {
+      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);
             }
+            set_state(PART:"sens", "show", 0.0);
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PLAIN;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 1;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               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";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_disabled_style";
-               }
-            }
+      }
+      program { name: "unfocused";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"sens", "default", 0.0);
+         }
+      }
+      program { name: "show";
+         signal: "edje,cursor,handle,show";
+         source: "edje";
+         script {
+            set_int(on_top, 0);
+            set_state(PART:"handle", "show", 0.0);
+            set_state(PART:"sens", "show", 0.0);
+         }
+      }
+      program { name: "hide";
+         signal: "edje,cursor,handle,hide";
+         source: "edje";
+         script {
+            set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"sens", "default", 0.0);
+         }
+      }
+      program { name: "top";
+         signal: "edje,cursor,handle,top";
+         source: "edje";
+         script {
+            set_int(on_top, 1);
+            set_state(PART:"handle", "top", 0.0);
+            set_state(PART:"sens", "show", 0.0);
          }
       }
    }
+}
 
-  group { name: "elm/entry/base-password/default";
-      alias: "elm/entry/base-password/vcenter_align";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "entry_single_textblock_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-	 part { name: "elm.text";
-	    type: TEXTBLOCK;
-	    mouse_events: 1;
-	    scale: 1;
-	    entry_mode: PASSWORD;
-//	    select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-	    cursor_mode: BEFORE;
-	    multiline: 0;
-	    source: "elm/entry/selection/default"; // selection under
-	    //source2: "X"; // selection over
-	    //source3: "X"; // cursor under
-	    source4: "elm/entry/cursor/default"; // cursorover
-	    source5: "elm/entry/anchor/default"; // anchor under
-//	    source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//	    source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//	    source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//	    source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//	    source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-	    description { state: "default" 0.0;
-	       text {
-		  style: "entry_single_textblock_style";
-		  repch: "•";
-		  min: 1 1;
-                  max: 0 1;
-	       }
-	    }
-	    description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-	       text {
-		  style: "entry_single_textblock_focused_style";
-	       }
-	    }
-	    description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-	       text {
-		  style: "entry_single_textblock_disabled_style";
-	       }
-	    }
-	 }
+group { name: "elm/entry/selection/block_handle_edge_left";
+   parts {
+      part { name: "align";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 0;
+            max: 0 0;
+            align: 0 0;
+         }
       }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "elm.text";
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            color: 0 81 181 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 0;
+            visible: 0;
          }
-         program { name: "action_unfocus";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-	 program { name: "focus";
-            signal: "load";
-	    source: "";
-	    action: FOCUS_SET;
-	    target: "elm.text";
-	 }
-	 program { name: "disable";
-	    signal: "elm,state,disabled";
-	    source: "elm";
-	    action: STATE_SET "disabled" 0.0;
-	    target: "elm.text";
-	 }
-	 program { name: "enable";
-	    signal: "elm,state,enabled";
-	    source: "elm";
-	    action: STATE_SET "default" 0.0;
-	    target: "elm.text";
-	 }
-         program { name: "gdisable";
-            signal: "elm,guide,disabled";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "elm.guide";
+      }
+   }
+   programs {
+      program { name: "show";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "show", 0.0);
          }
-         program { name: "genable";
-            signal: "elm,guide,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.guide";
+      }
+      program { name: "hide";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "default", 0.0);
          }
-         ENTRY_SOUND_PROGRAM
       }
    }
+}
 
-   group { name: "elm/entry/base-password/editfield";
-      inherit: "elm/entry/base-password/default";
-      alias: "elm/entry/base-password/editfield/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "editfield_single_textblock_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
+group { name: "elm/entry/selection/block_handle_edge_right";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 0 81 181 255;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
+            visible: 0;
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            repeat_events:1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               ENTRY_TOP_BOTTOM_REL
-               text {
-                  style: "editfield_single_textblock_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_disabled_style";
-               }
-            }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "show";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "show", 0.0);
+         }
+      }
+      program { name: "hide";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "default", 0.0);
          }
       }
    }
+}
 
-   group { name: "elm/entry/base-password/editfield/popup";
-      inherit: "elm/entry/base-password/default";
-      alias: "elm/entry/base-password/editfield/password/popup";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
+group { name: "elm/entry/anchor/default";
+   parts {
+      part { name: "bg";
+         type: SPACER;
+         description { state: "default" 0.0;
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               ENTRY_TOP_BOTTOM_REL
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_disabled_style";
-               }
-            }
+      }
+   }
+}
+
+group { name: "elm/entry/preedit/default";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 128 128 128 255;
          }
       }
    }
+}
 
-   group { name: "elm/entry/base-password/editfield/fixed_size";
-      inherit: "elm/entry/base-password/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "editfield_single_textblock_fixed_size_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+group { name: "elm/entry/magnifier/fixed-size";
+   data.item: "height" MAGNIFIER_HEIGHT_MIN;
+   data.item: "scale" MAGNIFIER_SCALE;
+   data.item: "arrow" MAGNIFIER_ARROW_HEIGHT_INC;
+   images {
+      image: "copy&paste_magnifier_line.#.png" COMP;
+      image: "copy&paste_magnifier_mask.#.png" COMP;
+   }
+   parts {
+      part { name: "bg_mask";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "copy&paste_magnifier_mask.#.png";
+            color: 245 245 245 255;
+         }
+         description { state: "custom_cc" 0.0;
+            inherit: "default" 0.0;
+            color_class: "mgf_custom_cc";
+         }
+      }
+      part { name: "bg";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MIN;
+            max: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MAX;
+            image.normal: "copy&paste_magnifier_line.#.png";
+            align: 0.0 0.0;
+         }
+      }
+      part { name: "left_offset";
+         type: SPACER;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: MAGNIFIER_LEFT_OFFSET_INC;
+            max: MAGNIFIER_LEFT_OFFSET_INC;
+            rel1 {
+               to: "bg";
+               relative: 0.0 0.0;
             }
+            align: 0.0 0.0;
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               ENTRY_TOP_BOTTOM_REL
-               text {
-                  style: "editfield_single_textblock_fixed_size_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-               }
+      }
+      part { name: "right_offset";
+         type: SPACER;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: MAGNIFIER_RIGHT_OFFSET_INC;
+            max: MAGNIFIER_RIGHT_OFFSET_INC;
+            rel1 {
+               to: "bg";
+               relative: 1.0 1.0;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_fixed_size_focused_style";
-               }
+            rel2 {
+               to: "bg";
+               relative: 1.0 1.0;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_fixed_size_disabled_style";
-               }
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "swallow";
+         type: SWALLOW;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            align: 0.0 0.0;
+            rel1 {
+               to: "left_offset";
+               relative: 1.0 1.0;
+            }
+            rel2 {
+               to: "right_offset";
+               relative: 0.0 0.0;
             }
          }
       }
    }
+   script {
+      public message(Msg_Type:type, id, ...) {
+         if (type == MSG_INT_SET) {
+            new r, g, b, a;
 
-	group { name: "elm/entry/cursor/default";
-		parts {
-			part { name: "clip2";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					rel1.to: "clip";
-					rel2.to: "clip";
-				visible: 0;
-				}
-				description { state: "focused" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part { name: "clip";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				clip_to: "clip2";
-				description { state: "default" 0.0;
-					rel1.offset: -10 0;
-					rel2.offset: 9 9;
-				}
-				description { state: "hidden" 0.0;
-					inherit: "default" 0.0;
-					visible: 0;
-				}
-			}
-			part { name: "base";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				clip_to: "clip";
-				description { state: "default" 0.0;
-					min: ENTRY_CURSOR_SIZE_INC;
-					align: 0.5 1.0;
-					color: 0 0 0 0;
-				}
-			}
-			part { name: "glow";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				clip_to: "clip2";
-				description { state: "default" 0.0;
-					min: ENTRY_CURSOR_SIZE_INC;
-					fixed: 1 0;
-					align: 0.5 0.5;
-					rel1 {
-						relative: 0.0  0.0;
-						offset: 0 -2;
-					}
-					rel2 {
-						relative: 0.0  1.0;
-						offset: 0 -2;
-					}
-					color: 2 61 132 255; /*(Changeable UI) color_class: "F052";*/
-					visible: 1;
-				}
-				description { state: "hidden" 0.0;
-					inherit: "default" 0.0;
-					visible: 0;
-				}
-			}
-		}
-		programs {
-			program { name: "show";
-				action: STATE_SET "hidden" 0.0;
-				in: 0.6 0.0;
-				target: "glow";
-				after: "show4";
-			}
-			program { name: "show4";
-				action: STATE_SET "default" 0.0;
-				in: 0.6 0.0;
-				target: "glow";
-				after: "show";
-			}
-			program { name: "focused";
-				signal: "elm,action,focus";
-				source: "elm";
-				action: STATE_SET "focused" 0.0;
-				target: "clip2";
-				after: "show4";
-			}
-			program { name: "unfocused";
-				signal: "elm,action,unfocus";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "clip2";
-				after: "stop_glow";
-			}
-			program { name: "stop_glow";
-			action: ACTION_STOP;
-				target: "show";
-				target: "show4";
-			}
-			program { name: "show_cursor";
-				signal: "elm,action,show,cursor";
-				source: "elm";
-				action: ACTION_STOP;
-				target: "show";
-				target: "show4";
-				after: "show_cursor1";
-			}
-			program { name: "show_cursor1";
-				action: STATE_SET "default" 0.0;
-				target: "glow";
-				after: "show";
-			}
-		}
-	}
-
-
-	group { name: "elm/entry/selection/default";
-		parts {
-			part { name: "bg";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description { state: "default" 0.0;
-					color: 0 103 229 127;
-				}
-			}
-		}
-	}
-
-	group { name: "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_left_bottom.png" COMP;
-		  image: "copy&paste_handler_left_top.png" COMP;
-		}
-		parts {
-			part { name: "handle";
-				mouse_events: 1;
-				scale: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					fixed: 1 1;
-					align: 1 0;
-					rel2.offset: 4 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;
-					color: 38 107 191 191;
-					image {
-						normal: "copy&paste_handler_left_bottom.png";
-						border: 0 0 0 0;
-					}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_left_top.png";
-					}
-				}
-				description { state: "bottom_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 0;
-				}
-				description { state: "top_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_left_top.png";
-					}
-				}
-			}
-		}
-		script {
-			public handler_ontop;
-			public handler_focused;
-			public handler_disabled;
-		}
-		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: "bottom_reversed";
-				signal: "elm,state,bottom,reversed";
-				source: "elm";
-				script {
-					new disabled;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						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;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						set_state(PART:"handle", "top_reversed", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-					}
-				}
-			}
-			program { name: "top";
-				signal: "elm,state,top";
-				source: "elm";
-				script {
-					new focused, disabled;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 1);
-					if ((focused == 1) && (disabled == 0))
-					{
-						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;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 0);
-					if ((focused == 1) && (disabled == 0))
-					{
-						set_state(PART:"handle", "show", 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/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_right_bottom.png" COMP;
-		  image: "copy&paste_handler_right_top.png" COMP;
-		}
-
-		parts {
-			part { name: "handle";
-				mouse_events: 1;
-				scale: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					fixed: 1 1;
-					align: 0 0;
-					rel1.offset: -5 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;
-					color: 38 107 191 191;
-					image {
-						normal: "copy&paste_handler_right_bottom.png";
-						border: 0 0 0 0;
-					}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_right_top.png";
-					}
-				}
-				description { state: "bottom_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 0;
-				}
-				description { state: "top_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_right_top.png";
-					}
-				}
-			}
-		}
-		script {
-			public handler_ontop;
-			public handler_focused;
-			public handler_disabled;
-		}
-		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: "top";
-				signal: "elm,state,top";
-				source: "elm";
-				script {
-					new focused, disabled;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 1);
-					if ((focused == 1) && (disabled == 0))
-						{
-							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;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 0);
-					if ((focused == 1) && (disabled == 0))
-						{
-							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;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						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;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						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/cursor_handle/default";
-      images {
-         set {
-            name: "copy&paste_handler_center_circle";
-            image {
-               image: SMALL"images/Copy_Paste/copy&paste_handler_center.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Copy_Paste/copy&paste_handler_center.png" COMP;
-            }
-         }
-      }
-		parts {
-			part { name: "sens";
-				type: RECT;
-				scale: 1;
-				mouse_events: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					color: 0 0 0 0;
-					rel1 { relative: -0.25 0.0; to: "handle";}
-					rel2 { relative: 1.25 1.0; to: "handle";}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part { name: "handle";
-				scale: 1;
-				mouse_events: 1;
-				description { state: "default" 0.0;
-					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;
-					color: 38 107 191 191;
-					image {
-						normal: "copy&paste_handler_center_circle";
-						border: 0 0 0 0;
-					}
-					image.middle: SOLID;
-					fill.smooth: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1.0;
-				}
-			}
-		}
-		script {
-			public on_top;
-		}
-		programs {
-			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);
-					}
-					set_state(PART:"sens", "show", 0.0);
-				}
-			}
-			program { name: "unfocused";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_state(PART:"handle", "default", 0.0);
-					set_state(PART:"sens", "default", 0.0);
-				}
-			}
-			program { name: "show";
-				signal: "edje,cursor,handle,show";
-				source: "edje";
-				script {
-					set_int(on_top, 0);
-					set_state(PART:"handle", "show", 0.0);
-					set_state(PART:"sens", "show", 0.0);
-				}
-			}
-			program { name: "hide";
-				signal: "edje,cursor,handle,hide";
-				source: "edje";
-				script {
-					set_state(PART:"handle", "default", 0.0);
-					set_state(PART:"sens", "default", 0.0);
-				}
-			}
-			program { name: "top";
-				signal: "edje,cursor,handle,top";
-				source: "edje";
-				script {
-					set_int(on_top, 1);
-					set_state(PART:"handle", "top", 0.0);
-					set_state(PART:"sens", "show", 0.0);
-				}
-			}
-		}
-	}
-	group { name: "elm/entry/selection/block_handle_edge_left";
-		parts {
-			part { name: "align";
-				type: SPACER;
-				scale: 1;
-				description { state: "default" 0.0;
-					min: 0 0;
-					max: 0 0;
-					align: 0 0;
-				}
-			}
-			part { name: "bg";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description { state: "default" 0.0;
-					fixed: 1 0;
-					color: 0 81 181 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 0;
-					visible: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-		}
-		programs {
-			program { name: "show";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "show", 0.0);
-				}
-			}
-			program { name: "hide";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "default", 0.0);
-				}
-			}
-		}
-	}
-
-	group { name: "elm/entry/selection/block_handle_edge_right";
-		parts {
-			part { name: "bg";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description { state: "default" 0.0;
-					color: 0 81 181 255;
-					min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
-					visible: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-		}
-		programs {
-			program { name: "show";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "show", 0.0);
-				}
-			}
-			program { name: "hide";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "default", 0.0);
-				}
-			}
-		}
-	}
-
-	group { name: "elm/entry/anchor/default";
-		parts {
-			part { name: "bg";
-				type: SPACER;
-				description { state: "default" 0.0;
-				}
-			}
-		}
-	}
+            r = getarg(2);
+            g = getarg(3);
+            b = getarg(4);
+            a = getarg(5);
 
-    group { name: "elm/entry/preedit/default";
-        parts {
-            part { name: "bg";
-                type: RECT;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                    color: 128 128 128 255;
-                }
-            }
-        }
+            set_state(PART:"bg_mask", "custom_cc", 0.0);
+            set_color_class("mgf_custom_cc", r, g, b, a);
+         }
+      }
    }
-
-
-#define MAGNIFIER_SCALE 1.5
-
-	group { name: "elm/entry/magnifier/fixed-size";
-		data.item: "height" MAGNIFIER_HEIGHT_MIN;
-		data.item: "scale" MAGNIFIER_SCALE;
-		data.item: "arrow" MAGNIFIER_ARROW_HEIGHT_INC;
-		images {
-		  image: "copy&paste_magnifier_line.#.png" COMP;
-		  image: "copy&paste_magnifier_mask.#.png" COMP;
-		}
-		parts {
-			part { name: "bg_mask";
-				scale: 1;
-				description { state: "default" 0.0;
-					rel1.to: "bg";
-					rel2.to: "bg";
-					image.normal: "copy&paste_magnifier_mask.#.png";
-					color: 245 245 245 255;
-				}
-				description { state: "custom_cc" 0.0;
-					inherit: "default" 0.0;
-					color_class: "mgf_custom_cc";
-				}
-			}
-			part { name: "bg";
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					min: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MIN;
-					max: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MAX;
-					image.normal: "copy&paste_magnifier_line.#.png";
-					align: 0.0 0.0;
-				}
-			}
-			part { name: "left_offset";
-				type: SPACER;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					min: MAGNIFIER_LEFT_OFFSET_INC;
-					max: MAGNIFIER_LEFT_OFFSET_INC;
-					rel1 {
-						to: "bg";
-						relative: 0.0 0.0;
-					}
-					align: 0.0 0.0;
-				}
-			}
-			part { name: "right_offset";
-				type: SPACER;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					min: MAGNIFIER_RIGHT_OFFSET_INC;
-					max: MAGNIFIER_RIGHT_OFFSET_INC;
-					rel1 {
-						to: "bg";
-						relative: 1.0 1.0;
-					}
-					rel2 {
-						to: "bg";
-						relative: 1.0 1.0;
-					}
-					align: 1.0 1.0;
-				}
-			}
-			part { name: "swallow";
-				type: SWALLOW;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					align: 0.0 0.0;
-					rel1 {
-						to: "left_offset";
-						relative: 1.0 1.0;
-					}
-					rel2 {
-						to: "right_offset";
-						relative: 0.0 0.0;
-					}
-				}
-			}
-		}
-		script {
-			public message(Msg_Type:type, id, ...) {
-				if (type == MSG_INT_SET) {
-					new r, g, b, a;
-
-					r = getarg(2);
-					g = getarg(3);
-					b = getarg(4);
-					a = getarg(5);
-
-					set_state(PART:"bg_mask", "custom_cc", 0.0);
-					set_color_class("mgf_custom_cc", r, g, b, a);
-				}
-			}
-		}
-	}
+}
 
 group { name: "elm/scroller/entry/default";
-      data {
-         item: "focus_highlight" "off";
-      }
-      script {
-         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
-         public timer0(val) {
-            new v;
-            v = get_int(sbvis_v);
-            if (v) {
-               v = get_int(sbalways_v);
-               if (!v) {
-                  emit("do-hide-vbar", "");
-                  set_int(sbvis_v, 0);
-               }
+   data {
+      item: "focus_highlight" "off";
+   }
+   script {
+      public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
+      public timer0(val) {
+         new v;
+         v = get_int(sbvis_v);
+         if (v) {
+            v = get_int(sbalways_v);
+            if (!v) {
+               emit("do-hide-vbar", "");
+               set_int(sbvis_v, 0);
             }
-            v = get_int(sbvis_h);
-            if (v) {
-               v = get_int(sbalways_h);
-               if (!v) {
-                  emit("do-hide-hbar", "");
-                  set_int(sbvis_h, 0);
-               }
+         }
+         v = get_int(sbvis_h);
+         if (v) {
+            v = get_int(sbalways_h);
+            if (!v) {
+               emit("do-hide-hbar", "");
+               set_int(sbvis_h, 0);
             }
-            set_int(sbvis_timer, 0);
-            return 0;
          }
+         set_int(sbvis_timer, 0);
+         return 0;
       }
-      images {
-         image: "core_scroll_bar_v.#.png" COMP;
-         image: "core_scroll_bar_v_ef.#.png" COMP;
-         image: "core_scroll_bar_h.#.png" COMP;
-         image: "core_scroll_bar_h_ef.#.png" COMP;
+   }
+   images {
+      image: "core_scroll_bar_v.#.png" COMP;
+      image: "core_scroll_bar_v_ef.#.png" COMP;
+      image: "core_scroll_bar_h.#.png" COMP;
+      image: "core_scroll_bar_h_ef.#.png" COMP;
+   }
+   parts {
+      part { name: "bg";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+         }
       }
-      parts {
-         part { name: "bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
+      part { name: "clipper";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
-         part { name: "focus_underline_bottom_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
+      }
+      part { name: "elm.swallow.icon";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            fixed: 1 1;
+            rel1 {
+               to: "bg";
+               relative: 0.0 0.0;
             }
-         }
-         part { name: "focus_underline";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
+            rel2 {
+               to: "bg";
+               relative: 0.0 1.0;
             }
+            visible: 0;
          }
-         ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PART
-         part { name: "clipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-         part { name: "icon_padding";
-            type: SPACER;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
+      }
+      part { name: "elm.swallow.end";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            align: 1.0 0.5;
+            fixed: 1 1;
+            rel1 {
+               to: "bg";
+               relative: 1.0 0.0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0 1.0;
-               }
+            rel2 {
+               to: "bg";
+               relative: 1.0 1.0;
             }
+            visible: 0;
          }
-         part { name: "elm.swallow.icon";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
-         part { name: "clear_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_x: "elm.swallow.clear";
-                  relative: 0.0 0.0;
-               }
-            }
+      }
+      part { name: "content_clipper";
+         scale: 1;
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
          }
-         part { name: "elm.swallow.clear";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  relative: 0.0 1.0;
-               }
-               visible: 0;
+      }
+      part { name: "elm.swallow.content";
+         clip_to: "content_clipper";
+         scale: 1;
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+               to_x: "elm.swallow.icon";
+               to_y: "bg";
+               relative: 1.0 0.0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+            rel2 {
+               to_x: "elm.swallow.end";
+               to_y: "bg";
+               relative: 0.0 1.0;
             }
          }
-         part { name: "elm.swallow.end";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               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;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
+      }
+      part { name: "sb_vbar_clip_master";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
-         part { name: "left_content_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               max: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  to_x: "icon_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "icon_padding";
-                  to_y: "bg";
-                  relative: 1.0 1.0;
-               }
-            }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
          }
-         part { name: "right_content_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               max: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               align: 1.0 0.5;
-               fixed: 1 0;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
+      }
+      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";
          }
-         part { name: "contentclipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "left_content_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "right_content_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  to_x: "clear_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
          }
-         part { name: "elm.swallow.content";
-            clip_to: "contentclipper";
-            scale: 1;
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "left_content_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "right_content_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
+      }
+      part { name: "sb_vbar";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
+            align: 1.0 0.0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 1.0 0.0;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  to_x: "clear_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
+            rel2 {
+               to_y: "sb_hbar";
+               to_x: "elm.swallow.content";
+               relative: 1.0 0.0;
             }
          }
-         part { name: "scroller_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT;
-               align: 0.0 0.0;
-               fixed: 1 0;
-               rel1 {
-                  to_y:     "elm.swallow.content";
-                  to_x:     "clear_padding";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_y:     "sb_hbar";
-                  to_x:     "clear_padding";
-                  relative: 1.0 0.0;
-               }
-            }
+      }
+      part { name: "elm.dragable.vbar";
+         scale: 1;
+         clip_to: "sb_vbar_clip";
+         mouse_events: 0;
+         dragable {
+            x: 0 0 0;
+            y: 1 1 0;
+            confine: "sb_vbar";
          }
-         part { name: "sb_vbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-                  to: "bg";
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  to: "scroller_padding";
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
+            max: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC;
+            rel1 {
+               relative: 0.5 0.5;
+               to: "sb_vbar";
             }
-         }
-         part { name: "sb_vbar_clip";
-            clip_to: "sb_vbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-                  to: "bg";
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  to: "scroller_padding";
-               }
+            rel2 {
+               relative: 0.5 0.5;
+               to: "sb_vbar";
             }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+            image {
+               normal: "core_scroll_bar_v.#.png";
+               middle: DEFAULT;
             }
+            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
          }
-         part { name: "sb_vbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
-               align: 1.0 0.0;
-               rel1 {
-                  to_y:     "elm.swallow.content";
-                  to_x:     "scroller_padding";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_y:     "sb_hbar";
-                  to_x:     "scroller_padding";
-                  relative: 1.0 0.0;
-               }
-            }
+      }
+      part { name: "vbar_effect";
+         clip_to: "sb_vbar_clip";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.dragable.vbar";
+            rel2.to: "elm.dragable.vbar";
+            image.normal: "core_scroll_bar_v_ef.#.png";
          }
-         part { name: "elm.dragable.vbar";
-            scale: 1;
-            clip_to: "sb_vbar_clip";
-            mouse_events: 0;
-            dragable {
-               x: 0 0 0;
-               y: 1 1 0;
-               confine: "sb_vbar";
-            }
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
-               max: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC;
-               rel1 {
-                  relative: 0.5  0.5;
-                  to: "sb_vbar";
-               }
-               rel2 {
-                  relative: 0.5  0.5;
-                  to: "sb_vbar";
-               }
-               image {
-                  normal: "core_scroll_bar_v.#.png";
-                  middle: DEFAULT;
-               }
-            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
-            }
+      }
+      part { name: "sb_hbar_clip_master";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
          }
-         part { name: "vbar_effect";
-            clip_to: "sb_vbar_clip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.dragable.vbar";
-               rel2.to: "elm.dragable.vbar";
-               image.normal: "core_scroll_bar_v_ef.#.png";
-            }
+         description { state: "hidden" 0.0;
+            visible: 0;
          }
-         part { name: "sb_hbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
+      }
+      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;
+            color: 255 255 255 0;
+         }
+      }
+      part { name: "sb_hbar";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
+            align: 0.0 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to_x: "elm.swallow.content";
+               to_y: "elm.swallow.content";
             }
-            description { state: "hidden" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+            rel2 {
+               relative: 0.0 1.0;
+               to_x: "sb_vbar";
+               to_y: "elm.swallow.content";
             }
          }
-         part { name: "sb_hbar_clip";
-            clip_to: "sb_hbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
+      }
+      part { name: "elm.dragable.hbar";
+         scale: 1;
+         clip_to: "sb_hbar_clip";
+         mouse_events: 0;
+         dragable {
+            x: 1 1 0;
+            y: 0 0 0;
+            confine: "sb_hbar";
+         }
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
+            max: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC;
+            rel1 {
+               relative: 0.5  0.5;
+               to: "sb_hbar";
             }
-            description { state: "hidden" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+            rel2 {
+               relative: 0.5  0.5;
+               to: "sb_hbar";
             }
-         }
-         part { name: "sb_hbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
-               align: 0.0 1.0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x:     "elm.swallow.content";
-                  to_y:     "elm.swallow.content";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x:     "sb_vbar";
-                  to_y:     "elm.swallow.content";
-               }
+            image {
+               normal: "core_scroll_bar_h.#.png";
+               middle: DEFAULT;
             }
+            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
          }
-         part { name: "elm.dragable.hbar";
-            scale: 1;
+         part { name: "hbar_effect";
             clip_to: "sb_hbar_clip";
             mouse_events: 0;
-            dragable {
-               x: 1 1 0;
-               y: 0 0 0;
-               confine: "sb_hbar";
-            }
+            scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
-               max: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC;
-               rel1 {
-                  relative: 0.5  0.5;
-                  to: "sb_hbar";
-               }
-               rel2 {
-                  relative: 0.5  0.5;
-                  to: "sb_hbar";
-               }
-              image {
-                  normal: "core_scroll_bar_h.#.png";
-                  middle: DEFAULT;
-               }
-               color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
-            }
-            part { name: "hbar_effect";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                  rel1.to: "elm.dragable.hbar";
-                  rel2.to: "elm.dragable.hbar";
-                  image.normal: "core_scroll_bar_h_ef.#.png";
-               }
+               rel1.to: "elm.dragable.hbar";
+               rel2.to: "elm.dragable.hbar";
+               image.normal: "core_scroll_bar_h_ef.#.png";
             }
          }
       }
-      programs {
-         program { name: "load";
-            signal: "load";
-            source: "";
-            script {
-               set_state(PART:"sb_hbar_clip", "hidden", 0.0);
-               set_state(PART:"sb_vbar_clip", "hidden", 0.0);
-               set_int(sbvis_h, 0);
-               set_int(sbvis_v, 0);
-               set_int(sbalways_v, 0);
-               set_int(sbalways_h, 0);
-               set_int(sbvis_timer, 0);
-               emit("reload", "elm");
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,action,show,icon";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.icon";
-            target: "icon_padding";
-         }
-         program { name: "icon_hide";
-            signal: "elm,action,hide,icon";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.icon";
-            target: "icon_padding";
-         }
-         program { name: "clear_show";
-            signal: "elm,state,clear,visible";
-            source: "*";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.clear";
-            target: "clear_padding";
-            target: "contentclipper";
-            target: "elm.swallow.content";
-         }
-         program { name: "clear_hide";
-            signal: "elm,state,clear,hidden";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.clear";
-            target: "clear_padding";
-            target: "contentclipper";
-            target: "elm.swallow.content";
-         }
-         program { name: "end_show";
-            signal: "elm,action,show,end";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.end";
-         }
-         program { name: "end_hide";
-            signal: "elm,action,hide,end";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.end";
-         }
-         program { name: "vbar_show";
-            signal: "elm,action,show,vbar";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "sb_vbar_clip_master";
-         }
-         program { name: "vbar_hide";
-            signal: "elm,action,hide,vbar";
-            source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "sb_vbar_clip_master";
-         }
-         program { name: "vbar_show_always";
-            signal: "elm,action,show_always,vbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_v);
-               if (!v) {
-                  set_int(sbalways_v, 1);
-                  v = get_int(sbvis_v);
-                  if (!v) {
-                     emit("do-show-vbar", "");
-                     set_int(sbvis_v, 1);
-                  }
-               }
-            }
-         }
-         program { name: "vbar_show_notalways";
-            signal: "elm,action,show_notalways,vbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_v);
-               if (v) {
-                  set_int(sbalways_v, 0);
-                  v = get_int(sbvis_v);
-                  if (!v) {
-                     emit("do-hide-vbar", "");
-                     set_int(sbvis_v, 0);
-                  }
-               }
-            }
-         }
-         program { name: "sb_vbar_show";
-            signal: "do-show-vbar";
-            source: "";
-            action:  STATE_SET "default" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_vbar_clip";
-         }
-         program { name: "sb_vbar_hide";
-            signal: "do-hide-vbar";
-            source: "";
-            action:  STATE_SET "hidden" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_vbar_clip";
+   }
+   programs {
+      program { name: "load";
+         signal: "load";
+         source: "";
+         script {
+            set_state(PART:"sb_hbar_clip", "hidden", 0.0);
+            set_state(PART:"sb_vbar_clip", "hidden", 0.0);
+            set_int(sbvis_h, 0);
+            set_int(sbvis_v, 0);
+            set_int(sbalways_v, 0);
+            set_int(sbalways_h, 0);
+            set_int(sbvis_timer, 0);
+            emit("reload", "elm");
          }
-
-         program { name: "hbar_show";
-            signal: "elm,action,show,hbar";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "sb_hbar_clip_master";
-         }
-         program { name: "hbar_hide";
-            signal: "elm,action,hide,hbar";
-            source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "sb_hbar_clip_master";
-         }
-         program { name: "hbar_show_always";
-            signal: "elm,action,show_always,hbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_h);
+      }
+      program { name: "icon_show";
+         signal: "elm,action,show,icon";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.swallow.icon";
+      }
+      program { name: "icon_hide";
+         signal: "elm,action,hide,icon";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.icon";
+      }
+      program { name: "end_show";
+         signal: "elm,action,show,end";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.swallow.end";
+      }
+      program { name: "end_hide";
+         signal: "elm,action,hide,end";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.end";
+      }
+      program { name: "vbar_show";
+         signal: "elm,action,show,vbar";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "sb_vbar_clip_master";
+      }
+      program { name: "vbar_hide";
+         signal: "elm,action,hide,vbar";
+         source: "elm";
+         action:  STATE_SET "hidden" 0.0;
+         target: "sb_vbar_clip_master";
+      }
+      program { name: "vbar_show_always";
+         signal: "elm,action,show_always,vbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_v);
+            if (!v) {
+               set_int(sbalways_v, 1);\
+               v = get_int(sbvis_v);
                if (!v) {
-                  set_int(sbalways_h, 1);
-                  v = get_int(sbvis_h);
-                  if (!v) {
-                     emit("do-show-hbar", "");
-                     set_int(sbvis_h, 1);
-                  }
-               }
-            }
-         }
-         program { name: "hbar_show_notalways";
-            signal: "elm,action,show_notalways,hbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_h);
-               if (v) {
-                  set_int(sbalways_h, 0);
-                  v = get_int(sbvis_h);
-                  if (!v) {
-                     emit("do-hide-hbar", "");
-                     set_int(sbvis_h, 0);
-                  }
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
                }
             }
          }
-         program { name: "sb_hbar_show";
-            signal: "do-show-hbar";
-            source: "";
-            action:  STATE_SET "default" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_hbar_clip";
-         }
-         program { name: "sb_hbar_hide";
-            signal: "do-hide-hbar";
-            source: "";
-            action:  STATE_SET "hidden" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_hbar_clip";
-         }
-
-         program { name: "scroll";
-            signal: "elm,action,scroll";
-            source: "elm";
-            script {
-               new v;
+      }
+      program { name: "vbar_show_notalways";
+         signal: "elm,action,show_notalways,vbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_v);
+            if (v) {
+               set_int(sbalways_v, 0);
                v = get_int(sbvis_v);
-               v |= get_int(sbalways_v);
                if (!v) {
-                  emit("do-show-vbar", "");
-                  set_int(sbvis_v, 1);
+                  emit("do-hide-vbar", "");
+                  set_int(sbvis_v, 0);
                }
+            }
+         }
+      }
+      program { name: "sb_vbar_show";
+         signal: "do-show-vbar";
+         source: "";
+         action:  STATE_SET "default" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_vbar_clip";
+      }
+      program { name: "sb_vbar_hide";
+         signal: "do-hide-vbar";
+         source: "";
+         action:  STATE_SET "hidden" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_vbar_clip";
+      }
+      program { name: "hbar_show";
+         signal: "elm,action,show,hbar";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "sb_hbar_clip_master";
+      }
+      program { name: "hbar_hide";
+         signal: "elm,action,hide,hbar";
+         source: "elm";
+         action:  STATE_SET "hidden" 0.0;
+         target: "sb_hbar_clip_master";
+      }
+      program { name: "hbar_show_always";
+         signal: "elm,action,show_always,hbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_h);
+            if (!v) {
+               set_int(sbalways_h, 1);
                v = get_int(sbvis_h);
-               v |= get_int(sbalways_h);
                if (!v) {
                   emit("do-show-hbar", "");
                   set_int(sbvis_h, 1);
                }
-               v = get_int(sbvis_timer);
-               if (v > 0) cancel_timer(v);
-               v = timer(1.0, "timer0", 0);
-               set_int(sbvis_timer, v);
             }
          }
-         ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PROGRAM
       }
-   }
-
-group { name: "elm/scroller/entry/editfield";
-      inherit: "elm/scroller/entry/default";
-      alias: "elm/scroller/entry/editfield/fixed_size";
-      alias: "elm/scroller/entry/editfield/searchbar/default";
-      alias: "elm/scroller/entry/editfield/searchbar/fixed_size";
-      data {
-         item: "focus_highlight" "on";
-      }
-      parts {
-         part { name: "left_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT;
-               max: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT;
-               fixed: 1 0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-            }
-         }
-         part { name: "right_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT;
-               max: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT;
-               align: 1.0 1.0;
-               fixed: 1 0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-            }
-         }
-         part { name: "bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "left_padding";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "right_padding";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "focus_underline_bottom_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_INC;
-               align: 0.5 1.0;
-               fixed: 0 1;
-               rel1 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 1.0 1.0;
-               }
-            }
-         }
-         part { name: "focus_underline";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC;
-               align: 0.5 1.0;
-               fixed: 0 1;
-               rel1 {
-                  to: "focus_underline_bottom_padding";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_underline_bottom_padding";
-                  relative: 1.0 0.0;
+      program { name: "hbar_show_notalways";
+         signal: "elm,action,show_notalways,hbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_h);
+            if (v) {
+               set_int(sbalways_h, 0);
+               v = get_int(sbvis_h);
+               if (!v) {
+                  emit("do-hide-hbar", "");
+                  set_int(sbvis_h, 0);
                }
-               color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/
             }
          }
-         part { name: "clear_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
+      }
+      program { name: "sb_hbar_show";
+         signal: "do-show-hbar";
+         source: "";
+         action:  STATE_SET "default" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_hbar_clip";
+      }
+      program { name: "sb_hbar_hide";
+         signal: "do-hide-hbar";
+         source: "";
+         action:  STATE_SET "hidden" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_hbar_clip";
+      }
+      program { name: "scroll";
+         signal: "elm,action,scroll";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbvis_v);
+            v |= get_int(sbalways_v);
+            if (!v) {
+               emit("do-show-vbar", "");
+               set_int(sbvis_v, 1);
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC 0;
-               max: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC 0;
+            v = get_int(sbvis_h);
+            v |= get_int(sbalways_h);
+            if (!v) {
+               emit("do-show-hbar", "");
+               set_int(sbvis_h, 1);
             }
+            v = get_int(sbvis_timer);
+            if (v > 0) cancel_timer(v);
+            v = timer(1.0, "timer0", 0);
+            set_int(sbvis_timer, v);
          }
       }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,state,focus,on";
-            source: "*";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_underline";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,state,focus,off";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "focus_underline";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "focus_underline";
-         }
-         program { name: "enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_underline";
-         }
-      }
+   }
 }
 
 ////////////////////////////   COPY&PASTE UI  ///////////////////////////////////