[Copy&PasteUI] GUI_v1.2: change images, size for dark theme
[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / entry.edc
index 68a5370..e406f1b 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; \
-   }
+   data.item: "focus_highlight" "on";
 
 #define ENTRY_EDITFIELD_FOCUS_IMAGE \
    images { \
       image: "00_eidt_field_bg.png" COMP; \
    }
 
-#define ENTRY_TEXTBLOCK_DEFAULT_REL \
+#define ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL \
    rel1 { \
       to_x: "focus_left_padding"; \
       relative: 1.0 0.0; \
    } \
    rel2 { \
-      to_x: "editfield_space"; \
+      to_x: "clear_padding"; \
       relative: 0.0 1.0; \
    }
 
-#define ENTRY_SWALLOW_SCRIPT_PUBLIC \
+#define ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC \
    script { \
       public scroll_enabled; \
    }
 
-#define ENTRY_SWALLOW_PARTS \
-   part { name: "editfield_space"; \
+#define ENTRY_EDITFIELD_SWALLOW_PARTS \
+   part { name: "clear_padding"; \
       type: SPACER; \
       scale: 1; \
       description { state: "default" 0.0; \
          align: 1.0 0.5; \
          min: 0 0; \
          max: 0 0; \
+         fixed: 1 0; \
          rel1 { \
             to_x: "focus_right_padding"; \
             relative: 0.0 0.0; \
             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; \
+         min: 70 0; \
+         max: 70 0; \
       } \
    } \
-   part { name: "elm.swallow.rename"; \
+   part { name: "elm.swallow.clear"; \
       type: SWALLOW; \
       scale: 1; \
       description { state: "default" 0.0; \
       } \
    }
 
-#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; \
-         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; \
-         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; \
       description { state: "default" 0.0; \
          min: 10 0; \
          max: 10 0; \
+         fixed: 1 0; \
          align: 0.0 0.5; \
          rel1 { \
             to_x: "focus_bg"; \
          min: 10 0; \
          max: 10 0; \
          align: 1.0 0.5; \
+         fixed: 1 0; \
          rel1 { \
             to_x: "focus_bg"; \
             relative: 1.0 0.0; \
       } \
    }
 
-#define ENTRY_SWALLOW_PROGRAMS \
+#define ENTRY_EDITFIELD_SWALLOW_PROGRAMS \
    program { name: "scroll_enabled"; \
       signal: "elm,state,scroll,enabled"; \
       source: "*"; \
          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); \
+            set_state(PART:"clear_padding", "visible", 0.0); \
          } \
       } \
    } \
          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); \
+            set_state(PART:"clear_padding", "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";
@@ -457,7 +276,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";
@@ -486,10 +305,7 @@ 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;
@@ -534,7 +350,6 @@ 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;
@@ -544,9 +359,7 @@ group { name: "elm/entry/base/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -583,8 +396,6 @@ group { name: "elm/entry/base/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -611,7 +422,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";
@@ -640,10 +451,7 @@ 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;
@@ -688,7 +496,6 @@ 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;
@@ -698,9 +505,7 @@ group { name: "elm/entry/base-charwrap/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
         program { name: "focus";
         signal: "load";
@@ -737,8 +542,6 @@ group { name: "elm/entry/base-charwrap/default";
         source: "elm.text";
         action: PLAY_SAMPLE "touch_sound" 1.0;
      }
-     ENTRY_SWALLOW_PROGRAMS
-     ENTRY_FOCUS_PROGRAMS
   }
 }
 
@@ -749,10 +552,7 @@ 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;
@@ -795,7 +595,6 @@ group { name: "elm/entry/base-nowrap/default";
                min: 1 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -805,9 +604,7 @@ group { name: "elm/entry/base-nowrap/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -844,8 +641,6 @@ group { name: "elm/entry/base-nowrap/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -862,7 +657,7 @@ group { name: "elm/entry/base/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_textblock_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -878,7 +673,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 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -894,7 +689,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 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -955,7 +750,7 @@ group { name: "elm/entry/base/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -965,9 +760,9 @@ group { name: "elm/entry/base/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1004,7 +799,7 @@ group { name: "elm/entry/base/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1021,7 +816,7 @@ group { name: "elm/entry/base-charwrap/editfield";
    data.item: "max_font_size" "60";
    styles {
       style { name: "editfield_textblock_char_wrap_style";
-         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2";
+         base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1037,7 +832,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 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1053,7 +848,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 text_class=entry";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1114,7 +909,7 @@ group { name: "elm/entry/base-charwrap/editfield";
                min: 0 1;
                align: 0.0 0.0;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1124,9 +919,9 @@ group { name: "elm/entry/base-charwrap/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1163,7 +958,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1195,7 +990,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";
@@ -1211,7 +1006,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 ellipsis=1.0";
+         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";
@@ -1270,7 +1065,7 @@ group { name: "elm/entry/base-single/editfield";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1279,9 +1074,9 @@ group { name: "elm/entry/base-single/editfield";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1318,7 +1113,7 @@ group { name: "elm/entry/base-single/editfield";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
       ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
@@ -1330,8 +1125,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    data {
       item: context_menu_orientation "horizontal";
    }
-   ENTRY_FOCUS_DATA
-   ENTRY_FOCUS_IMAGE
+   ENTRY_EDITFIELD_FOCUS_DATA
+   ENTRY_EDITFIELD_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";
@@ -1350,7 +1145,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          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=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry";
+         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";
@@ -1377,7 +1172,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
       }
    }
    parts {
-      ENTRY_FOCUS_PARTS
+      ENTRY_EDITFIELD_FOCUS_PARTS
       part { name: "elm.guide";
          type: TEXTBLOCK;
          mouse_events: 0;
@@ -1420,7 +1215,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
+            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -1429,9 +1224,9 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
+      ENTRY_EDITFIELD_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
+   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1468,8 +1263,8 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
+      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
+      ENTRY_EDITFIELD_FOCUS_PROGRAMS
    }
 }
 
@@ -1495,7 +1290,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";
@@ -1521,13 +1316,10 @@ 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;
@@ -1572,7 +1364,6 @@ 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;
@@ -1581,9 +1372,7 @@ group { name: "elm/entry/base-single/default";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -1620,8 +1409,6 @@ group { name: "elm/entry/base-single/default";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -2022,10 +1809,7 @@ 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;
@@ -2069,7 +1853,6 @@ group { name: "elm/entry/base-noedit/default";
                  min: 1 1;
                   max: 0 1;
               }
-               ENTRY_TEXTBLOCK_DEFAULT_REL
            }
            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2078,9 +1861,7 @@ group { name: "elm/entry/base-noedit/default";
               }
            }
         }
-         ENTRY_SWALLOW_PARTS
       }
-      ENTRY_SWALLOW_SCRIPT_PUBLIC
       programs {
         program { name: "focus";
             signal: "load";
@@ -2117,8 +1898,6 @@ group { name: "elm/entry/base-noedit/default";
             source: "elm.text";
             action: PLAY_SAMPLE "touch_sound" 1.0;
          }
-         ENTRY_SWALLOW_PROGRAMS
-         ENTRY_FOCUS_PROGRAMS
       }
    }
 
@@ -2148,7 +1927,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";
@@ -2174,10 +1953,7 @@ 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;
@@ -2221,7 +1997,6 @@ group { name: "elm/entry/base-password/popup";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -2230,9 +2005,7 @@ group { name: "elm/entry/base-password/popup";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -2269,8 +2042,6 @@ group { name: "elm/entry/base-password/popup";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -2879,7 +2650,7 @@ group { name: "elm/entry/base-password/popup";
        group { name: "elm/entry/magnifier/fixed-size";
                data.item: "height" MAGNIFIER_HEIGHT_FIXED;
                data.item: "scale" MAGNIFIER_SCALE;
-               data.item: "arrow" 24;
+               data.item: "arrow" 30;
                images {
                  image: "copy&paste_Magnifier_left.png" COMP;
                  image: "copy&paste_Magnifier_middle.png" COMP;
@@ -2903,7 +2674,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                type: RECT;
                                description { state: "default" 0.0;
-                                       min: 20 134;
+                                       min: 20 MAGNIFIER_HEIGHT_FIXED;
                                        max: 20 -1;
                                        align: 1.0 0.0;
                                        rel2 { relative: 0.5 1.0; to: "bg"; }
@@ -2916,7 +2687,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                type: RECT;
                                description { state: "default" 0.0;
-                                       min: 20 134;
+                                       min: 20 MAGNIFIER_HEIGHT_FIXED;
                                        max: 20 -1;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.5 0.0; to: "bg"; }
@@ -2929,7 +2700,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                description { state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: 136 134;
+                                       min: 142 MAGNIFIER_HEIGHT_FIXED;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 0.0; to: "bg"; }
                                        rel2 { relative: 0.0 1.0; to: "bg_middle_left"; }
@@ -2961,7 +2732,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                description { state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: 136 134;
+                                       min: 142 MAGNIFIER_HEIGHT_FIXED;
                                        rel1 { relative: 1.0 0.0; to: "bg_middle_right"; }
                                        rel2.to: "bg";
                                        image {
@@ -4702,22 +4473,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";
@@ -4725,31 +4489,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";
@@ -4762,10 +4526,7 @@ 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;
@@ -4774,9 +4535,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;
@@ -4791,37 +4552,32 @@ 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";
@@ -4858,40 +4614,190 @@ group { name: "elm/entry/base/font_color_black";
          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 {
-               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;
-         }
+
+   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";
       }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
+      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";
+   }
+   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;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "font_color_black_textblock_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+   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;
+      }
+   }
+}
+
+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;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
          scale: 1;
          entry_mode: PLAIN;
          select_mode: BLOCK_HANDLE;
@@ -4978,7 +4884,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";
@@ -4994,7 +4900,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";
@@ -5010,7 +4916,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";
@@ -5023,10 +4929,7 @@ 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;
@@ -5070,7 +4973,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
                style: "font_color_black_textblock_char_wrap_style";
                min: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5080,9 +4982,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5119,8 +5019,6 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5139,7 +5037,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";
@@ -5155,7 +5053,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";
@@ -5171,7 +5069,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";
@@ -5184,10 +5082,7 @@ 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;
@@ -5230,7 +5125,6 @@ group { name: "elm/entry/base-single/font_color_black";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5239,9 +5133,7 @@ group { name: "elm/entry/base-single/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5278,8 +5170,6 @@ group { name: "elm/entry/base-single/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
@@ -5384,7 +5274,7 @@ 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";
@@ -5400,7 +5290,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";
@@ -5416,7 +5306,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 ellipsis=1.0";
+         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";
@@ -5450,7 +5340,6 @@ 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;
@@ -5469,10 +5358,7 @@ 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;
@@ -5515,7 +5401,6 @@ group { name: "elm/entry/base-password/font_color_black";
                min: 1 1;
                max: 0 1;
             }
-            ENTRY_TEXTBLOCK_DEFAULT_REL
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -5524,9 +5409,7 @@ group { name: "elm/entry/base-password/font_color_black";
             }
          }
       }
-      ENTRY_SWALLOW_PARTS
    }
-   ENTRY_SWALLOW_SCRIPT_PUBLIC
    programs {
       program { name: "focus";
          signal: "load";
@@ -5563,17 +5446,12 @@ group { name: "elm/entry/base-password/font_color_black";
          source: "elm.text";
          action: PLAY_SAMPLE "touch_sound" 1.0;
       }
-      ENTRY_SWALLOW_PROGRAMS
-      ENTRY_FOCUS_PROGRAMS
    }
 }
 
 group { name: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_focus.png" COMP;
+         item: "focus_highlight" "off";
       }
       script {
          public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
@@ -5603,143 +5481,68 @@ group { name: "elm/scroller/entry/default";
          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_image";
-            scale: 1;
             mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
                visible: 0;
-               image {
-                  normal: "00_focus.png";
-                  border: 6 6 6 6;
-                  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;
+         part { name: "bg";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 10 0;
-               max: 10 0;
-               align: 0.0 0.5;
-               rel1 {
-                  to: "focus_bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 0.0 1.0;
-               }
+               visible: 0;
             }
          }
-         part { name: "focus_right_padding";
-            type: SPACER;
+         part { name: "clipper";
+            type: RECT;
             scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               min: 10 0;
-               max: 10 0;
-               align: 1.0 0.5;
-               rel1 {
-                  to: "focus_bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "focus_bg";
-                  relative: 1.0 1.0;
-               }
+               rel1.to: "bg";
+               rel2.to: "bg";
             }
          }
-         part { name: "bg";
+         part { name: "contentclipper";
             type: RECT;
             scale: 1;
+            mouse_events: 0;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               visible: 0;
                rel1 {
-                  to_x: "focus_left_padding";
+                  to_x: "icon_padding";
+                  to_y: "bg";
                   relative: 1.0 0.0;
                }
                rel2 {
-                  to_x: "focus_right_padding";
+                  to_x: "clear_padding";
+                  to_y: "bg";
                   relative: 0.0 1.0;
                }
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-         }
-         part { name: "editfield_space";
+         part { name: "icon_padding";
             type: SPACER;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 1.0 1.0;
+               align: 0.0 0.5;
                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;
+               fixed: 1 1;
                rel1 {
-                  to_x: "elm.swallow.rename";
+                  to: "bg";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to_x: "elm.swallow.rename";
+                  to: "bg";
                   relative: 0.0 1.0;
                }
             }
-            description { state: "clear_visible" 0.0;
+            description { state: "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;
+               min: 70 0;
+               max: 70 0;
             }
          }
          part { name: "elm.swallow.icon";
@@ -5764,36 +5567,13 @@ group { name: "elm/scroller/entry/default";
                visible: 1;
             }
          }
-         part { name: "icon_right_padding";
+         part { name: "clear_padding";
             type: SPACER;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.0 0.0;
+               align: 1.0 0.5;
                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";
@@ -5805,14 +5585,14 @@ group { name: "elm/scroller/entry/default";
                   to_y: "bg";
                   relative: 0.0 1.0;
                }
-               visible: 0;
             }
-            description { state: "clear_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               min: 70 0;
+               max: 70 0;
             }
          }
-         part { name: "elm.swallow.rename";
+         part { name: "elm.swallow.clear";
             type: SWALLOW;
             scale: 1;
             clip_to: "clipper";
@@ -5831,7 +5611,7 @@ group { name: "elm/scroller/entry/default";
                }
                visible: 0;
             }
-            description { state: "rename_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
@@ -5864,12 +5644,14 @@ group { name: "elm/scroller/entry/default";
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
-                       to_x: "icon_right_padding";
-                       relative: 1.0 0.0;
+                  to_x: "icon_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
                }
                rel2 {
-                to_x: "editfield_space";
-                relative: 0.0 1.0;
+                  to_x: "clear_padding";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
                }
             }
          }
@@ -5908,12 +5690,12 @@ group { name: "elm/scroller/entry/default";
                rel1 {
                   relative: 0.0 0.0;
                   to_y:     "elm.swallow.content";
-                  to_x:     "editfield_space";
+                  to_x:     "clear_padding";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_y:     "sb_hbar";
-                  to_x:     "editfield_space";
+                  to_x:     "clear_padding";
                }
             }
          }
@@ -6030,42 +5812,28 @@ group { name: "elm/scroller/entry/default";
             source: "elm";
             action: STATE_SET "visible" 0.0;
             target: "elm.swallow.icon";
-            target: "icon_right_padding";
+            target: "icon_padding";
          }
          program { name: "icon_hide";
             signal: "elm,action,hide,icon";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.icon";
-            target: "icon_right_padding";
+            target: "icon_padding";
          }
          program { name: "clear_show";
             signal: "elm,state,clear,visible";
             source: "*";
-            action: STATE_SET "clear_visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.swallow.clear";
-            target: "editfield_space";
+            target: "clear_padding";
          }
          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";
+            target: "clear_padding";
          }
          program { name: "end_show";
             signal: "elm,action,show,end";
@@ -6216,24 +5984,12 @@ 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";
+         item: "focus_highlight" "on";
       }
       images {
          image: "00_edit_field_focus.png" COMP;
@@ -6256,63 +6012,66 @@ group { name: "elm/scroller/entry/editfield";
                rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "focus_image";
+         part { name: "focus_left_padding";
+            type: SPACER;
             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;
-               }
+               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: 1.0 1.0;
+                  relative: 0.0 1.0;
                }
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
-         part { name: "focus_left_padding";
+         part { name: "focus_right_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
                min: 10 0;
                max: 10 0;
-               align: 0.0 0.5;
+               align: 1.0 0.5;
+               fixed: 1 0;
                rel1 {
                   to: "focus_bg";
-                  relative: 0.0 0.0;
+                  relative: 1.0 0.0;
                }
                rel2 {
                   to: "focus_bg";
-                  relative: 0.0 1.0;
+                  relative: 1.0 1.0;
                }
             }
          }
-         part { name: "focus_right_padding";
-            type: SPACER;
+         part { name: "focus_image";
             scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
-               min: 10 0;
-               max: 10 0;
-               align: 1.0 0.5;
+               visible: 0;
+               image {
+                  normal: "00_edit_field_focus.png";
+                  border: 8 8 8 8;
+                  border_scale: 1;
+               }
                rel1 {
                   to: "focus_bg";
-                  relative: 1.0 0.0;
+                  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: "bg";
             type: RECT;
@@ -6348,7 +6107,7 @@ group { name: "elm/scroller/entry/editfield";
 group { name: "elm/scroller/entry/editfield/searchbar/default";
       inherit: "elm/scroller/entry/default";
       data {
-         item: "focus_highlight" "off";
+         item: "focus_highlight" "on";
       }
       images {
          image: "00_search_edit_field_bg_focus.png" COMP;
@@ -6371,63 +6130,65 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
                rel2.relative: 1.0 1.0;
             }
          }
-         part { name: "focus_image";
+         part { name: "focus_left_padding";
+            type: SPACER;
             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;
-               }
+               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: 1.0 1.0;
+                  relative: 0.0 1.0;
                }
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
-         part { name: "focus_left_padding";
+         part { name: "focus_right_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
                min: 10 0;
                max: 10 0;
-               align: 0.0 0.5;
+               align: 1.0 0.5;
+               fixed: 1 0;
                rel1 {
                   to: "focus_bg";
-                  relative: 0.0 0.0;
+                  relative: 1.0 0.0;
                }
                rel2 {
                   to: "focus_bg";
-                  relative: 0.0 1.0;
+                  relative: 1.0 1.0;
                }
             }
          }
-         part { name: "focus_right_padding";
-            type: SPACER;
+         part { name: "focus_image";
             scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               min: 10 0;
-               max: 10 0;
-               align: 1.0 0.5;
+               visible: 0;
+               image {
+                  normal: "00_search_edit_field_bg_focus.png";
+                  border: 12 13 12 13;
+                  border_scale: 1;
+               }
                rel1 {
                   to: "focus_bg";
-                  relative: 1.0 0.0;
+                  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: "bg";
             type: RECT;
@@ -6460,6 +6221,64 @@ group { name: "elm/scroller/entry/editfield/searchbar/default";
          }
       }
 }
-
+group { name: "elm/entry/base-single/datetime_popup";
+   inherit: "elm/entry/base-single/default";
+   alias: "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";
+   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;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}