[Elm_datetime] Timepicker dark theme UX v0.5 is implemented.
[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / entry.edc
index ab48f7b..fb57d33 100644 (file)
 #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_FOCUS_DATA \
+   data.item: "focus_highlight" "on";
+
+#define ENTRY_EDITFIELD_FOCUS_DATA \
+   data.item: "focus_highlight" "off";
+
+#define ENTRY_FOCUS_IMAGE \
+   images { \
+      image: "00_focus.png" COMP; \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_IMAGE \
+   images { \
+      image: "00_edit_field_focus.png" COMP; \
+      image: "00_eidt_field_bg.png" COMP; \
+   }
+
+#define ENTRY_TEXTBLOCK_DEFAULT_REL \
+   rel1 { \
+      to_x: "focus_left_padding"; \
+      relative: 1.0 0.0; \
+   } \
+   rel2 { \
+      to_x: "editfield_space"; \
+      relative: 0.0 1.0; \
+   }
+
+#define ENTRY_SWALLOW_SCRIPT_PUBLIC \
+   script { \
+      public scroll_enabled; \
+   }
+
+#define ENTRY_SWALLOW_PARTS \
+   part { name: "editfield_space"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         align: 1.0 0.5; \
+         min: 0 0; \
+         max: 0 0; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "rename_visible" 0.0; \
+         inherit: "default" 0.0; \
+         min: 9 0; \
+         max: 9 0; \
+         rel1 { \
+            to_x: "elm.swallow.rename"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "elm.swallow.rename"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "clear_visible" 0.0; \
+         inherit: "default" 0.0; \
+         min: 9 0; \
+         max: 9 0; \
+         rel1 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+   } \
+   part { name: "elm.swallow.clear"; \
+      type: SWALLOW; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         align: 1.0 0.5; \
+         fixed: 1 1; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
+   part { name: "elm.swallow.rename"; \
+      type: SWALLOW; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         align: 1.0 0.5; \
+         fixed: 1 1; \
+         rel1 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_right_padding"; \
+            relative: 0.0 1.0; \
+         } \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_FOCUS_PARTS \
+   part { name: "focus_bg"; \
+      type: RECT; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         rel1.relative: 0.0 0.0; \
+         rel2.relative: 1.0 1.0; \
+      } \
+   } \
+   part { name: "focus_left_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         fixed: 1 0; \
+         align: 0.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_right_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         align: 1.0 0.5; \
+         fixed: 1 0; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_image"; \
+      scale: 1; \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         image { \
+            normal: "00_focus.png"; \
+            border: 6 6 6 6; \
+            border_scale: 1; \
+         } \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_EDITFIELD_FOCUS_PARTS \
+   part { name: "focus_bg"; \
+      type: IMAGE; \
+      scale: 1; \
+      mouse_events: 0; \
+      repeat_events: 1; \
+      description { state: "default" 0.0; \
+         visible: 1; \
+         image { \
+            normal: "00_edit_field_bg.png"; \
+            border: 8 8 8 8; \
+            border_scale: 1; \
+         } \
+         rel1.relative: 0.0 0.0; \
+         rel2.relative: 1.0 1.0; \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 0; \
+      } \
+   } \
+   part { name: "focus_left_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         fixed: 1 0; \
+         align: 0.0 0.5; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_right_padding"; \
+      type: SPACER; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         min: 10 0; \
+         max: 10 0; \
+         align: 1.0 0.5; \
+         fixed: 1 0; \
+         rel1 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "hidden" 0.0; \
+         inherit: "default" 0.0; \
+         min: 0 0; \
+         max: 0 0; \
+      } \
+   } \
+   part { name: "focus_image"; \
+      scale: 1; \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+         image { \
+            normal: "00_edit_field_focus.png"; \
+            border: 8 8 8 8; \
+            border_scale: 1; \
+         } \
+         rel1 { \
+            to: "focus_bg"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to: "focus_bg"; \
+            relative: 1.0 1.0; \
+         } \
+      } \
+      description { state: "focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   }
+
+#define ENTRY_SWALLOW_PROGRAMS \
+   program { name: "scroll_enabled"; \
+      signal: "elm,state,scroll,enabled"; \
+      source: "*"; \
+      script { \
+         set_int(scroll_enabled, 1); \
+         set_state(PART:"focus_bg", "hidden", 0.0); \
+         set_state(PART:"focus_left_padding", "hidden", 0.0); \
+         set_state(PART:"focus_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_bg", "default", 0.0); \
+         set_state(PART:"focus_left_padding", "default", 0.0); \
+         set_state(PART:"focus_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:"editfield_space", "clear_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:"editfield_space", "default", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "rename_show"; \
+      signal: "elm,state,rename,visible"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"elm.swallow.rename", "visible", 0.0); \
+            set_state(PART:"editfield_space", "rename_visible", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "rename_hide"; \
+      signal: "elm,state,rename,hidden"; \
+      source: "*"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"elm.swallow.rename", "default", 0.0); \
+            set_state(PART:"editfield_space", "default", 0.0); \
+         } \
+      } \
+   }
+
+#define ENTRY_FOCUS_PROGRAMS \
+   program { name: "action_focus"; \
+      signal: "elm,action,focus_highlight,show"; \
+      source: "elm"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "focused", 0.0); \
+         } \
+      } \
+   } \
+   program { name: "action_unfocus"; \
+      signal: "elm,action,focus_highlight,hide"; \
+      source: "elm"; \
+      script { \
+         new v; \
+         v = get_int(scroll_enabled); \
+         if (!v) { \
+            set_state(PART:"focus_image", "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_image", "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_image", "default", 0.0); \
+         } \
+      } \
+   }
+
+sounds {
+   sample {
+      name: "touch_sound" AS_IS;
+      source: "S_Touch_30ms.wav";
+   }
+}
+
 group { name: "elm/entry/base/default";
    alias: "elm/entry/base-mixedwrap/default";
    data.item: "default_font_size" "24";
@@ -44,7 +461,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=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 left_margin=1 right_margin=2 wrap=mixed text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" left_margin=1 right_margin=2 wrap=mixed text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -73,7 +490,10 @@ group { name: "elm/entry/base/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -106,13 +526,11 @@ group { name: "elm/entry/base/default";
          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 {
@@ -120,6 +538,7 @@ group { name: "elm/entry/base/default";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -129,7 +548,9 @@ group { name: "elm/entry/base/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -161,6 +582,13 @@ group { name: "elm/entry/base/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -187,7 +615,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=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -216,7 +644,10 @@ group { name: "elm/entry/base-charwrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -249,13 +680,11 @@ group { name: "elm/entry/base-charwrap/default";
          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 {
@@ -263,6 +692,7 @@ group { name: "elm/entry/base-charwrap/default";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -272,10 +702,12 @@ group { name: "elm/entry/base-charwrap/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
         program { name: "focus";
-            signal: "load";
+        signal: "load";
            source: "";
            action: FOCUS_SET;
            target: "elm.text";
@@ -292,20 +724,27 @@ group { name: "elm/entry/base-charwrap/default";
            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";
-         }
-      }
-   }
+     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";
+     }
+     program { name: "touch_snd";
+        signal: "mouse,clicked,1";
+        source: "elm.text";
+        action: PLAY_SAMPLE "touch_sound" 1.0;
+     }
+     ENTRY_SWALLOW_PROGRAMS
+     ENTRY_FOCUS_PROGRAMS
+  }
+}
 
 group { name: "elm/entry/base-nowrap/default";
    data.item: "default_font_size" "24";
@@ -314,7 +753,10 @@ group { name: "elm/entry/base-nowrap/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -346,19 +788,18 @@ group { name: "elm/entry/base-nowrap/default";
          //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";
                min: 1 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -368,7 +809,9 @@ group { name: "elm/entry/base-nowrap/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -400,6 +843,13 @@ group { name: "elm/entry/base-nowrap/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -432,7 +882,7 @@ group { name: "elm/entry/base/editfield";
          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=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -448,7 +898,7 @@ group { name: "elm/entry/base/editfield";
          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=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -461,7 +911,10 @@ group { name: "elm/entry/base/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -494,13 +947,11 @@ group { name: "elm/entry/base/editfield";
          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 {
@@ -508,6 +959,7 @@ group { name: "elm/entry/base/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -517,7 +969,9 @@ group { name: "elm/entry/base/editfield";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -549,6 +1003,13 @@ group { name: "elm/entry/base/editfield";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -580,7 +1041,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          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_char_wrap_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -596,7 +1057,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          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_char_wrap_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -609,7 +1070,10 @@ group { name: "elm/entry/base-charwrap/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -642,13 +1106,11 @@ group { name: "elm/entry/base-charwrap/editfield";
          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 {
@@ -656,6 +1118,7 @@ group { name: "elm/entry/base-charwrap/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -665,7 +1128,9 @@ group { name: "elm/entry/base-charwrap/editfield";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -697,6 +1162,13 @@ group { name: "elm/entry/base-charwrap/editfield";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -727,7 +1199,7 @@ group { name: "elm/entry/base-single/editfield";
          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=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -743,7 +1215,7 @@ group { name: "elm/entry/base-single/editfield";
          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=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -756,7 +1228,10 @@ group { name: "elm/entry/base-single/editfield";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_FOCUS_IMAGE
    parts {
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -766,7 +1241,7 @@ group { name: "elm/entry/base-single/editfield";
             rel2.to: "elm.text";
             text {
                style: "editfield_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -788,19 +1263,18 @@ group { name: "elm/entry/base-single/editfield";
          //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";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -809,7 +1283,9 @@ group { name: "elm/entry/base-single/editfield";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -841,6 +1317,13 @@ group { name: "elm/entry/base-single/editfield";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -851,7 +1334,54 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
+   styles {
+      style { name: "editfield_searchbar_single_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=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=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font=Tizen:style=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=Roman font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+      }
+   }
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -860,8 +1390,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "editfield_single_textblock_guide_style";
-               min: 1 1;
+               style: "editfield_searchbar_single_textblock_guide_style";
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -883,28 +1413,29 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          //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: "editfield_single_textblock_style";
+               style: "editfield_searchbar_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "editfield_single_textblock_disabled_style";
+               style: "editfield_searchbar_single_textblock_disabled_style";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -936,6 +1467,13 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -961,7 +1499,7 @@ group { name: "elm/entry/base-single/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_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -977,7 +1515,7 @@ group { name: "elm/entry/base-single/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_single_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -987,10 +1525,13 @@ group { name: "elm/entry/base-single/default";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    data {
       item: context_menu_orientation "horizontal";
    }
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1000,7 +1541,7 @@ group { name: "elm/entry/base-single/default";
             rel2.to: "elm.text";
             text {
                style: "entry_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 0;
                align: 0.0 0.5;
             }
@@ -1023,13 +1564,11 @@ group { name: "elm/entry/base-single/default";
          //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";
@@ -1037,6 +1576,7 @@ group { name: "elm/entry/base-single/default";
                max: 0 0;
                align: 0.0 0.5;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1045,7 +1585,9 @@ group { name: "elm/entry/base-single/default";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1077,6 +1619,13 @@ group { name: "elm/entry/base-single/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1097,7 +1646,7 @@ group { name: "elm/entry/base-single-noedit/default";
             rel2.to: "elm.text";
             text {
                style: "entry_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -1118,13 +1667,11 @@ group { name: "elm/entry/base-single-noedit/default";
          //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";
@@ -1171,6 +1718,11 @@ group { name: "elm/entry/base-single-noedit/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
    }
 }
 
@@ -1212,13 +1764,11 @@ group { name: "elm/entry/base-noedit/default";
          //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 {
@@ -1266,6 +1816,11 @@ group { name: "elm/entry/base-noedit/default";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
    }
 }
 
@@ -1307,13 +1862,11 @@ group { name: "elm/entry/base-noedit/default";
            //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 {
@@ -1331,36 +1884,41 @@ group { name: "elm/entry/base-noedit/default";
         }
       }
       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";
-         }
+         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";
+        }
+        program { name: "touch_snd";
+           signal: "mouse,clicked,1";
+           source: "elm.text";
+           action: PLAY_SAMPLE "touch_sound" 1.0;
+        }
       }
    }
 
@@ -1402,13 +1960,11 @@ group { name: "elm/entry/base-noedit/default";
            //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";
@@ -1455,6 +2011,11 @@ group { name: "elm/entry/base-noedit/default";
             action: STATE_SET "default" 0.0;
             target: "elm.guide";
          }
+         program { name: "touch_snd";
+            signal: "mouse,clicked,1";
+            source: "elm.text";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+         }
       }
    }
 
@@ -1465,7 +2026,10 @@ group { name: "elm/entry/base-noedit/default";
       data {
          item: context_menu_orientation "horizontal";
       }
+      ENTRY_FOCUS_DATA
+      ENTRY_FOCUS_IMAGE
       parts {
+         ENTRY_FOCUS_PARTS
          part { name: "elm.guide";
             type: TEXTBLOCK;
             mouse_events: 0;
@@ -1475,7 +2039,7 @@ group { name: "elm/entry/base-noedit/default";
                rel2.to: "elm.text";
                text {
                   style: "editfield_single_textblock_guide_style";
-                  min: 1 1;
+                  min: 0 1;
                   max: 0 1;
                }
             }
@@ -1497,20 +2061,19 @@ group { name: "elm/entry/base-noedit/default";
            //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: "*";
+                 repch: "•";
                  min: 1 1;
                   max: 0 1;
               }
+               ENTRY_TEXTBLOCK_DEFAULT_REL
            }
            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -1519,7 +2082,9 @@ group { name: "elm/entry/base-noedit/default";
               }
            }
         }
+         ENTRY_SWALLOW_PARTS
       }
+      ENTRY_SWALLOW_SCRIPT_PUBLIC
       programs {
         program { name: "focus";
             signal: "load";
@@ -1551,6 +2116,13 @@ group { name: "elm/entry/base-noedit/default";
             action: STATE_SET "default" 0.0;
             target: "elm.guide";
          }
+         program { name: "touch_snd";
+            signal: "mouse,clicked,1";
+            source: "elm.text";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+         }
+         ENTRY_SWALLOW_PROGRAMS
+         ENTRY_FOCUS_PROGRAMS
       }
    }
 
@@ -1580,7 +2152,7 @@ group { name: "elm/entry/base-password/popup";
          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_popup_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 align=center wrap=mixed ellipsis=1.0 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_DISABLED_TEXT_COLOR_INC" align=center wrap=mixed ellipsis=1.0 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1606,7 +2178,10 @@ group { name: "elm/entry/base-password/popup";
          tag:  "hilight" "+ font=Tizen:style=Bold";
       }
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1616,7 +2191,7 @@ group { name: "elm/entry/base-password/popup";
             rel2.to: "elm.text";
             text {
                style: "entry_single_textblock_popup_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -1638,20 +2213,19 @@ group { name: "elm/entry/base-password/popup";
          //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_popup_style";
-               repch: "*";
+               repch: "•";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1660,7 +2234,9 @@ group { name: "elm/entry/base-password/popup";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1692,6 +2268,13 @@ group { name: "elm/entry/base-password/popup";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -1748,7 +2331,7 @@ group { name: "elm/entry/base-password/popup";
                                        align: 0.5 0.5;
                                        rel1 {
                                                relative: 0.0  0.0;
-                                               offset: 0 2;
+                                               offset: 0 -2;
                                        }
                                        rel2 {
                                                relative: 0.0  1.0;
@@ -1811,154 +2394,28 @@ group { name: "elm/entry/base-password/popup";
                }
        }
 
-       group { name: "elm/entry/selection/block_handle";
-       data.item: "position" "BOTH";
-               images {
-                 image: "reader_handler_up.png" COMP;
-               }
-               parts {
-                       part { name: "bg";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       fixed: 1 1;
-                                       align: 0.5 0.25;
-                                       min: 50 80;
-                                       color: 0 0 0 0;
-                               }
-                               description { state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       part { name: "handle";
-                               mouse_events: 1;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                       fixed: 1 1;
-                                       align: 0.5 0.0;
-                                       min: 48 66;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               offset: 0 0;
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               offset: 0 0;
-                                       }
-                                       image {
-                                               normal: "reader_handler_up.png";
-                                               border: 0 0 0 0;
-                                       }
-                                       image.middle: SOLID;
-                                       fill.smooth: 0;
-                               }
-                               description { state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-               }
-               programs {
-                       program { name: "focused";
-                               signal: "elm,action,focus";
-                               source: "elm";
-                               action: STATE_SET "show" 0.0;
-                               target: "handle";
-                               target: "bg";
-                       }
-                       program { name: "unfocused";
-                               signal: "elm,action,unfocus";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "handle";
-                               target: "bg";
-                       }
-               }
-       }
-
-       group { name: "elm/entry/selection/block_handle_top";
-       data.item: "position" "BOTH";
+       group { name: "elm/entry/selection/block_handle_left";
+               data.item: "height" "79";
+               data.item: "gap" "32";
                images {
-                 image: "reader_handler_down.png" COMP;
+                 image: "copy&paste_Handler_left.png" COMP;
+                 image: "copy&paste_Handler_left_01.png" COMP;
+                 image: "copy&paste_Handler_left_reverse.png" COMP;
+                 image: "copy&paste_Handler_left_01_reverse.png" COMP;
                }
                parts {
-                       part { name: "bg";
+                       part { name: "edge";
                                type: RECT;
                                scale: 1;
-                               mouse_events: 1;
+                               mouse_events: 0;
                                description { state: "default" 0.0;
-                                       visible: 0;
-                                       fixed: 1 1;
-                                       align: 0.5 0.75;
-                                       min: 50 80;
+                                       min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+                                       max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
                                        color: 0 0 0 0;
-                               }
-                               description { state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       part { name: "handle";
-                               mouse_events: 1;
-                               scale: 1;
-                               description { state: "default" 0.0;
                                        visible: 0;
-                       fixed: 1 1;
-                                       align: 0.5 1.0;
-                                       min: 48 66;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               offset: 0 0;
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               offset: 0 0;
-                                       }
-                                       image {
-                                               normal: "reader_handler_down.png";
-                                               border: 0 0 0 0;
-                                       }
-                                       image.middle: SOLID;
-                                       fill.smooth: 0;
-                               }
-                               description { state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
+                                       align: 0 0;
                                }
                        }
-               }
-               programs {
-                       program { name: "focused";
-                               signal: "elm,action,focus";
-                               source: "elm";
-                               action: STATE_SET "show" 0.0;
-                               target: "handle";
-                               target: "bg";
-                       }
-                       program { name: "unfocused";
-                               signal: "elm,action,unfocus";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "handle";
-                               target: "bg";
-                       }
-               }
-       }
-
-       group { name: "elm/entry/selection/block_handle_left";
-               data.item: "height" "40";
-               data.item: "gap" "51";
-               images {
-                 image: "copy&paste_Handler_left.png" COMP;
-                 image: "copy&paste_Handler_left_01.png" COMP;
-                 image: "copy&paste_Handler_left_reversed.png" COMP;
-                 image: "copy&paste_Handler_left_01_reversed.png" COMP;
-               }
-               parts {
                        part { name: "handle";
                                mouse_events: 1;
                                scale: 1;
@@ -1966,10 +2423,9 @@ group { name: "elm/entry/base-password/popup";
                                        visible: 0;
                                        fixed: 1 1;
                                        align: 1 0;
+                                       rel2 { relative: 1 1; to_x: "edge"; }
                                        min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
-                                       max:ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
-                                       rel1.offset: 0 -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
-                                       rel2.offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 0;
+                                       max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        image {
                                                normal: "copy&paste_Handler_left_01.png";
                                                border: 0 0 0 0;
@@ -1985,9 +2441,7 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 1 1;
-                                       rel2 {
-                                               offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
-                                       }
+                                       rel2 { relative: 1 1; to_x: "edge"; }
                                        image {
                                                normal: "copy&paste_Handler_left.png";
                                        }
@@ -1996,23 +2450,18 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 0 0;
-                                       rel1 {
-                                               offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
-                                       }
+                                       rel1 { relative: 0 0; to_x: "edge"; }
                                        image {
-                                               normal: "copy&paste_Handler_left_01_reversed.png";
+                                               normal: "copy&paste_Handler_left_01_reverse.png";
                                        }
                                }
                                description { state: "top_reversed" 0.0;
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 0 1;
-                                       rel1.offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 0;
-                                       rel2 {
-                                               offset: 0 ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
-                                       }
+                                       rel1 { relative: 0 0; to_x: "edge"; }
                                        image {
-                                               normal: "copy&paste_Handler_left_reversed.png";
+                                               normal: "copy&paste_Handler_left_reverse.png";
                                        }
                                }
                        }
@@ -2089,15 +2538,27 @@ group { name: "elm/entry/base-password/popup";
        }
 
        group { name: "elm/entry/selection/block_handle_right";
-               data.item: "height" "40";
-               data.item: "gap" "51";
+               data.item: "height" "79";
+               data.item: "gap" "32";
                images {
                  image: "copy&paste_Handler_right.png" COMP;
                  image: "copy&paste_Handler_right_01.png" COMP;
-                 image: "copy&paste_Handler_right_reversed.png" COMP;
-                 image: "copy&paste_Handler_right_01_reversed.png" COMP;
+                 image: "copy&paste_Handler_right_reverse.png" COMP;
+                 image: "copy&paste_Handler_right_01_reverse.png" COMP;
                }
                parts {
+                       part { name: "edge";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description { state: "default" 0.0;
+                                       min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+                                       max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+                                       color: 0 0 0 0;
+                                       visible: 0;
+                                       align: 0 0;
+                               }
+                       }
                        part { name: "handle";
                                mouse_events: 1;
                                scale: 1;
@@ -2107,7 +2568,6 @@ group { name: "elm/entry/base-password/popup";
                                        align: 0 0;
                                        min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
-                                       rel1.offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
                                        image {
                                                normal: "copy&paste_Handler_right.png";
                                                border: 0 0 0 0;
@@ -2123,8 +2583,6 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 0 1;
-                                       rel1.offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 0;
-                                       rel2.offset: 0 ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
                                        image {
                                                normal: "copy&paste_Handler_right_01.png";
                                        }
@@ -2133,19 +2591,18 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 1 0;
-                                       rel1.offset: 0 -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
-                                       rel2.offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET+ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+                                       rel2 { relative: 1.0 0.0; to_x: "edge"; }
                                        image {
-                                               normal: "copy&paste_Handler_right_reversed.png";
+                                               normal: "copy&paste_Handler_right_reverse.png";
                                        }
                                }
                                description { state: "top_reversed" 0.0;
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        align: 1 1;
-                                       rel2.offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET+ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET;
+                                       rel2 { relative: 1.0 0.0; to_x: "edge"; }
                                        image {
-                                               normal: "copy&paste_Handler_right_01_reversed.png";
+                                               normal: "copy&paste_Handler_right_01_reverse.png";
                                        }
                                }
                        }
@@ -2224,18 +2681,18 @@ group { name: "elm/entry/base-password/popup";
        group { name: "elm/entry/cursor_handle/default";
                images {
                  image: "copy&paste_Handler_center.png" COMP;
+                 image: "copy&paste_Handler_center_reverse.png" COMP;
                }
                parts {
                        part { name: "handle";
                                scale: 1;
                                mouse_events: 1;
                                description { state: "default" 0.0;
-                                       max: 60 60;
-                                       min: 60 60;
+                                       max: 59 86;
+                                       min: 59 86;
                                        align: 0 0;
-                                       fixed: 1 1;
                                        visible: 0;
-                                       rel1 { offset: -30 -8; }
+                                       align: 0.5 0;
                                        image {
                                                normal: "copy&paste_Handler_center.png";
                                                border: 0 0 0 0;
@@ -2247,14 +2704,34 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                }
+                               description { state: "top" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                                       align: 0.5 1.0;
+                                       image {
+                                               normal: "copy&paste_Handler_center_reverse.png";
+                                               border: 0 0 0 0;
+                                       }
+                               }
                        }
                }
+               script {
+                       public on_top;
+               }
                programs {
                        program { name: "focused";
                                signal: "edje,focus,in";
                                source: "edje";
                                script {
-                                       set_state(PART:"handle", "show", 0.0);
+                                       new on_top_val = get_int(on_top);
+                                       if (on_top_val)
+                                       {
+                                               set_state(PART:"handle", "top", 0.0);
+                                       }
+                                       else
+                                       {
+                                               set_state(PART:"handle", "show", 0.0);
+                                       }
                                }
                        }
                        program { name: "unfocused";
@@ -2268,6 +2745,7 @@ group { name: "elm/entry/base-password/popup";
                                signal: "edje,cursor,handle,show";
                                source: "edje";
                                script {
+                                       set_int(on_top, 0);
                                        set_state(PART:"handle", "show", 0.0);
                                }
                        }
@@ -2278,6 +2756,14 @@ group { name: "elm/entry/base-password/popup";
                                        set_state(PART:"handle", "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);
+                               }
+                       }
                }
        }
 
@@ -2288,9 +2774,11 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                mouse_events: 0;
                                description { state: "default" 0.0;
-                                       min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
-                                       color: 255 0 0 100;
+                                       min: 0 0;
+                                       max: 0 0;
+                                       color: 0 0 0 0;
                                        visible: 0;
+                                       align: 0 0;
                                }
                        }
                        part { name: "bg";
@@ -2300,7 +2788,9 @@ group { name: "elm/entry/base-password/popup";
                                description { state: "default" 0.0;
                                        color: ENTRY_SELECTION_EDGE_COLOR;
                                        min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
-                                       rel2 { relative: 0 1; to: "align"; }
+                                       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;
@@ -2336,6 +2826,7 @@ group { name: "elm/entry/base-password/popup";
                                description { state: "default" 0.0;
                                        color: ENTRY_SELECTION_EDGE_COLOR;
                                        min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+                                       max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
                                        visible: 0;
                                }
                                description { state: "show" 0.0;
@@ -2362,39 +2853,13 @@ group { name: "elm/entry/base-password/popup";
                }
        }
 
-
-/////////////////////////////////////////////////////////////////////////
-
-       group { name: "elm/entry/selection/block_bar";
-               images {
-                 image: "reader_longtap_blue.png" COMP;
-               }
-               parts {
-                       part { name: "bar_bg";
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       image {
-                                               normal: "reader_longtap_blue.png";
-                                               border: 0 0 0 0;
-                                       }
-                                       image.middle: SOLID;
-                                       fill.smooth: 0;
-                               }
-                       }
-               }
-       }
-
-
-
        group { name: "elm/entry/anchor/default";
                parts {
                        part { name: "bg";
                                type: RECT;
                                mouse_events: 0;
                                description { state: "default" 0.0;
-                                       color: 128 0 0 64;
+                                       color: 0 0 0 0;
                                }
                        }
                }
@@ -2415,83 +2880,50 @@ group { name: "elm/entry/base-password/popup";
 
 #define MAGNIFIER_SCALE 1.5
 
-       group { name: "elm/entry/magnifier/fill-width";
-               data.item: "height" MAGNIFIER_HEIGHT_FILL;
+       group { name: "elm/entry/magnifier/fixed-size";
+               data.item: "height" MAGNIFIER_HEIGHT_FIXED;
                data.item: "scale" MAGNIFIER_SCALE;
+               data.item: "arrow" 24;
                images {
-                 image: "magnifier_noarrow.png" COMP;
-                 image: "magnifier_noarrow_line.png" COMP;
+                 image: "copy&paste_Magnifier_left.png" COMP;
+                 image: "copy&paste_Magnifier_middle.png" COMP;
+                 image: "copy&paste_Magnifier_right.png" COMP;
                }
                parts {
                        part { name: "bg";
                                mouse_events: 0;
                                scale: 1;
+                               type: RECT;
                                description { state: "default" 0.0;
+                                       fixed: 1 1;
+                                       min: MAGNIFIER_WIDTH_FIXED MAGNIFIER_HEIGHT_FIXED;
                                        align: 0.5 0.0;
-                                       rel1 { offset: -20 -10; }
-                                       rel2 { offset: 22 15; }
-                                       image {
-                                               normal: "magnifier_noarrow.png";
-                                               border: 25 25 35 25;
-                                       }
-                                       image.middle: SOLID;
-                                       fill.smooth: 0;
-                               }
-                       }
-                       part { name: "swallow";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       align: 0.0 0.0;
-                                       rel1 {
-                                               to: "bg";
-                                               offset: 18 18;
-                                       }
-                                       rel2 {
-                                               to: "bg";
-                                               offset: -20 -20;
-                                       }
+                                       visible: 1;
+                                       color: 0 0 0 0;
                                }
                        }
-                       part { name: "outline";
+                       part { name: "bg_middle_left";
                                mouse_events: 0;
                                scale: 1;
+                               type: RECT;
                                description { state: "default" 0.0;
-                                       visible: 0;
-                                       align: 0.0 0.0;
-                                       rel1 { to: "bg"; offset: 0 0; }
-                                       rel2 { to: "bg"; offset: -1 -1; }
-                                       image {
-                                               normal: "magnifier_noarrow_line.png";
-                                               border: 25 25 35 25;
-                                       }
-                                       image.middle: SOLID;
-                                       fill.smooth: 0;
+                                       min: 20 134;
+                                       max: 20 -1;
+                                       align: 1.0 0.0;
+                                       rel2 { relative: 0.5 1.0; to: "bg"; }
+                                       visible: 1;
+                                       color: 0 0 0 0;
                                }
                        }
-               }
-       }
-
-
-       group { name: "elm/entry/magnifier/fixed-size";
-               data.item: "height" MAGNIFIER_HEIGHT_FIXED;
-               data.item: "scale" MAGNIFIER_SCALE;
-               data.item: "arrow" 24;
-               images {
-                 image: "copy&paste_Magnifier_left.png" COMP;
-                 image: "copy&paste_Magnifier_middle.png" COMP;
-                 image: "copy&paste_Magnifier_right.png" COMP;
-               }
-               parts {
-                       part { name: "bg";
+                       part { name: "bg_middle_right";
                                mouse_events: 0;
                                scale: 1;
                                type: RECT;
                                description { state: "default" 0.0;
-                                       fixed: 1 1;
-                                       min: MAGNIFIER_WIDTH_FIXED MAGNIFIER_HEIGHT_FIXED;
-                                       align: 0.5 0.0;
+                                       min: 20 134;
+                                       max: 20 -1;
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 0.5 0.0; to: "bg"; }
                                        visible: 1;
                                        color: 0 0 0 0;
                                }
@@ -2504,7 +2936,7 @@ group { name: "elm/entry/base-password/popup";
                                        min: 136 134;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 0.0; to: "bg"; }
-                                       rel2 { relative: 0.5 1.0; to: "bg"; offset: -20 -1;}
+                                       rel2 { relative: 0.0 1.0; to: "bg_middle_left"; }
                                        image {
                                                normal: "copy&paste_Magnifier_left.png";
                                                border: 21 1 20 44;
@@ -2517,15 +2949,12 @@ group { name: "elm/entry/base-password/popup";
                                mouse_events: 0;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       fixed: 1 1;
-                                       min: 40 134;
-                                       max: 40 999999;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 1.0 0.0; to: "bg_left"; }
-                                       rel2 { relative: 0.0 1.0; to: "bg_right"; }
+                                       rel1 { relative: 0.0 0.0; to: "bg_middle_left"; }
+                                       rel2 { relative: 1.0 1.0; to: "bg_middle_right"; }
                                        image {
                                                normal: "copy&paste_Magnifier_middle.png";
-                                               border: 0 40 20 44;
+                                               border: 1 38 20 44;
                                        }
                                        image.middle: 1;
                                        fill.smooth: 0;
@@ -2537,7 +2966,7 @@ group { name: "elm/entry/base-password/popup";
                                description { state: "default" 0.0;
                                        fixed: 1 1;
                                        min: 136 134;
-                                       rel1 { relative: 0.5 0.0; to: "bg"; offset: 21 0;}
+                                       rel1 { relative: 1.0 0.0; to: "bg_middle_right"; }
                                        rel2.to: "bg";
                                        image {
                                                normal: "copy&paste_Magnifier_right.png";
@@ -2547,72 +2976,6 @@ group { name: "elm/entry/base-password/popup";
                                        fill.smooth: 0;
                                }
                        }
-                       part { name: "content_bg";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color: 255 255 255 255;
-                                       rel1.to: "swallow";
-                                       rel2.to: "swallow";
-                                       visible: 1;
-                               }
-                       }
-                       part { name: "content_bg_right";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color: 255 0 0 100;
-                                       rel1.to: "bg_right";
-                                       rel2.to: "bg_right";
-                                       visible: 0;
-                               }
-                       }
-                       part { name: "fining_left"; //temporary to reduce rounded corner effect
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color: 255 255 255 255;
-                                       rel1 { relative: 0.0 0.0; to: "swallow"; offset: -4 5;}
-                                       rel2 { relative: 0.0 1.0; to: "swallow"; offset: -1 -5;}
-                                       visible: 1;
-                               }
-                       }
-                       part { name: "fining_right";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color: 255 255 255 255;
-                                       rel1 { relative: 1.0 0.0; to: "swallow"; offset: 0 5;}
-                                       rel2 { relative: 1.0 1.0; to: "swallow"; offset: 2 -5;}
-                                       visible: 1;
-                               }
-                       }
-                       part { name: "fining_top";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color: 255 255 255 255;
-                                       rel1 { relative: 0.0 0.0; to: "swallow"; offset: 5 -1;}
-                                       rel2 { relative: 1.0 0.0; to: "swallow"; offset: -5 -1;}
-                                       visible: 1;
-                               }
-                       }
-                       part { name: "fining_bottom";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color: 255 255 255 255;
-                                       rel1 { relative: 0.0 1.0; to: "swallow"; offset: 5 0;}
-                                       rel2 { relative: 1.0 1.0; to: "swallow"; offset: -5 1;}
-                                       visible: 1;
-                               }
-                       }
                        part { name: "swallow";
                                type: SWALLOW;
                                mouse_events: 0;
@@ -2633,44 +2996,6 @@ group { name: "elm/entry/base-password/popup";
                }
        }
 
-       group { name: "elm/copypaste/notify/default";
-               parts {
-                       part { name: "base";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 0 110;
-                                       color: 50 50 50 255;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               offset: 0 50;
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                       }
-                               }
-                       }
-                       part { name: "elm.text";
-                               type: TEXT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0 0;
-                                       rel1 {relative: 0.0 0.0; to: "base";}
-                                       rel2 {relative: 1.0 1.0; to: "base";}
-                                       color: 255 255 255 255;
-                                       text {
-                                               font: "Tizen:style=Roman";
-                                               size: 40;
-                                               text_class: "tizen";
-                                       }
-                               }
-                       }
-               }
-       }
-
        group { name: "elm/entry/matchlist/default";
                data.item: "max_height" "230";
                parts {
@@ -2709,7 +3034,7 @@ group { name: "elm/entry/base-password/popup";
 /* Entry's bubble style */
 
 styles {
-   style {
+   style { 
       name: "entry_bubble_date_area_textblock_style";
       base: "font=Tizen:style=Roman font_size="ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" left_margin=2 right_margin=2 wrap=mixed text_class=entry";
       tag:  "br" "\n";
@@ -2819,7 +3144,7 @@ styles {
               state: "default" 0.0;
               rel2.to_x: "elm.rect.right.pad";
               image {
-                 normal: "00_MessageBubble_BG_receive.png";
+                 normal: "00_messagebubble_bg_receive.png";
                  border: 1 20 13 20;
                  border_scale: 1;
               }
@@ -2838,13 +3163,11 @@ styles {
            //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
-               */
 //         source6: "X"; // anchor over
            description { state: "default" 0.0;
                fixed: 1 0;
@@ -3036,7 +3359,7 @@ styles {
               state: "default" 0.0;
               rel2.to_x: "elm.rect.right.pad";
               image {
-                 normal: "00_MessageBubble_BG_receive.png";
+                 normal: "00_messagebubble_bg_receive.png";
                  border: ENTRY_BUBBLE_RECEV_BG_BORDER_INC;
                  border_scale: 1;
               }
@@ -3136,13 +3459,11 @@ styles {
            //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;
@@ -3498,7 +3819,7 @@ styles {
               state: "default" 0.0;
               rel2.to_x: "elm.rect.right.pad";
               image {
-                 normal: "00_MessageBubble_BG_receive.png";
+                 normal: "00_messagebubble_bg_receive.png";
                  border: 1 20 13 20;
                  border_scale: 1;
               }
@@ -3516,13 +3837,11 @@ styles {
            //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;
                align: 0.0 0.0;
@@ -3633,7 +3952,7 @@ styles {
               state: "default" 0.0;
                rel1.to_x: "elm.rect.left.pad";
               image {
-                 normal: "00_MessageBubble_BG_send.png";
+                 normal: "00_messagebubble_bg_sent.png";
                  border: 20 1 13 20;
                  border_scale: 1;
               }
@@ -3653,13 +3972,11 @@ styles {
            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;
                align: 1.0 0.0;
@@ -3849,7 +4166,7 @@ styles {
               state: "default" 0.0;
            rel1.to_x: "elm.rect.left.pad";
               image {
-                     normal: "00_MessageBubble_BG_send.png";
+                     normal: "00_messagebubble_bg_sent.png";
                      border: ENTRY_BUBBLE_SENT_BG_BORDER_INC;
                      border_scale: 1;
               }
@@ -3948,13 +4265,11 @@ styles {
            //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;
@@ -4327,7 +4642,7 @@ styles {
               state: "default" 0.0;
                rel1.to_x: "elm.rect.left.pad";
               image {
-                 normal: "00_MessageBubble_BG_send.png";
+                 normal: "00_messagebubble_bg_sent.png";
                  border: 20 1 13 20;
                  border_scale: 1;
               }
@@ -4345,13 +4660,11 @@ styles {
            //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;
                align: 1.0 0.0;
@@ -4393,22 +4706,15 @@ styles {
       }
    }
 
-group { name: "elm/entry/base/font_color_black";
-   alias: "elm/entry/base-mixedwrap/font_color_black";
-   alias: "elm/entry/base/font_color_black/default";
-   alias: "elm/entry/base/font_color_black/lighting";
-   alias: "elm/entry/base/font_color_black/multiline";
-   alias: "elm/entry/base/font_color_black/multiline/default";
-   alias: "elm/entry/base/font_color_black/multiline/lighting";
-   alias: "elm/entry/base/editfield/font_color_black";
+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: "font_color_black_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+      style { name: "multibuttonentry_single_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4416,31 +4722,31 @@ group { name: "elm/entry/base/font_color_black";
          tag:  "b" "+ font=Tizen:style=Bold";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font=Tizen:style=Bold";
-         tag:  "preedit" "+ underline=on underline_color=#000000FF";
-         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color=#000000FF";
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color=#000000FF";
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF";
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
+         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: "font_color_black_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+      style { name: "multibuttonentry_single_textblock_disabled_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
          tag:  "em" "+ font=Tizen:style=Oblique";
          tag:  "b" "+ font=Tizen:style=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#8008";
          tag:  "hilight" "+ font=Tizen:style=Bold";
-         tag:  "preedit" "+ underline=on underline_color=#000000FF";
-         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color=#000000FF";
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color=#000000FF";
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF";
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
+         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: "font_color_black_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+      style { name: "multibuttonentry_single_textblock_guide_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4453,7 +4759,10 @@ group { name: "elm/entry/base/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4462,9 +4771,9 @@ group { name: "elm/entry/base/font_color_black";
             rel1.to: "elm.text";
             rel2.to: "elm.text";
             text {
-               style: "font_color_black_textblock_guide_style";
+               style: "multibuttonentry_single_textblock_guide_style";
                min: 0 1;
-               align: 0.0 0.0;
+               max: 0 1;
             }
          }
          description { state: "hidden" 0.0;
@@ -4479,36 +4788,35 @@ group { name: "elm/entry/base/font_color_black";
          entry_mode: EDITABLE;
          select_mode: BLOCK_HANDLE;
          //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: "font_color_black_textblock_style";
-               min: 0 1;
+               style: "multibuttonentry_single_textblock_style";
+               min: 1 1;
+               max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             text {
-               style: "font_color_black_textblock_disabled_style";
-               min: 0 1;
+               style: "multibuttonentry_single_textblock_disabled_style";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4540,25 +4848,192 @@ group { name: "elm/entry/base/font_color_black";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
+group { name: "elm/entry/base/font_color_black";
+   alias: "elm/entry/base-mixedwrap/font_color_black";
+   alias: "elm/entry/base/font_color_black/default";
+   alias: "elm/entry/base/font_color_black/lighting";
+   alias: "elm/entry/base/font_color_black/multiline";
+   alias: "elm/entry/base/font_color_black/multiline/default";
+   alias: "elm/entry/base/font_color_black/multiline/lighting";
+   alias: "elm/entry/base/editfield/font_color_black";
 
-group { name: "elm/entry/base-noedit/font_color_black";
    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 {
+
+   styles {
+      style { name: "font_color_black_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+         tag:  "preedit" "+ underline=on underline_color=#000000FF";
+         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color=#000000FF";
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color=#000000FF";
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF";
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
+      }
+      style { name: "font_color_black_textblock_disabled_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+         tag:  "preedit" "+ underline=on underline_color=#000000FF";
+         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color=#000000FF";
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color=#000000FF";
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color=#000000FF";
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
+      }
+      style { name: "font_color_black_textblock_guide_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=Bold";
+      }
+   }
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
+   parts {
+      ENTRY_FOCUS_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: "font_color_black_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: EDITABLE;
+         select_mode: BLOCK_HANDLE;
+         //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 {
+               style: "font_color_black_textblock_style";
+               min: 0 1;
+            }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "font_color_black_textblock_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+      ENTRY_SWALLOW_PARTS
+   }
+   ENTRY_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";
+      }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
+   }
+}
+
+group { name: "elm/entry/base-noedit/font_color_black";
+   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: "font_color_black_textblock_guide_style";
                min: 0 1;
                align: 0.0 0.0;
@@ -4583,13 +5058,11 @@ group { name: "elm/entry/base-noedit/font_color_black";
          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 {
@@ -4637,6 +5110,11 @@ group { name: "elm/entry/base-noedit/font_color_black";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
    }
 }
 
@@ -4655,7 +5133,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_char_wrap_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4671,7 +5149,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4687,7 +5165,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=char left_margin=1 right_margin=2 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4700,7 +5178,10 @@ group { name: "elm/entry/base-charwrap/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4733,19 +5214,18 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          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: "font_color_black_textblock_char_wrap_style";
                min: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4755,7 +5235,9 @@ group { name: "elm/entry/base-charwrap/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4787,6 +5269,13 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4805,7 +5294,7 @@ group { name: "elm/entry/base-single/font_color_black";
 
    styles {
       style { name: "font_color_black_single_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4821,7 +5310,7 @@ group { name: "elm/entry/base-single/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4837,7 +5326,7 @@ group { name: "elm/entry/base-single/font_color_black";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "font_color_black_single_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -4850,7 +5339,10 @@ group { name: "elm/entry/base-single/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -4860,7 +5352,7 @@ group { name: "elm/entry/base-single/font_color_black";
             rel2.to: "elm.text";
             text {
                style: "font_color_black_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -4882,19 +5374,18 @@ group { name: "elm/entry/base-single/font_color_black";
          //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: "font_color_black_single_textblock_style";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -4903,7 +5394,9 @@ group { name: "elm/entry/base-single/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -4935,6 +5428,13 @@ group { name: "elm/entry/base-single/font_color_black";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -4955,7 +5455,7 @@ group { name: "elm/entry/base-single-noedit/font_color_black";
             rel2.to: "elm.text";
             text {
                style: "font_color_black_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -4977,13 +5477,11 @@ group { name: "elm/entry/base-single-noedit/font_color_black";
          //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: "font_color_black_single_textblock_style";
@@ -5030,13 +5528,18 @@ group { name: "elm/entry/base-single-noedit/font_color_black";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
    }
 }
 group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
    inherit: "elm/entry/base-single/font_color_black";
    styles {
       style { name: "tizen_text_class_single_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -5052,7 +5555,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "tizen_text_class_single_textblock_disabled_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -5068,7 +5571,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF";
       }
       style { name: "tizen_text_class_single_textblock_guide_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -5088,7 +5591,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
             rel2.to: "elm.text";
             text {
                style: "tizen_text_class_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -5102,6 +5605,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class";
             text {
                style: "tizen_text_class_single_textblock_style";
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5120,7 +5624,10 @@ group { name: "elm/entry/base-password/font_color_black";
    data {
       item: context_menu_orientation "horizontal";
    }
+   ENTRY_FOCUS_DATA
+   ENTRY_FOCUS_IMAGE
    parts {
+      ENTRY_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -5130,7 +5637,7 @@ group { name: "elm/entry/base-password/font_color_black";
             rel2.to: "elm.text";
             text {
                style: "font_color_black_single_textblock_guide_style";
-               min: 1 1;
+               min: 0 1;
                max: 0 1;
             }
          }
@@ -5151,20 +5658,19 @@ group { name: "elm/entry/base-password/font_color_black";
          //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: "font_color_black_single_textblock_style";
-               repch: "*";
+               repch: "•";
                min: 1 1;
                max: 0 1;
             }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5173,7 +5679,9 @@ group { name: "elm/entry/base-password/font_color_black";
             }
          }
       }
+      ENTRY_SWALLOW_PARTS
    }
+   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5205,15 +5713,23 @@ group { name: "elm/entry/base-password/font_color_black";
          action: STATE_SET "default" 0.0;
          target: "elm.guide";
       }
+      program { name: "touch_snd";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         action: PLAY_SAMPLE "touch_sound" 1.0;
+      }
+      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_FOCUS_PROGRAMS
    }
 }
 
 group { name: "elm/scroller/entry/default";
-      alias : "elm/scroller/entry/editfield";
-      alias : "elm/scroller/entry/editfield/searchbar/default";
       data {
          item: "focus_highlight" "on";
       }
+      images {
+         image: "00_focus.png" COMP;
+      }
       script {
          public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
          public timer0(val) {
@@ -5238,120 +5754,297 @@ group { name: "elm/scroller/entry/default";
             return 0;
          }
       }
-      images {
-         image: "bt_sm_base2.png" COMP;
-      }
       parts {
-         part { name: "bg";
+         part { name: "focus_bg";
             type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
                visible: 0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-         }
-         part { name: "contentclipper";
-            type: RECT;
+         part { name: "focus_image";
+            scale: 1;
             mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1.to: "elm.swallow.icon";
-               rel1.relative: 1.0 0.0;
-               rel2.to: "elm.swallow.end";
-               rel2.relative: 0.0 1.0;
-            }
-         }
-         part { name: "elm.swallow.icon";
-            type: SWALLOW;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               fixed: 1 1;
+               visible: 0;
+               image {
+                  normal: "00_focus.png";
+                  border: 6 6 6 6;
+                  border_scale: 1;
+               }
                rel1 {
-                  to: "bg";
+                  to: "focus_bg";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
                }
-               visible: 0;
             }
-            description { state: "visible" 0.0;
-               fixed: 1 1;
-               align: 0.0 1.0;
-               rel1 {
-                         to: "bg";
-                         relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
                visible: 1;
             }
          }
-         part { name: "elm.swallow.end";
-            type: SWALLOW;
-            clip_to: "clipper";
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 1;
+               min: 10 0;
+               max: 10 0;
+               align: 0.0 0.5;
+               fixed: 1 0;
                rel1 {
-                  to: "bg";
-                  relative: 1.0 0.0;
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
                }
                rel2 {
-                  to: "bg";
-                  relative: 1.0 1.0;
+                  to: "focus_bg";
+                  relative: 0.0 1.0;
                }
-               visible: 0;
             }
-            description { state: "visible" 0.0;
-               fixed: 1 1;
-               align: 1.0 1.0;
+         }
+         part { name: "focus_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 1.0 0.5;
+               fixed: 1 0;
                rel1 {
-                  to: "bg";
+                  to: "focus_bg";
                   relative: 1.0 0.0;
                }
                rel2 {
-                  to: "bg";
+                  to: "focus_bg";
                   relative: 1.0 1.0;
                }
-               visible: 1;
             }
          }
-         part { name: "elm.swallow.content";
-            clip_to: "contentclipper";
-            type: SWALLOW;
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
+               visible: 0;
                rel1 {
-                       to: "elm.swallow.icon";
-                       relative: 1.0 0.0;
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
                }
                rel2 {
-                to: "elm.swallow.end";
-                relative: 0.0 1.0;
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
                }
             }
          }
-         part { name: "sb_vbar_clip_master";
+         part { name: "clipper";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-            }
-            description { state: "hidden" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
+               rel1.to: "bg";
+               rel2.to: "bg";
             }
          }
-         part { name: "sb_vbar_clip";
-            clip_to: "sb_vbar_clip_master";
+         part { name: "editfield_space";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               min: 0 0;
+               max: 0 0;
+               rel1.to: "elm.swallow.end";
+               rel1.relative: 0.0 0.0;
+               rel2.to: "elm.swallow.end";
+               rel2.relative: 1.0 1.0;
+            }
+            description { state: "rename_visible" 0.0;
+               inherit: "default" 0.0;
+               min: 9 0;
+               max: 9 0;
+               rel1 {
+                  to_x: "elm.swallow.rename";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.rename";
+                  relative: 0.0 1.0;
+               }
+            }
+            description { state: "clear_visible" 0.0;
+               inherit: "default" 0.0;
+               min: 9 0;
+               max: 9 0;
+               rel1 {
+                  to_x: "elm.swallow.clear";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.clear";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "contentclipper";
             type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               rel1.to: "icon_right_padding";
+               rel1.relative: 1.0 0.0;
+               rel2.to: "editfield_space";
+               rel2.relative: 0.0 1.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;
+            }
+         }
+         part { name: "icon_right_padding";
+            type: SPACER;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 0.0;
+               min: 0 0;
+               max: 0 0;
+               rel1 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.icon";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 8 0;
+               max: 8 0;
+            }
+         }
+         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";
+                  to_y: "bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
+               }
+               visible: 0;
+            }
+            description { state: "clear_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.swallow.rename";
+            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";
+                  to_y: "bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.end";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
+               }
+               visible: 0;
+            }
+            description { state: "rename_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         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: "elm.swallow.content";
+            clip_to: "contentclipper";
+            scale: 1;
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1 {
+                       to_x: "icon_right_padding";
+                       relative: 1.0 0.0;
+               }
+               rel2 {
+                to_x: "editfield_space";
+                relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "sb_vbar_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_vbar_clip";
+            clip_to: "sb_vbar_clip_master";
+            type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5362,6 +6055,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_vbar";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5371,16 +6065,18 @@ group { name: "elm/scroller/entry/default";
                rel1 {
                   relative: 0.0 0.0;
                   to_y:     "elm.swallow.content";
-                  to_x:     "elm.swallow.end";
+                  to_x:     "editfield_space";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_y:     "sb_hbar";
-                  to_x:     "elm.swallow.end";
+                  to_x:     "editfield_space";
                }
             }
          }
          part { name: "elm.dragable.vbar";
+            type: RECT;
+            scale: 1;
             clip_to: "sb_vbar_clip";
             mouse_events: 0;
             dragable {
@@ -5401,15 +6097,11 @@ group { name: "elm/scroller/entry/default";
                   relative: 0.5  0.5;
                   to: "sb_vbar";
                }
-               image {
-                  normal: "bt_sm_base2.png";
-                  border: 6 6 6 6;
-                  middle: SOLID;
-               }
             }
          }
          part { name: "sb_hbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5421,6 +6113,7 @@ group { name: "elm/scroller/entry/default";
          part { name: "sb_hbar_clip";
             clip_to: "sb_hbar_clip_master";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
             }
@@ -5431,6 +6124,7 @@ group { name: "elm/scroller/entry/default";
          }
          part { name: "sb_hbar";
             type: RECT;
+            scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
@@ -5450,6 +6144,8 @@ group { name: "elm/scroller/entry/default";
             }
          }
          part { name: "elm.dragable.hbar";
+            type: RECT;
+            scale: 1;
             clip_to: "sb_hbar_clip";
             mouse_events: 0;
             dragable {
@@ -5469,11 +6165,6 @@ group { name: "elm/scroller/entry/default";
                   relative: 0.5  0.5;
                   to: "sb_hbar";
                }
-               image {
-                  normal: "bt_sm_base2.png";
-                  border: 4 4 4 4;
-                  middle: SOLID;
-               }
             }
          }
       }
@@ -5496,12 +6187,42 @@ group { name: "elm/scroller/entry/default";
             source: "elm";
             action: STATE_SET "visible" 0.0;
             target: "elm.swallow.icon";
+            target: "icon_right_padding";
          }
          program { name: "icon_hide";
             signal: "elm,action,hide,icon";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.icon";
+            target: "icon_right_padding";
+         }
+         program { name: "clear_show";
+            signal: "elm,state,clear,visible";
+            source: "*";
+            action: STATE_SET "clear_visible" 0.0;
+            target: "elm.swallow.clear";
+            target: "editfield_space";
+         }
+         program { name: "clear_hide";
+            signal: "elm,state,clear,hidden";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.clear";
+            target: "editfield_space";
+         }
+         program { name: "rename_show";
+            signal: "elm,state,rename,visible";
+            source: "*";
+            action: STATE_SET "rename_visible" 0.0;
+            target: "elm.swallow.rename";
+            target: "editfield_space";
+         }
+         program { name: "rename_hide";
+            signal: "elm,state,rename,hidden";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.rename";
+            target: "editfield_space";
          }
          program { name: "end_show";
             signal: "elm,action,show,end";
@@ -5652,5 +6373,316 @@ group { name: "elm/scroller/entry/default";
                set_int(sbvis_timer, v);
             }
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
       }
    }
+group { name: "elm/scroller/entry/editfield";
+      inherit: "elm/scroller/entry/default";
+      data {
+         item: "focus_highlight" "off";
+      }
+      images {
+         image: "00_edit_field_focus.png" COMP;
+         image: "00_edit_field_bg.png" COMP;
+      }
+      parts {
+         part { name: "focus_bg";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "00_edit_field_bg.png";
+                  border: 8 8 8 8;
+                  border_scale: 1;
+               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_edit_field_focus.png";
+                  border: 8 8 8 8;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "focus_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 1.0 0.5;
+               fixed: 1 0;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+      }
+      programs {
+         program { name: "action_focus";
+            signal: "elm,state,focus,on";
+            source: "*";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,state,focus,off";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
+      }
+}
+group { name: "elm/scroller/entry/editfield/searchbar/default";
+      inherit: "elm/scroller/entry/default";
+      data {
+         item: "focus_highlight" "off";
+      }
+      images {
+         image: "00_search_edit_field_bg_focus.png" COMP;
+         image: "00_search_edit_field_bg.png" COMP;
+      }
+      parts {
+         part { name: "focus_bg";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 1;
+               image {
+                  normal: "00_search_edit_field_bg.png";
+                  border: 12 13 12 13;
+                  border_scale: 1;
+               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "00_search_edit_field_bg_focus.png";
+                  border: 12 13 12 13;
+                  border_scale: 1;
+               }
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "focus_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+         part { name: "focus_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 10 0;
+               max: 10 0;
+               align: 1.0 0.5;
+               fixed: 1 0;
+               rel1 {
+                  to: "focus_bg";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to: "focus_bg";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to_x: "focus_left_padding";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "focus_right_padding";
+                  relative: 0.0 1.0;
+               }
+            }
+         }
+      }
+      programs {
+         program { name: "action_focus";
+            signal: "elm,state,focus,on";
+            source: "*";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,state,focus,off";
+            source: "*";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
+      }
+}
+group { name: "elm/entry/base-single/datetime_popup";
+   name: "elm/entry/base-single/datetime_popup/year";
+   alias: "elm/entry/base-single/datetime_popup/month";
+   alias: "elm/entry/base-single/datetime_popup/date";
+   alias: "elm/entry/base-single/datetime_popup/hour";
+   alias: "elm/entry/base-single/datetime_popup/minute";
+
+   inherit: "elm/entry/base-single/default";
+
+   data.item: "default_font_size" "64";
+
+   styles {
+      style { name: "entry_datetime_popup_textblock_style";
+         base: "font=Tizen:style=Roman font_size="ENTRY_DATETIME_POPUP_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen";
+         tag:  "br" "\n";
+         tag:  "ps" "ps";
+         tag:  "tab" "\t";
+         tag:  "em" "+ font=Tizen:style=Oblique";
+         tag:  "b" "+ font=Tizen:style=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font=Tizen:style=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;
+      }
+   }
+   parts {
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: BLOCK_HANDLE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection 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_datetime_popup_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+            ENTRY_TEXTBLOCK_DEFAULT_REL
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+