From df7eabc6760d5b7c33c24fc11adce10ff7f4fffe Mon Sep 17 00:00:00 2001
From: WooHyun Jung <wh0705.jung@samsung.com>
Date: Tue, 16 Aug 2011 10:10:54 +0900
Subject: [PATCH] [Editfield & Entry] HD styles were added

---
 themes/groups/editfield.edc                        | 176 ++++++++++-----------
 themes/groups/entry.edc                            |  24 +--
 .../00_EditField_clear.png}                        | Bin
 .../00_field_btn_Clear.png}                        | Bin
 themes/images/nbeat-black/00_field_btn_delete.png  | Bin 440 -> 0 bytes
 themes/images/nbeat-hd/00_EditField_clear.png      | Bin 0 -> 3272 bytes
 .../00_field_btn_Clear.png}                        | Bin 3097 -> 3163 bytes
 .../00_EditField_clear.png}                        | Bin
 .../00_field_btn_Clear.png}                        | Bin
 themes/inc/nbeat-black-inc.edc                     |  38 +++++
 themes/inc/nbeat-hd-inc.edc                        |  38 +++++
 themes/inc/nbeat-inc.edc                           |  38 +++++
 12 files changed, 214 insertions(+), 100 deletions(-)
 rename themes/images/{nbeat/00_field_btn_delete.png => nbeat-black/00_EditField_clear.png} (100%)
 rename themes/images/{nbeat/00_field_btn_clear.png => nbeat-black/00_field_btn_Clear.png} (100%)
 delete mode 100644 themes/images/nbeat-black/00_field_btn_delete.png
 create mode 100644 themes/images/nbeat-hd/00_EditField_clear.png
 rename themes/images/{nbeat-black/00_field_btn_clear.png => nbeat-hd/00_field_btn_Clear.png} (84%)
 rename themes/images/{nbeat-hd/00_field_btn_delete.png => nbeat/00_EditField_clear.png} (100%)
 rename themes/images/{nbeat-hd/00_field_btn_clear.png => nbeat/00_field_btn_Clear.png} (100%)

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 758bbbe..38b3b21 100644
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -23,11 +23,11 @@
 
 group { name: "elm/editfield/base/default";
    images {
-      image: "00_field_btn_delete.png" COMP;
+      image: "00_EditField_clear.png" COMP;
    }
    styles {
       style { name: "editfield_content_singleline_style";
-         base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=mixed ellipsis=1";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed ellipsis=1";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -37,7 +37,7 @@ group { name: "elm/editfield/base/default";
          tag:  "hilight" "+ font=SLP:style=Bold";
       }
       style { name: "editfield_content_multiline_style";
-         base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=mixed";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -104,7 +104,7 @@ group { name: "elm/editfield/base/default";
          ignore_flags: ON_HOLD;
          description {
             state: "default" 0.0;
-            min: 0 80;
+            min: 0 EDITFIELD_DEFAULT_MINH_INC;
             color: 0 0 0 0;
          }
       }
@@ -116,7 +116,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 20;
+            min: 0 EDITFIELD_DEFAULT_TOP1_SINGLE_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -125,7 +125,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 35;
+            min: 0 EDITFIELD_DEFAULT_TOP1_MULTI_INC;
          }
       }
       part {
@@ -136,7 +136,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 6;
+            min: 0 EDITFIELD_DEFAULT_TOP2_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -155,7 +155,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_LEFT1_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -170,7 +170,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_LEFT2_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -185,7 +185,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 2 0;
+            min: EDITFIELD_DEFAULT_LEFT3_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1 {
@@ -206,7 +206,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -215,7 +215,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "elm.eraser.show" 0.0;
             inherit: "default" 0.0;
-            min: 40 0;
+            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
          }
       }
       part {
@@ -226,7 +226,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_RIGHT2_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -241,7 +241,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 20;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC;
             fixed: 1 1;
             align: 0 1;
             rel1.relative: 0.0 1.0;
@@ -249,7 +249,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 5;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC;
          }
       }
       part {
@@ -260,7 +260,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 25;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -268,7 +268,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 8;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC;
          }
       }
       part {
@@ -279,7 +279,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 70;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -287,7 +287,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 60;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC;
          }
       }
       part {
@@ -314,7 +314,7 @@ group { name: "elm/editfield/base/default";
             color: EDITFIELD_TITLE_COLOR_INC;
             text {
                font: "SLP:style=Medium";
-               size: 24;
+               size: EDITFIELD_TITLE_SIZE_INC;
                min: 1 1;
                align: 0.0 0.0;
             }
@@ -339,7 +339,7 @@ group { name: "elm/editfield/base/default";
             color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 32;
+               size: ENTRY_TEXT_SIZE_INC;
                min: 0 0;
                align: 0.0 0.5;
             }
@@ -502,7 +502,7 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 30 30;
+            min: EDITFIELD_DEFAULT_ERASER_MINW_INC EDITFIELD_DEFAULT_ERASER_MINH_INC;
             fixed: 1 1;
             align: 1 1;
             rel1 {
@@ -516,7 +516,7 @@ group { name: "elm/editfield/base/default";
                to_y : "bottom2";
             }
             image {
-               normal: "00_field_btn_delete.png";
+               normal: "00_EditField_clear.png";
                border: 10 10 10 10;
                border_scale: 1;
             }
@@ -669,7 +669,7 @@ group { name: "elm/editfield/base/default";
 group { name: "elm/editfield/base/searchbar";
    alias: "elm/editfield/base/searchbar/default";
    images {
-      image: "00_field_btn_clear.png" COMP;
+      image: "00_field_btn_Clear.png" COMP;
    }
    script {
       public single_line = 0;
@@ -718,7 +718,7 @@ group { name: "elm/editfield/base/searchbar";
          ignore_flags: ON_HOLD;
          description {
             state: "default" 0.0;
-            min: 0 30;
+            min: 0 EDITFIELD_SEARCHBAR_MINH_INC;
             color: 0 0 0 0;
          }
       }
@@ -730,7 +730,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 6;
+            min: 0 EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -739,7 +739,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 10.5;
+            min: 0 EDITFIELD_SEARCHBAR_TOP1_MULTI_INC;
          }
       }
       part {
@@ -750,7 +750,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 10;
+            min: 0 EDITFIELD_SEARCHBAR_TOP2_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -769,7 +769,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_SEARCHBAR_LEFT1_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -784,7 +784,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_SEARCHBAR_LEFT2_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -799,7 +799,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 2 0;
+            min: EDITFIELD_SEARCHBAR_LEFT3_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1 {
@@ -820,7 +820,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 15 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -829,7 +829,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "elm.eraser.show" 0.0;
             inherit: "default" 0.0;
-            min: 55 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
          }
       }
       part {
@@ -840,7 +840,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 5 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT2_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -855,7 +855,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 8;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC;
             fixed: 1 1;
             align: 0 1;
             rel1.relative: 0.0 1.0;
@@ -863,7 +863,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 2;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC;
          }
       }
       part {
@@ -874,7 +874,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 11;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -882,7 +882,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 2;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC;
          }
       }
       part {
@@ -893,7 +893,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 60;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -901,7 +901,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 50;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC;
          }
       }
       part {
@@ -928,7 +928,7 @@ group { name: "elm/editfield/base/searchbar";
             color: EDITFIELD_TITLE_COLOR_INC;
             text {
                font: "SLP:style=Medium";
-               size: 20;
+               size: EDITFIELD_TITLE_SIZE_INC;
                min: 1 1;
                align: 0.0 0.0;
             }
@@ -953,7 +953,7 @@ group { name: "elm/editfield/base/searchbar";
             color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 32;
+               size: ENTRY_TEXT_SIZE_INC;
                min: 0 0;
                align: 0.0 0.5;
             }
@@ -1116,7 +1116,7 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 30 30;
+            min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC;
             fixed: 1 1;
             align: 1 1;
             rel1 {
@@ -1130,7 +1130,7 @@ group { name: "elm/editfield/base/searchbar";
                to_y : "bottom2";
             }
             image {
-               normal: "00_field_btn_clear.png";
+               normal: "00_field_btn_Clear.png";
                border: 4 4 4 4 ;
                border_scale: 1;
             }
@@ -1282,11 +1282,11 @@ group { name: "elm/editfield/base/searchbar";
 
 group { name: "elm/editfield/base/font_color_black";
    images {
-      image: "00_field_btn_delete.png" COMP;
+      image: "00_EditField_clear.png" COMP;
    }
    styles {
       style { name: "editfield_content_singleline_black_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=mixed ellipsis=1";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed ellipsis=1";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1296,7 +1296,7 @@ group { name: "elm/editfield/base/font_color_black";
          tag:  "hilight" "+ font=SLP:style=Bold";
       }
       style { name: "editfield_content_multiline_black_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=mixed";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -1363,7 +1363,7 @@ group { name: "elm/editfield/base/font_color_black";
          ignore_flags: ON_HOLD;
          description {
             state: "default" 0.0;
-            min: 0 80;
+            min: 0 EDITFIELD_DEFAULT_MINH_INC;
             color: 0 0 0 0;
          }
       }
@@ -1375,7 +1375,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 20;
+            min: 0 EDITFIELD_DEFAULT_TOP1_SINGLE_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -1384,7 +1384,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 35;
+            min: 0 EDITFIELD_DEFAULT_TOP1_MULTI_INC;
          }
       }
       part {
@@ -1395,7 +1395,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 6;
+            min: 0 EDITFIELD_DEFAULT_TOP2_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -1414,7 +1414,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_LEFT1_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -1429,7 +1429,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_LEFT2_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -1444,7 +1444,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 2 0;
+            min: EDITFIELD_DEFAULT_LEFT3_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1 {
@@ -1465,7 +1465,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -1474,7 +1474,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "elm.eraser.show" 0.0;
             inherit: "default" 0.0;
-            min: 40 0;
+            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
          }
       }
       part {
@@ -1485,7 +1485,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_DEFAULT_RIGHT2_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -1500,7 +1500,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 20;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC;
             fixed: 1 1;
             align: 0 1;
             rel1.relative: 0.0 1.0;
@@ -1508,7 +1508,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 5;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC;
          }
       }
       part {
@@ -1519,7 +1519,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 25;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -1527,7 +1527,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 8;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC;
          }
       }
       part {
@@ -1538,7 +1538,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 70;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -1546,7 +1546,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 60;
+            min: 0 EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC;
          }
       }
       part {
@@ -1573,7 +1573,7 @@ group { name: "elm/editfield/base/font_color_black";
             color: 0 0 0 255;
             text {
                font: "SLP:style=Medium";
-               size: 24;
+               size: EDITFIELD_TITLE_SIZE_INC;
                min: 1 1;
                align: 0.0 0.0;
             }
@@ -1598,7 +1598,7 @@ group { name: "elm/editfield/base/font_color_black";
             color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 32;
+               size: ENTRY_TEXT_SIZE_INC;
                min: 0 0;
                align: 0.0 0.5;
             }
@@ -1761,7 +1761,7 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 30 30;
+            min: EDITFIELD_DEFAULT_ERASER_MINW_INC EDITFIELD_DEFAULT_ERASER_MINH_INC;
             fixed: 1 1;
             align: 1 1;
             rel1 {
@@ -1775,7 +1775,7 @@ group { name: "elm/editfield/base/font_color_black";
                to_y : "bottom2";
             }
             image {
-               normal: "00_field_btn_delete.png";
+               normal: "00_EditField_clear.png";
                border: 10 10 10 10;
                border_scale: 1;
             }
@@ -1927,7 +1927,7 @@ group { name: "elm/editfield/base/font_color_black";
 
 group { name: "elm/editfield/base/searchbar/font_color_black";
    images {
-      image: "00_field_btn_clear.png" COMP;
+      image: "00_field_btn_Clear.png" COMP;
    }
    script {
       public single_line = 0;
@@ -1976,7 +1976,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          ignore_flags: ON_HOLD;
          description {
             state: "default" 0.0;
-            min: 0 30;
+            min: 0 EDITFIELD_SEARCHBAR_MINH_INC;
             color: 0 0 0 0;
          }
       }
@@ -1988,7 +1988,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 6;
+            min: 0 EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -1997,7 +1997,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 10.5;
+            min: 0 EDITFIELD_SEARCHBAR_TOP1_MULTI_INC;
          }
       }
       part {
@@ -2008,7 +2008,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 10;
+            min: 0 EDITFIELD_SEARCHBAR_TOP2_INC;
             fixed: 1 1;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
@@ -2027,7 +2027,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_SEARCHBAR_LEFT1_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -2042,7 +2042,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 0;
+            min: EDITFIELD_SEARCHBAR_LEFT2_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1.relative : 0.0 0.0;
@@ -2057,7 +2057,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 2 0;
+            min: EDITFIELD_SEARCHBAR_LEFT3_INC 0;
             fixed: 1 1;
             align: 0 0;
             rel1 {
@@ -2078,7 +2078,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 15 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -2087,7 +2087,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "elm.eraser.show" 0.0;
             inherit: "default" 0.0;
-            min: 55 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
          }
       }
       part {
@@ -2098,7 +2098,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 5 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT2_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
@@ -2113,7 +2113,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 8;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC;
             fixed: 1 1;
             align: 0 1;
             rel1.relative: 0.0 1.0;
@@ -2121,7 +2121,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 2;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC;
          }
       }
       part {
@@ -2132,7 +2132,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 11;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -2140,7 +2140,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 2;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC;
          }
       }
       part {
@@ -2151,7 +2151,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 0 60;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
             align: 0 1;
@@ -2159,7 +2159,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "elm.text.show" 0.0;
             inherit: "default" 0.0;
-            min: 0 50;
+            min: 0 EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC;
          }
       }
       part {
@@ -2186,7 +2186,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
             color: EDITFIELD_TITLE_COLOR_INC;
             text {
                font: "SLP:style=Medium";
-               size: 20;
+               size: EDITFIELD_TITLE_SIZE_INC;
                min: 1 1;
                align: 0.0 0.0;
             }
@@ -2211,7 +2211,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
             color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
             text {
                font: "SLP:style=Roman";
-               size: 32;
+               size: ENTRY_TEXT_SIZE_INC;
                min: 0 0;
                align: 0.0 0.5;
             }
@@ -2374,7 +2374,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: 30 30;
+            min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_ERASER_MINH_INC;
             fixed: 1 1;
             align: 1 1;
             rel1 {
@@ -2388,7 +2388,7 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
                to_y : "bottom2";
             }
             image {
-               normal: "00_field_btn_clear.png";
+               normal: "00_field_btn_Clear.png";
                border: 4 4 4 4 ;
                border_scale: 1;
             }
diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index b282527..5618276 100644
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -336,7 +336,7 @@
 		styles
 		{
 			style { name: "editfield_textblock_style";
-				base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=2 right_margin=2";
+				base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=mixed left_margin=2 right_margin=2";
 				tag:  "br" "\n";
 				tag:  "ps" "ps";
 				tag:  "tab" "\t";
@@ -348,7 +348,7 @@
 	      			tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
 			}
 			style { name: "editfield_textblock_disabled_style";
-				base: "font=SLP:style=Roman font_size=32 color=#00000080 wrap=mixed linesize=44";
+				base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed linesize=44";
 				tag:  "br" "\n";
 				tag:  "ps" "ps";
 				tag:  "tab" "\t";
@@ -441,7 +441,7 @@
 		styles
 		{
 			style { name: "editfield_textblock_char_wrap_style";
-				base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=2 right_margin=2";
+				base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=char left_margin=2 right_margin=2";
 				tag:  "br" "\n";
 				tag:  "ps" "ps";
 				tag:  "tab" "\t";
@@ -453,7 +453,7 @@
 	      			tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
 			}
 			style { name: "editfield_textblock_char_wrap_disabled_style";
-				base: "font=SLP:style=Roman font_size=32 color=#00000080 wrap=char linesize=44";
+				base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char linesize=44";
 				tag:  "br" "\n";
 				tag:  "ps" "ps";
 				tag:  "tab" "\t";
@@ -545,7 +545,7 @@
 		styles
 		{
 			style { name: "editfield_single_textblock_style";
-				base: "font=SLP:style=Roman font_size=32 color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=2 right_margin=3";
+				base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" wrap=none left_margin=2 right_margin=3";
 				tag:  "br" "\n";
 				tag:  "ps" "ps";
 				tag:  "tab" "\t";
@@ -557,7 +557,7 @@
 	      			tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
 			}
 			style { name: "editfield_single_textblock_disabled_style";
-		 	    base: "font=SLP:style=Roman font_size=32 color=#00000080 wrap=none";
+		 	    base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none";
 				tag:  "br" "\n";
 				tag:  "ps" "ps";
 				tag:  "tab" "\t";
@@ -2758,7 +2758,7 @@ group { name: "elm/entry/base/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=mixed left_margin=2 right_margin=2";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed left_margin=2 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2770,7 +2770,7 @@ group { name: "elm/entry/base/font_color_black";
          tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
       }
       style { name: "font_color_black_textblock_disabled_style";
-         base: "font=SLP:style=Roman font_size=32 color=#00000080 wrap=mixed linesize=44";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed linesize=44";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2863,7 +2863,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
 
    styles {
       style { name: "font_color_black_textblock_char_wrap_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=char left_margin=2 right_margin=2";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=char left_margin=2 right_margin=2";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2875,7 +2875,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
       }
       style { name: "font_color_black_textblock_char_wrap_disabled_style";
-         base: "font=SLP:style=Roman font_size=32 color=#00000080 wrap=char linesize=44";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char linesize=44";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2968,7 +2968,7 @@ group { name: "elm/entry/base-single/font_color_black";
 
    styles {
       style { name: "font_color_black_single_textblock_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000FF wrap=none left_margin=2 right_margin=3";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=2 right_margin=3";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -2980,7 +2980,7 @@ group { name: "elm/entry/base-single/font_color_black";
          tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
       }
       style { name: "font_color_black_single_textblock_disabled_style";
-         base: "font=SLP:style=Roman font_size=32 color=#00000080 wrap=none";
+         base: "font=SLP:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
diff --git a/themes/images/nbeat/00_field_btn_delete.png b/themes/images/nbeat-black/00_EditField_clear.png
similarity index 100%
rename from themes/images/nbeat/00_field_btn_delete.png
rename to themes/images/nbeat-black/00_EditField_clear.png
diff --git a/themes/images/nbeat/00_field_btn_clear.png b/themes/images/nbeat-black/00_field_btn_Clear.png
similarity index 100%
rename from themes/images/nbeat/00_field_btn_clear.png
rename to themes/images/nbeat-black/00_field_btn_Clear.png
diff --git a/themes/images/nbeat-black/00_field_btn_delete.png b/themes/images/nbeat-black/00_field_btn_delete.png
deleted file mode 100644
index 0e8d7ee5e013ba6f4a22b8c60cb48466d9dd7852..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzT1iAfRCwCd*WGP{Fc1J>$Kt)+r0oXD
z1U&Nw8<-863Bm^930~U?$_VKubc5bWM|5)exwD0%o^(<q5<dHUG3L;9oq>3Tyg(k!
zzA-@7MN!-i03-SZ`E1g~TShaT&@+u{kH{e%eZFL@yba{L_HIx%ahdzRH-sN8yYQKy
z#COA*2Sv7W4cEP7%ODOYsiWUFuoR;fE~)V_ULY$WdSwG1mj*2@HQwl|L|0=C#*wyC
zd<Jcy%uNVvsJxr_0$PR6ScHe5Tg~O;h5@BF5EZI{w{R62vVr(z4?-Whb7|qF|7l50
zwhR2Hd;M<L;5GuS=Kg9@+(w|&^Ee2%F=!0F20ID5fxFl>ZY7V!89Zp`YP~0w^bA(P
zOuuLDA%;io$%Em|zu39*1YXWdJ<!>D>cAi6!A|<sCuR%?*X$L>C73n#PK~9$L7pH#
i5};_D@TKinfB^u9bAW+R71OW)0000<MNUMnLSTZ81Hn1~

diff --git a/themes/images/nbeat-hd/00_EditField_clear.png b/themes/images/nbeat-hd/00_EditField_clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..79b89f18b8dce76f20d6af10f90b4f50bbd73797
GIT binary patch
literal 3272
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
GLSTYGcny*O

literal 0
HcmV?d00001

diff --git a/themes/images/nbeat-black/00_field_btn_clear.png b/themes/images/nbeat-hd/00_field_btn_Clear.png
similarity index 84%
rename from themes/images/nbeat-black/00_field_btn_clear.png
rename to themes/images/nbeat-hd/00_field_btn_Clear.png
index 8359287a63bb4e7dd817e732ec7fd282b59a018e..fa984add62a40c139900c9cb46215f6fe9151eb2 100644
GIT binary patch
delta 457
zcmV;)0XF`b7~2>jiBL{Q4GJ0x0000DNk~Le0000c0000c2nGNE0H{6buCXDX3V()4
zL_t(|+U(fTZNe}RfZ;zD1Ed>t1V$($^yQw(1f>(8PCz#xuklMqfNsDD86hL^(4&eX
z5@P$B(5fd{LKZrIvdvvWR#g=mYhVjJGEdaNn~0PEPAB&|=0c%s@4feXfCaG8-MW`p
zd+$FT@Y0$rfd?R)YKTatYaUyUt$*tr-z(5ey+tC@0MG4Xb)D}tbDf{!zQb{+@vC7=
z;GkofuvSo>#fXGE;7LCpfE93xMCGlVE6bzIBX+KfGCRs{2?@bnLp7Q+8Ftcb55@JN
zMqP!mM;VGsLWSP3vAASZ%;mp@GeN}`*dd$=Dy8!G;Y?7eE$JH01odZ|_<vAEkLeI5
zu)bekV})~us8wW#FoE5wQzt8&Geo8K)+ktLMNh`LA3&Ml#=v$76}=C)v%dT>6@92f
zBtO9(b;P!r3+|HV<`e89AZcm@<@tZ%O@-xiLA>{Q7gi6HhAB}Wt*JVzs%kT)u1p+-
z1K#=i!|q<96p`|B#|o`2^&X6%8Yo1h05}f-jXjh2v#?x(00000NkvXXu0mjf?BC4=

delta 390
zcmV;10eSx07?~I$iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_^~0M3V%dN
zL_t(|+N_nqaf2`rMIQ`z(?RSGNC&tBm%w)5bl_AFS0GV>JFrWjgWwKu2e~XW8X18U
z*b^f(|7mx>R+%vdjS8rNlJ#*Dkq#hJKm%B|jc*aTWX701@T-eg;I&eC2b}f$Pyi=K
z{3}&WMBdh{wJ7A2J2ii8Se{X<EPnzUO6|)7=;oBHwWB#&5gGjdAwUEC00VHGfmFcV
zslwIYkcVuh;-v~y3*v)jODv$*lZPO__;K`oEC4Ob6eL=Ft_MEk?m&nYU&<hqNg2`n
zB*3bO0r)jva#s@It)YJ7^`iX?FeTnixoZxRCyECx9D;-Zb%a}dNS$&IT3csi^a~dL
z)REt&0EVf-6?hN&xxKk_!rg}UAGL<UnSy7n<ugS|UoSU4bld~n3e7<D(Qh`)LPVr5
koTfg2{YK)w_J+R!0JY(EEDjlqcK`qY07*qoM6N<$f>P(FZ2$lO

diff --git a/themes/images/nbeat-hd/00_field_btn_delete.png b/themes/images/nbeat/00_EditField_clear.png
similarity index 100%
rename from themes/images/nbeat-hd/00_field_btn_delete.png
rename to themes/images/nbeat/00_EditField_clear.png
diff --git a/themes/images/nbeat-hd/00_field_btn_clear.png b/themes/images/nbeat/00_field_btn_Clear.png
similarity index 100%
rename from themes/images/nbeat-hd/00_field_btn_clear.png
rename to themes/images/nbeat/00_field_btn_Clear.png
diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 0e3c8f3..0cd26f7 100644
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -350,8 +350,45 @@
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MAX_INC 36
 
+#define EDITFIELD_TITLE_SIZE_INC 20
 #define EDITFIELD_TITLE_COLOR_INC 73 73 73 255
 #define EDITFIELD_GUIDE_TEXT_COLOR_INC 70 70 70 255
+#define EDITFIELD_DEFAULT_ERASER_MINW_INC 30
+#define EDITFIELD_DEFAULT_ERASER_MINH_INC 30
+#define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 30
+#define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 30
+#define EDITFIELD_DEFAULT_MINH_INC 80
+#define EDITFIELD_SEARCHBAR_MINH_INC 30
+#define EDITFIELD_DEFAULT_TOP1_SINGLE_INC 20
+#define EDITFIELD_DEFAULT_TOP1_MULTI_INC 35
+#define EDITFIELD_DEFAULT_TOP2_INC 6
+#define EDITFIELD_DEFAULT_LEFT1_INC 0
+#define EDITFIELD_DEFAULT_LEFT2_INC 0
+#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 40
+#define EDITFIELD_DEFAULT_RIGHT2_INC 0
+#define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
+#define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
+#define EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC 25
+#define EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC 8
+#define EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC 70
+#define EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC 60
+#define EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC 6
+#define EDITFIELD_SEARCHBAR_TOP1_MULTI_INC 10
+#define EDITFIELD_SEARCHBAR_TOP2_INC 10
+#define EDITFIELD_SEARCHBAR_LEFT1_INC 0
+#define EDITFIELD_SEARCHBAR_LEFT2_INC 0
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 45
+#define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
+#define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
+#define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2
+#define EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC 11
+#define EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC 2
+#define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 60
+#define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
 #define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        249 249 249 255
 #define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
@@ -425,6 +462,7 @@
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 81 78 76 255
 
+#define ENTRY_TEXT_SIZE_INC 28
 #define ENTRY_TEXT_COLOR_INC "#FFFFFF"
 #define ENTRY_CURSOR_COLOR_INC 42 109 140 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FFFFFF"
diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 8bf558c..2953078 100644
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -375,8 +375,45 @@
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MAX_INC 36
 
+#define EDITFIELD_TITLE_SIZE_INC 32
 #define EDITFIELD_TITLE_COLOR_INC 73 73 73 255
 #define EDITFIELD_GUIDE_TEXT_COLOR_INC 189 189 189 255
+#define EDITFIELD_DEFAULT_ERASER_MINW_INC 48
+#define EDITFIELD_DEFAULT_ERASER_MINH_INC 48
+#define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38
+#define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38
+#define EDITFIELD_DEFAULT_MINH_INC 112
+#define EDITFIELD_SEARCHBAR_MINH_INC 50
+#define EDITFIELD_DEFAULT_TOP1_SINGLE_INC 20
+#define EDITFIELD_DEFAULT_TOP1_MULTI_INC 45
+#define EDITFIELD_DEFAULT_TOP2_INC 6
+#define EDITFIELD_DEFAULT_LEFT1_INC 0
+#define EDITFIELD_DEFAULT_LEFT2_INC 0
+#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 60
+#define EDITFIELD_DEFAULT_RIGHT2_INC 0
+#define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
+#define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
+#define EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC 32
+#define EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC 6
+#define EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC 85
+#define EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC 60
+#define EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC 6
+#define EDITFIELD_SEARCHBAR_TOP1_MULTI_INC 10
+#define EDITFIELD_SEARCHBAR_TOP2_INC 10
+#define EDITFIELD_SEARCHBAR_LEFT1_INC 0
+#define EDITFIELD_SEARCHBAR_LEFT2_INC 0
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 55
+#define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
+#define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
+#define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2
+#define EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC 16
+#define EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC 2
+#define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 50
+#define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
 #define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
 #define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
@@ -448,6 +485,7 @@
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 173 170 165 255
 
+#define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#000000"
 #define ENTRY_CURSOR_COLOR_INC 217 147 26 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 115e0e5..71e914e 100644
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -374,8 +374,45 @@
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MAX_INC 36
 
+#define EDITFIELD_TITLE_SIZE_INC 20
 #define EDITFIELD_TITLE_COLOR_INC 73 73 73 255
 #define EDITFIELD_GUIDE_TEXT_COLOR_INC 189 189 189 255
+#define EDITFIELD_DEFAULT_ERASER_MINW_INC 30
+#define EDITFIELD_DEFAULT_ERASER_MINH_INC 30
+#define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 30
+#define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 30
+#define EDITFIELD_DEFAULT_MINH_INC 80
+#define EDITFIELD_SEARCHBAR_MINH_INC 30
+#define EDITFIELD_DEFAULT_TOP1_SINGLE_INC 20
+#define EDITFIELD_DEFAULT_TOP1_MULTI_INC 35
+#define EDITFIELD_DEFAULT_TOP2_INC 6
+#define EDITFIELD_DEFAULT_LEFT1_INC 0
+#define EDITFIELD_DEFAULT_LEFT2_INC 0
+#define EDITFIELD_DEFAULT_LEFT3_INC 2
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 40
+#define EDITFIELD_DEFAULT_RIGHT2_INC 0
+#define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
+#define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
+#define EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC 25
+#define EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC 8
+#define EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC 70
+#define EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC 60
+#define EDITFIELD_SEARCHBAR_TOP1_SINGLE_INC 6
+#define EDITFIELD_SEARCHBAR_TOP1_MULTI_INC 10
+#define EDITFIELD_SEARCHBAR_TOP2_INC 10
+#define EDITFIELD_SEARCHBAR_LEFT1_INC 0
+#define EDITFIELD_SEARCHBAR_LEFT2_INC 0
+#define EDITFIELD_SEARCHBAR_LEFT3_INC 2
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 45
+#define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
+#define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
+#define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2
+#define EDITFIELD_SEARCHBAR_BOTTOM2_SINGLE_INC 11
+#define EDITFIELD_SEARCHBAR_BOTTOM2_MULTI_INC 2
+#define EDITFIELD_SEARCHBAR_BOTTOM3_SINGLE_INC 60
+#define EDITFIELD_SEARCHBAR_BOTTOM3_MULTI_INC 50
 
 #define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
 #define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
@@ -449,6 +486,7 @@
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 173 170 165 255
 
+#define ENTRY_TEXT_SIZE_INC 28
 #define ENTRY_TEXT_COLOR_INC "#000000"
 #define ENTRY_CURSOR_COLOR_INC 217 147 26 255
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
-- 
2.7.4