Merge remote-tracking branch '2.4/tizen_2.4' into tizensubmit/tizen/20150727.092816accepted/tizen/mobile/20150727.093906

Conflicts:
	AUTHORS
	COPYING

954 files changed, 18666 insertions, 17602 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..4f615954
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.edj
+*.swp
+themes/inc/tmp-inc.edc
diff --git a/Makefile.am b/Makefile.am
index d963647b..748b3272 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in configure depcomp install-sh missing compile config.h.in~
 
-SUBDIRS = themes
+SUBDIRS = mobile
diff --git a/configure.ac b/configure.ac
index 2ca2a2af..5d056bd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,5 +17,5 @@ AM_INIT_AUTOMAKE([foreign])
 # Checks for library functions.
 
 AC_CONFIG_FILES([Makefile
-                 themes/Makefile])
+                 mobile/Makefile])
 AC_OUTPUT
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc
new file mode 100644
index 00000000..44041de3
--- /dev/null
+++ b/mobile/HD-inc.edc
@@ -0,0 +1,1110 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+//****************************************************************************//
+// This file defines the width, height (not color!) for each widgets
+// We can define different INC file by Resolution (HD, qHD, WVGA, HVGA)
+//
+// ************* Naming Rule ************ //
+// {WIDGET}_{GROUP}_{PART}_{STATE}_{TYPE}
+//   WIDGET: NAVIFRAME, LIST, DATETIME, POPUP, etc.
+//   GROUP:  INDEX
+//   PART:   TEXT, ICON, BG, PADDING, DIVIDER, ICON, etc.
+//   STATE:  LEFT, RIGHT, TOP, BOTTOM, MIN, MAX,
+//   TYPE:   HEIGHT, WIDTH, SIZE
+// e.g. LIST_PADDING_LEFT_HEIGHT
+//****************************************************************************//
+
+#define BASE_SCALE_INC 2.6
+#define SMALL "HD/"
+#define MEDIUM "HD/"
+#define DEFAULT_IMAGE "HD/"
+
+//****************************************************************************//
+// Colorselector
+//****************************************************************************//
+#define COLORSELECTOR_PALETTE_COLORPLANE_HEIGHT_INC 238
+#define COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC 720
+#define COLORSELECTOR_PORTRAIT_HOR_PAD_COLORPLANE_INC "8"
+#define COLORSELECTOR_PORTRAIT_VER_PAD_COLORPLANE_INC "8"
+#define COLORSELECTOR_PALETTE_COLORBG_MIN_COLORPLANE_INC 90 90
+#define COLORSELECTOR_TOPBOTTOM_PAD_COLORPLANE_INC 24
+//****************************************************************************//
+// Naviframe
+//****************************************************************************//
+#define NAVIFRAME_TITLE_HEIGHT_INC 110
+#define NAVIFRAME_SUBTITLE_HEIGHT_INC 38
+#define NAVIFRAME_TITLE_TOP_PADDING_HEIGHT_INC 3
+#define NAVIFRAME_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC 3
+#define NAVIFRAME_TABBAR_HEIGHT_INC 110
+#define NAVIFRAME_TABBAR_TITLE_HEIGHT_INC 100
+#define NAVIFRAME_NAVIGATIONBAR_HEIGHT_INC 70
+#define NAVIFRAME_NAVIGATIONBAR_TOP_DIVIDER_HEIGHT_INC 2
+#define NAVIFRAME_TABBAR2_HEIGHT_INC 144
+#define NAVIFRAME_TABBAR_TOP_DIVIDER_HEIGHT_INC 0
+#define NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC 32
+#define NAVIFRAME_TITLE_RIGHT_PADDING_WIDTH_INC 32
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 176 110
+#define NAVIFRAME_BADGE_ICON_LEFT_PADDING_WIDTH_INC 22
+#define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 22
+#define NAVIFRAME_BADGE_HEIGHT_INC 48
+#define NAVIFRAME_BADGE2_PADDING_WIDTH_INC (NAVIFRAME_BADGE_ICON_LEFT_PADDING_WIDTH_INC + NAVIFRAME_BADGE_TEXT_LEFT_PADDING_WIDTH_INC + NAVIFRAME_BADGE_TEXT_LEFT_PADDING_WIDTH_INC)
+#define NAVIFRAME_DRAWERS_WIDTH_INC 82
+#define NAVIFRAME_TOOLBAR_HEIGHT_INC 162
+#define NAVIFRAME_TOOLBAR_COLOR_INC 245 245 245 255
+#define NAVIFRAME_BACK_BUTTON_LR_PADDING_WIDTH_INC 10
+#define NAVIFRAME_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 100
+#define NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 50
+#define NAVIFRAME_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC 42
+#define NAVIFRAME_VISIBLE_TEXT_FONT_SIZE_INC 28
+
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_SIZE_INC 67 67
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC 67 67
+#define BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC 67 67
+#define BUTTON_NAVIFRAME_DRAWERS_WIDTH_INC 55
+#define BUTTON_NAVIFRAME_DRAWERS_IMAGE_SIZE_INC 55 72
+#define BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC 80 80
+
+#define BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_SIZE_INC 176 110
+#define BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_LEFT_PADDING_WIDTH_INC 32
+#define BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_RIGHT_PADDING_WIDTH_INC 16
+#define BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_LEFT_PADDING_WIDTH_INC 16
+#define BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_RIGHT_PADDING_WIDTH_INC 32
+
+//****************************************************************************//
+// Label
+//****************************************************************************//
+#define LABEL_FONT_SIZE_INC 24
+
+//****************************************************************************//
+// Layout
+//****************************************************************************//
+#define LAYOUT_INDICATOR_HEIGHT_INC 52
+#define SEARCHBAR_CANCEL_BUTTON_W_INC 30
+#define SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 10
+#define SEARCHBAR_H_INC 63
+#define SEARCHBAR_HEIGHT_INC 63
+#define SEARCHBAR_BASE_HEIGHT_INC 63
+#define SEARCHBAR_WIDTH_INC 320
+#define SEARCHBAR_TOP_PADDING_INC 0
+#define SEARCHBAR_BOTTOM_PADDING_INC 0
+#define SEARCHBAR_LEFT_PADDING_INC 0
+#define SEARCHBAR_RIGHT_PADDING_INC 0
+
+#define BADGE_LAYOUT_SIZE_MIN_INC 50 50
+#define BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC 13 50
+#define BADGE_LAYOUT_TEXT_MIN_SIZE_INC 32 50
+
+//****************************************************************************//
+// Ctxpopup
+//****************************************************************************//
+#define CTXPOPUP_MOVE_PAD 40
+#define CTXPOPUP_OUTLINE_SIZE 2
+#define CTXPOPUP_WIDTH_INC 720
+#define CTXPOPUP_TEXT_MAX_INC 672
+#define CTXPOPUP_ITEM_HEIGHT_MAX_INC 80
+#define CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC 24
+#define CTXPOPUP_ITEM_TEXT_LR_PADDING 22
+#define CTXPOPUP_ITEM_TEXT_HEIGHT_MIN_INC 41
+#define CTXPOPUP_ITEM_ICON_STYLE_LR_PADDING_INC 20
+#define CTXPOPUP_MORE_ITEM_TEXT_MAX_INC 492
+#define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 36
+#define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 120
+#define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 120
+#define CTXPOPUP_MORE_ITEM_TEXT_TB_PADDING_INC 17
+#define CTXPOPUP_MORE_ITEM_TEXT_LR_PADDING_INC 24
+#define CTXPOPUP_MORE_ITEM_TEXT_HEIGHT_MIN_INC 38
+#define CTXPOPUP_DROPDOWN_WIDTH 656
+#define CTXPOPUP_DROPDOWN_TEXT_MAX 592
+#define CTXPOPUP_DROPDOWN_ITEM_TEXT_SIZE 40
+#define CTXPOPUP_DROPDOWN_ITEM_TEXT_MAX_SIZE (CTXPOPUP_DROPDOWN_ITEM_TEXT_SIZE*2)
+#define CTXPOPUP_DROPDOWN_ITEM_HEIGHT_MIN 96
+#define CTXPOPUP_DROPDOWN_ITEM_HEIGHT_MAX 96
+#define CTXPOPUP_DROPDOWN_ITEM_TEXT_LR_PADDING 30
+#define CTXPOPUP_DROPDOWN_CONTENT_LR_PADDING 1
+#define CTXPOPUP_DROPDOWN_CONTENT_TB_PADDING 1
+#define CTXPOPUP_DROPDOWN_SEPARATOR_HEIGHT 2
+#define CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC 72
+#define CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC 32
+#define CTXPOPUP_ITEM_ICON_RIGHT_PADDING_INC 10
+#define CTXPOPUP_ITEM_ICON_LEFT_PADDING_INC 20
+#define CTXPOPUP_ITEM_HORIZONTAL_WIDTH_MIN_INC 106
+#define CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_MIN_INC 118
+#define CTXPOPUP_ITEM_HORIZONTAL_TEXT_HEIGHT_MIN 41
+#define CTXPOPUP_SEPARATOR_MIN_SIZE_INC 2 CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC
+#define CTXPOPUP_SEPARATOR_MAX_SIZE_INC 2 -1
+#define CTXPOPUP_ICON_WIDTH_INC 40
+#define CTXPOPUP_ICON_HEIGHT_INC 40
+#define CTXPOPUP_ITEM_TEXT_RIGHT_PADDING_INC 12
+#define CTXPOPUP_ITEM_ICON_TEXT_STYLE_TB_PADDING_INC 20
+#define CTXPOPUP_ITEM_ICON_TEXT_STYLE_ICON_PADDING_INC 4
+#define CTXPOPUP_ITEM_ICON_TEXT_STYLE_TEXT_SIZE_INC 35
+#define CTXPOPUP_ITEM_ICON_HORIZONTAL_WIDTH_MIN_INC 106
+#define CTXPOPUP_ITEM_ICON_HORIZONTAL_HEIGHT_MIN_INC 80
+#define CTXPOPUP_ITEM_ICON_HORIZONTAL_TB_PADDING_INC 20
+
+//****************************************************************************//
+// Copypaste
+//****************************************************************************//
+#define CTXPOPUP_SHADOW_TOP_PADDING 2
+#define CTXPOPUP_SHADOW_BOTTOM_PADDING 3
+#define CTXPOPUP_SHADOW_LEFT_PADDING 2
+#define CTXPOPUP_SHADOW_RIGHT_PADDING 2
+#define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
+#define CTXPOPUP_ITEM_TEXT_PADDING_INC 32
+#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING_WIDTH_INC 18
+#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING_HEIGHT_INC 20
+#define CTXPOPUP_CONTENT_TOP_PADDING 28
+#define CTXPOPUP_CONTENT_BOTTOM_PADDING 5
+#define CTXPOPUP_CONTENT_LEFT_PADDING 24
+#define CTXPOPUP_CONTENT_RIGHT_PADDING 24
+#define CTXPOPUP_ARROW_PADDING_INC 0
+#define CTXPOPUP_ARROW_SIZE_INC 12 12
+#define CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC 128
+#define CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MAX_INC 192
+#define CTXPOPUP_COPYPASTE_TEXT_STYLE_TEXT_SIZE_INC 37
+#define CTXPOPUP_COPYPASTE_TEXT_MAX_SIZE_INC (CTXPOPUP_COPYPASTE_TEXT_SIZE_INC * 2)
+#define CTXPOPUP_COPYPASTE_WIDTH_MAX_INC 504
+#define CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_HEIGHT_MIN_INC 64
+#define CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC 13
+#define CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC 14
+#define CTXPOPUP_COPYPASTE_SEPARATOR_TEXT_STYLE_MIN_SIZE_INC 2 CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC
+
+//****************************************************************************//
+// Tabbar
+//****************************************************************************//
+#define TABBAR_TWO_ITEMS_SIZE_INC 320 0;
+#define TABBAR_THREE_ITEMS_SIZE_INC 205 0;
+#define TABBAR_FOUR_ITEMS_SIZE_INC 148 0;
+#define TABBAR_SCROLLABLE_ITEMS_SIZE_INC 205 0;
+#define TABBAR_LANDSCAPE_TWO_ITEMS_SIZE_INC 528 0;
+#define TABBAR_LANDSCAPE_THREE_ITEMS_SIZE_INC 341 0;
+#define TABBAR_LANDSCAPE_FOUR_ITEMS_SIZE_INC 248 0;
+#define TABBAR_LANDSCAPE_SCROLLABLE_ITEMS_SIZE_INC 248 0;
+#define TABBAR_SELECTED_LINE_SIZE_INC 0 4
+#define TABBAR_TEXT_CENTER_PADDING_SIZE_INC 0 3
+#define TABBAR_TEXT_LEFT_TOP_PADDING_SIZE_INC 16 27
+#define TABBAR_TEXT_RIGHT_BOTTOM_PADDING_SIZE_INC 16 27
+#define TABBAR_ICON_TEXT_LEFT_TOP_PADDING_SIZE_INC 16 20
+#define TABBAR_ICON_TEXT_RIGHT_BOTTOM_PADDING_SIZE_INC 16 15
+#define TABBAR_ICON_TEXT_LAND_LEFT_TOP_PADDING_SIZE_INC 16 27
+#define TABBAR_ICON_TEXT_LAND_RIGHT_BOTTOM_PADDING_SIZE_INC 16 20
+#define TABBAR_ICON_SIZE_INC 60 60
+#define TABBAR_ICON_RECT_SIZE_INC 59 59
+#define TABBAR_ICON_TEXT_TEXT_SIZE_INC 0 31
+#define TABBAR_ICON_TEXT_LAND_TEXT_SIZE_INC 0 39
+#define TABBAR_TITLE_TEXT_LEFT_TOP_PADDING_SIZE_INC 16 27
+#define TABBAR_TITLE_ICON_TEXT_LAND_LEFT_TOP_PADDING_SIZE_INC 16 27
+#define TABBAR_TITLE_ICON_SIZE_INC 50 59
+#define TABBAR_TITLE_ICON_TEXT_PAD_INC 9 0
+#define TABBAR_BADGE_TOP_RIGHT_PADDING_SIZE_INC 14 2
+
+//Navigation style
+#define TOOLBAR_NAVI_HEIGHT_INC 70
+#define TOOLBAR_NAVI_PADDING_INC 32
+#define TOOLBAR_NAVI_DIVIDER_INC 60
+
+//****************************************************************************//
+// Genlist
+//****************************************************************************//
+// Tizen 2.4
+#define GENLIST_ITEM_1LINE_HEIGHT_INC                    120
+#define GENLIST_ITEM_2LINE_HEIGHT_INC                    144
+#define GENLIST_ITEM_LR_PADDING_INC                      32
+#define GENLIST_ITEM_TB_PADDING_INC                      24
+#define GENLIST_ITEM_CENTER_LEFT_PADDING_INC             32
+#define GENLIST_ITEM_MAIN_LINE_ICON_TEXT_PADDING_INC     12
+#define GENLIST_ITEM_MAIN_LINE_HEIGHT_INC                54
+#define GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC      32
+#define GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC       32
+#define GENLIST_ITEM_END_TEXT_WIDTH_INC                  121
+#define GENLIST_ITEM_GROUP_INDEX_HEIGHT_INC              80
+#define GENLIST_ITEM_GROUP_INDEX_TOP_PADDING_INC         16
+#define GENLIST_ITEM_GROUP_INDEX_BOTTOM_PADDING_INC      16
+#define GENLIST_ITEM_GROUP_INDEX_RIGHT_PADDING_INC       17
+#define GENLIST_ITEM_GROUP_INDEX_EXPAND_ICON_SIZE_INC    80 80
+
+//No use to Combination
+#define LIST_BOTTOMLINE_HEIGHT               2
+
+//****************************************************************************//
+// Genlist - Tizen 2.3
+//****************************************************************************//
+// Group index
+#define LIST_INDEX_PADDING_LEFT_SIZE        22
+#define LIST_INDEX_PADDING_RIGHT_SIZE       22
+#define LIST_INDEX_PADDING_TOP_SIZE         11
+#define LIST_INDEX_PADDING_BOTTOM_SIZE      11
+#define LIST_INDEX_HEIGHT                   54
+#define LIST_INDEX_TEXT_SUB_WIDTH_MAX       240
+#define LIST_INDEX_TEXT_PADDING_SIZE        22
+#define LIST_INDEX_BOTTOMLINE_HEIGHT        2
+
+// Normal style
+#define LIST_ITEM_HEIGHT                     140
+#define LIST_PADDING_TOP_SIZE                42   // FIXME: please check font height
+#define LIST_PADDING_BOTTOM_SIZE             42   // FIXME: please check font height
+#define LIST_2LINE_PADDING_TOP_SIZE          18   // FIXME: please check font height
+#define LIST_2LINE_PADDING_BOTTOM_SIZE       18   // FIXME: please check font height
+#define LIST_PADDING_CENTER_LEFT_SIZE        22
+#define LIST_PADDING_CENTER_RIGHT_SIZE       22
+#define LIST_PADDING_TEXT_SIZE               22
+#define LIST_PADDING_DEFAULT_SIZE            22
+
+#define LIST_TEXT_MAIN_HEIGHT                56
+#define LIST_TEXT_SUB_HEIGHT                 48
+
+#define LIST_TEXT_MAIN_SIZE                  44
+#define LIST_TEXT_SUB_SIZE                   36
+#define LIST_TEXT_SUB_WIDTH_MAX              194
+
+// Multiline style
+#define LIST_WRAP_PADDING_LEFT_SIZE          22
+#define LIST_WRAP_PADDING_RIGHT_SIZE         22
+#define LIST_WRAP_PADDING_TOP_SIZE           20
+#define LIST_WRAP_PADDING_BOTTOM_SIZE        20
+#define LIST_MULTILINE_ICON_SIZE             90 90
+#define LIST_MULTILINE_ICON_SIZE1            60 60
+
+// Editfield style
+#define LIST_ENTRY_PADDING_LEFT_SIZE          0
+#define LIST_ENTRY_PADDING_RIGHT_SIZE         0
+#define LIST_ENTRY_PADDING_TOP_SIZE           0
+#define LIST_ENTRY_PADDING_BOTTOM_SIZE        0
+#define LIST_ENTRY_PADDING_MAIN_TEXT_TOP_SIZE 18
+#define LIST_ENTRY_ENTRY_HEIGHT               140
+#define LIST_ENTRY_TEXT_SUB_WIDTH_MAX         240
+#define LIST_ENTRY_ICON_SIZE                  70 70
+
+// Bar style
+#define LIST_BAR_PADDING_TOP_SIZE             20
+#define LIST_BAR_PADDING_BOTTOM_SIZE          20
+#define LIST_SLIDER_PADDING_CENTER_SIZE       14
+#define LIST_PROGRESSBAR_HEIGHT               134
+#define LIST_PROGRESSBAR_PADDING_CENTER_SIZE  14
+
+// List A
+#define LIST_A_LEFTICON_RIGHT_PADDING_WIDTH   22
+#define LIST_A_LEFTICON_SIZE               48 48
+#define LIST_A_RIGHTICON_LEFT_PADDING_WIDTH   22
+#define LIST_A_RIGHTICON_SIZE              48 48
+
+// B part - layout
+#define LIST_B_TYPE1_ICON_SIZE             140 140
+#define LIST_B_TYPE2_LEFT_PADDING_WIDTH       22
+#define LIST_B_TYPE2_ICON_SIZE             110 110
+#define LIST_B_TYPE3_LEFT_PADDING_WIDTH       20
+#define LIST_B_TYPE3_ICON_SIZE             70 70
+#define LIST_B_TYPE4_LEFT_PADDING_WIDTH       22
+#define LIST_B_TYPE4_RIGHT_PADDING_WIDTH       8
+#define LIST_B_TYPE4_ICON_SIZE             60 60
+
+// C part - layout
+#define LIST_C_TYPE1_RIGHT_PADDING_WIDTH      22
+#define LIST_C_TYPE1_ICON_SIZE             70 70
+#define LIST_C_TYPE2_RIGHT_PADDING_WIDTH      22
+#define LIST_C_TYPE2_ICON_SIZE             60 60
+#define LIST_C_TYPE3_RIGHT_PADDING_WIDTH      22
+#define LIST_C_TYPE3_ICON_SIZE             90 90
+#define LIST_C_TYPE4_TOGGLE_DIVIDER_SIZE    1 60
+#define LIST_C_TYPE4_LEFT_PADDING_WIDTH       22
+#define LIST_C_TYPE4_RIGHT_PADDING_WIDTH      22
+#define LIST_C_TYPE4_ICON_SIZE             90 90
+
+// Select all
+#define LIST_SELECT_ALL_PADDING_LEFT_SIZE     22
+#define LIST_SELECT_ALL_PADDING_RIGHT_SIZE    22
+#define LIST_SELECT_ALL_PADDING_BOTTOM_SIZE    2
+#define LIST_SELECT_ALL_ICON_SIZE          60 60
+#define LIST_SELECT_ALL_PADDING_CENTER_SIZE   22
+#define LIST_SELECT_ALL_HEIGHT                126
+
+//Expand style
+#define GENLIST_TREESIZE_DEFAULT            32
+
+//****************************************************************************//
+// SCROLLER
+//****************************************************************************//
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC 21 44
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC 21 99999
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC 37 21
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 21
+#define SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT 20
+#define SCROLLER_TABBAR_SCROLLBAR_HBAR_MIN_SIZE_INC 22 SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT
+#define SCROLLER_TABBAR_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT
+
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_PADDING_SIZE 11
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_PADDING_SIZE 11
+#define SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_TB_PADDING_SIZE_INC 5
+#define SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_LR_PADDING_SIZE_INC 12
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC 43 82
+#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC 82 43
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 32 32
+#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 32 32
+
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_HEADER_SIZE 46
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE 11
+#define SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 11
+
+#define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 45
+#define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MIN_SIZE 30
+#define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MOVE_CORRECTION_VALUE 15
+#define SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE 30
+#define SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MIN_SIZE 20
+#define SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MOVE_CORRECTION_VALUE 10
+#define SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE 15
+#define SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MIN_SIZE 10
+#define SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MOVE_CORRECTION_VALUE 5
+
+//****************************************************************************//
+// Entry
+//****************************************************************************//
+// Normal Entry
+#define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FAFAFA"
+#define ENTRY_PREEDIT_TEXT_COLOR_INC "#000000"
+#define ENTRY_PREEDIT_UNDERLINE_COLOR_INC "#FAFAFA"
+#define ENTRY_PREEDIT_SUB1_COLOR_INC "#2EA8E1"
+#define ENTRY_PREEDIT_SUB2_COLOR_INC "#9962C3"
+#define ENTRY_PREEDIT_SUB3_COLOR_INC "#76DE37"
+#define ENTRY_PREEDIT_SUB4_COLOR_INC "#999999"
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC 44
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC 44
+#define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 3
+#define ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC 44
+#define ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC 44
+#define ENTRY_CURSOR_SIZE_INC 2 0
+#define MAGNIFIER_WIDTH_FIXED_INC 226
+#define MAGNIFIER_HEIGHT_MIN 96
+#define MAGNIFIER_HEIGHT_MAX 118
+#define MAGNIFIER_ARROW_HEIGHT_INC 20
+#define MAGNIFIER_LEFT_OFFSET_INC 8 8
+#define MAGNIFIER_RIGHT_OFFSET_INC 8 8
+#define ENTRY_EMOTICON_SIZE_INC 26 26
+#define ENTRY_LEFT_RIGHT_MARGIN_INC 5
+#define ENTRY_FONT_SIZE_INC 40
+
+//****************************************************************************//
+// Editfield
+//****************************************************************************//
+// Clear Button
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 46 46
+#define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 46 46
+
+// Editfield Layout
+#define EDITFIELD_BASE_HEIGHT_INC 120
+#define EDITFIELD_TOP_LEFT_PADDING_MIN_INC 32 33
+#define EDITFIELD_MULTILINE_TOP_LEFT_PADDING_MIN_INC 32 24
+#define EDITFIELD_BOTTOM_RIGHT_PADDING_MIN_INC 32 33
+#define EDITFIELD_LINE_LEFT_PADDING_MIN_INC 32 0
+#define EDITFIELD_LINE_RIGHT_PADDING_MIN_INC 32 0
+#define EDITFIELD_MULTILINE_BOTTOM_RIGHT_PADDING_MIN_INC 32 33
+#define EDITFIELD_BUTTON_FIELD_MIN_INC 54 54
+#define EDITFIELD_FOCUSED_BOTTOM_RIGHT_PADDING_MIN_INC 32+54 33
+#define EDITFIELD_ENTRY_FIELD_MIN_INC 0 54
+#define EDITFIELD_LINE_BOTTOM_PADDING_MIN_INC 0 20
+#define EDITFIELD_LINE_RECT_MIN_INC 0 3
+#define EDITFIELD_ENTRY_SWALLOW_ALIGN 0.5 0.5
+
+#define BUTTON_OPTION_MIN_MAX_INC 70 70
+#define BUTTON_OPTION_IMAGE_MIN_MAX_INC 70 70
+
+//****************************************************************************//
+// Slider
+//****************************************************************************//
+#define SLIDER_BASE_HEIGHT_INC 8
+#define SLIDER_INDICATOR_SIZE_INC 20
+#define SLIDER_SWALLOWBAR_HEIGHT_INC 42
+#define SLIDER_LEFT_RIGHT_PADDING_SIZE_INC 32 0
+#define SLIDER_ICON_PADDING_SIZE_INC 5 0
+#define SLIDER_CENTER_POINT_SIZE_INC 6 26
+#define SLIDER_INDICATOR_NORMAL_SIZE_INC 20 20
+#define SLIDER_INDICATOR_BUBBLE_SIZE_INC 20 20
+#define SLIDER_INDICATOR_BUBBLE_PRESSED_SIZE_INC 80 140
+#define SLIDER_WARNING_LEVEL 0.636
+
+//Slider vertical
+#define SLIDER_VERTICAL_BASE_HEIGHT_INC 6
+#define SLIDER_SWALLOWBAR_WIDTH_INC 42
+#define SLIDER_VERTICAL_CENTER_POINT_SIZE_INC 26 6
+
+#define SLIDER_POPUP_WIDTH_INC 80
+#define SLIDER_POPUP_HEIGHT_INC 92
+#define SLIDER_INDICATOR_PADDING_TOP 20
+#define SLIDER_INDICATOR_PADDING_BOTTOM 32
+#define SLIDER_INDICATOR_TEXT_SIZE_HEIGHT 48
+#define SLIDER_INDICATOR_TEXT_SIZE_WIDTH 20
+
+#define SLIDER_VERTICAL_INDICATOR_SIZE_INC 20
+#define SLIDER_LEFT_VERTICAL_INDICATOR_SIZE_INC 20
+#define SLIDER_TOP_PADDING_SIZE_INC 42 44
+#define SLIDER_BOTTOM_PADDING_SIZE_INC 42 44
+
+//****************************************************************************//
+// Progressbar
+//****************************************************************************//
+#define PROGRESSBAR_DEFAULT_HEIGHT_INC 8
+#define PROGRESSBAR_PENDING_HEIGHT_INC 8
+#define PROGRESSBAR_PADDING_HEIGHT_INC 8
+#define PROGRESSBAR_LARGE_SIZE_INC 102 102
+#define PROGRESSBAR_MEDIUM_SIZE_INC 56 54
+#define PROGRESSBAR_SMALL_SIZE_INC 44 44
+
+
+//****************************************************************************//
+// Check
+//****************************************************************************//
+#define CHECK_DEFAULT_SIZE 50 50
+#define CHECK_ONOFF_SIZE 80 80
+#define CHECK_ONOFF_ICON_SIZE 36 36
+#define CHECK_FAVORITE_SIZE 80 80
+#define CHECK_PAD_BEFORE_TEXT_INC 32 0
+
+
+//****************************************************************************//
+// Radio
+//****************************************************************************//
+#define RADIO_SIZE 50 50
+
+
+//****************************************************************************//
+// No Content
+//****************************************************************************//
+#define NO_CONTENT_BG_HEIGHT_INC 1280
+#define NO_CONTENT_TEXT_BG_MAX_HEIGHT_INC 572
+#define NO_CONTENT_TOP_PADDING_HEIGHT_INC 282
+#define NO_CONTENT_BOTTOM_PADDING_HEIGHT_INC 235
+#define NO_CONTENT_LEFT_RIGHT_PADDING_WIDTH_INC 24
+#define NO_CONTENT_TITLE_TEXT_HEIGHT_INC 41
+#define NO_CONTENT_TEXT_PADDING_HEIGHT_INC 54
+
+//****************************************************************************//
+// Button
+//****************************************************************************//
+
+#define BUTTON_MIN_WIDTH_INC 50
+#define BUTTON_MIN_HEIGHT_INC 78
+#define BUTTON_BOTTOM_MIN_WIDTH_INC 118
+#define BUTTON_BOTTOM_MIN_HEIGHT_INC 104
+#define BUTTON_PADDING_ICON_RIGHT_INC 14
+#define BUTTON_PADDING_LEFT_RIGHT_INC 32
+#define BUTTON_PADDING_LEFT_ICON_TEXT_INC 56
+#define BUTTON_PADDING_TOP_HEIGHT_INC 10
+#define BUTTON_PADDING_BOTTOM_HEIGHT_INC 14
+#define BUTTON_BOTTOM_PADDING_TOP_HEIGHT_INC 22
+#define BUTTON_BOTTOM_PADDING_BOTTOM_HEIGHT_INC 28
+#define BUTTON_ICON_HEIGHT_INC 80
+#define BUTTON_ICON_WIDTH_INC 80
+#define BUTTON_ICON_DEFAULT_HEIGHT_INC 60
+#define BUTTON_ICON_DEFAULT_WIDTH_INC 60
+
+#define BUTTON_CIRCLE_SIZE_INC  98 98
+#define BUTTON_CIRCLE_BASE_SIZE_INC 126 98
+#define BUTTON_CIRCLE_EXTENDED_SIZE_INC 126 199
+#define BUTTON_CIRCLE_ICON_SIZE_INC 60 60
+#define BUTTON_CIRCLE_PADDING_ICON_BOTTOM_INC 13
+#define BUTTON_CIRCLE_PADDING_TEXT_LEFT_RIGHT_INC 8
+
+//****************************************************************************//
+// Multibuttonentry
+//****************************************************************************//
+
+#define MULTIBUTTONENTRY_BOX_HORIZONTAL_PAD_INC 20
+#define MULTIBUTTONENTRY_BOX_VERTICAL_PAD_INC 16
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 20
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 20
+#define MULTIBUTTONENTRY_BOTTOM_HEIGHT_PAD_INC 20
+#define MULTIBUTTONENTRY_GUIDE_HEIGHT_INC 78
+#define MULTIBUTTONENTRY_GUIDE_TEXT_SIZE_INC 20
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 40
+#define MULTIBUTTONENTRY_BUTTON_PAD_INC 32
+#define MULTIBUTTONENTRY_BUTTON_WIDTH_INC 105
+#define MULTIBUTTONENTRY_BUTTON_HEIGHT_INC 78
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 40
+#define MULTIBUTTONENTRY_LABEL_HEIGHT_INC 78 // same as button
+#define MULTIBUTTONENTRY_LABEL_PAD_INC 0
+
+//****************************************************************************//
+// Index
+//****************************************************************************//
+// FastScrol
+#define INDEX_ITEM_WIDTH_INC                        42 // 40 + 2(left line)
+#define INDEX_ITEM_HEIGHT_INC                       40
+#define INDEX_POPUP_TEXT_SIZE_INC                   112
+#define INDEX_DIVIDER_WIDTH_INC                     2
+#define INDEX_SCROLL_BG_LINE_WIDTH_INC              2
+#define INDEX_TEXT_LEFT_PADDING_SIZE_INC            0
+#define INDEX_TEXT_RIGHT_PADDING_SIZE_INC           0
+#define INDEX_TEXT_BOTTOM_PADDING_SIZE_INC          10
+#define INDEX_PADDING_SIZE_INC                      7
+#define INDEX_ITEM_PADDING_SIZE_INC                 0
+#define INDEX_SCROLL_DRAG_PART_SIZE                 42 40
+#define INDEX_SCROLL_PADDING_COLOR                  34 34 34 255
+#define INDEX_SCROLL_POPUP_SIZE                     168 168
+#define INDEX_SCROLL_POPUP_ACTIVE_SIZE              168 168
+#define INDEX_SCROLL_TEXT1_DEFAULT_SIZE             168 158
+#define INDEX_SCROLL_TEXT1_ACTIVE_SIZE              168 158
+
+// Page Control
+#define INDEX_PAGECONTROL_IND_INC 52 32
+#define INDEX_PAGECONTROL_IND_MIN_INC 32 32
+
+//****************************************************************************//
+// Popup
+//****************************************************************************//
+#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50
+#define POPUP_TITLE_SUB_TEXT_FONT_SIZE_INC 42
+#define POPUP_SUBTITLE_TEXT_FONT_SIZE_INC 30
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 40
+#define POPUP_TOAST_BASE_DEFAULT_TEXT_FONT_SIZE_INC 30
+
+#define POPUP_OUTSIDE_PADDING "80"
+#define POPUP_TITLE_AREA_HEIGHT "100"
+#define POPUP_CONTENT_AREA_LANDSCAPE_WIDTH_INC "660"
+
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 660 0
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 720 1208
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 660 0
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 720 640
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 0 100
+#define POPUP_BASE_DEFAULT_TITLE_SUB_DEFAULT_MIN_INC 0 124
+#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 152
+#define POPUP_CONTENT_AREA_DEFAULT_MIN_INC 660 0
+#define POPUP_CONTENT_AREA_LANDSCAPE_MIN_INC 660 0
+
+#define POPUP_TITLE_LEFT_PADDING 32
+#define POPUP_TITLE_RIGHT_PADDING 32
+#define POPUP_TITLE_TOP_PADDING 32
+#define POPUP_TITLE_TOP_SUB_PADDING 26
+#define POPUP_TITLE_BOTTOM_PADDING 0
+#define POPUP_SUBTITLE_HEIGHT 41
+
+#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 24
+#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 32
+#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 32
+#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 24
+
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "152"
+#define POPUP_BUTTON1_DEFAULT_HEIGHT_INC 104
+#define POPUP_BUTTON1_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 32
+#define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 104
+#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 32 104
+#define POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 32
+#define POPUP_BUTTON3_DEFAULT_HEIGHT_INC 104
+#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 32 104
+#define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 32
+
+#define POPUP_TOAST_TITLE_TOP_PAD_INC 9
+#define POPUP_TOAST_TITLE_BOTTOM_PAD_INC 12
+#define POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 28
+#define POPUP_TOAST_VI_BOTTOM_PAD_INC 69
+#define POPUP_TOAST_BOTTOM_PAD_INC 72
+#define POPUP_TOAST_TEXT_MIN_WIDTH_INC 50
+#define POPUP_TOAST_TEXT_MIN_HEIGHT_INC 41
+#define POPUP_TOAST_TEXT_MAX_WIDTH_INC 564
+#define POPUP_TOAST_TEXT_MAX_HEIGHT_INC 668
+#define POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC 564
+
+
+//****************************************************************************//
+// Gengrid
+//****************************************************************************//
+
+#define GRID_PADDING_LEFT_TOP_SIZE               1 1
+#define GRID_PADDING_RIGHT_BOTTOM_SIZE           1 1
+#define GRID_PADDING_END_TOP_RIGHT_SIZE          9 9
+#define GRID_END_SIZE                            50 50
+#define GRID_PADDING_OUT_TEXT_BOTTOM_RIGHT_SIZE  1 63
+#define GRID_PADDING_OUT_TEXT_LEFT_RIGHT_SIZE    10 0
+#define GRID_IN_OUT_TEXT_ONE_LINE_HEIGHT         0 39
+#define GRID_PADDING_IN_TEXT_LEFT_RIGHT_SIZE     10 12
+#define GRID_POPUP_PADDING_LEFT_TOP_SIZE         31 6
+#define GRID_POPUP_PADDING_RIGHT_BOTTOM_SIZE     31 6
+#define GRID_POPUP_PADDING_BOTTOM_SIZE           8 6
+#define GRID_POPUP_ITEM_REAL_BG_SIZE             180 222
+#define GRID_POPUP_SWALLOW_ICON_SIZE             118 118
+#define GRID_POPUP_TEXT_HEIGHT                   86
+#define GENGRID_POPUP_CONTENT_TOP_PADDING        24
+#define GENGRID_POPUP_CONTENT_BOTTOM_PADDING     24
+
+
+//****************************************************************************//
+// DATETIME
+//****************************************************************************//
+
+#define DATETIME_LAYOUT_BASE_BG_SIZE_INC 646 406
+#define DATETIME_LAYOUT_CONTENT_SIZE_INC 646 348
+#define TIME_LAYOUT_BASE_BG_SIZE_INC 603 406
+#define TIME_LAYOUT_CONTENT_SIZE_INC 603 348
+#define TIME24_LAYOUT_BASE_BG_SIZE_INC 388 406
+#define TIME24_LAYOUT_CONTENT_SIZE_INC 388 348
+
+#define DATETIME_BG_TOP_BOTTOM_PADDING 0
+#define TIME_LAYOUT_CONTENT_TIME_24HR_LEFT_RIGHT_PADDING_WIDTH_INC 0
+#define TIME_LAYOUT_CONTENT_TIME_24HR_CENTER_PADDING_WIDTH_INC 56
+#define TIME_LAYOUT_CONTENT_COLON_WIDTH_INC 18
+
+#define DATETIME_AMPM_BUTTON_WIDTH_SIZE_INC 160
+#define DATETIME_AMPM_BUTTON_HEIGHT_SIZE_INC 78
+#define DATETIME_AMPM_BUTTON_TOP_LEFT_PADDING_INC 32 10
+#define DATETIME_AMPM_BUTTON_BOTTOM_RIGHT_PADDING_INC 32 14
+#define DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC 32
+
+#define TIME_LAYOUT_CONTENT_LEFT_PADDING_WIDTH_INC 0
+#define TIME_LAYOUT_CONTENT_RIGHT_PADDING_WIDTH_INC 0
+#define TIME_LAYOUT_CONTENT_FIELD_WIDTH_INC 146
+#define TIME_LAYOUT_CONTENT_AMPM_FIELD_WIDTH_INC 160
+#define TIME_LAYOUT_CONTENT_CENTER_PADDING_WIDTH_INC 39
+#define TIME_LAYOUT_MINITE_RIGHT_PADDING_WIDTH_INC 55
+
+#define DATE_LAYOUT_CONTENT_FIELD_WIDTH_INC 202
+#define DATE_LAYOUT_CONTENT_LEFT_PADDING_WIDTH_INC 0
+#define DATE_LAYOUT_CONTENT_RIGHT_PADDING_WIDTH_INC 0
+#define DATE_LAYOUT_CONTENT_CENTER_PADDING_WIDTH_INC 20
+
+//****************************************************************************//
+// SPINNER
+//****************************************************************************//
+
+#define SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC 64 90
+#define SPINNER_LEFT_RIGHT_BG_IMAGE_SIZE_INC 64 90
+#define SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC 146 80
+#define SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC 146 80
+#define SPINNER_VERTICAL_BG_SIZE_INC 146 348
+#define SPINNER_VERTICAL_DATE_PICKER_BG_SIZE_INC 158 262
+#define SPINNER_VERTICAL_TEXT_BUTTON_BG_SIZE_INC 146 188
+#define SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC 202 188
+#define SPINNER_TEXT_HEIGHT_INC 146
+
+
+//****************************************************************************//
+// Floating Button
+//****************************************************************************//
+
+#define FLOATINGBUTTON_HEIGHT_INC 120
+#define FLOATINGBUTTON_BOTTOM_PADDING_INC 43
+
+#define BUTTON_FLOATINGBUTTON_SIZE_INC 80 80
+
+//****************************************************************************//
+// Calendar
+//****************************************************************************//
+#define CALENDAR_BG_SIZE_INC 720 676
+#define CALENDAR_SPINNER_BASE_SIZE_INC 720 120
+#define CALENDAR_TABLE_BASE_SIZE_INC 720 556
+#define CALENDAR_HEADER_SIZE_INC 720 52
+#define CALENDAR_HEADER_SEPARATOR_SIZE_INC 0 2
+#define CALENDAR_BASE_TOP_PADDING_SIZE_INC 0 16
+#define CALENDAR_BASE_BOTTOM_PADDING_SIZE_INC 0 20
+#define CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC 48 48
+#define CALENDAR_SELECTED_IMAGE_SIZE_INC 78 78
+#define CALENDAR_MONTH_TEXT_SIZE 50
+#define CALENDAR_DATE_TITLE_TEXT_SIZE 30
+#define CALENDAR_DATE_TEXT_SIZE 40
+
+//****************************************************************************//
+// Flipselector
+//****************************************************************************//
+#define FLIPSELECTOR_BASE_SIZE_INC 204 270
+#define FLIPSELECTOR_TOP_SIZE_INC 204 131
+#define FLIPSELECTOR_BOTTOM_SIZE_INC 204 138
+#define FLIPSELECTOR_DIVIDER_SIZE_INC 0 1
+#define FLIPSELECTOR_ARROW_TOP_PADDING_SIZE_INC 0 12
+#define FLIPSELECTOR_ARROW_BOTTOM_PADDING_SIZE_INC 0 21
+#define FLIPSELECTOR_ARROW_TOP_BOTTOM_SIZE_INC 28 15
+#define FLIPSELECTOR_TEXT_SIZE_INC 138
+
+//****************************************************************************//
+// HOVERSEL
+//****************************************************************************//
+
+#define BUTTON_HOVERSEL_MIN_SIZE_INC 180 80
+#define BUTTON_HOVERSEL_TEXT_LEFT_PADDING_INC 8
+#define BUTTON_HOVERSEL_TEXT_RIGHT_PADDING_INC 10
+#define BUTTON_HOVERSEL_UNDERLINE_HEIGHT_INC 2
+#define BUTTON_HOVERSEL_UNDERLINE_PADDING_INC 10
+#define BUTTON_HOVERSEL_ARROW_ICON_SIZE_INC 20 20
+
+#define HOVERSEL_ITEM_MIN_HEIGHT_INC 96
+#define HOVERSEL_ITEM_TEXT_LR_PADDING_INC 30
+
+#define HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT 20
+
+#define STYLE_TAGS \
+   tag:  "br" "\n";\
+   tag:  "ps" "ps";\
+   tag:  "tab" "\t";\
+   tag:  "b" "+ font_weight=Bold";
+
+#define STYLE_TAG_MATCH \
+   tag:  "match" "+ color=#3db8cc";
+
+styles {
+   // ************* list main text ********** //
+   style { name: "list_text_main";
+      base: "color=#070707FF font=Tizen:style=Regular font_size=40 text_class=list_item ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023 text_class=T023 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_main_dim";
+      base: "color=#0707077F font=Tizen:style=Regular font_size=40 text_class=list_item ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff  color_class=T023D text_class=T023D ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_main_press";
+      base: "color=#070707FF font=Tizen:style=Regular font_size=40 text_class=list_item ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023P text_class=T023P ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_end";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_end_dim";
+      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_end_press";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   // ************* list sub text ********** //
+   style { name: "list_text_sub_01";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=32 text_class=tizen ellipsis=1.0";
+      //base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color=#4C4C4CFF color_class=T024 text_class=T024 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_01_dim";
+      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=32 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024D text_class=T024D ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_01_press";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=32 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024P text_class=T024P ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_02";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L1 text_class=T024L1 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_02_dim";
+      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L1D text_class=T024L1D ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_02_press";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L1P text_class=T024L1P ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_03";
+      base: "font=Tizen:style=Regular font_size=24  color=#023D84FF text_class=tizen ellipsis=1.0";
+      //base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L2 fotext_class=T024L2 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_03_dim";
+      base: "color=#023D847F font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L2D text_class=T024L2D ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_sub_03_press";
+      base: "color=#023D84FF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L2P text_class=T024L2P ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   // ************* list multiline text ********** //
+   style { name: "list_text_multiline";
+      base: "color=#666666FF font=Tizen:style=Regular font_size=32 text_class=list_item wrap=mixed linesize=33";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_dim";
+      base: "color=#666666A3 font=Tizen:style=Regular font_size=32 text_class=list_item wrap=mixed linesize=33";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_press";
+      base: "color=#666666FF font=Tizen:style=Regular font_size=32 text_class=list_item wrap=mixed linesize=33";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   // ************* list group index text ********** //
+   style { name: "list_text_group_index_main";
+      base: "color=#3DB9CCFF font=Tizen:style=Regular font_size=36 text_class=tizen ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_group_index_main_dim";
+      base: "color=#3DB9CCFF font=Tizen:styleRegular font_size=36 text_class=tizen ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_group_index_main_press";
+      base: "color=#3DB9CCFF font=Tizen:style=Regular font_size=36 text_class=tizen ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_group_index_sub";
+      base: "color=#3DB9CCFF font=Tizen:style=Regular font_size=36 text_class=tizen ellipsis=1.0 align=right";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_group_index_sub_dim";
+      base: "color=#3DB9CCFF font=Tizen:style=Regular font_size=36 text_class=tizen ellipsis=1.0 align=right";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_group_index_sub_press";
+      base: " color=#3DB9CCFF font=Tizen:style=Regular font_size=36 text_class=tizen ellipsis=1.0 align=right";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   // ************* list index text ********** //
+   style { name: "list_text_index_main";
+      base: "color=#023d84ff font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_MAIN_SIZE" color=#ffffff color_class=T027L1 text_class=T027L1 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_index_main_dim";
+      base: "color=#023d84ff font=Tizen:styleRegular font_size=27 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_MAIN_SIZE" color=#ffffff color_class=T027L1 text_class=T027L1 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_index_main_press";
+      base: "color=#023d84ff font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_MAIN_SIZE" color=#ffffff color_class=T027L1 text_class=T027L1 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_index_sub";
+      base: "color=#023D84FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_SUB_SIZE" color=#ffffff color_class=T027L2 text_class=T027L2 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_index_sub_dim";
+      base: "color=#023D847F font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_SUB_SIZE" color=#ffffff color_class=T027L2 text_class=T027L2 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_index_sub_press";
+      base: " color=#023D84FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
+      //base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_SUB_SIZE" color=#ffffff color_class=T027L2 font=Tizen:style=Regular ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   // multiline text
+   style { name: "list_text_multiline_main";
+      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=list_item wrap=mixed";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023 text_class=T023 wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_main_dim";
+      base: "color=#0707077F font=Tizen:style=Regular font_size=30 text_class=list_item wrap=mixed";
+      //base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023D text_class=T023D wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_main_press";
+      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=list_item wrap=mixed";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023P text_class=T023P wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_sub";
+      base: "font=Tizen:style=Regular font_size=24 color=#4C4C4CFF text_class=tizen wrap=mixed";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024 text_class=T024 wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_sub_dim";
+      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024D text_class=T024D wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_multiline_sub_press";
+      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024P text_class=T024P wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_desc";
+      base: "color=#006FD1FF font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_DESC_TEXT_SIZE" color=#ffffff color_class=T129 text_class=T129 wrap=mixed";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   style { name: "list_text_select";
+      base: "color=#006FD1FF font=Tizen:style=Regular font_size=24 text_class=list_item ellipsis=1.0";
+       //(Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_DESC_TEXT_SIZE" color=#ffffff color=#006FD1FF color_class=T129 text_class=T129 ellipsis=1.0";
+      STYLE_TAGS
+      STYLE_TAG_MATCH
+   }
+   // ************* button text ********** //
+   style { name: "button_main";
+      base: "align=center valign=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_ampm";
+      base: "align=center color=#FAFAFAFF font=Tizen:style=Light font_size=40 text_class=tizen";
+      STYLE_TAGS
+   }
+   style { name: "button_ampm_dim";
+      base: "align=center color=#FAFAFAA3 font=Tizen:style=Light font_size=40 text_class=tizen";
+      STYLE_TAGS
+   }
+   style { name: "button_ampm_press";
+      base: "align=center color=#FAFAFAFA font=Tizen:style=Light font_size=40 text_class=tizen";
+      STYLE_TAGS
+   }
+   style { name: "button_bottom";
+      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=40 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_bottom_dim";
+      base: "align=center color=#ffffff7f font=Tizen:style=Regular font_size=40 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_bottom_press";
+      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=40 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_popup";
+      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_popup_dim";
+      base: "align=center color=#ffffff80 font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_popup_press";
+      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_trans";
+      base: "color=#070707FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=0.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff color_class=T1221 text_class=T1221 ellipsis=0.0";
+      STYLE_TAGS
+   }
+   style { name: "button_circle";
+      base: "align=center color=#000000DE font=Tizen:style=Regular font_size=32 text_class=tizen wrap=mixed ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_CIRCLE_SIZE" align=center color=#ffffff color_class=T127 text_class=T127 wrap=mixed";
+      STYLE_TAGS
+   }
+   style { name: "button_contacts";
+      base: "color=#ffffffff align=center font=Tizen:style=Regular font_size=30 text_class=tizen  wrap=none ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2 text_class=T051L2  wrap=none ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_contacts_dim";
+      base: "color=#ffffff7f align=center font=Tizen:style=Regular font_size=30 text_class=tizen wrap=none  ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2D text_class=T051L2D wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_contacts_press";
+      base: "color=#ffffffff align=center font=Tizen:style=Regular font_size=30 text_class=tizen wrap=none  ellipsis=1.0";
+      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2P text_class=T051L2P wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_title_left";
+      base: "color=#ffffffdd align=left font=Tizen:style=Medium:width=Condensed font_size=32 text_class=tizen wrap=mixed  ellipsis=1.0";
+      // (Changeable UI) base: "font=Samsung Condensed:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T043 text_class=T043 wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_title_left_press";
+      base: "color=#ffffffff align=left font=Tizen:style=Medium:width=Condensed font_size=32 text_class=tizen wrap=mixed  ellipsis=1.0";
+      // (Changeable UI) base: "font=Samsung Condensed:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T043P text_class=T043P wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_title_left_dim";
+      base: "color=#ffffff92 align=left font=Tizen:style=Medium:width=Condensed font_size=32 text_class=tizen wrap=mixed  ellipsis=1.0";
+      // (Changeable UI) base: "font=Samsung Condensed:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T043D text_class=T043D wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_title_right";
+      base: "color=#ffffffdd align=right font=Tizen:style=Medium:width=Condensed font_size=32 text_class=tizen wrap=mixed  ellipsis=1.0";
+      // (Changeable UI) base: "font=Samsung Condensed:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T044 text_class=T044 wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_title_right_press";
+      base: "color=#ffffffff align=right font=Tizen:style=Medium:width=Condensed font_size=32 text_class=tizen wrap=mixed  ellipsis=1.0";
+      // (Changeable UI) base: "font=Samsung Condensed:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T044P text_class=T044P wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "button_title_right_dim";
+      base: "color=#ffffff92 align=right font=Tizen:style=Medium:width=Condensed font_size=32 text_class=tizen wrap=mixed  ellipsis=1.0";
+      // (Changeable UI) base: "font=Samsung Condensed:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T044D text_class=T044D wrap=none  ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "check_default";
+      base: "color=#000000FF font=Tizen:style=Regular font_size=40 text_class=label ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "check_default_dim";
+      base: "color=#000000A3 font=Tizen:style=Regular font_size=40 text_class=label ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "check_default_press";
+      base: "color=#000000FF font=Tizen:style=Regular font_size=40 text_class=label ellipsis=1.0";
+      STYLE_TAGS
+   }
+  // ************* no Content text ********** //
+   style { name: "empty_state_1";
+      base: "font=Tizen:style=Regular font_size=40 align=center color=#ffffffff text_class=tizen ellipsis=1.0";
+      STYLE_TAGS
+   }
+   style { name: "empty_state_2";
+      base: "font=Tizen:style=Regular font_size=38 align=center color=#ffffffff  text_class=tizen wrap=mixed";
+      STYLE_TAGS
+   }
+}
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_bg.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_bg.#.png
new file mode 100644
index 00000000..1fb8211a
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_bg.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_center.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_center.#.png
new file mode 100644
index 00000000..14dfe07e
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_center.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_left.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_left.#.png
new file mode 100644
index 00000000..98faee72
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_left.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_right.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_right.#.png
new file mode 100644
index 00000000..3eee1075
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_press_right.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_bg_stroke.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_stroke.#.png
new file mode 100644
index 00000000..fde9a045
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_bg_stroke.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png
new file mode 100644
index 00000000..049f28d6
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_list_bg_press_center.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_list_bg_press_center.#.png
new file mode 100644
index 00000000..14dfe07e
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_list_bg_press_center.#.png
diff --git a/mobile/HD/images/Assist_Views/core_contextual_popup_scroll_bar.#.png b/mobile/HD/images/Assist_Views/core_contextual_popup_scroll_bar.#.png
new file mode 100644
index 00000000..c9275263
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_contextual_popup_scroll_bar.#.png
diff --git a/mobile/HD/images/Assist_Views/core_icon_badge_container.#.png b/mobile/HD/images/Assist_Views/core_icon_badge_container.#.png
new file mode 100644
index 00000000..bba06a6d
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_icon_badge_container.#.png
diff --git a/themes/MIDDLE/images/Content_views/core_focus.#.png b/mobile/HD/images/Assist_Views/core_popup_noti_bg.#.png
index bf366868..ad1dcceb 100755..100644
--- a/themes/MIDDLE/images/Content_views/core_focus.#.png
+++ b/mobile/HD/images/Assist_Views/core_popup_noti_bg.#.png
diff --git a/mobile/HD/images/Assist_Views/core_popup_noti_bg_stroke.#.png b/mobile/HD/images/Assist_Views/core_popup_noti_bg_stroke.#.png
new file mode 100644
index 00000000..3c840825
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_popup_noti_bg_stroke.#.png
diff --git a/mobile/HD/images/Assist_Views/core_theme_bg_dim.png b/mobile/HD/images/Assist_Views/core_theme_bg_dim.png
new file mode 100644
index 00000000..59380d5e
--- /dev/null
+++ b/mobile/HD/images/Assist_Views/core_theme_bg_dim.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_center.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_center.png
new file mode 100644
index 00000000..b6189766
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_handler_center.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png
new file mode 100644
index 00000000..4ddb0d89
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png
new file mode 100644
index 00000000..f7251a31
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png
new file mode 100644
index 00000000..4ddb0d89
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png
new file mode 100644
index 00000000..f7251a31
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_magnifier_line.#.png b/mobile/HD/images/Copy_Paste/copy&paste_magnifier_line.#.png
new file mode 100644
index 00000000..ee4ef9e5
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_magnifier_line.#.png
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_magnifier_mask.#.png b/mobile/HD/images/Copy_Paste/copy&paste_magnifier_mask.#.png
new file mode 100644
index 00000000..ef39983e
--- /dev/null
+++ b/mobile/HD/images/Copy_Paste/copy&paste_magnifier_mask.#.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-angry-shout.png b/mobile/HD/images/Emoticon/emo-angry-shout.png
index 9995fe8a..9995fe8a 100644
--- a/themes/MIDDLE/images/Emoticon/emo-angry-shout.png
+++ b/mobile/HD/images/Emoticon/emo-angry-shout.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-angry.png b/mobile/HD/images/Emoticon/emo-angry.png
index 8ad74e19..8ad74e19 100644
--- a/themes/MIDDLE/images/Emoticon/emo-angry.png
+++ b/mobile/HD/images/Emoticon/emo-angry.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-guilty.png b/mobile/HD/images/Emoticon/emo-guilty.png
index d2894414..d2894414 100644
--- a/themes/MIDDLE/images/Emoticon/emo-guilty.png
+++ b/mobile/HD/images/Emoticon/emo-guilty.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-haha.png b/mobile/HD/images/Emoticon/emo-haha.png
index a4c61b7c..a4c61b7c 100644
--- a/themes/MIDDLE/images/Emoticon/emo-haha.png
+++ b/mobile/HD/images/Emoticon/emo-haha.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-half-smile.png b/mobile/HD/images/Emoticon/emo-half-smile.png
index d1d07cc3..d1d07cc3 100644
--- a/themes/MIDDLE/images/Emoticon/emo-half-smile.png
+++ b/mobile/HD/images/Emoticon/emo-half-smile.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-happy.png b/mobile/HD/images/Emoticon/emo-happy.png
index 8cdfd564..8cdfd564 100644
--- a/themes/MIDDLE/images/Emoticon/emo-happy.png
+++ b/mobile/HD/images/Emoticon/emo-happy.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-kiss.png b/mobile/HD/images/Emoticon/emo-kiss.png
index 0f148a87..0f148a87 100644
--- a/themes/MIDDLE/images/Emoticon/emo-kiss.png
+++ b/mobile/HD/images/Emoticon/emo-kiss.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-little-bit-sorry.png b/mobile/HD/images/Emoticon/emo-little-bit-sorry.png
index e053f281..e053f281 100644
--- a/themes/MIDDLE/images/Emoticon/emo-little-bit-sorry.png
+++ b/mobile/HD/images/Emoticon/emo-little-bit-sorry.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-love.png b/mobile/HD/images/Emoticon/emo-love.png
index 78892a09..78892a09 100644
--- a/themes/MIDDLE/images/Emoticon/emo-love.png
+++ b/mobile/HD/images/Emoticon/emo-love.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-minimal-smile.png b/mobile/HD/images/Emoticon/emo-minimal-smile.png
index aff28da5..aff28da5 100644
--- a/themes/MIDDLE/images/Emoticon/emo-minimal-smile.png
+++ b/mobile/HD/images/Emoticon/emo-minimal-smile.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-omg.png b/mobile/HD/images/Emoticon/emo-omg.png
index 94faeefc..94faeefc 100644
--- a/themes/MIDDLE/images/Emoticon/emo-omg.png
+++ b/mobile/HD/images/Emoticon/emo-omg.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-smile.png b/mobile/HD/images/Emoticon/emo-smile.png
index 7a011d37..7a011d37 100644
--- a/themes/MIDDLE/images/Emoticon/emo-smile.png
+++ b/mobile/HD/images/Emoticon/emo-smile.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-sorry.png b/mobile/HD/images/Emoticon/emo-sorry.png
index bbfbe4e8..bbfbe4e8 100644
--- a/themes/MIDDLE/images/Emoticon/emo-sorry.png
+++ b/mobile/HD/images/Emoticon/emo-sorry.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-surprised.png b/mobile/HD/images/Emoticon/emo-surprised.png
index 87a9d987..87a9d987 100644
--- a/themes/MIDDLE/images/Emoticon/emo-surprised.png
+++ b/mobile/HD/images/Emoticon/emo-surprised.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-tongue-dangling.png b/mobile/HD/images/Emoticon/emo-tongue-dangling.png
index 3a7f0ac4..3a7f0ac4 100644
--- a/themes/MIDDLE/images/Emoticon/emo-tongue-dangling.png
+++ b/mobile/HD/images/Emoticon/emo-tongue-dangling.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-very-sorry.png b/mobile/HD/images/Emoticon/emo-very-sorry.png
index a9daeb73..a9daeb73 100644
--- a/themes/MIDDLE/images/Emoticon/emo-very-sorry.png
+++ b/mobile/HD/images/Emoticon/emo-very-sorry.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-wink.png b/mobile/HD/images/Emoticon/emo-wink.png
index 2f22878a..2f22878a 100644
--- a/themes/MIDDLE/images/Emoticon/emo-wink.png
+++ b/mobile/HD/images/Emoticon/emo-wink.png
diff --git a/themes/MIDDLE/images/Emoticon/emo-worried.png b/mobile/HD/images/Emoticon/emo-worried.png
index 9bb78c86..9bb78c86 100644
--- a/themes/MIDDLE/images/Emoticon/emo-worried.png
+++ b/mobile/HD/images/Emoticon/emo-worried.png
diff --git a/mobile/HD/images/Navigation_elements/core_icon_back.png b/mobile/HD/images/Navigation_elements/core_icon_back.png
new file mode 100644
index 00000000..baf1df03
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_icon_back.png
diff --git a/mobile/HD/images/Navigation_elements/core_icon_expand_close.png b/mobile/HD/images/Navigation_elements/core_icon_expand_close.png
new file mode 100644
index 00000000..b46d2a78
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_icon_expand_close.png
diff --git a/themes/MIDDLE/images/Content_views/core_dropdown_label_icon_arrow.png b/mobile/HD/images/Navigation_elements/core_icon_expand_open.png
index 8baacdc8..7927ef22 100755..100644
--- a/themes/MIDDLE/images/Content_views/core_dropdown_label_icon_arrow.png
+++ b/mobile/HD/images/Navigation_elements/core_icon_expand_open.png
diff --git a/mobile/HD/images/Navigation_elements/core_index_fastscroll_rollover_line_focus.#.png b/mobile/HD/images/Navigation_elements/core_index_fastscroll_rollover_line_focus.#.png
new file mode 100644
index 00000000..4664cfb2
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_index_fastscroll_rollover_line_focus.#.png
diff --git a/mobile/HD/images/Navigation_elements/core_index_scroll_bar_h.#.png b/mobile/HD/images/Navigation_elements/core_index_scroll_bar_h.#.png
new file mode 100644
index 00000000..1e004ad0
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_bar_h.#.png
diff --git a/mobile/HD/images/Navigation_elements/core_index_scroll_bar_v.#.png b/mobile/HD/images/Navigation_elements/core_index_scroll_bar_v.#.png
new file mode 100644
index 00000000..58b31964
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_bar_v.#.png
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_handler_h_01.png b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_h_01.png
index 55a59cef..55a59cef 100755..100644
--- a/themes/MIDDLE/images/Controls/core_index_scroll_handler_h_01.png
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_h_01.png
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_handler_h_02.png b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_h_02.png
index 550c14ca..550c14ca 100755..100644
--- a/themes/MIDDLE/images/Controls/core_index_scroll_handler_h_02.png
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_h_02.png
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_handler_v_01.png b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_v_01.png
index 00f6f724..00f6f724 100755..100644
--- a/themes/MIDDLE/images/Controls/core_index_scroll_handler_v_01.png
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_v_01.png
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_handler_v_02.png b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_v_02.png
index 7da518dc..7da518dc 100755..100644
--- a/themes/MIDDLE/images/Controls/core_index_scroll_handler_v_02.png
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_handler_v_02.png
diff --git a/mobile/HD/images/Navigation_elements/core_index_scroll_popup_bg.png b/mobile/HD/images/Navigation_elements/core_index_scroll_popup_bg.png
new file mode 100644
index 00000000..3f523240
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_index_scroll_popup_bg.png
diff --git a/themes/MIDDLE/images/Navigation_elements/core_navigation_bar_icon_arrow.png b/mobile/HD/images/Navigation_elements/core_navigation_bar_icon_arrow.png
index 39301643..39301643 100755..100644
--- a/themes/MIDDLE/images/Navigation_elements/core_navigation_bar_icon_arrow.png
+++ b/mobile/HD/images/Navigation_elements/core_navigation_bar_icon_arrow.png
diff --git a/mobile/HD/images/Navigation_elements/core_page_indicator_off.png b/mobile/HD/images/Navigation_elements/core_page_indicator_off.png
new file mode 100644
index 00000000..2b33cbb8
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_page_indicator_off.png
diff --git a/mobile/HD/images/Navigation_elements/core_page_indicator_on.png b/mobile/HD/images/Navigation_elements/core_page_indicator_on.png
new file mode 100644
index 00000000..4c1ebbbc
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_page_indicator_on.png
diff --git a/mobile/HD/images/Navigation_elements/core_scroll_bar_h.#.png b/mobile/HD/images/Navigation_elements/core_scroll_bar_h.#.png
new file mode 100644
index 00000000..4f36f349
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_scroll_bar_h.#.png
diff --git a/themes/MIDDLE/images/Controls/core_scroll_bar_h_tab.#.png b/mobile/HD/images/Navigation_elements/core_scroll_bar_h_tab.#.png
index 7d259173..7d259173 100644
--- a/themes/MIDDLE/images/Controls/core_scroll_bar_h_tab.#.png
+++ b/mobile/HD/images/Navigation_elements/core_scroll_bar_h_tab.#.png
diff --git a/mobile/HD/images/Navigation_elements/core_scroll_bar_v.#.png b/mobile/HD/images/Navigation_elements/core_scroll_bar_v.#.png
new file mode 100644
index 00000000..c049587b
--- /dev/null
+++ b/mobile/HD/images/Navigation_elements/core_scroll_bar_v.#.png
diff --git a/themes/MIDDLE/images/Content_views/core_dropdown_label_bg.#.png b/mobile/HD/images/Old/core_dropdown_label_bg.#.png
index 17e88fca..17e88fca 100755..100644
--- a/themes/MIDDLE/images/Content_views/core_dropdown_label_bg.#.png
+++ b/mobile/HD/images/Old/core_dropdown_label_bg.#.png
diff --git a/mobile/HD/images/Old/core_dropdown_label_bg_stroke.#.png b/mobile/HD/images/Old/core_dropdown_label_bg_stroke.#.png
new file mode 100644
index 00000000..acb86e46
--- /dev/null
+++ b/mobile/HD/images/Old/core_dropdown_label_bg_stroke.#.png
diff --git a/themes/MIDDLE/images/Content_views/core_group_list_bg_ef.#.png b/mobile/HD/images/Old/core_group_list_bg_ef.#.png
index d7424efd..d7424efd 100644
--- a/themes/MIDDLE/images/Content_views/core_group_list_bg_ef.#.png
+++ b/mobile/HD/images/Old/core_group_list_bg_ef.#.png
diff --git a/themes/MIDDLE/images/Navigation_elements/core_icon_drawer.png b/mobile/HD/images/Old/core_icon_drawer.png
index f58e6770..f58e6770 100755..100644
--- a/themes/MIDDLE/images/Navigation_elements/core_icon_drawer.png
+++ b/mobile/HD/images/Old/core_icon_drawer.png
diff --git a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_left.png b/mobile/HD/images/Old/core_icon_picker_arrow_left.png
index 86dd9f5f..86dd9f5f 100644
--- a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_left.png
+++ b/mobile/HD/images/Old/core_icon_picker_arrow_left.png
diff --git a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_right.png b/mobile/HD/images/Old/core_icon_picker_arrow_right.png
index ca413c9c..ca413c9c 100644
--- a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_right.png
+++ b/mobile/HD/images/Old/core_icon_picker_arrow_right.png
diff --git a/themes/MIDDLE/images/Navigation_elements/core_navigation_bar_bg.png b/mobile/HD/images/Old/core_navigation_bar_bg.png
index 28503a57..28503a57 100755..100644
--- a/themes/MIDDLE/images/Navigation_elements/core_navigation_bar_bg.png
+++ b/mobile/HD/images/Old/core_navigation_bar_bg.png
diff --git a/themes/MIDDLE/images/Controls/core_slider_popup_bg.png b/mobile/HD/images/Old/core_slider_popup_bg.png
index 6649c238..6649c238 100755..100644
--- a/themes/MIDDLE/images/Controls/core_slider_popup_bg.png
+++ b/mobile/HD/images/Old/core_slider_popup_bg.png
diff --git a/themes/MIDDLE/images/Controls/core_slider_popup_bg_ef.png b/mobile/HD/images/Old/core_slider_popup_bg_ef.png
index ba289a11..ba289a11 100755..100644
--- a/themes/MIDDLE/images/Controls/core_slider_popup_bg_ef.png
+++ b/mobile/HD/images/Old/core_slider_popup_bg_ef.png
diff --git a/themes/MIDDLE/images/Controls/core_slider_popup_bg_stroke.png b/mobile/HD/images/Old/core_slider_popup_bg_stroke.png
index 70fd6605..70fd6605 100755..100644
--- a/themes/MIDDLE/images/Controls/core_slider_popup_bg_stroke.png
+++ b/mobile/HD/images/Old/core_slider_popup_bg_stroke.png
diff --git a/themes/MIDDLE/images/Navigation_elements/core_title_button_bg.png b/mobile/HD/images/Old/core_title_button_bg.png
index 1e22522d..1e22522d 100755..100644
--- a/themes/MIDDLE/images/Navigation_elements/core_title_button_bg.png
+++ b/mobile/HD/images/Old/core_title_button_bg.png
diff --git a/themes/MIDDLE/images/Navigation_elements/core_title_icon_cancel.png b/mobile/HD/images/Old/core_title_icon_cancel.png
index 98fe29a1..98fe29a1 100755..100644
--- a/themes/MIDDLE/images/Navigation_elements/core_title_icon_cancel.png
+++ b/mobile/HD/images/Old/core_title_icon_cancel.png
diff --git a/themes/MIDDLE/images/Navigation_elements/core_title_icon_done.png b/mobile/HD/images/Old/core_title_icon_done.png
index ecc3061b..ecc3061b 100755..100644
--- a/themes/MIDDLE/images/Navigation_elements/core_title_icon_done.png
+++ b/mobile/HD/images/Old/core_title_icon_done.png
diff --git a/themes/MIDDLE/images/Content_views/core_title_icon_option.png b/mobile/HD/images/Old/core_title_icon_option.png
index 1d18a02c..1d18a02c 100755..100644
--- a/themes/MIDDLE/images/Content_views/core_title_icon_option.png
+++ b/mobile/HD/images/Old/core_title_icon_option.png
diff --git a/themes/MIDDLE/images/Content_views/core_button_icon_clear.png b/mobile/HD/images/Presentation_views/core_button_icon_clear.png
index ae9c80d5..ae9c80d5 100755..100644
--- a/themes/MIDDLE/images/Content_views/core_button_icon_clear.png
+++ b/mobile/HD/images/Presentation_views/core_button_icon_clear.png
diff --git a/mobile/HD/images/Presentation_views/core_focus.#.png b/mobile/HD/images/Presentation_views/core_focus.#.png
new file mode 100644
index 00000000..3aa7f59d
--- /dev/null
+++ b/mobile/HD/images/Presentation_views/core_focus.#.png
diff --git a/themes/MIDDLE/images/Controls/core_button_add.png b/mobile/HD/images/User_Input_Elements/core_button_add.png
index ff9e0b18..ff9e0b18 100755..100644
--- a/themes/MIDDLE/images/Controls/core_button_add.png
+++ b/mobile/HD/images/User_Input_Elements/core_button_add.png
diff --git a/themes/MIDDLE/images/Controls/core_button_delete.png b/mobile/HD/images/User_Input_Elements/core_button_delete.png
index 854e6003..854e6003 100755..100644
--- a/themes/MIDDLE/images/Controls/core_button_delete.png
+++ b/mobile/HD/images/User_Input_Elements/core_button_delete.png
diff --git a/themes/MIDDLE/images/Controls/core_button_reorder.png b/mobile/HD/images/User_Input_Elements/core_button_reorder.png
index 80946b16..80946b16 100755..100644
--- a/themes/MIDDLE/images/Controls/core_button_reorder.png
+++ b/mobile/HD/images/User_Input_Elements/core_button_reorder.png
diff --git a/themes/MIDDLE/images/Controls/core_color_picker_color_shadow.png b/mobile/HD/images/User_Input_Elements/core_color_picker_color_shadow.png
index a9cc9d5a..a9cc9d5a 100755..100644
--- a/themes/MIDDLE/images/Controls/core_color_picker_color_shadow.png
+++ b/mobile/HD/images/User_Input_Elements/core_color_picker_color_shadow.png
diff --git a/themes/MIDDLE/images/Controls/core_color_picker_palette.png b/mobile/HD/images/User_Input_Elements/core_color_picker_palette.png
index 94ff4cce..94ff4cce 100755..100644
--- a/themes/MIDDLE/images/Controls/core_color_picker_palette.png
+++ b/mobile/HD/images/User_Input_Elements/core_color_picker_palette.png
diff --git a/themes/MIDDLE/images/Controls/core_color_picker_palette_focused.png b/mobile/HD/images/User_Input_Elements/core_color_picker_palette_focused.png
index 6c616ca1..6c616ca1 100755..100644
--- a/themes/MIDDLE/images/Controls/core_color_picker_palette_focused.png
+++ b/mobile/HD/images/User_Input_Elements/core_color_picker_palette_focused.png
diff --git a/themes/MIDDLE/images/Controls/core_color_picker_palette_selected.png b/mobile/HD/images/User_Input_Elements/core_color_picker_palette_selected.png
index e70de271..e70de271 100755..100644
--- a/themes/MIDDLE/images/Controls/core_color_picker_palette_selected.png
+++ b/mobile/HD/images/User_Input_Elements/core_color_picker_palette_selected.png
diff --git a/themes/MIDDLE/images/Controls/core_color_picker_palette_selected_bg.png b/mobile/HD/images/User_Input_Elements/core_color_picker_palette_selected_bg.png
index a76b5242..a76b5242 100755..100644
--- a/themes/MIDDLE/images/Controls/core_color_picker_palette_selected_bg.png
+++ b/mobile/HD/images/User_Input_Elements/core_color_picker_palette_selected_bg.png
diff --git a/mobile/HD/images/User_Input_Elements/core_date_picker_arrow_l.png b/mobile/HD/images/User_Input_Elements/core_date_picker_arrow_l.png
new file mode 100644
index 00000000..d2e62bb7
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_date_picker_arrow_l.png
diff --git a/mobile/HD/images/User_Input_Elements/core_date_picker_arrow_r.png b/mobile/HD/images/User_Input_Elements/core_date_picker_arrow_r.png
new file mode 100644
index 00000000..fefe32fd
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_date_picker_arrow_r.png
diff --git a/mobile/HD/images/User_Input_Elements/core_date_picker_press.png b/mobile/HD/images/User_Input_Elements/core_date_picker_press.png
new file mode 100644
index 00000000..a62725d8
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_date_picker_press.png
diff --git a/mobile/HD/images/User_Input_Elements/core_dropdown_label_icon_arrow.png b/mobile/HD/images/User_Input_Elements/core_dropdown_label_icon_arrow.png
new file mode 100644
index 00000000..bc16936c
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_dropdown_label_icon_arrow.png
diff --git a/mobile/HD/images/User_Input_Elements/core_icon_picker_arrow_down.png b/mobile/HD/images/User_Input_Elements/core_icon_picker_arrow_down.png
new file mode 100755
index 00000000..378f2e8a
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_icon_picker_arrow_down.png
diff --git a/mobile/HD/images/User_Input_Elements/core_icon_picker_arrow_up.png b/mobile/HD/images/User_Input_Elements/core_icon_picker_arrow_up.png
new file mode 100755
index 00000000..dc17cadb
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_icon_picker_arrow_up.png
diff --git a/themes/MIDDLE/images/Controls/core_list_button_bg.#.png b/mobile/HD/images/User_Input_Elements/core_list_button_bg.#.png
index 6e326fc8..6e326fc8 100755..100644
--- a/themes/MIDDLE/images/Controls/core_list_button_bg.#.png
+++ b/mobile/HD/images/User_Input_Elements/core_list_button_bg.#.png
diff --git a/mobile/HD/images/User_Input_Elements/core_picker_arrow_down.png b/mobile/HD/images/User_Input_Elements/core_picker_arrow_down.png
new file mode 100644
index 00000000..9b0df67d
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_picker_arrow_down.png
diff --git a/mobile/HD/images/User_Input_Elements/core_picker_arrow_up.png b/mobile/HD/images/User_Input_Elements/core_picker_arrow_up.png
new file mode 100644
index 00000000..3b56c796
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_picker_arrow_up.png
diff --git a/mobile/HD/images/User_Input_Elements/core_picker_down.png b/mobile/HD/images/User_Input_Elements/core_picker_down.png
new file mode 100644
index 00000000..0c932adf
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_picker_down.png
diff --git a/mobile/HD/images/User_Input_Elements/core_picker_up.png b/mobile/HD/images/User_Input_Elements/core_picker_up.png
new file mode 100644
index 00000000..b56b9c15
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_picker_up.png
diff --git a/mobile/HD/images/User_Input_Elements/core_picker_up_bg.png b/mobile/HD/images/User_Input_Elements/core_picker_up_bg.png
new file mode 100644
index 00000000..c45bf6d5
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_picker_up_bg.png
diff --git a/mobile/HD/images/User_Input_Elements/core_progress_bar.#.png b/mobile/HD/images/User_Input_Elements/core_progress_bar.#.png
new file mode 100644
index 00000000..57e7a38b
--- /dev/null
+++ b/mobile/HD/images/User_Input_Elements/core_progress_bar.#.png
diff --git a/themes/MIDDLE/images/Controls/core_progress_pending_bg_01.png b/mobile/HD/images/User_Input_Elements/core_progress_pending_bg_01.png
index 8354a328..8354a328 100755..100644
--- a/themes/MIDDLE/images/Controls/core_progress_pending_bg_01.png
+++ b/mobile/HD/images/User_Input_Elements/core_progress_pending_bg_01.png
diff --git a/themes/MIDDLE/images/Controls/core_progress_pending_bg_02.png b/mobile/HD/images/User_Input_Elements/core_progress_pending_bg_02.png
index 1dc90ca2..1dc90ca2 100755..100644
--- a/themes/MIDDLE/images/Controls/core_progress_pending_bg_02.png
+++ b/mobile/HD/images/User_Input_Elements/core_progress_pending_bg_02.png
diff --git a/mobile/HD/images/core_theme_bg_01.png b/mobile/HD/images/core_theme_bg_01.png
new file mode 100644
index 00000000..be3057d3
--- /dev/null
+++ b/mobile/HD/images/core_theme_bg_01.png
diff --git a/themes/Makefile b/mobile/Makefile
index 333dc19f..333dc19f 100644
--- a/themes/Makefile
+++ b/mobile/Makefile
diff --git a/mobile/Makefile.am b/mobile/Makefile.am
new file mode 100644
index 00000000..6e99ac4c
--- /dev/null
+++ b/mobile/Makefile.am
@@ -0,0 +1,48 @@
+prefix ?= /usr
+INSTALL=install -c
+THEME_DIR=$(DESTDIR)/$(prefix)/share/elementary/themes
+EDJE_FLAGS_VERBOSE_ =
+EDJE_FLAGS_VERBOSE_0 =
+EDJE_FLAGS_VERBOSE_1 = -v
+EDJE_FLAGS =
+SRC=efl-theme-tizen-mobile
+DEFAULT_SRC=default-mobile
+
+all:
+	edje_cc $(EDJE_FLAGS) $(EDJE_FLAGS_$(V)) \
+		-id ./HD/images/\
+		-id ./HD/images/Navigation_elements\
+		-id ./HD/images/Presentation_views\
+		-id ./HD/images/User_Input_Elements\
+		-id ./HD/images/Assist_Views\
+		-id ./HD/images/Copy_Paste\
+		-id ./HD/images/Emoticon\
+		-id ./HD/images/Old\
+		-sd ./HD/sounds -fd ../objects \
+		$(SRC).edc $(SRC).edj;
+	edje_cc $(EDJE_FLAGS_$(V)) \
+		-id default/images/tizen-hd -sd default/sounds -fd ../objects \
+		-id ./HD/images/\
+		-id ./HD/images/Navigation_elements\
+		-id ./HD/images/Presentation_views\
+		-id ./HD/images/User_Input_Elements\
+		-id ./HD/images/Assist_Views\
+		-id ./HD/images/Copy_Paste\
+		-id ./HD/images/Emoticon\
+		-id ./HD/images/Old\
+		$(DEFAULT_SRC).edc $(DEFAULT_SRC).edj;
+
+
+clean:
+	rm -rf $(SRC).edj;
+	rm -rf $(DEFAULT_SRC).edj;
+
+install:
+	mkdir -p $(THEME_DIR)
+	$(INSTALL) $(SRC).edj $(THEME_DIR);
+	$(INSTALL) $(DEFAULT_SRC).edj $(THEME_DIR);
+
+uninstall:
+	rm -rf $(THEME_DIR)/
+
+distclean: clean
diff --git a/themes/default-mobile.edc b/mobile/default-mobile.edc
index 44a21fd4..68d5d5a5 100644
--- a/themes/default-mobile.edc
+++ b/mobile/default-mobile.edc
@@ -91,6 +91,7 @@ collections {
 #include "widgets_default/pointer.edc"
 #include "widgets_default/player.edc"
 #include "widgets_default/focus_highlight.edc"
+#include "widgets_default/a11y_highlight.edc"
 #include "widgets_default/flipselector.edc"
 #include "widgets_default/slider.edc"
 #include "widgets_default/win.edc"
diff --git a/themes/default/images/00_badge_bg.png b/mobile/default/images/tizen-hd/00_badge_bg.png
index 6dda2a8f..6dda2a8f 100644
--- a/themes/default/images/00_badge_bg.png
+++ b/mobile/default/images/tizen-hd/00_badge_bg.png
diff --git a/themes/default/images/00_button_02.png b/mobile/default/images/tizen-hd/00_button_02.png
index c18a83b3..c18a83b3 100644
--- a/themes/default/images/00_button_02.png
+++ b/mobile/default/images/tizen-hd/00_button_02.png
diff --git a/themes/default/images/00_button_02_dim.png b/mobile/default/images/tizen-hd/00_button_02_dim.png
index c18a83b3..c18a83b3 100644
--- a/themes/default/images/00_button_02_dim.png
+++ b/mobile/default/images/tizen-hd/00_button_02_dim.png
diff --git a/themes/default/images/00_button_02_press.png b/mobile/default/images/tizen-hd/00_button_02_press.png
index 674d467c..674d467c 100644
--- a/themes/default/images/00_button_02_press.png
+++ b/mobile/default/images/tizen-hd/00_button_02_press.png
diff --git a/themes/default/images/00_divider_line.png b/mobile/default/images/tizen-hd/00_divider_line.png
index fa2f19e0..fa2f19e0 100644
--- a/themes/default/images/00_divider_line.png
+++ b/mobile/default/images/tizen-hd/00_divider_line.png
diff --git a/themes/default/images/00_message_button_add_recipient.png b/mobile/default/images/tizen-hd/00_message_button_add_recipient.png
index 93da581b..93da581b 100644
--- a/themes/default/images/00_message_button_add_recipient.png
+++ b/mobile/default/images/tizen-hd/00_message_button_add_recipient.png
diff --git a/themes/default/images/00_scroll_bar.png b/mobile/default/images/tizen-hd/00_scroll_bar.png
index 9930bbf2..9930bbf2 100644
--- a/themes/default/images/00_scroll_bar.png
+++ b/mobile/default/images/tizen-hd/00_scroll_bar.png
diff --git a/themes/default/images/00_slider_handle.png b/mobile/default/images/tizen-hd/00_slider_handle.png
index d81b9351..d81b9351 100644
--- a/themes/default/images/00_slider_handle.png
+++ b/mobile/default/images/tizen-hd/00_slider_handle.png
diff --git a/themes/default/images/00_slider_handle_dim.png b/mobile/default/images/tizen-hd/00_slider_handle_dim.png
index 83600a8e..83600a8e 100644
--- a/themes/default/images/00_slider_handle_dim.png
+++ b/mobile/default/images/tizen-hd/00_slider_handle_dim.png
diff --git a/themes/default/images/00_slider_handle_press.png b/mobile/default/images/tizen-hd/00_slider_handle_press.png
index 7e9485f5..7e9485f5 100644
--- a/themes/default/images/00_slider_handle_press.png
+++ b/mobile/default/images/tizen-hd/00_slider_handle_press.png
diff --git a/themes/default/images/00_splite_handler_bg_h.png b/mobile/default/images/tizen-hd/00_splite_handler_bg_h.png
index e5f1bfb5..e5f1bfb5 100644
--- a/themes/default/images/00_splite_handler_bg_h.png
+++ b/mobile/default/images/tizen-hd/00_splite_handler_bg_h.png
diff --git a/themes/default/images/00_splite_handler_bg_press.png b/mobile/default/images/tizen-hd/00_splite_handler_bg_press.png
index ead2aa64..ead2aa64 100644
--- a/themes/default/images/00_splite_handler_bg_press.png
+++ b/mobile/default/images/tizen-hd/00_splite_handler_bg_press.png
diff --git a/themes/default/images/00_splite_handler_bg_v.png b/mobile/default/images/tizen-hd/00_splite_handler_bg_v.png
index 8761449c..8761449c 100644
--- a/themes/default/images/00_splite_handler_bg_v.png
+++ b/mobile/default/images/tizen-hd/00_splite_handler_bg_v.png
diff --git a/themes/default/images/00_splite_handler_h.png b/mobile/default/images/tizen-hd/00_splite_handler_h.png
index f6f2c97a..f6f2c97a 100644
--- a/themes/default/images/00_splite_handler_h.png
+++ b/mobile/default/images/tizen-hd/00_splite_handler_h.png
diff --git a/themes/default/images/00_splite_handler_v.png b/mobile/default/images/tizen-hd/00_splite_handler_v.png
index d0cf6bb2..d0cf6bb2 100644
--- a/themes/default/images/00_splite_handler_v.png
+++ b/mobile/default/images/tizen-hd/00_splite_handler_v.png
diff --git a/themes/default/images/00_thumbs_bg_focus.png b/mobile/default/images/tizen-hd/00_thumbs_bg_focus.png
index 29bfe6af..29bfe6af 100644
--- a/themes/default/images/00_thumbs_bg_focus.png
+++ b/mobile/default/images/tizen-hd/00_thumbs_bg_focus.png
diff --git a/themes/default/images/00_thumbs_line_bg.png b/mobile/default/images/tizen-hd/00_thumbs_line_bg.png
index 254d73f5..254d73f5 100644
--- a/themes/default/images/00_thumbs_line_bg.png
+++ b/mobile/default/images/tizen-hd/00_thumbs_line_bg.png
diff --git a/themes/default/images/00_thumbs_loading_bg.png b/mobile/default/images/tizen-hd/00_thumbs_loading_bg.png
index 1f760af7..1f760af7 100644
--- a/themes/default/images/00_thumbs_loading_bg.png
+++ b/mobile/default/images/tizen-hd/00_thumbs_loading_bg.png
diff --git a/themes/default/images/00_winset_list_process_01.png b/mobile/default/images/tizen-hd/00_winset_list_process_01.png
index 5c8fbb45..5c8fbb45 100644
--- a/themes/default/images/00_winset_list_process_01.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_01.png
diff --git a/themes/default/images/00_winset_list_process_02.png b/mobile/default/images/tizen-hd/00_winset_list_process_02.png
index eeec62e9..eeec62e9 100644
--- a/themes/default/images/00_winset_list_process_02.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_02.png
diff --git a/themes/default/images/00_winset_list_process_03.png b/mobile/default/images/tizen-hd/00_winset_list_process_03.png
index 45f82b98..45f82b98 100644
--- a/themes/default/images/00_winset_list_process_03.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_03.png
diff --git a/themes/default/images/00_winset_list_process_04.png b/mobile/default/images/tizen-hd/00_winset_list_process_04.png
index 251e3ba2..251e3ba2 100644
--- a/themes/default/images/00_winset_list_process_04.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_04.png
diff --git a/themes/default/images/00_winset_list_process_05.png b/mobile/default/images/tizen-hd/00_winset_list_process_05.png
index e2782174..e2782174 100644
--- a/themes/default/images/00_winset_list_process_05.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_05.png
diff --git a/themes/default/images/00_winset_list_process_06.png b/mobile/default/images/tizen-hd/00_winset_list_process_06.png
index 1e47db8f..1e47db8f 100644
--- a/themes/default/images/00_winset_list_process_06.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_06.png
diff --git a/themes/default/images/00_winset_list_process_07.png b/mobile/default/images/tizen-hd/00_winset_list_process_07.png
index 18d5db9a..18d5db9a 100644
--- a/themes/default/images/00_winset_list_process_07.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_07.png
diff --git a/themes/default/images/00_winset_list_process_08.png b/mobile/default/images/tizen-hd/00_winset_list_process_08.png
index 0cabf18f..0cabf18f 100644
--- a/themes/default/images/00_winset_list_process_08.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_08.png
diff --git a/themes/default/images/00_winset_list_process_09.png b/mobile/default/images/tizen-hd/00_winset_list_process_09.png
index 94bba2b3..94bba2b3 100644
--- a/themes/default/images/00_winset_list_process_09.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_09.png
diff --git a/themes/default/images/00_winset_list_process_10.png b/mobile/default/images/tizen-hd/00_winset_list_process_10.png
index 2e5b2b7f..2e5b2b7f 100644
--- a/themes/default/images/00_winset_list_process_10.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_10.png
diff --git a/themes/default/images/00_winset_list_process_11.png b/mobile/default/images/tizen-hd/00_winset_list_process_11.png
index 264e6b5d..264e6b5d 100644
--- a/themes/default/images/00_winset_list_process_11.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_11.png
diff --git a/themes/default/images/00_winset_list_process_12.png b/mobile/default/images/tizen-hd/00_winset_list_process_12.png
index c49841e8..c49841e8 100644
--- a/themes/default/images/00_winset_list_process_12.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_12.png
diff --git a/themes/default/images/00_winset_list_process_13.png b/mobile/default/images/tizen-hd/00_winset_list_process_13.png
index cdec3943..cdec3943 100644
--- a/themes/default/images/00_winset_list_process_13.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_13.png
diff --git a/themes/default/images/00_winset_list_process_14.png b/mobile/default/images/tizen-hd/00_winset_list_process_14.png
index aeb28529..aeb28529 100644
--- a/themes/default/images/00_winset_list_process_14.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_14.png
diff --git a/themes/default/images/00_winset_list_process_15.png b/mobile/default/images/tizen-hd/00_winset_list_process_15.png
index b37ee4ae..b37ee4ae 100644
--- a/themes/default/images/00_winset_list_process_15.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_15.png
diff --git a/themes/default/images/00_winset_list_process_16.png b/mobile/default/images/tizen-hd/00_winset_list_process_16.png
index 5bb072b0..5bb072b0 100644
--- a/themes/default/images/00_winset_list_process_16.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_16.png
diff --git a/themes/default/images/00_winset_list_process_17.png b/mobile/default/images/tizen-hd/00_winset_list_process_17.png
index b7e6eb62..b7e6eb62 100644
--- a/themes/default/images/00_winset_list_process_17.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_17.png
diff --git a/themes/default/images/00_winset_list_process_18.png b/mobile/default/images/tizen-hd/00_winset_list_process_18.png
index e5ce36b3..e5ce36b3 100644
--- a/themes/default/images/00_winset_list_process_18.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_18.png
diff --git a/themes/default/images/00_winset_list_process_19.png b/mobile/default/images/tizen-hd/00_winset_list_process_19.png
index 40b4e7d8..40b4e7d8 100644
--- a/themes/default/images/00_winset_list_process_19.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_19.png
diff --git a/themes/default/images/00_winset_list_process_20.png b/mobile/default/images/tizen-hd/00_winset_list_process_20.png
index b50abde7..b50abde7 100644
--- a/themes/default/images/00_winset_list_process_20.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_20.png
diff --git a/themes/default/images/00_winset_list_process_21.png b/mobile/default/images/tizen-hd/00_winset_list_process_21.png
index e7cc057d..e7cc057d 100644
--- a/themes/default/images/00_winset_list_process_21.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_21.png
diff --git a/themes/default/images/00_winset_list_process_22.png b/mobile/default/images/tizen-hd/00_winset_list_process_22.png
index 35e93e37..35e93e37 100644
--- a/themes/default/images/00_winset_list_process_22.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_22.png
diff --git a/themes/default/images/00_winset_list_process_23.png b/mobile/default/images/tizen-hd/00_winset_list_process_23.png
index 50990db2..50990db2 100644
--- a/themes/default/images/00_winset_list_process_23.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_23.png
diff --git a/themes/default/images/00_winset_list_process_24.png b/mobile/default/images/tizen-hd/00_winset_list_process_24.png
index 3dfea10b..3dfea10b 100644
--- a/themes/default/images/00_winset_list_process_24.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_24.png
diff --git a/themes/default/images/00_winset_list_process_25.png b/mobile/default/images/tizen-hd/00_winset_list_process_25.png
index 4878a78d..4878a78d 100644
--- a/themes/default/images/00_winset_list_process_25.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_25.png
diff --git a/themes/default/images/00_winset_list_process_26.png b/mobile/default/images/tizen-hd/00_winset_list_process_26.png
index b57750f1..b57750f1 100644
--- a/themes/default/images/00_winset_list_process_26.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_26.png
diff --git a/themes/default/images/00_winset_list_process_27.png b/mobile/default/images/tizen-hd/00_winset_list_process_27.png
index c8cee336..c8cee336 100644
--- a/themes/default/images/00_winset_list_process_27.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_27.png
diff --git a/themes/default/images/00_winset_list_process_28.png b/mobile/default/images/tizen-hd/00_winset_list_process_28.png
index db518093..db518093 100644
--- a/themes/default/images/00_winset_list_process_28.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_28.png
diff --git a/themes/default/images/00_winset_list_process_29.png b/mobile/default/images/tizen-hd/00_winset_list_process_29.png
index 2fb304ea..2fb304ea 100644
--- a/themes/default/images/00_winset_list_process_29.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_29.png
diff --git a/themes/default/images/00_winset_list_process_30.png b/mobile/default/images/tizen-hd/00_winset_list_process_30.png
index 98680892..98680892 100644
--- a/themes/default/images/00_winset_list_process_30.png
+++ b/mobile/default/images/tizen-hd/00_winset_list_process_30.png
diff --git a/mobile/default/images/tizen-hd/a11y_highlight.png b/mobile/default/images/tizen-hd/a11y_highlight.png
new file mode 100644
index 00000000..dd48ffe7
--- /dev/null
+++ b/mobile/default/images/tizen-hd/a11y_highlight.png
diff --git a/themes/default/images/action_slider_bg.png b/mobile/default/images/tizen-hd/action_slider_bg.png
index 5d1573bf..5d1573bf 100644
--- a/themes/default/images/action_slider_bg.png
+++ b/mobile/default/images/tizen-hd/action_slider_bg.png
diff --git a/themes/default/images/action_slider_btn.png b/mobile/default/images/tizen-hd/action_slider_btn.png
index d9c20c53..d9c20c53 100644
--- a/themes/default/images/action_slider_btn.png
+++ b/mobile/default/images/tizen-hd/action_slider_btn.png
diff --git a/themes/default/images/action_slider_guage_off.png b/mobile/default/images/tizen-hd/action_slider_guage_off.png
index 837d8d16..837d8d16 100644
--- a/themes/default/images/action_slider_guage_off.png
+++ b/mobile/default/images/tizen-hd/action_slider_guage_off.png
diff --git a/themes/default/images/action_slider_guage_on.png b/mobile/default/images/tizen-hd/action_slider_guage_on.png
index cd06b1d6..cd06b1d6 100644
--- a/themes/default/images/action_slider_guage_on.png
+++ b/mobile/default/images/tizen-hd/action_slider_guage_on.png
diff --git a/themes/default/images/bt_sm_hilight.png b/mobile/default/images/tizen-hd/bt_sm_hilight.png
index 63899caa..63899caa 100644
--- a/themes/default/images/bt_sm_hilight.png
+++ b/mobile/default/images/tizen-hd/bt_sm_hilight.png
diff --git a/themes/default/images/bt_sm_shine.png b/mobile/default/images/tizen-hd/bt_sm_shine.png
index 23bf3110..23bf3110 100644
--- a/themes/default/images/bt_sm_shine.png
+++ b/mobile/default/images/tizen-hd/bt_sm_shine.png
diff --git a/themes/default/images/bubble.png b/mobile/default/images/tizen-hd/bubble.png
index 78b831b4..78b831b4 100644
--- a/themes/default/images/bubble.png
+++ b/mobile/default/images/tizen-hd/bubble.png
diff --git a/themes/default/images/bubble_1.png b/mobile/default/images/tizen-hd/bubble_1.png
index 3931db31..3931db31 100644
--- a/themes/default/images/bubble_1.png
+++ b/mobile/default/images/tizen-hd/bubble_1.png
diff --git a/themes/default/images/bubble_2.png b/mobile/default/images/tizen-hd/bubble_2.png
index 95785531..95785531 100644
--- a/themes/default/images/bubble_2.png
+++ b/mobile/default/images/tizen-hd/bubble_2.png
diff --git a/themes/default/images/bubble_3.png b/mobile/default/images/tizen-hd/bubble_3.png
index c3ad2660..c3ad2660 100644
--- a/themes/default/images/bubble_3.png
+++ b/mobile/default/images/tizen-hd/bubble_3.png
diff --git a/themes/default/images/bubble_4.png b/mobile/default/images/tizen-hd/bubble_4.png
index e232b5e0..e232b5e0 100644
--- a/themes/default/images/bubble_4.png
+++ b/mobile/default/images/tizen-hd/bubble_4.png
diff --git a/themes/default/images/bubble_shine.png b/mobile/default/images/tizen-hd/bubble_shine.png
index 33fd1d80..33fd1d80 100644
--- a/themes/default/images/bubble_shine.png
+++ b/mobile/default/images/tizen-hd/bubble_shine.png
diff --git a/themes/default/images/emo-angry-shout.png b/mobile/default/images/tizen-hd/emo-angry-shout.png
index 09df0a09..09df0a09 100644
--- a/themes/default/images/emo-angry-shout.png
+++ b/mobile/default/images/tizen-hd/emo-angry-shout.png
diff --git a/themes/default/images/emo-angry.png b/mobile/default/images/tizen-hd/emo-angry.png
index 8ac4de1a..8ac4de1a 100644
--- a/themes/default/images/emo-angry.png
+++ b/mobile/default/images/tizen-hd/emo-angry.png
diff --git a/themes/default/images/emo-crazy-laugh.png b/mobile/default/images/tizen-hd/emo-crazy-laugh.png
index cca7d0f5..cca7d0f5 100644
--- a/themes/default/images/emo-crazy-laugh.png
+++ b/mobile/default/images/tizen-hd/emo-crazy-laugh.png
diff --git a/themes/default/images/emo-evil-laugh.png b/mobile/default/images/tizen-hd/emo-evil-laugh.png
index 345570c7..345570c7 100644
--- a/themes/default/images/emo-evil-laugh.png
+++ b/mobile/default/images/tizen-hd/emo-evil-laugh.png
diff --git a/themes/default/images/emo-evil.png b/mobile/default/images/tizen-hd/emo-evil.png
index fd37758d..fd37758d 100644
--- a/themes/default/images/emo-evil.png
+++ b/mobile/default/images/tizen-hd/emo-evil.png
diff --git a/themes/default/images/emo-goggle-smile.png b/mobile/default/images/tizen-hd/emo-goggle-smile.png
index 4a8e6304..4a8e6304 100644
--- a/themes/default/images/emo-goggle-smile.png
+++ b/mobile/default/images/tizen-hd/emo-goggle-smile.png
diff --git a/themes/default/images/emo-grumpy-smile.png b/mobile/default/images/tizen-hd/emo-grumpy-smile.png
index 09f326fd..09f326fd 100644
--- a/themes/default/images/emo-grumpy-smile.png
+++ b/mobile/default/images/tizen-hd/emo-grumpy-smile.png
diff --git a/themes/default/images/emo-grumpy.png b/mobile/default/images/tizen-hd/emo-grumpy.png
index c7ee0469..c7ee0469 100644
--- a/themes/default/images/emo-grumpy.png
+++ b/mobile/default/images/tizen-hd/emo-grumpy.png
diff --git a/themes/default/images/emo-guilty-smile.png b/mobile/default/images/tizen-hd/emo-guilty-smile.png
index 6892c812..6892c812 100644
--- a/themes/default/images/emo-guilty-smile.png
+++ b/mobile/default/images/tizen-hd/emo-guilty-smile.png
diff --git a/themes/default/images/emo-guilty.png b/mobile/default/images/tizen-hd/emo-guilty.png
index b5f3cdab..b5f3cdab 100644
--- a/themes/default/images/emo-guilty.png
+++ b/mobile/default/images/tizen-hd/emo-guilty.png
diff --git a/themes/default/images/emo-haha.png b/mobile/default/images/tizen-hd/emo-haha.png
index a8f28c71..a8f28c71 100644
--- a/themes/default/images/emo-haha.png
+++ b/mobile/default/images/tizen-hd/emo-haha.png
diff --git a/themes/default/images/emo-half-smile.png b/mobile/default/images/tizen-hd/emo-half-smile.png
index 4f1014c5..4f1014c5 100644
--- a/themes/default/images/emo-half-smile.png
+++ b/mobile/default/images/tizen-hd/emo-half-smile.png
diff --git a/themes/default/images/emo-happy-panting.png b/mobile/default/images/tizen-hd/emo-happy-panting.png
index cf714a77..cf714a77 100644
--- a/themes/default/images/emo-happy-panting.png
+++ b/mobile/default/images/tizen-hd/emo-happy-panting.png
diff --git a/themes/default/images/emo-happy.png b/mobile/default/images/tizen-hd/emo-happy.png
index f4b208cb..f4b208cb 100644
--- a/themes/default/images/emo-happy.png
+++ b/mobile/default/images/tizen-hd/emo-happy.png
diff --git a/themes/default/images/emo-indifferent.png b/mobile/default/images/tizen-hd/emo-indifferent.png
index 539582d9..539582d9 100644
--- a/themes/default/images/emo-indifferent.png
+++ b/mobile/default/images/tizen-hd/emo-indifferent.png
diff --git a/themes/default/images/emo-kiss.png b/mobile/default/images/tizen-hd/emo-kiss.png
index 2ab85dff..2ab85dff 100644
--- a/themes/default/images/emo-kiss.png
+++ b/mobile/default/images/tizen-hd/emo-kiss.png
diff --git a/themes/default/images/emo-knowing-grin.png b/mobile/default/images/tizen-hd/emo-knowing-grin.png
index 7d77c521..7d77c521 100644
--- a/themes/default/images/emo-knowing-grin.png
+++ b/mobile/default/images/tizen-hd/emo-knowing-grin.png
diff --git a/themes/default/images/emo-laugh.png b/mobile/default/images/tizen-hd/emo-laugh.png
index e3342d7f..e3342d7f 100644
--- a/themes/default/images/emo-laugh.png
+++ b/mobile/default/images/tizen-hd/emo-laugh.png
diff --git a/themes/default/images/emo-little-bit-sorry.png b/mobile/default/images/tizen-hd/emo-little-bit-sorry.png
index b0dad6c5..b0dad6c5 100644
--- a/themes/default/images/emo-little-bit-sorry.png
+++ b/mobile/default/images/tizen-hd/emo-little-bit-sorry.png
diff --git a/themes/default/images/emo-love-lots.png b/mobile/default/images/tizen-hd/emo-love-lots.png
index c6e83d18..c6e83d18 100644
--- a/themes/default/images/emo-love-lots.png
+++ b/mobile/default/images/tizen-hd/emo-love-lots.png
diff --git a/themes/default/images/emo-love.png b/mobile/default/images/tizen-hd/emo-love.png
index d55f6bfb..d55f6bfb 100644
--- a/themes/default/images/emo-love.png
+++ b/mobile/default/images/tizen-hd/emo-love.png
diff --git a/themes/default/images/emo-minimal-smile.png b/mobile/default/images/tizen-hd/emo-minimal-smile.png
index fe36d10d..fe36d10d 100644
--- a/themes/default/images/emo-minimal-smile.png
+++ b/mobile/default/images/tizen-hd/emo-minimal-smile.png
diff --git a/themes/default/images/emo-not-happy.png b/mobile/default/images/tizen-hd/emo-not-happy.png
index 603826a2..603826a2 100644
--- a/themes/default/images/emo-not-happy.png
+++ b/mobile/default/images/tizen-hd/emo-not-happy.png
diff --git a/themes/default/images/emo-not-impressed.png b/mobile/default/images/tizen-hd/emo-not-impressed.png
index 4a0bd5a6..4a0bd5a6 100644
--- a/themes/default/images/emo-not-impressed.png
+++ b/mobile/default/images/tizen-hd/emo-not-impressed.png
diff --git a/themes/default/images/emo-omg.png b/mobile/default/images/tizen-hd/emo-omg.png
index 8e08c18f..8e08c18f 100644
--- a/themes/default/images/emo-omg.png
+++ b/mobile/default/images/tizen-hd/emo-omg.png
diff --git a/themes/default/images/emo-opensmile.png b/mobile/default/images/tizen-hd/emo-opensmile.png
index 4c3ec257..4c3ec257 100644
--- a/themes/default/images/emo-opensmile.png
+++ b/mobile/default/images/tizen-hd/emo-opensmile.png
diff --git a/themes/default/images/emo-smile.png b/mobile/default/images/tizen-hd/emo-smile.png
index b982187d..b982187d 100644
--- a/themes/default/images/emo-smile.png
+++ b/mobile/default/images/tizen-hd/emo-smile.png
diff --git a/themes/default/images/emo-sorry.png b/mobile/default/images/tizen-hd/emo-sorry.png
index aa752219..aa752219 100644
--- a/themes/default/images/emo-sorry.png
+++ b/mobile/default/images/tizen-hd/emo-sorry.png
diff --git a/themes/default/images/emo-squint-laugh.png b/mobile/default/images/tizen-hd/emo-squint-laugh.png
index b54a063c..b54a063c 100644
--- a/themes/default/images/emo-squint-laugh.png
+++ b/mobile/default/images/tizen-hd/emo-squint-laugh.png
diff --git a/themes/default/images/emo-surprised.png b/mobile/default/images/tizen-hd/emo-surprised.png
index 08a05092..08a05092 100644
--- a/themes/default/images/emo-surprised.png
+++ b/mobile/default/images/tizen-hd/emo-surprised.png
diff --git a/themes/default/images/emo-suspicious.png b/mobile/default/images/tizen-hd/emo-suspicious.png
index 68d441ec..68d441ec 100644
--- a/themes/default/images/emo-suspicious.png
+++ b/mobile/default/images/tizen-hd/emo-suspicious.png
diff --git a/themes/default/images/emo-tongue-dangling.png b/mobile/default/images/tizen-hd/emo-tongue-dangling.png
index a03883fb..a03883fb 100644
--- a/themes/default/images/emo-tongue-dangling.png
+++ b/mobile/default/images/tizen-hd/emo-tongue-dangling.png
diff --git a/themes/default/images/emo-tongue-poke.png b/mobile/default/images/tizen-hd/emo-tongue-poke.png
index 12ca3089..12ca3089 100644
--- a/themes/default/images/emo-tongue-poke.png
+++ b/mobile/default/images/tizen-hd/emo-tongue-poke.png
diff --git a/themes/default/images/emo-uh.png b/mobile/default/images/tizen-hd/emo-uh.png
index 5eac52cb..5eac52cb 100644
--- a/themes/default/images/emo-uh.png
+++ b/mobile/default/images/tizen-hd/emo-uh.png
diff --git a/themes/default/images/emo-unhappy.png b/mobile/default/images/tizen-hd/emo-unhappy.png
index 2fda0d5d..2fda0d5d 100644
--- a/themes/default/images/emo-unhappy.png
+++ b/mobile/default/images/tizen-hd/emo-unhappy.png
diff --git a/themes/default/images/emo-very-sorry.png b/mobile/default/images/tizen-hd/emo-very-sorry.png
index 7cb6ce64..7cb6ce64 100644
--- a/themes/default/images/emo-very-sorry.png
+++ b/mobile/default/images/tizen-hd/emo-very-sorry.png
diff --git a/themes/default/images/emo-what.png b/mobile/default/images/tizen-hd/emo-what.png
index cc0031bd..cc0031bd 100644
--- a/themes/default/images/emo-what.png
+++ b/mobile/default/images/tizen-hd/emo-what.png
diff --git a/themes/default/images/emo-wink.png b/mobile/default/images/tizen-hd/emo-wink.png
index cf6b42aa..cf6b42aa 100644
--- a/themes/default/images/emo-wink.png
+++ b/mobile/default/images/tizen-hd/emo-wink.png
diff --git a/themes/default/images/emo-worried.png b/mobile/default/images/tizen-hd/emo-worried.png
index 76f50fb7..76f50fb7 100644
--- a/themes/default/images/emo-worried.png
+++ b/mobile/default/images/tizen-hd/emo-worried.png
diff --git a/themes/default/images/emo-wtf.png b/mobile/default/images/tizen-hd/emo-wtf.png
index a2c84def..a2c84def 100644
--- a/themes/default/images/emo-wtf.png
+++ b/mobile/default/images/tizen-hd/emo-wtf.png
diff --git a/themes/default/images/icon_apps.png b/mobile/default/images/tizen-hd/icon_apps.png
index aed4067b..aed4067b 100644
--- a/themes/default/images/icon_apps.png
+++ b/mobile/default/images/tizen-hd/icon_apps.png
diff --git a/themes/default/images/icon_arrow_down.png b/mobile/default/images/tizen-hd/icon_arrow_down.png
index d1b74762..d1b74762 100644
--- a/themes/default/images/icon_arrow_down.png
+++ b/mobile/default/images/tizen-hd/icon_arrow_down.png
diff --git a/themes/default/images/icon_arrow_left.png b/mobile/default/images/tizen-hd/icon_arrow_left.png
index 85615c75..85615c75 100644
--- a/themes/default/images/icon_arrow_left.png
+++ b/mobile/default/images/tizen-hd/icon_arrow_left.png
diff --git a/themes/default/images/icon_arrow_right.png b/mobile/default/images/tizen-hd/icon_arrow_right.png
index 10c7457c..10c7457c 100644
--- a/themes/default/images/icon_arrow_right.png
+++ b/mobile/default/images/tizen-hd/icon_arrow_right.png
diff --git a/themes/default/images/icon_arrow_up.png b/mobile/default/images/tizen-hd/icon_arrow_up.png
index 1b548e90..1b548e90 100644
--- a/themes/default/images/icon_arrow_up.png
+++ b/mobile/default/images/tizen-hd/icon_arrow_up.png
diff --git a/themes/default/images/icon_back.png b/mobile/default/images/tizen-hd/icon_back.png
index f27dd1ed..f27dd1ed 100644
--- a/themes/default/images/icon_back.png
+++ b/mobile/default/images/tizen-hd/icon_back.png
diff --git a/themes/default/images/icon_chat.png b/mobile/default/images/tizen-hd/icon_chat.png
index 39a75ac9..39a75ac9 100644
--- a/themes/default/images/icon_chat.png
+++ b/mobile/default/images/tizen-hd/icon_chat.png
diff --git a/themes/default/images/icon_clock.png b/mobile/default/images/tizen-hd/icon_clock.png
index a87b4f18..a87b4f18 100644
--- a/themes/default/images/icon_clock.png
+++ b/mobile/default/images/tizen-hd/icon_clock.png
diff --git a/themes/default/images/icon_close.png b/mobile/default/images/tizen-hd/icon_close.png
index 4f0d6778..4f0d6778 100644
--- a/themes/default/images/icon_close.png
+++ b/mobile/default/images/tizen-hd/icon_close.png
diff --git a/themes/default/images/icon_close_small.png b/mobile/default/images/tizen-hd/icon_close_small.png
index dced2e2c..dced2e2c 100644
--- a/themes/default/images/icon_close_small.png
+++ b/mobile/default/images/tizen-hd/icon_close_small.png
diff --git a/themes/default/images/icon_delete.png b/mobile/default/images/tizen-hd/icon_delete.png
index 418a24bb..418a24bb 100644
--- a/themes/default/images/icon_delete.png
+++ b/mobile/default/images/tizen-hd/icon_delete.png
diff --git a/themes/default/images/icon_edit.png b/mobile/default/images/tizen-hd/icon_edit.png
index ad302bf5..ad302bf5 100644
--- a/themes/default/images/icon_edit.png
+++ b/mobile/default/images/tizen-hd/icon_edit.png
diff --git a/themes/default/images/icon_file.png b/mobile/default/images/tizen-hd/icon_file.png
index f75e0e81..f75e0e81 100644
--- a/themes/default/images/icon_file.png
+++ b/mobile/default/images/tizen-hd/icon_file.png
diff --git a/themes/default/images/icon_folder.png b/mobile/default/images/tizen-hd/icon_folder.png
index b87c819a..b87c819a 100644
--- a/themes/default/images/icon_folder.png
+++ b/mobile/default/images/tizen-hd/icon_folder.png
diff --git a/themes/default/images/icon_home.png b/mobile/default/images/tizen-hd/icon_home.png
index 7d8fb7a3..7d8fb7a3 100644
--- a/themes/default/images/icon_home.png
+++ b/mobile/default/images/tizen-hd/icon_home.png
diff --git a/themes/default/images/icon_media_ff.png b/mobile/default/images/tizen-hd/icon_media_ff.png
index 953b5f7d..953b5f7d 100644
--- a/themes/default/images/icon_media_ff.png
+++ b/mobile/default/images/tizen-hd/icon_media_ff.png
diff --git a/themes/default/images/icon_media_info.png b/mobile/default/images/tizen-hd/icon_media_info.png
index f56ab854..f56ab854 100644
--- a/themes/default/images/icon_media_info.png
+++ b/mobile/default/images/tizen-hd/icon_media_info.png
diff --git a/themes/default/images/icon_media_next.png b/mobile/default/images/tizen-hd/icon_media_next.png
index 000c6106..000c6106 100644
--- a/themes/default/images/icon_media_next.png
+++ b/mobile/default/images/tizen-hd/icon_media_next.png
diff --git a/themes/default/images/icon_media_pause.png b/mobile/default/images/tizen-hd/icon_media_pause.png
index e1533b5c..e1533b5c 100644
--- a/themes/default/images/icon_media_pause.png
+++ b/mobile/default/images/tizen-hd/icon_media_pause.png
diff --git a/themes/default/images/icon_media_play.png b/mobile/default/images/tizen-hd/icon_media_play.png
index d9b9c6ef..d9b9c6ef 100644
--- a/themes/default/images/icon_media_play.png
+++ b/mobile/default/images/tizen-hd/icon_media_play.png
diff --git a/themes/default/images/icon_media_prev.png b/mobile/default/images/tizen-hd/icon_media_prev.png
index 883fa152..883fa152 100644
--- a/themes/default/images/icon_media_prev.png
+++ b/mobile/default/images/tizen-hd/icon_media_prev.png
diff --git a/themes/default/images/icon_media_rew.png b/mobile/default/images/tizen-hd/icon_media_rew.png
index a0d31b4d..a0d31b4d 100644
--- a/themes/default/images/icon_media_rew.png
+++ b/mobile/default/images/tizen-hd/icon_media_rew.png
diff --git a/themes/default/images/icon_media_stop.png b/mobile/default/images/tizen-hd/icon_media_stop.png
index edcab719..edcab719 100644
--- a/themes/default/images/icon_media_stop.png
+++ b/mobile/default/images/tizen-hd/icon_media_stop.png
diff --git a/themes/default/images/icon_noimage.png b/mobile/default/images/tizen-hd/icon_noimage.png
index 28327c2d..28327c2d 100644
--- a/themes/default/images/icon_noimage.png
+++ b/mobile/default/images/tizen-hd/icon_noimage.png
diff --git a/themes/default/images/icon_refresh.png b/mobile/default/images/tizen-hd/icon_refresh.png
index 395509b8..395509b8 100644
--- a/themes/default/images/icon_refresh.png
+++ b/mobile/default/images/tizen-hd/icon_refresh.png
diff --git a/themes/default/images/map_circle.png b/mobile/default/images/tizen-hd/map_circle.png
index 1641097c..1641097c 100644
--- a/themes/default/images/map_circle.png
+++ b/mobile/default/images/tizen-hd/map_circle.png
diff --git a/themes/default/images/map_item.png b/mobile/default/images/tizen-hd/map_item.png
index b83e5527..b83e5527 100644
--- a/themes/default/images/map_item.png
+++ b/mobile/default/images/tizen-hd/map_item.png
diff --git a/themes/default/images/map_item_2.png b/mobile/default/images/tizen-hd/map_item_2.png
index f92ebfac..f92ebfac 100644
--- a/themes/default/images/map_item_2.png
+++ b/mobile/default/images/tizen-hd/map_item_2.png
diff --git a/themes/default/images/map_scale.png b/mobile/default/images/tizen-hd/map_scale.png
index ff7be49e..ff7be49e 100644
--- a/themes/default/images/map_scale.png
+++ b/mobile/default/images/tizen-hd/map_scale.png
diff --git a/themes/default/images/sb_runnerh.png b/mobile/default/images/tizen-hd/sb_runnerh.png
index a483ce8b..a483ce8b 100644
--- a/themes/default/images/sb_runnerh.png
+++ b/mobile/default/images/tizen-hd/sb_runnerh.png
diff --git a/themes/default/images/sb_runnerv.png b/mobile/default/images/tizen-hd/sb_runnerv.png
index cb2da6fc..cb2da6fc 100644
--- a/themes/default/images/sb_runnerv.png
+++ b/mobile/default/images/tizen-hd/sb_runnerv.png
diff --git a/themes/default/images/whitetheme/action_slider_bg.png b/mobile/default/images/tizen-hd/whitetheme/action_slider_bg.png
index 5d1573bf..5d1573bf 100644
--- a/themes/default/images/whitetheme/action_slider_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/action_slider_bg.png
diff --git a/themes/default/images/whitetheme/action_slider_btn.png b/mobile/default/images/tizen-hd/whitetheme/action_slider_btn.png
index d9c20c53..d9c20c53 100644
--- a/themes/default/images/whitetheme/action_slider_btn.png
+++ b/mobile/default/images/tizen-hd/whitetheme/action_slider_btn.png
diff --git a/themes/default/images/whitetheme/action_slider_guage_off.png b/mobile/default/images/tizen-hd/whitetheme/action_slider_guage_off.png
index 837d8d16..837d8d16 100644
--- a/themes/default/images/whitetheme/action_slider_guage_off.png
+++ b/mobile/default/images/tizen-hd/whitetheme/action_slider_guage_off.png
diff --git a/themes/default/images/whitetheme/action_slider_guage_on.png b/mobile/default/images/tizen-hd/whitetheme/action_slider_guage_on.png
index cd06b1d6..cd06b1d6 100644
--- a/themes/default/images/whitetheme/action_slider_guage_on.png
+++ b/mobile/default/images/tizen-hd/whitetheme/action_slider_guage_on.png
diff --git a/themes/default/images/whitetheme/btn_arrow_bottom_nor.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_bottom_nor.png
index 5b3558dc..5b3558dc 100644
--- a/themes/default/images/whitetheme/btn_arrow_bottom_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_bottom_nor.png
diff --git a/themes/default/images/whitetheme/btn_arrow_bottom_sel.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_bottom_sel.png
index a6f2595e..a6f2595e 100644
--- a/themes/default/images/whitetheme/btn_arrow_bottom_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_bottom_sel.png
diff --git a/themes/default/images/whitetheme/btn_arrow_left_nor.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_left_nor.png
index cbc1f3be..cbc1f3be 100644
--- a/themes/default/images/whitetheme/btn_arrow_left_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_left_nor.png
diff --git a/themes/default/images/whitetheme/btn_arrow_left_sel.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_left_sel.png
index 16a435cd..16a435cd 100644
--- a/themes/default/images/whitetheme/btn_arrow_left_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_left_sel.png
diff --git a/themes/default/images/whitetheme/btn_arrow_right_nor.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_right_nor.png
index fb785083..fb785083 100644
--- a/themes/default/images/whitetheme/btn_arrow_right_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_right_nor.png
diff --git a/themes/default/images/whitetheme/btn_arrow_right_sel.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_right_sel.png
index c8732c8d..c8732c8d 100644
--- a/themes/default/images/whitetheme/btn_arrow_right_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_right_sel.png
diff --git a/themes/default/images/whitetheme/btn_arrow_top_nor.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_top_nor.png
index d7683b98..d7683b98 100644
--- a/themes/default/images/whitetheme/btn_arrow_top_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_top_nor.png
diff --git a/themes/default/images/whitetheme/btn_arrow_top_sel.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_top_sel.png
index e58be931..e58be931 100644
--- a/themes/default/images/whitetheme/btn_arrow_top_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_top_sel.png
diff --git a/themes/default/images/whitetheme/btn_arrow_updown_nor.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_updown_nor.png
index 3d55b4f5..3d55b4f5 100644
--- a/themes/default/images/whitetheme/btn_arrow_updown_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_updown_nor.png
diff --git a/themes/default/images/whitetheme/btn_arrow_updown_sel.png b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_updown_sel.png
index 38b1df47..38b1df47 100644
--- a/themes/default/images/whitetheme/btn_arrow_updown_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_arrow_updown_sel.png
diff --git a/themes/default/images/whitetheme/btn_style_nor.png b/mobile/default/images/tizen-hd/whitetheme/btn_style_nor.png
index fc4e2df8..fc4e2df8 100644
--- a/themes/default/images/whitetheme/btn_style_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_style_nor.png
diff --git a/themes/default/images/whitetheme/btn_style_sel.png b/mobile/default/images/tizen-hd/whitetheme/btn_style_sel.png
index 46e572fa..46e572fa 100644
--- a/themes/default/images/whitetheme/btn_style_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/btn_style_sel.png
diff --git a/themes/default/images/whitetheme/bubble_1.png b/mobile/default/images/tizen-hd/whitetheme/bubble_1.png
index 3931db31..3931db31 100644
--- a/themes/default/images/whitetheme/bubble_1.png
+++ b/mobile/default/images/tizen-hd/whitetheme/bubble_1.png
diff --git a/themes/default/images/whitetheme/bubble_2.png b/mobile/default/images/tizen-hd/whitetheme/bubble_2.png
index 95785531..95785531 100644
--- a/themes/default/images/whitetheme/bubble_2.png
+++ b/mobile/default/images/tizen-hd/whitetheme/bubble_2.png
diff --git a/themes/default/images/whitetheme/bubble_3.png b/mobile/default/images/tizen-hd/whitetheme/bubble_3.png
index c3ad2660..c3ad2660 100644
--- a/themes/default/images/whitetheme/bubble_3.png
+++ b/mobile/default/images/tizen-hd/whitetheme/bubble_3.png
diff --git a/themes/default/images/whitetheme/bubble_4.png b/mobile/default/images/tizen-hd/whitetheme/bubble_4.png
index e232b5e0..e232b5e0 100644
--- a/themes/default/images/whitetheme/bubble_4.png
+++ b/mobile/default/images/tizen-hd/whitetheme/bubble_4.png
diff --git a/themes/default/images/whitetheme/check_btn.png b/mobile/default/images/tizen-hd/whitetheme/check_btn.png
index 52d7978d..52d7978d 100644
--- a/themes/default/images/whitetheme/check_btn.png
+++ b/mobile/default/images/tizen-hd/whitetheme/check_btn.png
diff --git a/themes/default/images/whitetheme/check_cover.png b/mobile/default/images/tizen-hd/whitetheme/check_cover.png
index 5d1f7f4e..5d1f7f4e 100644
--- a/themes/default/images/whitetheme/check_cover.png
+++ b/mobile/default/images/tizen-hd/whitetheme/check_cover.png
diff --git a/themes/default/images/whitetheme/color_selector_bg.png b/mobile/default/images/tizen-hd/whitetheme/color_selector_bg.png
index 3d15bce6..3d15bce6 100644
--- a/themes/default/images/whitetheme/color_selector_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/color_selector_bg.png
diff --git a/themes/default/images/whitetheme/color_selector_gradient.png b/mobile/default/images/tizen-hd/whitetheme/color_selector_gradient.png
index 5ef2e4a9..5ef2e4a9 100644
--- a/themes/default/images/whitetheme/color_selector_gradient.png
+++ b/mobile/default/images/tizen-hd/whitetheme/color_selector_gradient.png
diff --git a/themes/default/images/whitetheme/emo-angry-shout.png b/mobile/default/images/tizen-hd/whitetheme/emo-angry-shout.png
index 525dc277..525dc277 100644
--- a/themes/default/images/whitetheme/emo-angry-shout.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-angry-shout.png
diff --git a/themes/default/images/whitetheme/emo-angry.png b/mobile/default/images/tizen-hd/whitetheme/emo-angry.png
index 53615e75..53615e75 100644
--- a/themes/default/images/whitetheme/emo-angry.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-angry.png
diff --git a/themes/default/images/whitetheme/emo-crazy-laugh.png b/mobile/default/images/tizen-hd/whitetheme/emo-crazy-laugh.png
index 4c95c90e..4c95c90e 100644
--- a/themes/default/images/whitetheme/emo-crazy-laugh.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-crazy-laugh.png
diff --git a/themes/default/images/whitetheme/emo-evil-laugh.png b/mobile/default/images/tizen-hd/whitetheme/emo-evil-laugh.png
index 9ca38dab..9ca38dab 100644
--- a/themes/default/images/whitetheme/emo-evil-laugh.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-evil-laugh.png
diff --git a/themes/default/images/whitetheme/emo-evil.png b/mobile/default/images/tizen-hd/whitetheme/emo-evil.png
index 49b6b9d9..49b6b9d9 100644
--- a/themes/default/images/whitetheme/emo-evil.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-evil.png
diff --git a/themes/default/images/whitetheme/emo-goggle-smile.png b/mobile/default/images/tizen-hd/whitetheme/emo-goggle-smile.png
index 54878279..54878279 100644
--- a/themes/default/images/whitetheme/emo-goggle-smile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-goggle-smile.png
diff --git a/themes/default/images/whitetheme/emo-grumpy-smile.png b/mobile/default/images/tizen-hd/whitetheme/emo-grumpy-smile.png
index 856737e6..856737e6 100644
--- a/themes/default/images/whitetheme/emo-grumpy-smile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-grumpy-smile.png
diff --git a/themes/default/images/whitetheme/emo-grumpy.png b/mobile/default/images/tizen-hd/whitetheme/emo-grumpy.png
index ad4abba4..ad4abba4 100644
--- a/themes/default/images/whitetheme/emo-grumpy.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-grumpy.png
diff --git a/themes/default/images/whitetheme/emo-guilty-smile.png b/mobile/default/images/tizen-hd/whitetheme/emo-guilty-smile.png
index 8db8100a..8db8100a 100644
--- a/themes/default/images/whitetheme/emo-guilty-smile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-guilty-smile.png
diff --git a/themes/default/images/whitetheme/emo-guilty.png b/mobile/default/images/tizen-hd/whitetheme/emo-guilty.png
index 3465de3c..3465de3c 100644
--- a/themes/default/images/whitetheme/emo-guilty.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-guilty.png
diff --git a/themes/default/images/whitetheme/emo-haha.png b/mobile/default/images/tizen-hd/whitetheme/emo-haha.png
index 4e4c472b..4e4c472b 100644
--- a/themes/default/images/whitetheme/emo-haha.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-haha.png
diff --git a/themes/default/images/whitetheme/emo-half-smile.png b/mobile/default/images/tizen-hd/whitetheme/emo-half-smile.png
index 023c09fd..023c09fd 100644
--- a/themes/default/images/whitetheme/emo-half-smile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-half-smile.png
diff --git a/themes/default/images/whitetheme/emo-happy-panting.png b/mobile/default/images/tizen-hd/whitetheme/emo-happy-panting.png
index 6e6d96e5..6e6d96e5 100644
--- a/themes/default/images/whitetheme/emo-happy-panting.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-happy-panting.png
diff --git a/themes/default/images/whitetheme/emo-happy.png b/mobile/default/images/tizen-hd/whitetheme/emo-happy.png
index 306220ef..306220ef 100644
--- a/themes/default/images/whitetheme/emo-happy.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-happy.png
diff --git a/themes/default/images/whitetheme/emo-indifferent.png b/mobile/default/images/tizen-hd/whitetheme/emo-indifferent.png
index 76f4e44f..76f4e44f 100644
--- a/themes/default/images/whitetheme/emo-indifferent.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-indifferent.png
diff --git a/themes/default/images/whitetheme/emo-kiss.png b/mobile/default/images/tizen-hd/whitetheme/emo-kiss.png
index b20a3fae..b20a3fae 100644
--- a/themes/default/images/whitetheme/emo-kiss.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-kiss.png
diff --git a/themes/default/images/whitetheme/emo-knowing-grin.png b/mobile/default/images/tizen-hd/whitetheme/emo-knowing-grin.png
index 087272da..087272da 100644
--- a/themes/default/images/whitetheme/emo-knowing-grin.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-knowing-grin.png
diff --git a/themes/default/images/whitetheme/emo-laugh.png b/mobile/default/images/tizen-hd/whitetheme/emo-laugh.png
index ae84ca97..ae84ca97 100644
--- a/themes/default/images/whitetheme/emo-laugh.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-laugh.png
diff --git a/themes/default/images/whitetheme/emo-little-bit-sorry.png b/mobile/default/images/tizen-hd/whitetheme/emo-little-bit-sorry.png
index e865e197..e865e197 100644
--- a/themes/default/images/whitetheme/emo-little-bit-sorry.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-little-bit-sorry.png
diff --git a/themes/default/images/whitetheme/emo-love-lots.png b/mobile/default/images/tizen-hd/whitetheme/emo-love-lots.png
index 26b1c519..26b1c519 100644
--- a/themes/default/images/whitetheme/emo-love-lots.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-love-lots.png
diff --git a/themes/default/images/whitetheme/emo-love.png b/mobile/default/images/tizen-hd/whitetheme/emo-love.png
index e248e066..e248e066 100644
--- a/themes/default/images/whitetheme/emo-love.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-love.png
diff --git a/themes/default/images/whitetheme/emo-minimal-smile.png b/mobile/default/images/tizen-hd/whitetheme/emo-minimal-smile.png
index 4b034d02..4b034d02 100644
--- a/themes/default/images/whitetheme/emo-minimal-smile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-minimal-smile.png
diff --git a/themes/default/images/whitetheme/emo-not-happy.png b/mobile/default/images/tizen-hd/whitetheme/emo-not-happy.png
index cbc13b81..cbc13b81 100644
--- a/themes/default/images/whitetheme/emo-not-happy.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-not-happy.png
diff --git a/themes/default/images/whitetheme/emo-not-impressed.png b/mobile/default/images/tizen-hd/whitetheme/emo-not-impressed.png
index 2c5ac8d4..2c5ac8d4 100644
--- a/themes/default/images/whitetheme/emo-not-impressed.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-not-impressed.png
diff --git a/themes/default/images/whitetheme/emo-omg.png b/mobile/default/images/tizen-hd/whitetheme/emo-omg.png
index 9b04bc0b..9b04bc0b 100644
--- a/themes/default/images/whitetheme/emo-omg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-omg.png
diff --git a/themes/default/images/whitetheme/emo-opensmile.png b/mobile/default/images/tizen-hd/whitetheme/emo-opensmile.png
index cd8c47f0..cd8c47f0 100644
--- a/themes/default/images/whitetheme/emo-opensmile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-opensmile.png
diff --git a/themes/default/images/whitetheme/emo-smile.png b/mobile/default/images/tizen-hd/whitetheme/emo-smile.png
index 15f2339b..15f2339b 100644
--- a/themes/default/images/whitetheme/emo-smile.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-smile.png
diff --git a/themes/default/images/whitetheme/emo-sorry.png b/mobile/default/images/tizen-hd/whitetheme/emo-sorry.png
index af6ea7bd..af6ea7bd 100644
--- a/themes/default/images/whitetheme/emo-sorry.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-sorry.png
diff --git a/themes/default/images/whitetheme/emo-squint-laugh.png b/mobile/default/images/tizen-hd/whitetheme/emo-squint-laugh.png
index 9e0e63bd..9e0e63bd 100644
--- a/themes/default/images/whitetheme/emo-squint-laugh.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-squint-laugh.png
diff --git a/themes/default/images/whitetheme/emo-surprised.png b/mobile/default/images/tizen-hd/whitetheme/emo-surprised.png
index e6c8acdb..e6c8acdb 100644
--- a/themes/default/images/whitetheme/emo-surprised.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-surprised.png
diff --git a/themes/default/images/whitetheme/emo-suspicious.png b/mobile/default/images/tizen-hd/whitetheme/emo-suspicious.png
index 2e53a796..2e53a796 100644
--- a/themes/default/images/whitetheme/emo-suspicious.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-suspicious.png
diff --git a/themes/default/images/whitetheme/emo-tongue-dangling.png b/mobile/default/images/tizen-hd/whitetheme/emo-tongue-dangling.png
index ec7c8ff6..ec7c8ff6 100644
--- a/themes/default/images/whitetheme/emo-tongue-dangling.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-tongue-dangling.png
diff --git a/themes/default/images/whitetheme/emo-tongue-poke.png b/mobile/default/images/tizen-hd/whitetheme/emo-tongue-poke.png
index 6106c244..6106c244 100644
--- a/themes/default/images/whitetheme/emo-tongue-poke.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-tongue-poke.png
diff --git a/themes/default/images/whitetheme/emo-uh.png b/mobile/default/images/tizen-hd/whitetheme/emo-uh.png
index d321cac1..d321cac1 100644
--- a/themes/default/images/whitetheme/emo-uh.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-uh.png
diff --git a/themes/default/images/whitetheme/emo-unhappy.png b/mobile/default/images/tizen-hd/whitetheme/emo-unhappy.png
index e92ff5f3..e92ff5f3 100644
--- a/themes/default/images/whitetheme/emo-unhappy.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-unhappy.png
diff --git a/themes/default/images/whitetheme/emo-very-sorry.png b/mobile/default/images/tizen-hd/whitetheme/emo-very-sorry.png
index bfba95a6..bfba95a6 100644
--- a/themes/default/images/whitetheme/emo-very-sorry.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-very-sorry.png
diff --git a/themes/default/images/whitetheme/emo-what.png b/mobile/default/images/tizen-hd/whitetheme/emo-what.png
index 076a6905..076a6905 100644
--- a/themes/default/images/whitetheme/emo-what.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-what.png
diff --git a/themes/default/images/whitetheme/emo-wink.png b/mobile/default/images/tizen-hd/whitetheme/emo-wink.png
index 090fcb16..090fcb16 100644
--- a/themes/default/images/whitetheme/emo-wink.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-wink.png
diff --git a/themes/default/images/whitetheme/emo-worried.png b/mobile/default/images/tizen-hd/whitetheme/emo-worried.png
index 8441c475..8441c475 100644
--- a/themes/default/images/whitetheme/emo-worried.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-worried.png
diff --git a/themes/default/images/whitetheme/emo-wtf.png b/mobile/default/images/tizen-hd/whitetheme/emo-wtf.png
index faf72fa1..faf72fa1 100644
--- a/themes/default/images/whitetheme/emo-wtf.png
+++ b/mobile/default/images/tizen-hd/whitetheme/emo-wtf.png
diff --git a/themes/default/images/whitetheme/ews_bg_shadow.png b/mobile/default/images/tizen-hd/whitetheme/ews_bg_shadow.png
index 6557830c..6557830c 100644
--- a/themes/default/images/whitetheme/ews_bg_shadow.png
+++ b/mobile/default/images/tizen-hd/whitetheme/ews_bg_shadow.png
diff --git a/themes/default/images/whitetheme/file_selector_entry.png b/mobile/default/images/tizen-hd/whitetheme/file_selector_entry.png
index 43f060e6..43f060e6 100644
--- a/themes/default/images/whitetheme/file_selector_entry.png
+++ b/mobile/default/images/tizen-hd/whitetheme/file_selector_entry.png
diff --git a/themes/default/images/whitetheme/file_selector_root_bg.png b/mobile/default/images/tizen-hd/whitetheme/file_selector_root_bg.png
index ddf72649..ddf72649 100644
--- a/themes/default/images/whitetheme/file_selector_root_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/file_selector_root_bg.png
diff --git a/themes/default/images/whitetheme/fileselector_icon.png b/mobile/default/images/tizen-hd/whitetheme/fileselector_icon.png
index 69e560ec..69e560ec 100644
--- a/themes/default/images/whitetheme/fileselector_icon.png
+++ b/mobile/default/images/tizen-hd/whitetheme/fileselector_icon.png
diff --git a/themes/default/images/whitetheme/flip_0b.png b/mobile/default/images/tizen-hd/whitetheme/flip_0b.png
index f314843f..f314843f 100644
--- a/themes/default/images/whitetheme/flip_0b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_0b.png
diff --git a/themes/default/images/whitetheme/flip_0t.png b/mobile/default/images/tizen-hd/whitetheme/flip_0t.png
index 5d1c15de..5d1c15de 100644
--- a/themes/default/images/whitetheme/flip_0t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_0t.png
diff --git a/themes/default/images/whitetheme/flip_1b.png b/mobile/default/images/tizen-hd/whitetheme/flip_1b.png
index 2281d1ac..2281d1ac 100644
--- a/themes/default/images/whitetheme/flip_1b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_1b.png
diff --git a/themes/default/images/whitetheme/flip_1t.png b/mobile/default/images/tizen-hd/whitetheme/flip_1t.png
index e6266710..e6266710 100644
--- a/themes/default/images/whitetheme/flip_1t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_1t.png
diff --git a/themes/default/images/whitetheme/flip_2b.png b/mobile/default/images/tizen-hd/whitetheme/flip_2b.png
index b1267950..b1267950 100644
--- a/themes/default/images/whitetheme/flip_2b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_2b.png
diff --git a/themes/default/images/whitetheme/flip_2t.png b/mobile/default/images/tizen-hd/whitetheme/flip_2t.png
index 2f63d613..2f63d613 100644
--- a/themes/default/images/whitetheme/flip_2t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_2t.png
diff --git a/themes/default/images/whitetheme/flip_3b.png b/mobile/default/images/tizen-hd/whitetheme/flip_3b.png
index d58ecd16..d58ecd16 100644
--- a/themes/default/images/whitetheme/flip_3b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_3b.png
diff --git a/themes/default/images/whitetheme/flip_3t.png b/mobile/default/images/tizen-hd/whitetheme/flip_3t.png
index 9278cdc5..9278cdc5 100644
--- a/themes/default/images/whitetheme/flip_3t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_3t.png
diff --git a/themes/default/images/whitetheme/flip_4b.png b/mobile/default/images/tizen-hd/whitetheme/flip_4b.png
index b0862d99..b0862d99 100644
--- a/themes/default/images/whitetheme/flip_4b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_4b.png
diff --git a/themes/default/images/whitetheme/flip_4t.png b/mobile/default/images/tizen-hd/whitetheme/flip_4t.png
index 31e491d1..31e491d1 100644
--- a/themes/default/images/whitetheme/flip_4t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_4t.png
diff --git a/themes/default/images/whitetheme/flip_5b.png b/mobile/default/images/tizen-hd/whitetheme/flip_5b.png
index cddf79a0..cddf79a0 100644
--- a/themes/default/images/whitetheme/flip_5b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_5b.png
diff --git a/themes/default/images/whitetheme/flip_5t.png b/mobile/default/images/tizen-hd/whitetheme/flip_5t.png
index 5e74da77..5e74da77 100644
--- a/themes/default/images/whitetheme/flip_5t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_5t.png
diff --git a/themes/default/images/whitetheme/flip_6b.png b/mobile/default/images/tizen-hd/whitetheme/flip_6b.png
index 5038b889..5038b889 100644
--- a/themes/default/images/whitetheme/flip_6b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_6b.png
diff --git a/themes/default/images/whitetheme/flip_6t.png b/mobile/default/images/tizen-hd/whitetheme/flip_6t.png
index 24d64b09..24d64b09 100644
--- a/themes/default/images/whitetheme/flip_6t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_6t.png
diff --git a/themes/default/images/whitetheme/flip_7b.png b/mobile/default/images/tizen-hd/whitetheme/flip_7b.png
index e298e39d..e298e39d 100644
--- a/themes/default/images/whitetheme/flip_7b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_7b.png
diff --git a/themes/default/images/whitetheme/flip_7t.png b/mobile/default/images/tizen-hd/whitetheme/flip_7t.png
index 5dc68bcf..5dc68bcf 100644
--- a/themes/default/images/whitetheme/flip_7t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_7t.png
diff --git a/themes/default/images/whitetheme/flip_8b.png b/mobile/default/images/tizen-hd/whitetheme/flip_8b.png
index 8a146cca..8a146cca 100644
--- a/themes/default/images/whitetheme/flip_8b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_8b.png
diff --git a/themes/default/images/whitetheme/flip_8t.png b/mobile/default/images/tizen-hd/whitetheme/flip_8t.png
index 1cb1a192..1cb1a192 100644
--- a/themes/default/images/whitetheme/flip_8t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_8t.png
diff --git a/themes/default/images/whitetheme/flip_9b.png b/mobile/default/images/tizen-hd/whitetheme/flip_9b.png
index 926bf930..926bf930 100644
--- a/themes/default/images/whitetheme/flip_9b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_9b.png
diff --git a/themes/default/images/whitetheme/flip_9t.png b/mobile/default/images/tizen-hd/whitetheme/flip_9t.png
index 46da8fd3..46da8fd3 100644
--- a/themes/default/images/whitetheme/flip_9t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_9t.png
diff --git a/themes/default/images/whitetheme/flip_amb.png b/mobile/default/images/tizen-hd/whitetheme/flip_amb.png
index 567351d0..567351d0 100644
--- a/themes/default/images/whitetheme/flip_amb.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_amb.png
diff --git a/themes/default/images/whitetheme/flip_amt.png b/mobile/default/images/tizen-hd/whitetheme/flip_amt.png
index 048284f2..048284f2 100644
--- a/themes/default/images/whitetheme/flip_amt.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_amt.png
diff --git a/themes/default/images/whitetheme/flip_b.png b/mobile/default/images/tizen-hd/whitetheme/flip_b.png
index b9af5ec0..b9af5ec0 100644
--- a/themes/default/images/whitetheme/flip_b.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_b.png
diff --git a/themes/default/images/whitetheme/flip_base.png b/mobile/default/images/tizen-hd/whitetheme/flip_base.png
index c9339cad..c9339cad 100644
--- a/themes/default/images/whitetheme/flip_base.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_base.png
diff --git a/themes/default/images/whitetheme/flip_btn_down.png b/mobile/default/images/tizen-hd/whitetheme/flip_btn_down.png
index 17e547b6..17e547b6 100644
--- a/themes/default/images/whitetheme/flip_btn_down.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_btn_down.png
diff --git a/themes/default/images/whitetheme/flip_btn_up.png b/mobile/default/images/tizen-hd/whitetheme/flip_btn_up.png
index 97512b26..97512b26 100644
--- a/themes/default/images/whitetheme/flip_btn_up.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_btn_up.png
diff --git a/themes/default/images/whitetheme/flip_colon.png b/mobile/default/images/tizen-hd/whitetheme/flip_colon.png
index 1121e1dc..1121e1dc 100644
--- a/themes/default/images/whitetheme/flip_colon.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_colon.png
diff --git a/themes/default/images/whitetheme/flip_pmb.png b/mobile/default/images/tizen-hd/whitetheme/flip_pmb.png
index 65bc01b3..65bc01b3 100644
--- a/themes/default/images/whitetheme/flip_pmb.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_pmb.png
diff --git a/themes/default/images/whitetheme/flip_pmt.png b/mobile/default/images/tizen-hd/whitetheme/flip_pmt.png
index 6f0791ae..6f0791ae 100644
--- a/themes/default/images/whitetheme/flip_pmt.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_pmt.png
diff --git a/themes/default/images/whitetheme/flip_shad.png b/mobile/default/images/tizen-hd/whitetheme/flip_shad.png
index f359a2b9..f359a2b9 100644
--- a/themes/default/images/whitetheme/flip_shad.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_shad.png
diff --git a/themes/default/images/whitetheme/flip_t.png b/mobile/default/images/tizen-hd/whitetheme/flip_t.png
index 9d4e5384..9d4e5384 100644
--- a/themes/default/images/whitetheme/flip_t.png
+++ b/mobile/default/images/tizen-hd/whitetheme/flip_t.png
diff --git a/themes/default/images/whitetheme/focus_highlight_icon.png b/mobile/default/images/tizen-hd/whitetheme/focus_highlight_icon.png
index 3d37a0cc..3d37a0cc 100644
--- a/themes/default/images/whitetheme/focus_highlight_icon.png
+++ b/mobile/default/images/tizen-hd/whitetheme/focus_highlight_icon.png
diff --git a/themes/default/images/whitetheme/frame_bg.png b/mobile/default/images/tizen-hd/whitetheme/frame_bg.png
index b1f9ea23..b1f9ea23 100644
--- a/themes/default/images/whitetheme/frame_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/frame_bg.png
diff --git a/themes/default/images/whitetheme/frame_outdent_bottom.png b/mobile/default/images/tizen-hd/whitetheme/frame_outdent_bottom.png
index c14f2042..c14f2042 100644
--- a/themes/default/images/whitetheme/frame_outdent_bottom.png
+++ b/mobile/default/images/tizen-hd/whitetheme/frame_outdent_bottom.png
diff --git a/themes/default/images/whitetheme/frame_outdent_top.png b/mobile/default/images/tizen-hd/whitetheme/frame_outdent_top.png
index 4daa1efd..4daa1efd 100644
--- a/themes/default/images/whitetheme/frame_outdent_top.png
+++ b/mobile/default/images/tizen-hd/whitetheme/frame_outdent_top.png
diff --git a/themes/default/images/whitetheme/gengrid_thumb_selected.png b/mobile/default/images/tizen-hd/whitetheme/gengrid_thumb_selected.png
index 524c6f1c..524c6f1c 100644
--- a/themes/default/images/whitetheme/gengrid_thumb_selected.png
+++ b/mobile/default/images/tizen-hd/whitetheme/gengrid_thumb_selected.png
diff --git a/themes/default/images/whitetheme/gengrid_thumb_shadow.png b/mobile/default/images/tizen-hd/whitetheme/gengrid_thumb_shadow.png
index dd2c63ca..dd2c63ca 100644
--- a/themes/default/images/whitetheme/gengrid_thumb_shadow.png
+++ b/mobile/default/images/tizen-hd/whitetheme/gengrid_thumb_shadow.png
diff --git a/themes/default/images/whitetheme/gengrid_thumb_stroke.png b/mobile/default/images/tizen-hd/whitetheme/gengrid_thumb_stroke.png
index 35fdb936..35fdb936 100644
--- a/themes/default/images/whitetheme/gengrid_thumb_stroke.png
+++ b/mobile/default/images/tizen-hd/whitetheme/gengrid_thumb_stroke.png
diff --git a/themes/default/images/whitetheme/hover_bottom_bg.png b/mobile/default/images/tizen-hd/whitetheme/hover_bottom_bg.png
index 51343f25..51343f25 100644
--- a/themes/default/images/whitetheme/hover_bottom_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hover_bottom_bg.png
diff --git a/themes/default/images/whitetheme/hover_center_bg.png b/mobile/default/images/tizen-hd/whitetheme/hover_center_bg.png
index 21c67a01..21c67a01 100644
--- a/themes/default/images/whitetheme/hover_center_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hover_center_bg.png
diff --git a/themes/default/images/whitetheme/hover_left_bg.png b/mobile/default/images/tizen-hd/whitetheme/hover_left_bg.png
index 8de40230..8de40230 100644
--- a/themes/default/images/whitetheme/hover_left_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hover_left_bg.png
diff --git a/themes/default/images/whitetheme/hover_right_bg.png b/mobile/default/images/tizen-hd/whitetheme/hover_right_bg.png
index 7d741af1..7d741af1 100644
--- a/themes/default/images/whitetheme/hover_right_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hover_right_bg.png
diff --git a/themes/default/images/whitetheme/hover_top_bg.png b/mobile/default/images/tizen-hd/whitetheme/hover_top_bg.png
index 34664310..34664310 100644
--- a/themes/default/images/whitetheme/hover_top_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hover_top_bg.png
diff --git a/themes/default/images/whitetheme/hoversel_bg.png b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg.png
index a92848b5..a92848b5 100644
--- a/themes/default/images/whitetheme/hoversel_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg.png
diff --git a/themes/default/images/whitetheme/hoversel_bg_2.png b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg_2.png
index c8f882b0..c8f882b0 100644
--- a/themes/default/images/whitetheme/hoversel_bg_2.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg_2.png
diff --git a/themes/default/images/whitetheme/hoversel_bg_shadow.png b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg_shadow.png
index 7670135d..7670135d 100644
--- a/themes/default/images/whitetheme/hoversel_bg_shadow.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg_shadow.png
diff --git a/themes/default/images/whitetheme/hoversel_bg_shadow_2.png b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg_shadow_2.png
index 7398cd43..7398cd43 100644
--- a/themes/default/images/whitetheme/hoversel_bg_shadow_2.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hoversel_bg_shadow_2.png
diff --git a/themes/default/images/whitetheme/hoversel_sel.png b/mobile/default/images/tizen-hd/whitetheme/hoversel_sel.png
index 2f5bd989..2f5bd989 100644
--- a/themes/default/images/whitetheme/hoversel_sel.png
+++ b/mobile/default/images/tizen-hd/whitetheme/hoversel_sel.png
diff --git a/themes/default/images/whitetheme/icon_apps.png b/mobile/default/images/tizen-hd/whitetheme/icon_apps.png
index aed4067b..aed4067b 100644
--- a/themes/default/images/whitetheme/icon_apps.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_apps.png
diff --git a/themes/default/images/whitetheme/icon_arrow_down.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_down.png
index d1b74762..d1b74762 100644
--- a/themes/default/images/whitetheme/icon_arrow_down.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_down.png
diff --git a/themes/default/images/whitetheme/icon_arrow_down_left.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_down_left.png
index ae897e29..ae897e29 100644
--- a/themes/default/images/whitetheme/icon_arrow_down_left.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_down_left.png
diff --git a/themes/default/images/whitetheme/icon_arrow_down_left_press.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_down_left_press.png
index 9f72c795..9f72c795 100644
--- a/themes/default/images/whitetheme/icon_arrow_down_left_press.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_down_left_press.png
diff --git a/themes/default/images/whitetheme/icon_arrow_left.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_left.png
index 85615c75..85615c75 100644
--- a/themes/default/images/whitetheme/icon_arrow_left.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_left.png
diff --git a/themes/default/images/whitetheme/icon_arrow_right.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_right.png
index 10c7457c..10c7457c 100644
--- a/themes/default/images/whitetheme/icon_arrow_right.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_right.png
diff --git a/themes/default/images/whitetheme/icon_arrow_up.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_up.png
index 1b548e90..1b548e90 100644
--- a/themes/default/images/whitetheme/icon_arrow_up.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_up.png
diff --git a/themes/default/images/whitetheme/icon_arrow_up_right.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_up_right.png
index 8b023eeb..8b023eeb 100644
--- a/themes/default/images/whitetheme/icon_arrow_up_right.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_up_right.png
diff --git a/themes/default/images/whitetheme/icon_arrow_up_right_press.png b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_up_right_press.png
index 53983648..53983648 100644
--- a/themes/default/images/whitetheme/icon_arrow_up_right_press.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_arrow_up_right_press.png
diff --git a/themes/default/images/whitetheme/icon_back.png b/mobile/default/images/tizen-hd/whitetheme/icon_back.png
index f27dd1ed..f27dd1ed 100644
--- a/themes/default/images/whitetheme/icon_back.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_back.png
diff --git a/themes/default/images/whitetheme/icon_chat.png b/mobile/default/images/tizen-hd/whitetheme/icon_chat.png
index bc1aa373..bc1aa373 100644
--- a/themes/default/images/whitetheme/icon_chat.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_chat.png
diff --git a/themes/default/images/whitetheme/icon_clock.png b/mobile/default/images/tizen-hd/whitetheme/icon_clock.png
index a87b4f18..a87b4f18 100644
--- a/themes/default/images/whitetheme/icon_clock.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_clock.png
diff --git a/themes/default/images/whitetheme/icon_close.png b/mobile/default/images/tizen-hd/whitetheme/icon_close.png
index 4f0d6778..4f0d6778 100644
--- a/themes/default/images/whitetheme/icon_close.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_close.png
diff --git a/themes/default/images/whitetheme/icon_close_small.png b/mobile/default/images/tizen-hd/whitetheme/icon_close_small.png
index d18b9be2..d18b9be2 100644
--- a/themes/default/images/whitetheme/icon_close_small.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_close_small.png
diff --git a/themes/default/images/whitetheme/icon_close_small_press.png b/mobile/default/images/tizen-hd/whitetheme/icon_close_small_press.png
index 3fc29045..3fc29045 100644
--- a/themes/default/images/whitetheme/icon_close_small_press.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_close_small_press.png
diff --git a/themes/default/images/whitetheme/icon_delete.png b/mobile/default/images/tizen-hd/whitetheme/icon_delete.png
index 418a24bb..418a24bb 100644
--- a/themes/default/images/whitetheme/icon_delete.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_delete.png
diff --git a/themes/default/images/whitetheme/icon_edit.png b/mobile/default/images/tizen-hd/whitetheme/icon_edit.png
index 6352dff4..6352dff4 100644
--- a/themes/default/images/whitetheme/icon_edit.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_edit.png
diff --git a/themes/default/images/whitetheme/icon_file.png b/mobile/default/images/tizen-hd/whitetheme/icon_file.png
index f75e0e81..f75e0e81 100644
--- a/themes/default/images/whitetheme/icon_file.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_file.png
diff --git a/themes/default/images/whitetheme/icon_folder.png b/mobile/default/images/tizen-hd/whitetheme/icon_folder.png
index b87c819a..b87c819a 100644
--- a/themes/default/images/whitetheme/icon_folder.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_folder.png
diff --git a/themes/default/images/whitetheme/icon_home.png b/mobile/default/images/tizen-hd/whitetheme/icon_home.png
index 7d8fb7a3..7d8fb7a3 100644
--- a/themes/default/images/whitetheme/icon_home.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_home.png
diff --git a/themes/default/images/whitetheme/icon_media_ff.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_ff.png
index 953b5f7d..953b5f7d 100644
--- a/themes/default/images/whitetheme/icon_media_ff.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_ff.png
diff --git a/themes/default/images/whitetheme/icon_media_info.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_info.png
index f56ab854..f56ab854 100644
--- a/themes/default/images/whitetheme/icon_media_info.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_info.png
diff --git a/themes/default/images/whitetheme/icon_media_next.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_next.png
index 000c6106..000c6106 100644
--- a/themes/default/images/whitetheme/icon_media_next.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_next.png
diff --git a/themes/default/images/whitetheme/icon_media_pause.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_pause.png
index e1533b5c..e1533b5c 100644
--- a/themes/default/images/whitetheme/icon_media_pause.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_pause.png
diff --git a/themes/default/images/whitetheme/icon_media_play.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_play.png
index d9b9c6ef..d9b9c6ef 100644
--- a/themes/default/images/whitetheme/icon_media_play.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_play.png
diff --git a/themes/default/images/whitetheme/icon_media_prev.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_prev.png
index 883fa152..883fa152 100644
--- a/themes/default/images/whitetheme/icon_media_prev.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_prev.png
diff --git a/themes/default/images/whitetheme/icon_media_rew.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_rew.png
index a0d31b4d..a0d31b4d 100644
--- a/themes/default/images/whitetheme/icon_media_rew.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_rew.png
diff --git a/themes/default/images/whitetheme/icon_media_stop.png b/mobile/default/images/tizen-hd/whitetheme/icon_media_stop.png
index edcab719..edcab719 100644
--- a/themes/default/images/whitetheme/icon_media_stop.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_media_stop.png
diff --git a/themes/default/images/whitetheme/icon_noimage.png b/mobile/default/images/tizen-hd/whitetheme/icon_noimage.png
index 28327c2d..28327c2d 100644
--- a/themes/default/images/whitetheme/icon_noimage.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_noimage.png
diff --git a/themes/default/images/whitetheme/icon_refresh.png b/mobile/default/images/tizen-hd/whitetheme/icon_refresh.png
index 51ea8dc6..51ea8dc6 100644
--- a/themes/default/images/whitetheme/icon_refresh.png
+++ b/mobile/default/images/tizen-hd/whitetheme/icon_refresh.png
diff --git a/themes/default/images/whitetheme/index_pagecontrol_bar_bg0.png b/mobile/default/images/tizen-hd/whitetheme/index_pagecontrol_bar_bg0.png
index cf3d69c4..cf3d69c4 100644
--- a/themes/default/images/whitetheme/index_pagecontrol_bar_bg0.png
+++ b/mobile/default/images/tizen-hd/whitetheme/index_pagecontrol_bar_bg0.png
diff --git a/themes/default/images/whitetheme/index_pagecontrol_bar_bg1.png b/mobile/default/images/tizen-hd/whitetheme/index_pagecontrol_bar_bg1.png
index e49b2774..e49b2774 100644
--- a/themes/default/images/whitetheme/index_pagecontrol_bar_bg1.png
+++ b/mobile/default/images/tizen-hd/whitetheme/index_pagecontrol_bar_bg1.png
diff --git a/themes/default/images/whitetheme/index_rollover_bg_h.png b/mobile/default/images/tizen-hd/whitetheme/index_rollover_bg_h.png
index 8d76ca04..8d76ca04 100644
--- a/themes/default/images/whitetheme/index_rollover_bg_h.png
+++ b/mobile/default/images/tizen-hd/whitetheme/index_rollover_bg_h.png
diff --git a/themes/default/images/whitetheme/index_rollover_bg_v.png b/mobile/default/images/tizen-hd/whitetheme/index_rollover_bg_v.png
index 3589ce59..3589ce59 100644
--- a/themes/default/images/whitetheme/index_rollover_bg_v.png
+++ b/mobile/default/images/tizen-hd/whitetheme/index_rollover_bg_v.png
diff --git a/themes/default/images/whitetheme/index_scroll_popup_bg.png b/mobile/default/images/tizen-hd/whitetheme/index_scroll_popup_bg.png
index fecf254f..fecf254f 100644
--- a/themes/default/images/whitetheme/index_scroll_popup_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/index_scroll_popup_bg.png
diff --git a/themes/default/images/whitetheme/line_h_2px.png b/mobile/default/images/tizen-hd/whitetheme/line_h_2px.png
index 0c9c2121..0c9c2121 100644
--- a/themes/default/images/whitetheme/line_h_2px.png
+++ b/mobile/default/images/tizen-hd/whitetheme/line_h_2px.png
diff --git a/themes/default/images/whitetheme/line_v_2px.png b/mobile/default/images/tizen-hd/whitetheme/line_v_2px.png
index 8472d406..8472d406 100644
--- a/themes/default/images/whitetheme/line_v_2px.png
+++ b/mobile/default/images/tizen-hd/whitetheme/line_v_2px.png
diff --git a/themes/default/images/whitetheme/list_2nd.png b/mobile/default/images/tizen-hd/whitetheme/list_2nd.png
index ad396a10..ad396a10 100644
--- a/themes/default/images/whitetheme/list_2nd.png
+++ b/mobile/default/images/tizen-hd/whitetheme/list_2nd.png
diff --git a/themes/default/images/whitetheme/list_move.png b/mobile/default/images/tizen-hd/whitetheme/list_move.png
index 4ccb33d3..4ccb33d3 100644
--- a/themes/default/images/whitetheme/list_move.png
+++ b/mobile/default/images/tizen-hd/whitetheme/list_move.png
diff --git a/themes/default/images/whitetheme/menu_arrow_left.png b/mobile/default/images/tizen-hd/whitetheme/menu_arrow_left.png
index 2d4f344d..2d4f344d 100644
--- a/themes/default/images/whitetheme/menu_arrow_left.png
+++ b/mobile/default/images/tizen-hd/whitetheme/menu_arrow_left.png
diff --git a/themes/default/images/whitetheme/menu_arrow_right.png b/mobile/default/images/tizen-hd/whitetheme/menu_arrow_right.png
index ee47880c..ee47880c 100644
--- a/themes/default/images/whitetheme/menu_arrow_right.png
+++ b/mobile/default/images/tizen-hd/whitetheme/menu_arrow_right.png
diff --git a/themes/default/images/whitetheme/menu_btn_nor.png b/mobile/default/images/tizen-hd/whitetheme/menu_btn_nor.png
index ef1523b2..ef1523b2 100644
--- a/themes/default/images/whitetheme/menu_btn_nor.png
+++ b/mobile/default/images/tizen-hd/whitetheme/menu_btn_nor.png
diff --git a/themes/default/images/whitetheme/menu_btn_press.png b/mobile/default/images/tizen-hd/whitetheme/menu_btn_press.png
index 9b6b7ee8..9b6b7ee8 100644
--- a/themes/default/images/whitetheme/menu_btn_press.png
+++ b/mobile/default/images/tizen-hd/whitetheme/menu_btn_press.png
diff --git a/themes/default/images/whitetheme/menu_separator.png b/mobile/default/images/tizen-hd/whitetheme/menu_separator.png
index 745625b6..745625b6 100644
--- a/themes/default/images/whitetheme/menu_separator.png
+++ b/mobile/default/images/tizen-hd/whitetheme/menu_separator.png
diff --git a/themes/default/images/whitetheme/panel_arrow_bottom.png b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_bottom.png
index 87accefc..87accefc 100644
--- a/themes/default/images/whitetheme/panel_arrow_bottom.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_bottom.png
diff --git a/themes/default/images/whitetheme/panel_arrow_left.png b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_left.png
index 682dffad..682dffad 100644
--- a/themes/default/images/whitetheme/panel_arrow_left.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_left.png
diff --git a/themes/default/images/whitetheme/panel_arrow_right.png b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_right.png
index e83e511f..e83e511f 100644
--- a/themes/default/images/whitetheme/panel_arrow_right.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_right.png
diff --git a/themes/default/images/whitetheme/panel_arrow_top.png b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_top.png
index 77bb0bb7..77bb0bb7 100644
--- a/themes/default/images/whitetheme/panel_arrow_top.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_arrow_top.png
diff --git a/themes/default/images/whitetheme/panel_btn_bg_lr.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_lr.png
index fc450813..fc450813 100644
--- a/themes/default/images/whitetheme/panel_btn_bg_lr.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_lr.png
diff --git a/themes/default/images/whitetheme/panel_btn_bg_lr_press.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_lr_press.png
index 79ed2198..79ed2198 100644
--- a/themes/default/images/whitetheme/panel_btn_bg_lr_press.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_lr_press.png
diff --git a/themes/default/images/whitetheme/panel_btn_bg_tb.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_tb.png
index fabc0f05..fabc0f05 100644
--- a/themes/default/images/whitetheme/panel_btn_bg_tb.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_tb.png
diff --git a/themes/default/images/whitetheme/panel_btn_bg_tb_press.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_tb_press.png
index 345e323e..345e323e 100644
--- a/themes/default/images/whitetheme/panel_btn_bg_tb_press.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_bg_tb_press.png
diff --git a/themes/default/images/whitetheme/panel_btn_drag_bg.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_drag_bg.png
index 593e60ec..593e60ec 100644
--- a/themes/default/images/whitetheme/panel_btn_drag_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_drag_bg.png
diff --git a/themes/default/images/whitetheme/panel_btn_selected_bottom.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_bottom.png
index 6363c6e0..6363c6e0 100644
--- a/themes/default/images/whitetheme/panel_btn_selected_bottom.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_bottom.png
diff --git a/themes/default/images/whitetheme/panel_btn_selected_left.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_left.png
index 58e99614..58e99614 100644
--- a/themes/default/images/whitetheme/panel_btn_selected_left.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_left.png
diff --git a/themes/default/images/whitetheme/panel_btn_selected_right.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_right.png
index a489c829..a489c829 100644
--- a/themes/default/images/whitetheme/panel_btn_selected_right.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_right.png
diff --git a/themes/default/images/whitetheme/panel_btn_selected_top.png b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_top.png
index cd9d54f8..cd9d54f8 100644
--- a/themes/default/images/whitetheme/panel_btn_selected_top.png
+++ b/mobile/default/images/tizen-hd/whitetheme/panel_btn_selected_top.png
diff --git a/themes/default/images/whitetheme/pointer.png b/mobile/default/images/tizen-hd/whitetheme/pointer.png
index 37ee725c..37ee725c 100644
--- a/themes/default/images/whitetheme/pointer.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer.png
diff --git a/themes/default/images/whitetheme/pointer_glint_01.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_01.png
index 36fb4f4e..36fb4f4e 100644
--- a/themes/default/images/whitetheme/pointer_glint_01.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_01.png
diff --git a/themes/default/images/whitetheme/pointer_glint_02.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_02.png
index 96bf6bbf..96bf6bbf 100644
--- a/themes/default/images/whitetheme/pointer_glint_02.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_02.png
diff --git a/themes/default/images/whitetheme/pointer_glint_03.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_03.png
index 68f45e3f..68f45e3f 100644
--- a/themes/default/images/whitetheme/pointer_glint_03.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_03.png
diff --git a/themes/default/images/whitetheme/pointer_glint_04.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_04.png
index 16421ab9..16421ab9 100644
--- a/themes/default/images/whitetheme/pointer_glint_04.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_04.png
diff --git a/themes/default/images/whitetheme/pointer_glint_05.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_05.png
index d0277b0e..d0277b0e 100644
--- a/themes/default/images/whitetheme/pointer_glint_05.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_05.png
diff --git a/themes/default/images/whitetheme/pointer_glint_06.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_06.png
index 689b7cb3..689b7cb3 100644
--- a/themes/default/images/whitetheme/pointer_glint_06.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_06.png
diff --git a/themes/default/images/whitetheme/pointer_glint_07.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_07.png
index 5c902b7f..5c902b7f 100644
--- a/themes/default/images/whitetheme/pointer_glint_07.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_07.png
diff --git a/themes/default/images/whitetheme/pointer_glint_08.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_08.png
index 0ef89142..0ef89142 100644
--- a/themes/default/images/whitetheme/pointer_glint_08.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_08.png
diff --git a/themes/default/images/whitetheme/pointer_glint_09.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_09.png
index 62947bdc..62947bdc 100644
--- a/themes/default/images/whitetheme/pointer_glint_09.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_09.png
diff --git a/themes/default/images/whitetheme/pointer_glint_10.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_10.png
index 0af04b36..0af04b36 100644
--- a/themes/default/images/whitetheme/pointer_glint_10.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_10.png
diff --git a/themes/default/images/whitetheme/pointer_glint_11.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_11.png
index b0ca3ed5..b0ca3ed5 100644
--- a/themes/default/images/whitetheme/pointer_glint_11.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_11.png
diff --git a/themes/default/images/whitetheme/pointer_glint_12.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_12.png
index dfcfc69e..dfcfc69e 100644
--- a/themes/default/images/whitetheme/pointer_glint_12.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glint_12.png
diff --git a/themes/default/images/whitetheme/pointer_glow.png b/mobile/default/images/tizen-hd/whitetheme/pointer_glow.png
index bce47fea..bce47fea 100644
--- a/themes/default/images/whitetheme/pointer_glow.png
+++ b/mobile/default/images/tizen-hd/whitetheme/pointer_glow.png
diff --git a/themes/default/images/whitetheme/progress_slider_bar_v.png b/mobile/default/images/tizen-hd/whitetheme/progress_slider_bar_v.png
index b7ea99a0..b7ea99a0 100644
--- a/themes/default/images/whitetheme/progress_slider_bar_v.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_slider_bar_v.png
diff --git a/themes/default/images/whitetheme/progress_slider_bg_v.png b/mobile/default/images/tizen-hd/whitetheme/progress_slider_bg_v.png
index a2862a76..a2862a76 100644
--- a/themes/default/images/whitetheme/progress_slider_bg_v.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_slider_bg_v.png
diff --git a/themes/default/images/whitetheme/progress_wheel_0.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_0.png
index 45f82b98..45f82b98 100644
--- a/themes/default/images/whitetheme/progress_wheel_0.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_0.png
diff --git a/themes/default/images/whitetheme/progress_wheel_1.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_1.png
index 251e3ba2..251e3ba2 100644
--- a/themes/default/images/whitetheme/progress_wheel_1.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_1.png
diff --git a/themes/default/images/whitetheme/progress_wheel_10.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_10.png
index cdec3943..cdec3943 100644
--- a/themes/default/images/whitetheme/progress_wheel_10.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_10.png
diff --git a/themes/default/images/whitetheme/progress_wheel_11.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_11.png
index aeb28529..aeb28529 100644
--- a/themes/default/images/whitetheme/progress_wheel_11.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_11.png
diff --git a/themes/default/images/whitetheme/progress_wheel_12.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_12.png
index b37ee4ae..b37ee4ae 100644
--- a/themes/default/images/whitetheme/progress_wheel_12.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_12.png
diff --git a/themes/default/images/whitetheme/progress_wheel_13.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_13.png
index 5bb072b0..5bb072b0 100644
--- a/themes/default/images/whitetheme/progress_wheel_13.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_13.png
diff --git a/themes/default/images/whitetheme/progress_wheel_14.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_14.png
index b7e6eb62..b7e6eb62 100644
--- a/themes/default/images/whitetheme/progress_wheel_14.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_14.png
diff --git a/themes/default/images/whitetheme/progress_wheel_15.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_15.png
index e5ce36b3..e5ce36b3 100644
--- a/themes/default/images/whitetheme/progress_wheel_15.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_15.png
diff --git a/themes/default/images/whitetheme/progress_wheel_16.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_16.png
index 40b4e7d8..40b4e7d8 100644
--- a/themes/default/images/whitetheme/progress_wheel_16.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_16.png
diff --git a/themes/default/images/whitetheme/progress_wheel_17.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_17.png
index b50abde7..b50abde7 100644
--- a/themes/default/images/whitetheme/progress_wheel_17.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_17.png
diff --git a/themes/default/images/whitetheme/progress_wheel_18.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_18.png
index e7cc057d..e7cc057d 100644
--- a/themes/default/images/whitetheme/progress_wheel_18.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_18.png
diff --git a/themes/default/images/whitetheme/progress_wheel_19.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_19.png
index 35e93e37..35e93e37 100644
--- a/themes/default/images/whitetheme/progress_wheel_19.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_19.png
diff --git a/themes/default/images/whitetheme/progress_wheel_2.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_2.png
index e2782174..e2782174 100644
--- a/themes/default/images/whitetheme/progress_wheel_2.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_2.png
diff --git a/themes/default/images/whitetheme/progress_wheel_20.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_20.png
index 50990db2..50990db2 100644
--- a/themes/default/images/whitetheme/progress_wheel_20.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_20.png
diff --git a/themes/default/images/whitetheme/progress_wheel_21.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_21.png
index 3dfea10b..3dfea10b 100644
--- a/themes/default/images/whitetheme/progress_wheel_21.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_21.png
diff --git a/themes/default/images/whitetheme/progress_wheel_22.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_22.png
index 4878a78d..4878a78d 100644
--- a/themes/default/images/whitetheme/progress_wheel_22.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_22.png
diff --git a/themes/default/images/whitetheme/progress_wheel_23.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_23.png
index b57750f1..b57750f1 100644
--- a/themes/default/images/whitetheme/progress_wheel_23.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_23.png
diff --git a/themes/default/images/whitetheme/progress_wheel_24.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_24.png
index c8cee336..c8cee336 100644
--- a/themes/default/images/whitetheme/progress_wheel_24.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_24.png
diff --git a/themes/default/images/whitetheme/progress_wheel_25.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_25.png
index db518093..db518093 100644
--- a/themes/default/images/whitetheme/progress_wheel_25.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_25.png
diff --git a/themes/default/images/whitetheme/progress_wheel_26.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_26.png
index 2fb304ea..2fb304ea 100644
--- a/themes/default/images/whitetheme/progress_wheel_26.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_26.png
diff --git a/themes/default/images/whitetheme/progress_wheel_27.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_27.png
index 98680892..98680892 100644
--- a/themes/default/images/whitetheme/progress_wheel_27.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_27.png
diff --git a/themes/default/images/whitetheme/progress_wheel_28.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_28.png
index 5c8fbb45..5c8fbb45 100644
--- a/themes/default/images/whitetheme/progress_wheel_28.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_28.png
diff --git a/themes/default/images/whitetheme/progress_wheel_29.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_29.png
index eeec62e9..eeec62e9 100644
--- a/themes/default/images/whitetheme/progress_wheel_29.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_29.png
diff --git a/themes/default/images/whitetheme/progress_wheel_3.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_3.png
index 1e47db8f..1e47db8f 100644
--- a/themes/default/images/whitetheme/progress_wheel_3.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_3.png
diff --git a/themes/default/images/whitetheme/progress_wheel_4.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_4.png
index 18d5db9a..18d5db9a 100644
--- a/themes/default/images/whitetheme/progress_wheel_4.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_4.png
diff --git a/themes/default/images/whitetheme/progress_wheel_5.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_5.png
index 0cabf18f..0cabf18f 100644
--- a/themes/default/images/whitetheme/progress_wheel_5.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_5.png
diff --git a/themes/default/images/whitetheme/progress_wheel_6.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_6.png
index 94bba2b3..94bba2b3 100644
--- a/themes/default/images/whitetheme/progress_wheel_6.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_6.png
diff --git a/themes/default/images/whitetheme/progress_wheel_7.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_7.png
index 2e5b2b7f..2e5b2b7f 100644
--- a/themes/default/images/whitetheme/progress_wheel_7.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_7.png
diff --git a/themes/default/images/whitetheme/progress_wheel_8.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_8.png
index 264e6b5d..264e6b5d 100644
--- a/themes/default/images/whitetheme/progress_wheel_8.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_8.png
diff --git a/themes/default/images/whitetheme/progress_wheel_9.png b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_9.png
index c49841e8..c49841e8 100644
--- a/themes/default/images/whitetheme/progress_wheel_9.png
+++ b/mobile/default/images/tizen-hd/whitetheme/progress_wheel_9.png
diff --git a/themes/default/images/whitetheme/shadow_bottom.png b/mobile/default/images/tizen-hd/whitetheme/shadow_bottom.png
index 82ebec4b..82ebec4b 100644
--- a/themes/default/images/whitetheme/shadow_bottom.png
+++ b/mobile/default/images/tizen-hd/whitetheme/shadow_bottom.png
diff --git a/themes/default/images/whitetheme/shadow_title.png b/mobile/default/images/tizen-hd/whitetheme/shadow_title.png
index 8cba3e48..8cba3e48 100644
--- a/themes/default/images/whitetheme/shadow_title.png
+++ b/mobile/default/images/tizen-hd/whitetheme/shadow_title.png
diff --git a/themes/default/images/whitetheme/slider_v_bg.png b/mobile/default/images/tizen-hd/whitetheme/slider_v_bg.png
index b8b02cf6..b8b02cf6 100644
--- a/themes/default/images/whitetheme/slider_v_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/slider_v_bg.png
diff --git a/themes/default/images/whitetheme/slider_v_guage.png b/mobile/default/images/tizen-hd/whitetheme/slider_v_guage.png
index 7ccd077c..7ccd077c 100644
--- a/themes/default/images/whitetheme/slider_v_guage.png
+++ b/mobile/default/images/tizen-hd/whitetheme/slider_v_guage.png
diff --git a/themes/default/images/whitetheme/spinner_bg.png b/mobile/default/images/tizen-hd/whitetheme/spinner_bg.png
index b1f9ea23..b1f9ea23 100644
--- a/themes/default/images/whitetheme/spinner_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/spinner_bg.png
diff --git a/themes/default/images/whitetheme/toast_popup.png b/mobile/default/images/tizen-hd/whitetheme/toast_popup.png
index da6d760b..da6d760b 100644
--- a/themes/default/images/whitetheme/toast_popup.png
+++ b/mobile/default/images/tizen-hd/whitetheme/toast_popup.png
diff --git a/themes/default/images/whitetheme/toolbar_more_bg.png b/mobile/default/images/tizen-hd/whitetheme/toolbar_more_bg.png
index f65461a2..f65461a2 100644
--- a/themes/default/images/whitetheme/toolbar_more_bg.png
+++ b/mobile/default/images/tizen-hd/whitetheme/toolbar_more_bg.png
diff --git a/themes/default/images/whitetheme/tooltip-base.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-base.png
index d76fb5cc..d76fb5cc 100644
--- a/themes/default/images/whitetheme/tooltip-base.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-base.png
diff --git a/themes/default/images/whitetheme/tooltip-corner-bottom-left-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-bottom-left-tip.png
index ee76b7cf..ee76b7cf 100644
--- a/themes/default/images/whitetheme/tooltip-corner-bottom-left-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-bottom-left-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-corner-bottom-right-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-bottom-right-tip.png
index d2144df2..d2144df2 100644
--- a/themes/default/images/whitetheme/tooltip-corner-bottom-right-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-bottom-right-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-corner-top-left-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-top-left-tip.png
index a012adb9..a012adb9 100644
--- a/themes/default/images/whitetheme/tooltip-corner-top-left-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-top-left-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-corner-top-right-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-top-right-tip.png
index 121f5243..121f5243 100644
--- a/themes/default/images/whitetheme/tooltip-corner-top-right-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-corner-top-right-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-edge-bottom-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-bottom-tip.png
index bf26db37..bf26db37 100644
--- a/themes/default/images/whitetheme/tooltip-edge-bottom-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-bottom-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-edge-left-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-left-tip.png
index e35db092..e35db092 100644
--- a/themes/default/images/whitetheme/tooltip-edge-left-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-left-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-edge-right-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-right-tip.png
index 5a7e26ed..5a7e26ed 100644
--- a/themes/default/images/whitetheme/tooltip-edge-right-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-right-tip.png
diff --git a/themes/default/images/whitetheme/tooltip-edge-top-tip.png b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-top-tip.png
index 93ba9251..93ba9251 100644
--- a/themes/default/images/whitetheme/tooltip-edge-top-tip.png
+++ b/mobile/default/images/tizen-hd/whitetheme/tooltip-edge-top-tip.png
diff --git a/themes/default/inc/tizen-default-inc.edc b/mobile/default/inc/tizen-default-inc.edc
index 13c9b751..cd4ca053 100644
--- a/themes/default/inc/tizen-default-inc.edc
+++ b/mobile/default/inc/tizen-default-inc.edc
@@ -117,10 +117,6 @@
 #define LIST_C_TYPE4_LEFT_PADDING_WIDTH       20
 #define LIST_C_TYPE4_RIGHT_PADDING_WIDTH      20
 #define LIST_C_TYPE4_ICON_SIZE             80 80
-#define LIST_GROUP_HEIGHT                     13
-#define LIST_DESC_PADDING_TOP_SIZE            13
-#define LIST_DESC_PADDING_BOTTOM_SIZE         43
-#define LIST_DESC_PADDING_LEFT_RIGHT_SIZE     20
 #define LIST_DESC_TEXT_PART_SIZE              43
 #define LIST_DESC_TEXT_SIZE                   32
 #define LIST_SELECT_ALL_PADDING_LEFT_SIZE     20
diff --git a/mobile/default/inc/tizen-hd-inc.edc b/mobile/default/inc/tizen-hd-inc.edc
new file mode 100644
index 00000000..c319a71f
--- /dev/null
+++ b/mobile/default/inc/tizen-hd-inc.edc
@@ -0,0 +1,1044 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * PROPRIETARY/CONFIDENTIAL
+ *
+ * This software is the confidential and proprietary information of SAMSUNG
+ * ELECTRONICS ("Confidential Information"). You agree and acknowledge that this
+ * software is owned by Samsung and you shall not disclose such Confidential
+ * Information and shall use it only in accordance with the terms of the license
+ * agreement you entered into with SAMSUNG ELECTRONICS. SAMSUNG make no
+ * representations or warranties about the suitability of the software, either
+ * express or implied, including but not limited to the implied warranties of
+ * merchantability, fitness for a particular purpose, or non-infringement.
+ * SAMSUNG shall not be liable for any damages suffered by licensee arising out
+ * of or releated to this software.
+ *
+ */
+#define BG_DEFAULT_COLOR_INC 248 246 239 255
+
+#define LAYOUT_BG_COLOR_INC 248 246 239 255
+
+#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255
+#define NAVIFRAME_OVERLAP_TITLE_BG_COLOR_INC 248 246 239 128
+#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255
+#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32
+#define NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC 0 33
+#define NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC 0 8
+#define NAVIFRAME_TITLE_H_INC 111
+#define NAVIFRAME_TAB_TITLE_H_INC 165
+#define NAVIFRAME_TOOLBAR_HEIGHT_INC 98
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 68 68
+#define NAVIFRAME_PREV_FUNC_BTN_SIZE_INC 60 60
+#define NAVIFRAME_TITLE_TAB_H_INC 68
+#define NAVIFRAME_TITLE_TAB_LARGE_H_INC 111
+#define NAVIFRAME_TITLE_TAB_FONT_SIZE_INC 44
+#define NAVIFRAME_TITLE_TAB_TEXT_H_INC 87
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 56
+#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 44
+#define NAVIFRAME_ICON_SIZE_INC 38 38
+#define NAVIFRAME_PADDING_INC 16 0
+#define NAVIFRAME_PADDING2_INC 18 0
+#define NAVIFRAME_PADDING3_INC 8 0
+#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11
+#define NAVIFRAME_BOTTOM_RIGHT_PADDING_INC 26 11
+#define NAVIFRAME_BOTTOM_PADDING_INC 0 10
+#define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 115 0
+#define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 15
+#define NAVIFRAME_ICON_PADDING_INC 70 0
+#define NAVIFRAME_TITLE_TEXT_COLOR_INC 59 115 182 255
+#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 59 115 182 255
+#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
+
+#define POPUP_ITEM_BG_DEFAULT_MIN_INC 648 112
+#define POPUP_ITEM_LEFT_MIN_PADDING_INC 26 0
+#define POPUP_ITEM_RIGHT_MIN_PADDING_INC 26 0
+#define POPUP_ITEM_ICON_TEXT_PADDING_INC 16 0
+#define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 128 128 128 255
+#define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 128 128 128 255
+
+#define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC "#3b73b6"
+#define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#000000"
+#define POPUP_DIM_BG_DEFAULT_COLOR_INC 0 0 0 0
+#define POPUP_DIM_BG_COLOR_INC 0 0 0 127
+#define POPUP_DIM_BG_CLICKED_COLOR_INC 0 0 0 127
+#define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0
+#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50
+
+#define CTXPOPUP_WIDTH_MIN_INC 386
+#define CTXPOPUP_WIDTH_MAX_INC 620
+#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 22 22 20 28
+#define CTXPOPUP_SHADOW_LEFT_PADDING 10
+#define CTXPOPUP_SHADOW_RIGHT_PADDING 10
+#define CTXPOPUP_SHADOW_TOP_PADDING 8
+#define CTXPOPUP_SHADOW_BOTTOM_PADDING 16
+#define CTXPOPUP_CONTENT_PADDING 4
+#define CTXPOPUP_SCROLLER_PADDING 8
+#define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 12
+#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 20
+#define CTXPOPUP_BG_COLOR_INC 0 0 0 0
+#define CTXPOPUP_BG_PRESS_COLOR_INC 42 137 194 255
+#define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255
+#define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
+#define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
+#define CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC 255 255 255 255
+#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
+#define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
+#define CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC 1
+#define CTXPOPUP_SEPARATOR_PADDING_INC 20
+#define CTXPOPUP_SEPARATOR_COLOR_INC 45 45 45 255
+#define CTXPOPUP_SEPARATOR2_COLOR_INC 91 91 91 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 45 45 45 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 91 91 91 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74
+#define CTXPOPUP_TP_BG_COLOR_INC 7 180 211 255
+#define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
+#define CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC 40
+#define CTXPOPUP_MAIN_TEXT_SIZE_INC 32
+#define CTXPOPUP_ITEM_HEIGHT_INC 110
+#define CTXPOPUP_ITEM_HORIZONTAL_WIDTH_INC 128
+#define CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC 96
+#define CTXPOPUP_ICON_WIDTH_INC 64
+#define CTXPOPUP_ICON_HEIGHT_INC 64
+#define CTXPOPUP_ICON_HORIZONTAL_WIDTH_INC 48
+#define CTXPOPUP_ICON_HORIZONTAL_HEIGHT_INC 48
+#define CTXPOPUP_ARROW_SIZE_INC 48 48
+#define CTXPOPUP_VERTICAL_ARROW_SIZE_INC 40 30
+#define CTXPOPUP_HORIZONTAL_ARROW_SIZE_INC 30 40
+#define CTXPOPUP_ITEM_TEXT_PADDING_INC 20
+#define CTXPOPUP_ITEM_ICON_PADDING_INC 16
+#define CTXPOPUP_IE_ARROW_SIZE_INC 52
+#define CTXPOPUP_IE_FONT_SIZE_INC 40
+#define CTXPOPUP_IE_ITEM_PADDING_INC 22
+#define CTXPOPUP_IE_ITEM_HEIGHT_INC 75
+#define CTXPOPUP_IE_CONTENT_WIDTH_MAX_INC 720
+#define CTXPOPUP_IE_ICON_WIDTH_INC 60
+#define CTXPOPUP_IE_ICON_HEIGHT_INC 60
+#define CTXPOPUP_TP_ARROW_SIZE_INC 30
+#define CTXPOPUP_TP_HEIGHT_INC 106
+#define CTXPOPUP_MORE_WIDTH_MIN_INC 502
+#define CTXPOPUP_MORE_ITEM_PADDING_INC 16
+#define CTXPOPUP_MORE_ITEM_HEIGHT_INC 110
+#define CTXPOPUP_MORE_ICON_WIDTH_INC 72
+#define CTXPOPUP_MORE_ICON_HEIGHT_INC 72
+#define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40
+#define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_INC 90
+
+#define DISKSELECTOR_DF_FONT_COLOR_INC 255 255 255 178
+#define DISKSELECTOR_DF_FONT_MOUSE_DOWN_COLOR_INC 255 255 255 255
+#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC 70 106;
+#define DISKSELECTOR_DF_FONT_SIZE_INC 48
+#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC "106"
+
+#define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000"
+#define LABEL_FONT_SIZE_INC 36
+#define LABEL_MIN_FONT_SIZE_INC 27
+#define LABEL_MAX_FONT_SIZE_INC 90
+
+#define GENGRID_FONT_STYLE_18_INC "26"
+#define GENGRID_PART_BG_COLOR_INC 0 0 0 0
+#define GENGRID_PART_REORDER_DEFAULT_BG_COLOR_INC 0 0 0 77
+#define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 77
+#define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#000000"
+#define GENGRID_PART_BACKGROUND_COLOR_INC 0 0 0 0
+#define GENGRID_EDIT_MODE_CHECK_TOP_RIGHT_INC 6 6
+#define GENGRID_EDIT_MODE_CHECK_SIZE_INC 54 54
+#define GENGRID_EDIT_MODE_CHECK_BG_COLOR_INC 0 0 0 154
+#define GENGRID_ITEM_CHECK_TOP_RIGHT_PADDING_INC 6 6
+
+#define GENGRID_DEFAULT_LEFT_TOP_PADDING_INC 2 2
+#define GENGRID_DEFAULT_RIGHT_BOTTOM_PADDING_INC 2 2
+#define GENGRID_DEFAULT_ITEM_BG_LEFT_TOP_PADDING_INC 1 1
+#define GENGRID_DEFAULT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1
+#define GENGRID_DEFAULT_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0
+#define GENGRID_DEFAULT_LEFT_TOP_FOCUS_PADDING_INC 2 2
+#define GENGRID_DEFAULT_RIGHT_BOTTOM_FOCUS_PADDING_INC 2 2
+
+#define GENGRID_LANDSCAPE_LEFT_TOP_PADDING_INC 5 5
+#define GENGRID_LANDSCAPE_RIGHT_BOTTOM_PADDING_INC 5 5
+#define GENGRID_LANDSCAPE_LEFT_TOP_FOCUS_PADDING_INC 4 4
+#define GENGRID_LANDSCAPE_RIGHT_BOTTOM_FOCUS_PADDING_INC 4 4
+#define GENGRID_LANDSCAPE_GRID_TEXT_LEFT_TOP_PADDING_INC 5 5
+#define GENGRID_LANDSCAPE_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 5 59
+#define GENGRID_LANDSCAPE_GRID_TEXT_LEFT_TOP_FOCUS_PADDING_INC 4 4
+#define GENGRID_LANDSCAPE_GRID_TEXT_RIGHT_BOTTOM_FOCUS_PADDING_INC 4 60
+
+#define GENGRID_GRID_TEXT_LEFT_TOP_PADDING_INC 2 2
+#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 2 62
+#define GENGRID_GRID_TEXT_ITEM_BG_LEFT_TOP_PADDING_INC 1 1
+#define GENGRID_GRID_TEXT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1
+#define GENGRID_GRID_TEXT_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0
+#define GENGRID_GRID_TEXT_LEFT_TOP_FOCUS_PADDING_INC 2 2
+#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_FOCUS_PADDING_INC 2 62
+
+#define GENGRID_GRID_TEXT2_LEFT_TOP_PADDING_INC 2 62
+#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_PADDING_INC 2 2
+#define GENGRID_GRID_TEXT2_ITEM_BG_LEFT_TOP_PADDING_INC 1 1
+#define GENGRID_GRID_TEXT2_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 1 1
+#define GENGRID_GRID_TEXT2_ITEM_REAL_BG_RIGHT_PADDING_INC 0 0
+#define GENGRID_GRID_TEXT2_LEFT_TOP_FOCUS_PADDING_INC 2 62
+#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_FOCUS_PADDING_INC 2 2
+
+// Please do not use these !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#define GENLIST_HEIGHT_1_INC 1
+#define GENLIST_PADDING_5_INC 5
+#define GENLIST_PADDING_24_INC 24
+#define GENLIST_PADDING_64_INC 64
+#define GENLIST_PADDING_88_INC 88
+#define GENLIST_PADDING_34_INC 34
+#define GENLIST_PADDING_32_INC 32
+#define GENLIST_PADDING_16_INC 16
+#define GENLIST_SIZE_80_INC 80
+
+#define BUBBLE_DISCLIP_COLOR                        255 255 255 102 // opacity 40%
+
+// List bg color
+#define GENLIST_LIST_BG_COLOR                       248 246 239 255
+#define GENLIST_DIALOGUE_BG_COLOR                   248 246 239 255
+#define GENLIST_LIST_PRESS_COLOR                    87 135 194 255
+#define GENLIST_LIST_DIM_COLOR                      219 217 212 255
+#define GENLIST_LIST_LINE1_COLOR                    211 209 203 255
+#define GENLIST_LIST_LINE2_COLOR                    255 255 255 255
+#define GENLIST_LIST_DIVIDER1_COLOR                 185 184 178 255
+#define GENLIST_LIST_DIVIDER2_COLOR                 255 255 255 255
+#define GENLIST_LIST_CENTERLINE1_COLOR              206 205 202 255
+#define GENLIST_SELECT_ALL_BG_COLOR                 220 218 211 255
+
+// Group Index
+#define GENLIST_GROUPINDEX_LIST_SIZE                     32
+#define GENLIST_GROUPINDEX_LIST_COLOR                    59 115 182 255
+#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR              255 255 255 255
+
+#define GENLIST_GROUPINDEX_LIST_BG_COLOR                 248 246 239 255
+#define GENLIST_GROUPINDEX_LIST_PRESS_COLOR              132 162 198 255
+#define GENLIST_GROUPINDEX_LINE_COLOR                    59 115 182 255
+#define GENLIST_GROUPINDEX_LINE_FOCUS_COLOR              255 255 255 255
+
+// Genlist Text
+#define GENLIST_LIST_MAIN_TEXT_SIZE                         44
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR                 0 0 0 255
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE           "#000000FF"
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR             0 0 0 102
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE       "#00000066"
+#define GENLIST_LIST_MAIN_TEXT_READ_COLOR                   128 128 128 255
+#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR               128 128 128 204
+#define GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR                  255 255 255 255
+#define GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE            "#FFFFFFFF"
+
+#define GENLIST_LIST_SUB_TEXT_SIZE                          32
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR                 128 128 128 255
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE           "#808080FF"
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR             128 128 128 204
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE       "#808080CC"
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR                59 115 182 255
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE          "#3B73B6FF"
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR            59 115 182 76
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE      "#3B73B64C"
+#define GENLIST_LIST_SUB_TEXT_FOCUS_COLOR                   255 255 255 255
+#define GENLIST_LIST_SUB_TEXT_FOCUS_COLOR_STYLE             "#FFFFFFFF"
+
+#define GENLIST_CONTENTS_TEXT_SIZE                          28
+#define GENLIST_CONTENTS_TEXT_COLOR                         128 128 128 255
+#define GENLIST_CONTENTS_TEXT_COLOR_STYLE                   "#808080FF"
+
+#define GENLIST_LIST_BUBBLE_TEXT_SIZE                       32
+#define GENLIST_LIST_BUBBLE_TEXT_COLOR                      249 249 249 255
+
+// Dialogue group
+#define GENLIST_DIALOGUE_GROUP_TITLE_SIZE           32
+#define GENLIST_DIALOGUE_GROUP_TITLE_COLOR          59 115 182 255
+
+#define GENLIST_APPS_NAME_SIZE                          30
+#define GENLIST_APPS_NAME_COLOR                         128 128 128 255
+#define GENLIST_APPS_INC_SIZE                           30
+#define GENLIST_APPS_INC_COLOR                          0 0 0 255
+#define GENLIST_APPS_RATING_SIZE                        24
+#define GENLIST_APPS_RATING_COLOR                       128 128 128 255
+#define GENLIST_APPS_PRICE_SIZE                         24
+#define GENLIST_APPS_PRICE_ORIGINAL_COLOR               59 115 182 255
+#define GENLIST_APPS_PRICE_SALE_COLOR                   229 33 52 255
+#define GENLIST_APPS_PRICE_FREE_COLOR                   59 115 182 255
+
+#define DIALOGUE_PASSWORD_TITLE_SIZE                    32
+#define DIALOGUE_PASSWORD_TITLE_COLOR                   128 128 128 255
+
+#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE           32
+#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE    "#808080FF"
+#define GENLIST_PART_MATCH_TAG_COLOR                    "+ color=#3F8DAD"
+
+#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+
+#define BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255
+#define BUTTON_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 0 0 0 163
+
+#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127
+#define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 127
+
+#define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 50 50 50 255
+#define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 50 50 50 76
+
+#define BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76
+#define BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163
+
+#define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 248 246 239 76
+#define BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC 0 0 0 163
+
+#define BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC 248 246 239 76
+#define BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC 0 0 0 163
+
+#define BUTTON_SEND_BUBBLE_TEXT_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_SEND_BUBBLE_TEXT_PRESSED_COLOR_INC 58 58 58 255
+#define BUTTON_SEND_BUBBLE_TEXT_FOCUSED_COLOR_INC 58 58 58 255
+#define BUTTON_SEND_BUBBLE_TEXT_DISABLED_COLOR_INC 58 58 58 76
+#define BUTTON_SEND_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 153
+
+#define BUTTON_RECEIVE_BUBBLE_TEXT_NORMAL_COLOR_INC 248 246 239 255
+#define BUTTON_RECEIVE_BUBBLE_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_RECEIVE_BUBBLE_TEXT_DISABLED_COLOR_INC 248 246 239 76
+#define BUTTON_RECEIVE_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 153
+
+#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 58 58 58 76
+
+#define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76
+
+#define BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC 249 249 249 255
+#define BUTTON_EXPAND_BUTTON_DISABLED_COLOR_INC 48 49 50 255
+
+#define BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC 248 246 239 255
+#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 248 246 239 76
+
+#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
+#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76
+
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 50 50 50 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 50 50 50 255
+
+#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 255 255 255 255
+#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
+#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76
+
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC 255 255 255 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 101 101 101 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 64 147 247 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 101 101 101 76
+
+#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 77 77 77 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 248 246 239 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 248 246 239 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 58 58 58 76
+
+#define BUTTON_DATETIME_AMPM_BG_MIN_INC 106 56
+
+#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 12 12 12 12
+#define BUTTON_SEARCH_BUTTON_BG_MIN_INC 100 66
+#define BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC 148 66
+#define BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC 66 66
+#define BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC 30
+
+#define BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC 74 74
+#define BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_BUBBLE_CIRCLE_MIN_WIDTH_INC 74
+#define BUTTON_BUBBLE_CIRCLE_MIN_HEIGHT_INC 74
+
+#define BUTTON_SENT_BUBBLE_BG_BORDER_INC 12 12 12 12
+#define BUTTON_SENT_BUBBLE_TEXT_FONT_SIZE_INC 36
+#define BUTTON_SENT_BUBBLE_TEXT_MULTILINE_FONT_SIZE_INC 28
+
+#define BUTTON_RECEIVE_BUBBLE_BG_BORDER_INC 12 12 12 12
+#define BUTTON_RECEIVE_BUBBLE_TEXT_FONT_SIZE_INC 36
+#define BUTTON_RECEIVE_BUBBLE_TEXT_MULTILINE_FONT_SIZE_INC 28
+
+#define BUTTON_TEXT_STYLE1_BG_MIN_INC 100 74
+#define BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC 148 74
+#define BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC 74 74
+#define BUTTON_TEXT_STYLE1_BG_BORDER_INC 12 12 12 12
+#define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 12 0
+#define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
+#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
+#define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 36
+
+#define BUTTON_TEXT_STYLE2_BG_MIN_INC 100 74
+#define BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC 148 74
+#define BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC 74 74
+#define BUTTON_TEXT_STYLE2_BG_BORDER_INC 12 12 12 12
+#define BUTTON_TEXT_STYLE2_PADDING_MIN_INC 12 0
+#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
+#define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
+#define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 36
+
+#define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 74 74
+#define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 44 44
+
+#define BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC 74
+#define BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC 74
+#define BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC 110
+#define BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC 110
+
+#define BUTTON_POPUP_BG_NORMAL_MIN_INC 30 74
+#define BUTTON_POPUP_BG_BORDER_INC 12 12 12 12
+#define BUTTON_POPUP_PADDING_MIN_INC 12 3
+#define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
+#define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 44 44
+#define BUTTON_POPUP_TEXT_MIN_INC 64 20
+#define BUTTON_POPUP_TEXT_FONT_SIZE_INC 36
+
+#define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74
+#define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 74 74
+
+#define BUTTON_EDIT_NORMAL_MIN_WIDTH_INC 74
+#define BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC 74
+#define BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC 90
+#define BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC 90
+
+#define BUTTON_SWEEP_BG_NORMAL_MIN_INC 74 74
+#define BUTTON_SWEEP_BG_BORDER_INC 12 12 12 12
+#define BUTTON_SWEEP_PADDING_MIN_INC 12 0
+#define BUTTON_SWEEP_ICON_RECT_MIN_INC 0 44
+#define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
+#define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 44 44
+#define BUTTON_SWEEP_TEXT_MIN_INC 50 26
+#define BUTTON_SWEEP_FONT_SIZE_INC 26
+
+#define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30
+
+#define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 98 46
+#define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 12 12 12 12
+#define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 12 1
+#define BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC 24 46
+#define BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC 50 46
+#define BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC 28
+
+#if 0
+#define BUTTON_CONTACT_DELETE_BG_NORMAL_MIN_INC 50 74
+#define BUTTON_CONTACT_DELETE_BG_BORDER_INC 8 0 5 5
+#define BUTTON_CONTACT_DELETE_PADDING_LEFT_TOP_MIN_INC 36 2
+#define BUTTON_CONTACT_DELETE_PADDING_RIGHT_BOTTOM_MIN_INC 14 2
+#define BUTTON_CONTACT_DELETE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
+#define BUTTON_CONTACT_DELETE_ICON_ICONONLY_MIN_INC 42 42
+#define BUTTON_CONTACT_DELETE_FONT_SIZE_INC 32
+
+#define BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC 74 74
+#define BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC 74 74
+
+#define BUTTON_TEXT_CONTACTS_DELETE_NORMAL_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC 249 249 249 255
+#define BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC 0 0 0 128
+#endif
+
+#define BUTTON_CONTACT_BG_MIN_INC 30 48
+#define BUTTON_CONTACT_BG_BORDER_INC 12 16 0 0
+#define BUTTON_CONTACT_LEFT_PADDING_MIN_INC 28 0
+#define BUTTON_CONTACT_RIGHT_PADDING_MIN_INC 16 0
+#define BUTTON_CONTACT_FONT_SIZE_INC 32
+
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 80 80
+#define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 60 60
+
+#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 249 249 249 255
+#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 249 249 249 255
+
+#define BUTTON_NAVITFRAME_TITLE_ICON_BG_MIN_MAX_INC 80 80
+#define BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC 68 68
+
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 182 70
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC 126 70
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 36 36 0 0
+#define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 28 5
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 32
+#define BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
+#define BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC 44 44
+#define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255
+
+#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 80 80
+#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 60 60
+
+#define BUTTON_TICKERNOTI_BG_MIN_MAX_INC 154 74
+#define BUTTON_TICKERNOTI_BG_BORDER_INC 12 12 12 12
+#define BUTTON_TICKERNOTI_PADDING_MIN_INC 12 0
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 4 0
+#define BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 44 44
+#define BUTTON_TICKERNOTI_FONT_SIZE_INC 36
+
+#define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
+#define BUTTON_COLORSELECTOR_BG_BORDER_INC 12 12 12 12
+#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74
+
+#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74
+#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 12 12 12 12
+#define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 12 5
+#define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
+#define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 44 44
+#define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 36
+#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 36
+
+#define BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC 100 80
+#define BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC 12 0
+
+#define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 249 249 249 255
+#define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 249 249 249 255
+
+#define CHECK_DEFAULT_TEXT_FONT_SIZE_INC 36
+
+#define CHECK_ONOFF_BG_NORMAL_MIN_MAX_INC 132 70
+#define CHECK_ONOFF_ON_FONT_SIZE_INC 24
+#define CHECK_ONOFF_OFF_FONT_SIZE_INC 24
+
+#define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 74
+#define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 74
+#define CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 100
+#define CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 100
+#define CHECK_STYLE_FAVORITE_BG_NORMAL_MIN_MAX_INC 74 74
+
+#define CHECK_STYLE_DEFAULT_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 64
+#define CHECK_STYLE_DEFAULT_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 64
+#define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 75
+#define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 91
+#define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 64 64
+
+#define CHECK_STYLE_DELETE_BUTTON_BG_IMAGE_MIN_MAX_WIDTH_INC 74 74
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 124 74
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC 8 0 5 5
+#define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 32
+
+#define INDEX_BG_NINEPATCH_INC 4 4 4 4
+#define INDEX_ITEM_WIDTH_INC 47
+#define INDEX_ITEM_HEIGHT_INC 47
+#define INDEX_ROLLOVER_TEXT_SIZE_INC 32
+#define INDEX_POPUP_BG_NINEPATCH_INC 24 24 24 24
+#define INDEX_POPUP_TEXT_SIZE_INC 140
+#define INDEX_BOTTOM_LINE_COLOR_INC 213 210 201 255
+#define INDEX_LEFT_LINE_COLOR_INC 59 115 182 255
+#define INDEX_PAGECONTROL_IND_INC 52 52
+#define INDEX_PAGECONTROL_IND_MIN_INC 24 24
+
+#define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 64
+#define RADIO_STYLE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 64
+#define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 76
+#define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 76
+#define RADIO_STYLE_DEFAULT_BG_MIN_MAX_INC 64 64
+#define RADIO_STYLE_DEFAULT_FONT_SIZE_INC 36
+
+#define PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC 60
+#define PANES_STYLE_DEFAULT_PADDING_LEFT_SIZE_INC 25
+#define PANES_STYLE_DEFAULT_PADDING_RIGHT_SIZE_INC 22
+#define PANES_STYLE_DEFAULT_MIDDLE_SIZE_INC 26
+#define PANES_STYLE_DEFAULT_FIXED_SIZE_INC 52
+
+#define SEGMENT_CONTROL_DEFAULT_ITEM_TEXT_COLOR_NORMAL_INC 153 153 153 255
+#define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 59 115 182 255
+#define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 59 115 182 255
+#define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 153 153 153 255
+
+#define SEGMENT_CONTROL_MULTILINE_TEXT_SIZE_INC 30
+#define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
+#define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MAX_INC 28
+#define SEGMENT_CONTROL_DIVIDER_LINE_MIN_SIZE_INC 2 32
+#define SEGMENT_CONTROL_TEXT_PADDING_MIN_SIZE_INC 18 0
+#define SEGMENT_CONTROL_VISIBLE_ICON_RECT_MIN_MAX_INC 40 40
+#define SEGMENT_CONTROL_BADGE_TEXT_LEFT_PADDING_MIN_INC 22 45
+#define SEGMENT_CONTROL_BADGE_TEXT_RIGHT_PADDING_MIN_INC 18 47
+#define SEGMENT_CONTROL_BADGE_TEXT_COLOR_INC 10 100 208 255;
+#define SEGMENT_CONTROL_BADGE_TEXT_FONT_SIZE_INC 26;
+
+#define EDITFIELD_TITLE_SIZE_INC 32
+#define EDITFIELD_TITLE_COLOR_INC 42 137 194 255
+#define EDITFIELD_GUIDE_TEXT_COLOR_INC 121 131 138 255
+#define EDITFIELD_DEFAULT_ERASER_MINW_INC 48
+#define EDITFIELD_DEFAULT_ERASER_MINH_INC 48
+#define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 48
+#define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 70
+#define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38
+#define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38
+#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC 38
+#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINH_INC 50
+#define EDITFIELD_DEFAULT_MINH_INC 112
+#define EDITFIELD_TITLE_MINH_INC 128
+#define EDITFIELD_SEARCHBAR_MINH_INC 50
+#define EDITFIELD_DEFAULT_TOP1_SINGLE_INC 27
+#define EDITFIELD_DEFAULT_TOP1_MULTI_INC 56
+#define EDITFIELD_DEFAULT_TOP2_INC 8
+#define EDITFIELD_DEFAULT_LEFT1_INC 0
+#define EDITFIELD_DEFAULT_LEFT2_INC 0
+#define EDITFIELD_DEFAULT_LEFT3_INC 1
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 56
+#define EDITFIELD_DEFAULT_RIGHT2_INC 0
+#define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 25
+#define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 8
+#define EDITFIELD_DEFAULT_BOTTOM2_SINGLE_INC 32
+#define EDITFIELD_DEFAULT_BOTTOM2_MULTI_INC 12
+#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 1
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 56
+#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_TICKERNOTI_NORMAL_COLOR_INC        225 215 215 255
+#define BUTTON_TICKERNOTI_PRESSED_COLOR_INC       248 246 239 255
+#define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      225 215 215 76
+
+#define BUTTON_DISCLIP_NORMAL_COLOR_INC           255 255 255 255
+#define BUTTON_DISCLIP_DISABLED_COLOR_INC         255 255 255 76
+
+#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        50 50 50 255
+#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      248 246 239 255
+#define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC          50 50 50 76
+#define CHECK_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
+#define CHECK_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
+
+#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        50 50 50 255
+#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC       248 246 239 255
+#define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC      50 50 50 76
+#define RADIO_DISCLIP_NORMAL_COLOR_INC             255 255 255 255
+#define RADIO_DISCLIP_DISABLED_COLOR_INC           255 255 255 76
+
+#define CONTROLBAR_LARGE_HEIGHT_INC 122
+#define CONTROLBAR_SMALL_HEIGHT_INC 114
+#define CONTROLBAR_WIDTH_INC 122
+#define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 23 34 38 255
+#define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 58 68 74 255
+
+#define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 8 158 185 255
+#define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 2 85 100 255
+#define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 102 102 102 255
+#define MULTIBUTTONENTRY_TEXT_COLOR_INC "#666666"
+#define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 70 70 70 255
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 26
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 13
+#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 330
+#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 64
+#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 12 16 0 0
+#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 8
+#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 24
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 16
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 27
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 32
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC 36
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 1
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT_INC 60
+#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 26
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 36
+#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC 64
+
+#define SEARCHBAR_CANCEL_BUTTON_W_INC 136
+#define SEARCHBAR_CANCEL_BUTTON_WITH_PADDING_W_INC 150
+#define SEARCHBAR_CANCEL_BUTTON_WITH_DOUBLE_PADDING_W_INC 166
+#define SEARCHBAR_TOP_PADDING_INC 10
+#define SEARCHBAR_BOTTOM_PADDING_INC 10
+#define SEARCHBAR_HEIGHT_INC 66
+#define SEARCHBAR_LEFT_PADDING_INC 26
+#define SEARCHBAR_RIGHT_PADDING_INC 26
+#define SEARCHBAR_INPUTFIELD_BORDER_INC 9 9 9 9
+#define SEARCHBAR_LEFT_ICON_PADDING_INC 16
+#define SEARCHBAR_ICON_MIN_W_INC 44
+#define SEARCHBAR_ICON_MIN_H_INC 44
+#define SEARCHBAR_LEFT_PADDING_SEARCHFIELD_INC 16
+#define SEARCHBAR_RIGHT_PADDING_SEARCHFIELD_INC 8
+#define SEARCHBAR_SEARCH_TEXTFIELD_H_INC 60
+#define SEARCHBAR_H_INC 86
+
+#define SELECTION_INFO_BACKGROUND_COLOR_INC          68 68 68 255
+#define SELECTION_INFO_TEXT_COLOR_INC                255 255 255 255
+#define SELECTION_INFO_MIN_VER_W_INC                 720
+#define SELECTION_INFO_MIN_HORZ_W_INC                1280
+#define SELECTION_INFO_VER_PADDING_INC               48
+#define SELECTION_INFO_LEFT_PADDING_INC              16
+#define SELECTION_INFO_TEXT_FONT_SIZE_INC            32
+#define SELECTION_INFO_SHADOW_VER_W_INC              720
+#define SELECTION_INFO_SHADOW_VER_H_INC              10
+#define SELECTION_INFO_SHADOW_HORZ_W_INC             1280
+#define SELECTION_INFO_SHADOW_HORZ_H_INC             10
+#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
+#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
+
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 648 300
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 42
+
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 720 0
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 720 1120
+#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 18 18 32 52
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 648 80
+#define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 720 68
+#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 16 0
+#define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
+#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 648 300
+#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 648 114
+#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50
+
+#define POPUP_DESC_LEFT_PADDING 0
+#define POPUP_DESC_RIGHT_PADDING 0
+#define POPUP_DESC_TOP_PADDING 14
+#define POPUP_DESC_BOTTOM_PADDING 34
+#define POPUP_LABEL_DESC_TOP_PADDING 39
+#define POPUP_LABEL_DESC_BOTTOM_PADDING 39
+#define POPUP_TITLE_TOP_PADDING 18
+#define POPUP_TITLE_BOTTOM_PADDING 0
+#define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0
+
+#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 20
+#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 36
+#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 36
+#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 20
+#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 648 0
+
+#define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 114
+#define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 80
+
+#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 648 294
+
+#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 20
+#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "294"
+#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 394 74
+#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 16
+#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16
+
+#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3
+#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 300
+#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 3 0
+
+#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 614 0
+#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 668 300
+#define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 668 250
+#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 668 134
+
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "114"
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 394 74
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 648 74
+#define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 74
+#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 270 74
+#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 20 74
+#define POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 36
+#define POPUP_BUTTON3_DEFAULT_HEIGHT_INC 74
+#define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 202 74
+#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 20 74
+#define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 36
+
+#define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          128 128 128 255
+#define PROGRESSBAR_DEFAULT_STYLE_STATUS_TEXT_COLOR_INC          128 128 128 255
+#define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          128 128 128 255
+#define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          128 128 128 255
+#define PROGRESSBAR_LIST_TITLE_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC      128 128 128 255
+#define PROGRESSBAR_LIST_PROCESS_WIDTH_INC 66
+#define PROGRESSBAR_LIST_PROCESS_HEIGHT_INC 66
+#define PROGRESSBAR_LIST_PROCESS_SMALL_INC 35
+#define PROGRESSBAR_LIST_PROCESS_SMALL_IMAGE "32x32"
+#define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 36
+#define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 34
+#define PROGRESSBAR_PROGRESS_CIRCLE_BG_SIZE_INC 128 128
+
+#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 128 128 128 255
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   32
+#define NOCONTENT_MIDDLE_PADDING_INC         38
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
+#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     280 280
+#define NOCONTENT_BG_COLOR_INC               0 0 0 0
+#define NOCONTENT_TEXT_STYLE_BG_MIN_INC       0 76
+
+#define ENTRY_TEXT_SIZE_INC 44
+#define ENTRY_TEXT_COLOR_INC "#000000"
+#define ENTRY_CURSOR_COLOR_INC 59 115 182 255
+#define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
+#define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"
+#define ENTRY_PREEDIT_UNDERLINE_COLOR_INC "#000000"
+#define ENTRY_PREEDIT_SUB1_COLOR_INC "#2EA8E1"
+#define ENTRY_PREEDIT_SUB2_COLOR_INC "#9962C3"
+#define ENTRY_PREEDIT_SUB3_COLOR_INC "#76DE37"
+#define ENTRY_PREEDIT_SUB4_COLOR_INC "#999999"
+#define ENTRY_SELECTION_BG_COLOR 90 123 138 127
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 48 67
+#define MAGNIFIER_HEIGHT_FILL 182
+#define MAGNIFIER_HEIGHT_FIXED 108
+#define MAGNIFIER_WIDTH_FIXED 358
+
+#define ENTRY_BUBBLE_EX_PAD 58
+#define ENTRY_BUBBLE_EX_CALLERID_PAD 178
+#define ENTRY_BUBBLE_IX_PAD 20
+#define ENTRY_BUBBLE_Y_PAD 15
+#define ENTRY_BUBBLE_BOTTOM_PAD 24
+#define ENTRY_BUBBLE_CALLERID_PAD 16
+#define ENTRY_BUBBLE_CALLERID_WIDTH 104
+#define ENTRY_BUBBLE_CALLERID_HEIGHT 104
+#define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 26
+#define ENTRY_BUBBLE_TEXT_SIZE 38
+
+#define ENTRY_BUBBLE_SENT_TEXT_COLOR "#000000"
+#define ENTRY_BUBBLE_SENT_TEXT_SHADOW_STYLE "far_shadow,bottom"
+#define ENTRY_BUBBLE_SENT_TEXT_SHADOW_COLOR "#ffffff7f"
+#define ENTRY_BUBBLE_RECEV_TEXT_COLOR "#FFFFFF"
+#define ENTRY_BUBBLE_RECEV_TEXT_SHADOW_STYLE "far_shadow,top"
+#define ENTRY_BUBBLE_RECEV_TEXT_SHADOW_COLOR "#0000009f"
+#define ENTRY_BUBBLE_RECEV_BG_BORDER_INC 58 24 62 20
+#define ENTRY_BUBBLE_SENT_BG_BORDER_INC 24 58 62 20
+#define ENTRY_BUBBLE_CALLERID_RELATIVE_INC 0.0 0.0
+#define ENTRY_BUBBLE_RECEV_CALLERID_REL_INC 1.0 0.0
+#define ENTRY_BUBBLE_BOTTOMRIGHT_PAD 120
+#define ENTRY_BUBBLE_TEXT_CALLID_REL2_X_INC "elm.rect.right.pad"
+#define ENTRY_BUBBLE_READ_TEXT_CALLID_REL1_X_INC "elm.rect.left.pad"
+#define ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC "elm.rect.groupchat.text.pad"
+#define ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC 14
+#define ENTRY_BUBBLE_STATUS_TIME_PAD_REL_INC 0.0 1.0
+#define ENTRY_BUBBLE_READ_STATUS_TIME_PAD_REL_INC 1.0 1.0
+#define ENTRY_BUBBLE_STATUS_TIME_SIZE_INC 22
+#define ENTRY_BUBBLE_SENT_STATUS_TIME_COLOR_INC 139 139 139 255
+#define ENTRY_BUBBLE_READ_STATUS_TIME_COLOR_INC 139 139 139 255
+#define ENTRY_BUBBLE_GROUPCHAT_SIZE_INC 24
+#define ENTRY_BUBBLE_GROUPCHAT_COLOR_INC 139 139 139 255
+#define ENTRY_BUBBLE_GROUPCHART_ENABLE_INC 1
+#define ENTRY_BUBBLE_GROUPCHART_PAD 36 30
+#define ENTRY_BUBBLE_GROUPCHART_WITH_CALLERID_PAD 158 30
+#define ENTRY_BUBBLE_READ_STATUS_REL_INC 1.0 0.0
+#define ENTRY_BUBBLE_READ_TIME_REL_INC 1.0 1.0
+
+#define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
+
+#define DAYSELECTOR_BACKGROUND_COLOR_INC       82 84 87 255
+#define DAYSELECTOR_WEEKDAY_COLOR_INC          249 249 249 255
+#define DAYSELECTOR_SATURDAY_COLOR_INC         0 168 231 255
+#define DAYSELECTOR_SUNDAY_COLOR_INC           7 180 211 255
+#define DAYSELECTOR_DAY_PRESSED_COLOR_INC      249 249 249 255
+#define DAYSELECTOR_DAY_FONT_SIZE_INC 32
+#define DAYSELECTOR_CHECK_WIDTH_INC 94
+#define DAYSELECTOR_CHECK_HEIGHT_INC 90
+
+#define SLIDER_INDICATOR_TEXT_COLOR_INC      42 137 194 255
+#define SLIDER_UNITS_TEXT_COLOR_INC      0 0 0 255
+#define SLIDER_UNITS_TEXT_SIZE_INC  30
+#define SLIDER_INDICATOR_TEXT_SIZE_INC  40
+#define SLIDER_BASE_HEIGHT_INC  34
+#define SLIDER_BASE_MIN_WIDTH_INC 375
+#define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC  72
+#define SLIDER_SWALLOW_BAR_HEIGHT_INC  74
+#define SLIDER_INDICATOR_MAX_WIDTH_INC 90
+#define SLIDER_INDICATOR_WIDTH_INC 72
+#define SLIDER_INDICATOR_HEIGHT_INC 72
+#define SLIDER_EBOOK_HEIGHT_INC  23
+#define SLIDER_EBOOK_UNITS_TEXT_COLOR_INC   164 160 149 255
+#define SLIDER_EBOOK_UNITS_TEXT_SIZE_INC  48
+#define SLIDER_EBOOK_INDICATOR_TEXT_COLOR_INC   7 180 211 255
+#define SLIDER_EBOOK_INDICATOR_DEFAULT_TEXT_SIZE_INC 36
+#define SLIDER_EBOOK_INDICATOR_DRAG_TEXT_SIZE_INC 48
+#define SLIDER_EBOOK_INDICATOR_WIDTH_INC 54
+#define SLIDER_EBOOK_INDICATOR_HEIGHT_INC 54
+
+#define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#ffffff"
+#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#ffffff"
+
+#define DATETIME_FIELD_MIN_SIZE_INC                40 60
+#define DATETIME_SEPARATOR_MIN_SIZE_INC            40 60
+#define DATETIME_TEXT_FONT_SIZE_INC                36
+#define DATETIME_TEXT_NORMAL_COLOR_INC             0 0 0 255
+#define DATETIME_SEPARATOR_TEXT_COLOR_INC          150 150 150 255
+#define DATETIME_TEXT_SELECTED_COLOR_INC           255 255 255 255
+#define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC  0 0 0 255
+#define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC  59 115 182 255
+
+#define COLORSELECTOR_MIN_W_INC 688
+#define COLORSELECTOR_MIN_H_INC 336
+#define COLORSELECTOR_MAX_W_INC 1014
+#define COLORSELECTOR_COLORBAR_HEIGHT 112
+#define COLORSELECTOR_COLORBAR_LEFT_PADDING 122
+#define COLORSELECTOR_COLORBAR_RIGHT_PADDING 122
+#define COLORSELECTOR_BUTTON_TOP_PADDING 19
+#define COLORSELECTOR_ARROW_BG_LEFT_PADDING 120
+#define COLORSELECTOR_ARROW_BG_RIGHT_PADDING 120
+#define COLORSELECTOR_ARROW_MIN_WIDTH 22
+#define COLORSELECTOR_ARROW_MIN_HEIGHT 70
+#define COLORSELECTOR_ARROW_REL1_OFFSET 0 5
+#define COLORSELECTOR_ARROW_REL2_OFFSET 0 5
+#define COLORSELECTOR_DRAGGABLE_EVENT_AREA 80 80
+#define COLORSELECTOR_BUTTON_LEFT_PADDING 32
+#define COLORSELECTOR_BUTTON_RIGHT_PADDING 32
+#define COLORSELECTOR_BUTTON_WIDTH 74
+#define COLORSELECTOR_BUTTON_HEIGHT 74
+#define COLORSELECTOR_BUTTON_BORDER 6 6 6 6
+#define COLORSELECTOR_PADDING_COLOR_INC 225 223 218 255
+
+#define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86
+#define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86
+#define COLORSELECTOR_PALETTE_COLORBG_FOCUS_MIN_WIDTH_INC 84
+#define COLORSELECTOR_PALETTE_COLORBG_FOCUS_MIN_HEIGHT_INC 84
+#define COLORSELECTOR_PORTRAIT_HOR_PAD_INC "60"
+#define COLORSELECTOR_PORTRAIT_VER_PAD_INC "20"
+#define COLORSELECTOR_LANDSCAPE_HOR_PAD_INC "36"
+#define COLORSELECTOR_LANDSCAPE_VER_PAD_INC "0"
+#define COLORSELECTOR_PALETTE_BORDER_INC 11 11 11 11
+
+#define CALENDAR_DAY_FONT_SIZE_INC 24
+#define CALENDAR_DATE_FONT_SIZE_INC 32
+#define CALENDAR_MONTH_FONT_SIZE_INC 38
+#define CALENDAR_MONTH_FONT_COLOR_INC 249 249 249 255
+#define CALENDAR_SATURDAY_FONT_COLOR_INC 47 120 220 255
+#define CALENDAR_SUNDAY_FONT_COLOR_INC 226 20 20 255
+#define CALENDAR_WEEKDAY_FONT_COLOR_INC 249 249 249 255
+#define CALENDAR_SELECTED_DATE_FONT_COLOR_INC 255 255 255 255
+#define CALENDAR_SEPERATOR_FONT_COLOR_INC 68 68 68 255
+#define CALENDAR_BACKGROUND_COLOR_INC 89 89 89 255
+#define CALENDAR_BUTTON_HEIGHT_INC 66
+#define CALENDAR_BUTTON_WIDTH_INC 74
+#define CALENDAR_ARROW_WIDTH_INC 30
+#define CALENDAR_ARROW_HEIGHT_INC 36
+#define CALENDAR_BASE_MIN_WIDTH_INC 692
+#define CALENDAR_BASE_MIN_HEIGHT_INC 420
+#define CALENDAR_HEADER_MIN_WIDTH_INC 98
+#define CALENDAR_HEADER_MIN_HEIGHT_INC 90
+
+#define CTXPOPUP_ENTRY_CENTER_IMAGE_BORDER 12 12 9 9
+#define CTXPOPUP_ENTRY_IMAGE_BORDER_WIDTH 12
+#define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
+#define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 68 68 68 255
+#define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 0 0 0 255
+#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
+#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 50
+#define CTXPOPUP_ENTRY_ITEM_HEIGHT 74
+#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 14
+#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 28
+#define CTXPOPUP_ENTRY_ICON_SIZE 58
+#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 240
+#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
+#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
+#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 18
+#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 29
+
+#define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 100
+#define TICKERNOTI_DEFAULT_BG_BOTTOM_MIN_HEIGHT_INC 12
+#define TICKERNOTI_DEFAULT_BG_BORDER_INC 2 2 2 14
+#define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 16 18
+#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 16 18
+#define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 16 0
+#define TICKERNOTI_DEFAULT_TEXT_MIN_INC 0 60
+#define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 154 74
+#define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 154 74
+#define TICKERNOTI_DEFAULT_ICON_MIN_INC 64 64
+#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 16 0
+#define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 30
+#define TICKERNOTI_DEFAULT_TEXT2_FONT_SIZE_INC 24
+#define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 60
+#define TICKERNOTI_INFO_BG_PADDING_LEFT_TOP_INC 8 5
+#define TICKERNOTI_INFO_BG_PADDING_RIGHT_BOTTOM_INC 8 5
+#define TICKERNOTI_BG_PADDING_AFTER_ICON_INC 15 0
+#define TICKERNOTI_INFO_TEXT_FONT_SIZE_INC 28
+#define TICKERNOTI_TEXT_ONLY_TEXT_MIN_INC 0 64
+
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_IMAGE "00_scroll_bar.png"
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_IMAGE "00_scroll_bar.png"
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_IMAGE_BORDER 5 10 5 10
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_IMAGE_BORDER 5 10 5 10
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC 16 238
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC 16 99999
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC 180 16
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 16
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_PADDING_SIZE 6
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_PADDING_SIZE 16
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_IMAGE "00_scroll_bar.png"
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_IMAGE "00_scroll_bar.png"
+#define SCROLLER_MATCHLIST_SCROLLBAR_BG_IMAGE_BORDER 13 13 10 15
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_PADDING_SIZE 6
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_PADDING_SIZE 16
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_MIN_SIZE_INC 16 238
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_MAX_SIZE_INC 16 99999
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_MIN_SIZE_INC 180 16
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 16
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_RUNNER_BORDER 0 0 4 4
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_RUNNER_BORDER 4 4 0 0
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_IMAGE_BORDER 5 10 5 10
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_IMAGE_BORDER 5 10 5 10
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_OVER1 6 6 6 0
+#define SCROLLER_MATCHLIST_SCROLLBAR_VBAR_OVER2 6 6 6 0
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_OVER1 6 6 6 0
+#define SCROLLER_MATCHLIST_SCROLLBAR_HBAR_OVER2 6 6 6 0
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_IMAGE "00_scroll_bar.png"
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_IMAGE "00_scroll_bar.png"
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_PADDING_SIZE 6
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_PADDING_SIZE 16
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_MIN_SIZE_INC 16 238
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_MAX_SIZE_INC 16 99999
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_MIN_SIZE_INC 180 16
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 16
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_RUNNER_BORDER 0 0 4 4
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_RUNNER_BORDER 4 4 0 0
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_IMAGE_BORDER 5 10 5 10
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_IMAGE_BORDER 5 10 5 10
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_OVER1 6 6 6 0
+#define SCROLLER_PHOTOCAM_SCROLLBAR_VBAR_OVER2 6 6 6 0
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_OVER1 6 6 6 0
+#define SCROLLER_PHOTOCAM_SCROLLBAR_HBAR_OVER2 6 6 6 0
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC 54 220
+#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC 220 54
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 54 26
+#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 26 54
+#define SCROLLER_HANDLER_SCROLLBAR_PADDING_INC 4
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_BOTTOM_BORDER 10 10 0 10
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_RIGHT_BORDER 0 10 10 10
+
+#define TOOLBAR_ITEM_SEPARATOR_LEFT_COLOR_INC 53 53 53 255
+#define TOOLBAR_ITEM_SEPARATOR_MIDDLE_COLOR_INC 0 0 0 255
+#define TOOLBAR_ITEM_SEPARATOR_RIGHT_COLOR_INC 25 25 25 255
+#define TOOLBAR_ITEM_BG_REL1_OFFSET_INC 4 4
+#define TOOLBAR_ITEM_BG_REL2_OFFSET_INC -5 -5
+#define TOOLBAR_ITEM_BG_SELECTED_BORDER_INC 3 3 3 3
+#define TABBAR_ITEM_TEXTBLOCK_COLOR_INC "#999999"
+#define TABBAR_ITEM_SELECTED_TEXTBLOCK_COLOR_INC "#3b73b6"
+#define TABBAR_ITEM_BG_DEFAULT_BORDER_INC 9 9 9 9
+#define TABBAR_ITEM_BG_DEFAULT_VISIBLE_INC 0
+#define TABBAR_ITEM_BG_DEFAULT_COLOR_INC 255 255 255 0
+#define TABBAR_DEFAULT_HEIGHT_INC 111
+#define TABBAR_ICON_TEXT_HEIGHT_INC 111
+#define TABBAR_HORIZONTAL_HEIGHT_INC 91
+#define TABBAR_HORIZONTAL_ICON_TEXT_HEIGHT_INC 91
+#define TABBAR_ITEM_ICON_SIZE_INC 68 68
+#define TABBAR_ITEM_SMALL_ICON_SIZE_INC 44 44
+
+#define CONFORMANT_INDICATOR_BG_DEFAULT_COLOR_INC 52 52 50 255
+#define CONFORMANT_INDICATOR_BG_TRANSLUCENT_COLOR_INC 0 0 0 125
+#define CONFORMANT_INDICATOR_BG_TRANSPARENT_COLOR_INC 0 0 0 0
diff --git a/themes/default/inc/tmp-inc.edc b/mobile/default/inc/tmp-inc.edc
index 4654c770..4654c770 100644
--- a/themes/default/inc/tmp-inc.edc
+++ b/mobile/default/inc/tmp-inc.edc
diff --git a/themes/default/sounds/S_Touch_30ms.wav b/mobile/default/sounds/S_Touch_30ms.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/S_Touch_30ms.wav
+++ b/mobile/default/sounds/S_Touch_30ms.wav
diff --git a/themes/default/sounds/Waterdrop.wav b/mobile/default/sounds/Waterdrop.wav
index adb7da03..adb7da03 100644
--- a/themes/default/sounds/Waterdrop.wav
+++ b/mobile/default/sounds/Waterdrop.wav
diff --git a/themes/default/sounds/button-pressed.wav b/mobile/default/sounds/button-pressed.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/button-pressed.wav
+++ b/mobile/default/sounds/button-pressed.wav
diff --git a/themes/default/sounds/button-toggle-off.wav b/mobile/default/sounds/button-toggle-off.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/button-toggle-off.wav
+++ b/mobile/default/sounds/button-toggle-off.wav
diff --git a/themes/default/sounds/button-toggle-on.wav b/mobile/default/sounds/button-toggle-on.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/button-toggle-on.wav
+++ b/mobile/default/sounds/button-toggle-on.wav
diff --git a/themes/default/sounds/dialog-cancel.wav b/mobile/default/sounds/dialog-cancel.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/dialog-cancel.wav
+++ b/mobile/default/sounds/dialog-cancel.wav
diff --git a/themes/default/sounds/dialog-error.wav b/mobile/default/sounds/dialog-error.wav
index 9ce5f263..9ce5f263 100644
--- a/themes/default/sounds/dialog-error.wav
+++ b/mobile/default/sounds/dialog-error.wav
diff --git a/themes/default/sounds/dialog-information.wav b/mobile/default/sounds/dialog-information.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/dialog-information.wav
+++ b/mobile/default/sounds/dialog-information.wav
diff --git a/themes/default/sounds/dialog-ok.wav b/mobile/default/sounds/dialog-ok.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/dialog-ok.wav
+++ b/mobile/default/sounds/dialog-ok.wav
diff --git a/themes/default/sounds/dialog-question.wav b/mobile/default/sounds/dialog-question.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/dialog-question.wav
+++ b/mobile/default/sounds/dialog-question.wav
diff --git a/themes/default/sounds/dialog-warning.wav b/mobile/default/sounds/dialog-warning.wav
index 9ce5f263..9ce5f263 100644
--- a/themes/default/sounds/dialog-warning.wav
+++ b/mobile/default/sounds/dialog-warning.wav
diff --git a/themes/default/sounds/drag-accept.wav b/mobile/default/sounds/drag-accept.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/drag-accept.wav
+++ b/mobile/default/sounds/drag-accept.wav
diff --git a/themes/default/sounds/drag-fail.wav b/mobile/default/sounds/drag-fail.wav
index 9ce5f263..9ce5f263 100644
--- a/themes/default/sounds/drag-fail.wav
+++ b/mobile/default/sounds/drag-fail.wav
diff --git a/themes/default/sounds/drag-start.wav b/mobile/default/sounds/drag-start.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/drag-start.wav
+++ b/mobile/default/sounds/drag-start.wav
diff --git a/themes/default/sounds/link-pressed.wav b/mobile/default/sounds/link-pressed.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/link-pressed.wav
+++ b/mobile/default/sounds/link-pressed.wav
diff --git a/themes/default/sounds/menu-click.wav b/mobile/default/sounds/menu-click.wav
index 99ba74d9..99ba74d9 100644
--- a/themes/default/sounds/menu-click.wav
+++ b/mobile/default/sounds/menu-click.wav
diff --git a/themes/default/sounds/menu-popup.wav b/mobile/default/sounds/menu-popup.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/menu-popup.wav
+++ b/mobile/default/sounds/menu-popup.wav
diff --git a/themes/default/sounds/tooltip-popup.wav b/mobile/default/sounds/tooltip-popup.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/tooltip-popup.wav
+++ b/mobile/default/sounds/tooltip-popup.wav
diff --git a/themes/default/sounds/window-new.wav b/mobile/default/sounds/window-new.wav
index cac31857..cac31857 100644
--- a/themes/default/sounds/window-new.wav
+++ b/mobile/default/sounds/window-new.wav
diff --git a/themes/efl-theme-tizen-mobile.edc b/mobile/efl-theme-tizen-mobile.edc
index 2c3df250..67129931 100644
--- a/themes/efl-theme-tizen-mobile.edc
+++ b/mobile/efl-theme-tizen-mobile.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
  *
@@ -39,7 +39,7 @@
 //****************************************************************************************//
 
 // Include INC (e.g. HD-inc.edc, HVGA-inc.edc for each resolution) file
-#include "inc.edc"
+#include "HD-inc.edc"
 
 externals {
    external: "elm";
@@ -52,12 +52,44 @@ data.item: "version" "110";
 
 collections {
    base_scale: BASE_SCALE_INC;
+   plugins {
+      plugin {
+         name: "touch_sound";
+         source: "feedback";
+         param: "FEEDBACK_TYPE_SOUND FEEDBACK_PATTERN_TAP"; // FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_TOUCH_TAP
+
+         /* 2014.06.11 updated from libsvi(feedback)
+          Above plugin will run below external function:
+          int feedback_play_type(feedback_type_e type, feedback_pattern_e pattern);
+
+          param1: feedback_type_e
+          FEEDBACK_TYPE_NONE = 0,
+          FEEDBACK_TYPE_SOUND = 1,
+          FEEDBACK_TYPE_VIBRATION,
+          FEEDBACK_TYPE_LED,
+          FEEDBACK_TYPE_END
+
+          * param2 enumeration:
+          FEEDBACK_PATTERN_TAP = 0,
+          FEEDBACK_PATTERN_SIP,
+          FEEDBACK_PATTERN_SIP_BACKSPACE,
+          FEEDBACK_PATTERN_SIP_FUNCTION,
+          FEEDBACK_PATTERN_SIP_FJKEY,
+          ...
+
+          * For more information please refer libsvi.
+          */
+      }
+   }
 
 #include "widgets/bg.edc"
 #include "widgets/button.edc"
+#include "widgets/calendar.edc"
 #include "widgets/conform.edc"
 #include "widgets/ctxpopup.edc"
 #include "widgets/datetime.edc"
+#include "widgets/flipselector.edc"
+#include "widgets/focus_highlight.edc"
 #include "widgets/genlist.edc"
 #include "widgets/label.edc"
 #include "widgets/layout.edc"
@@ -77,6 +109,8 @@ collections {
 #include "widgets/popup.edc"
 #include "widgets/multibuttonentry.edc"
 #include "widgets/win.edc"
+#include "widgets/hover.edc"
+#include "widgets/list.edc"
 
    color_classes {
       color_class {
diff --git a/themes/widgets/bg.edc b/mobile/widgets/bg.edc
index 1b3badd3..d64024a6 100644
--- a/themes/widgets/bg.edc
+++ b/mobile/widgets/bg.edc
@@ -30,7 +30,7 @@ group { name: "elm/bg/base/default";
       part { name: "base";
          type: RECT;
          description { state: "default" 0.0;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       }
       part { name: "elm.swallow.rectangle";
@@ -87,7 +87,7 @@ group { name: "elm/bg/base/indicator/default";
       part { name: "base";
          type: RECT;
          description { state: "default" 0.0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+            color: 61 184 204 255;
          }
       }
    }
diff --git a/themes/widgets/button.edc b/mobile/widgets/button.edc
index fa4a5d43..929cf15c 100755..100644
--- a/themes/widgets/button.edc
+++ b/mobile/widgets/button.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
  *
@@ -24,175 +24,183 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-group { name: "elm/button/base/default";
+   group { name: "elm/button/base/default";
+      data.item: "vector_ux" "default";
       script {
          public mouse_down = 0;
          public multi_down = 0;
-         public text_visible = 0;
          public disabled = 0;
-      }
-      images {
-         set {
-         name: "core_list_button_bg.#";
-            image {
-               image: SMALL"images/Controls/core_list_button_bg.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_list_button_bg.#.png" COMP;
-            }
-         }
+         public text = 0;
+         public content = 0;
       }
       parts {
          part { name: "base";
             scale: 1;
             type: SPACER;
             description { state: "default" 0.0;
-               min: BUTTON_MIN_WIDTH BUTTON_MIN_HEIGHT;
+               min: BUTTON_MIN_WIDTH_INC BUTTON_MIN_HEIGHT_INC;
             }
          }
-         part { name: "bg";
+         //Base Shape Part
+         part { name: "tizen_vg_shape";
+            type: SWALLOW;
+            clip_to: "tizen_vg_shape_clipper";
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               image.normal: "core_list_button_bg.#";
-               color: 38 107 191 255; /*(Changeable UI) color_class: "W012";*/
+               min: 0 BUTTON_MIN_HEIGHT_INC;
+               rel1.relative: 0 0.5;
+               rel2.relative: 1 0.5;
+               fixed: 0 1;
+            }
+         }
+         part { name: "tizen_vg_shape_clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 82 198 216 255;
+            }
+            description { state: "disabled" 0.0;
+               color: 138 195 204 255;
+            }
+         }
+         //Effect Shape Part
+         part { name: "tizen_vg_shape2";
+            type: SWALLOW;
+            clip_to: "tizen_vg_shape_clipper2";
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               rel1.relative: 0.15 0.15;
+               rel2.relative: 0.85 0.85;
+            }
+            description { state: "ready" 0.0;
+               inherit: "default" 0.0;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 30 85 153 255; /*(Changeable UI) color_class: "W012P";*/
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
             }
-            description { state: "disabled" 0.0;
+         }
+         part { name: "tizen_vg_shape_clipper2";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 48 139 153 0;
+            }
+            description { state: "ready" 0.0;
                inherit: "default" 0.0;
-               color: 76 128 191 255; /*(Changeable UI) color_class: "W012D";*/
+               visible: 1;
+            }
+            description { state: "pressed" 0.0;
+               color: 48 139 153 255;
             }
          }
          part { name: "padding_left_top";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_PADDING_LEFT_RIGHT 0;
+               min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_TOP_HEIGHT_INC;
                fixed: 1 1;
             }
+            description { state: "icon_only" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+            }
+            description { state: "icon_text" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_PADDING_LEFT_ICON_TEXT_INC BUTTON_PADDING_TOP_HEIGHT_INC;
+            }
          }
          part { name: "padding_right_bottom";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_PADDING_LEFT_RIGHT 0;
+               min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_BOTTOM_HEIGHT_INC;
                fixed: 1 1;
             }
+            description { state: "icon_only" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+            }
          }
          part { name: "icon_rect";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               align: 0.0 0.5;
+               align: 0.0 0.0;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
                }
-               min: 0 0;
+               min: 0 BUTTON_ICON_DEFAULT_HEIGHT_INC;
                fixed: 1 1;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: (BUTTON_PADDING_LEFT_RIGHT + BUTTON_PADDING_ICON_RIGHT + BUTTON_ICON_DEFAULT_WIDTH) BUTTON_ICON_DEFAULT_HEIGHT;
-               max: (BUTTON_PADDING_LEFT_RIGHT + BUTTON_PADDING_ICON_RIGHT + BUTTON_ICON_DEFAULT_WIDTH) BUTTON_ICON_DEFAULT_HEIGHT;
+               min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
                fixed: 1 1;
             }
-         }
-         part { name: "icon_text_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               min: BUTTON_PADDING_ICON_RIGHT BUTTON_ICON_DEFAULT_HEIGHT;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text";
-                  to_y: "padding_right_bottom";
-               }
+            description { state: "icon_only" 0.0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
+               max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
+               align: 0.5 0.5;
                fixed: 1 1;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "elm.icon.clipper";
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               rel1.to: "icon_rect";
+               rel2.to: "icon_rect";
+            }
+         }
+         part { name: "icon_text_padding";
+            type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
                align: 0.0 0.5;
+               min: 0 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
                   relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 1;
-               min: BUTTON_ICON_DEFAULT_WIDTH BUTTON_ICON_DEFAULT_HEIGHT;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "icon_text_padding";
-                  to_y: "padding_left_top";
+                  to: "icon_rect";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "icon_text_padding";
-                  to_y: "padding_right_bottom";
+                  relative: 1.0 1.0;
+                  to: "icon_rect";
                }
+               fixed: 1 1;
             }
-            description { state: "icononly" 0.0;
-               visible: 1;
-               min: BUTTON_ICON_DEFAULT_WIDTH BUTTON_ICON_DEFAULT_HEIGHT;
-               max: BUTTON_ICON_DEFAULT_WIDTH BUTTON_ICON_DEFAULT_HEIGHT;
-            }
-         }
-         part { name: "elm.icon.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "W012i";*/
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "W012iP";*/
-            }
-            description { state: "disabled" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               color: 244 244 244 127; /*(Changeable UI) color_class: "W012iD";*/
+               min: BUTTON_PADDING_ICON_RIGHT_INC 0;
             }
          }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               visible: 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "icon_rect";
-                  to_y: "padding_left_top";
+                  relative: 1.0 0.0;
+                  to: "icon_text_padding";
                }
                rel2 {
                   relative: 0.0 0.0;
@@ -200,57 +208,74 @@ group { name: "elm/button/base/default";
                }
                text {
                   style: "button_main";
-                  min: 1 0;
-                  max: 1 0;
-                  ellipsis: -1;
+                  min: 1 1;
                }
             }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_main_press";
+         }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               text.style: "button_main_dim";
+               color: 255 255 255 127;
             }
          }
          part { name: "event";
-            scale: 1;
             type: RECT;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              color: 0 0 0 0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               color: 0 0 0 0;
             }
          }
       }
       programs {
-         program { name: "pressed";
-            signal: "mouse,down,1*";
-            source: "event";
+         program { name: "clicked_effect";
+            action: STATE_SET "ready" 0.0;
+            target: "tizen_vg_shape2";
+            target: "tizen_vg_shape_clipper2";
+            after: "clicked_effect2";
+         }
+         program { name: "clicked_effect2";
             script {
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
-                 {
-                     set_int(mouse_down, 1);
-                     run_program(PROGRAM:"button_press1");
-                 }
+               run_program(PROGRAM:"clicked_effect3");
+               run_program(PROGRAM:"clicked_effect4");
             }
          }
-         program { name: "button_press1";
+         program { name: "clicked_effect3";
+            action: STATE_SET "pressed" 0.0;
+            target: "tizen_vg_shape2";
+            transition: DECELERATE 0.3;
+         }
+         program { name: "clicked_effect4";
+            action: STATE_SET "pressed" 0.0;
+            target: "tizen_vg_shape_clipper2";
+            transition: DECELERATE 0.225;
+            after: "clicked_effect5";
+         }
+         program { name: "clicked_effect5";
+            action: STATE_SET "ready" 0.0;
+            target: "tizen_vg_shape_clipper2";
+            transition: LINEAR 0.45;
+            after: "clicked_effect6";
+         }
+         program { name: "clicked_effect6";
+            action: STATE_SET "default" 0.0;
+            target: "tizen_vg_shape2";
+            target: "tizen_vg_shape_clipper2";
+         }
+         program { name: "pressed";
+            signal: "mouse,down,1*";
+            source: "event";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"bg", "pressed", 0.0);
-                  set_state(PART:"elm.icon.clipper", "pressed", 0.0);
-                  if (get_int(text_visible) == 1)
-                    set_state(PART:"elm.text", "pressed", 0.0);
-                  emit("elm,action,press", "");
+               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) {
+                  set_int(mouse_down, 1);
+                  if (get_int(disabled) == 0) {
+                     emit("elm,action,press", "");
+                     run_program(PROGRAM:"clicked_effect");
+                  }
                }
             }
          }
@@ -259,22 +284,10 @@ group { name: "elm/button/base/default";
             source: "event";
             script {
                if (get_int(mouse_down) == 1) {
-                 set_int(mouse_down, 0);
-                 run_program(PROGRAM:"button_unpress1");
-               }
-            }
-         }
-         program { name: "button_unpress1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"elm.icon.clipper", "default", 0.0);
-                  if (get_int(text_visible) == 1)
-                    set_state(PART:"elm.text", "default", 0.0);
-                  emit("elm,action,unpress", "");
+                  set_int(mouse_down, 0);
+                  if (get_int(disabled) == 0) {
+                     emit("elm,action,unpress", "");
+                  }
                }
             }
          }
@@ -282,78 +295,74 @@ group { name: "elm/button/base/default";
             signal: "mouse,clicked,1";
             source: "event";
             script {
-               new st[31];
-               new Float:vl;
                if (get_int(multi_down) == 0) {
-                  get_state(PART:"bg", st, 30, vl);
-                  if (strcmp(st, "disabled")) {
+                  if (get_int(disabled) == 0) {
+                     run_program(PROGRAM:"touch_sound");
                      emit("elm,action,click", "");
                   }
                }
             }
          }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
+         program { name: "touch_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
             source: "elm";
             script {
-               new st[31];
-               new Float:vl;
-               set_int(text_visible, 1);
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                 }
-               if(get_int(disabled) == 0)
-                 set_state(PART:"elm.text", "default", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(content, 1);
+               set_state(PART:"icon_text_padding", "visible", 0.0);
+               if (get_int(text) == 1) {
+                  set_state(PART:"icon_rect", "visible", 0.0);
+                  set_state(PART:"padding_left_top", "icon_text", 0.0);
+               } else {
+                  set_state(PART:"icon_rect", "icon_only", 0.0);
+                  set_state(PART:"padding_left_top", "icon_only", 0.0);
+                  set_state(PART:"padding_right_bottom", "icon_only", 0.0);
+               }
             }
          }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
             source: "elm";
             script {
-               new st[31];
-               new Float:vl;
-               set_int(text_visible, 0);
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "default", 0.0);
-                 }
-               set_state(PART:"elm.text", "invisible", 0.0);
+               set_int(content, 0);
+               set_state(PART:"icon_text_padding", "default", 0.0);
+               set_state(PART:"icon_rect", "default", 0.0);
+               set_state(PART:"padding_left_top", "default", 0.0);
+               set_state(PART:"padding_right_bottom", "default", 0.0);
             }
          }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
             source: "elm";
             script {
-              set_state(PART:"icon_rect", "visible", 0.0);
-              if (get_int(text_visible) == 1)
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_int(text, 1);
+               if (get_int(content) == 1) {
+                  set_state(PART:"icon_rect", "visible", 0.0);
+                  set_state(PART:"padding_left_top", "icon_text", 0.0);
+               }
             }
          }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "icon_rect";
+            script {
+               set_int(text, 0);
+               if (get_int(content) == 1) {
+                  set_state(PART:"icon_rect", "icon_only", 0.0);
+                  set_state(PART:"padding_left_top", "icon_only", 0.0);
+                  set_state(PART:"padding_right_bottom", "icon_only", 0.0);
+               }
+            }
          }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             script {
               set_int(disabled, 1);
-              set_state(PART:"bg", "disabled", 0.0);
-              set_state(PART:"elm.icon.clipper", "disabled", 0.0);
-              if (get_int(text_visible) == 1)
-                set_state(PART:"elm.text", "disabled", 0.0);
+              set_state(PART:"clipper", "disabled", 0.0);
+              set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
             }
          }
          program { name: "enable";
@@ -361,10 +370,8 @@ group { name: "elm/button/base/default";
             source: "elm";
             script {
               set_int(disabled, 0);
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"elm.icon.clipper", "default", 0.0);
-              if (get_int(text_visible) == 1)
-                set_state(PART:"elm.text", "default", 0.0);
+              set_state(PART:"clipper", "default", 0.0);
+              set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
             }
          }
          program { name: "multi_down";
@@ -383,576 +390,222 @@ group { name: "elm/button/base/default";
          }
       }
    }
-
-   /* This transparent button style is used by applications which use webview. */
-   group{ name: "elm/button/base/transparent";
-       script {
+   group { name: "elm/button/base/circle";
+      data.item: "vector_ux" "circle";
+      script {
          public mouse_down = 0;
          public multi_down = 0;
-       }
-       parts {
-         part { name: "bg";
-            type: SPACER;
+         public disabled = 0;
+      }
+      parts {
+         part { name: "base";
             scale: 1;
+            type: SPACER;
             description { state: "default" 0.0;
+               min: BUTTON_CIRCLE_BASE_SIZE_INC;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
+            description { state: "extended" 0.0;
+               min: BUTTON_CIRCLE_EXTENDED_SIZE_INC;
             }
          }
-         part { name: "elm.swallow.content";
+         //Base Shape Part
+         part { name: "tizen_vg_shape";
             type: SWALLOW;
+            clip_to: "tizen_vg_shape_clipper";
             scale: 1;
             description { state: "default" 0.0;
+               min: BUTTON_CIRCLE_SIZE_INC;
+               rel1.relative: 0.5 0;
+               rel2.relative: 0.5 0;
+               align: 0.5 0;
+               fixed: 1 1;
             }
          }
-        part { name: "event";
+         part { name: "tizen_vg_shape_clipper";
             type: RECT;
-            scale: 1;
-            /* Do not remove the following line.
-             * elm.swallow.content part should receive mouse events. */
-            repeat_events: 1;
-            description { state: "default" 0.0;
-              color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "pressed";
-            signal: "mouse,down,1*";
-            source: "event";
-            script {
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
-                 {
-                     set_int(mouse_down, 1);
-                     run_program(PROGRAM:"button_press1");
-                 }
-            }
-         }
-         program { name: "button_press1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  emit("elm,action,press", "");
-               }
-            }
-         }
-         program { name: "unpressed";
-            signal: "mouse,up,1";
-            source: "event";
-            script {
-               if (get_int(mouse_down) == 1) {
-                 set_int(mouse_down, 0);
-                 run_program(PROGRAM:"button_unpress1");
-               }
-            }
-         }
-         program { name: "button_unpress1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  emit("elm,action,unpress", "");
-               }
-            }
-         }
-         program { name: "clicked";
-            signal: "mouse,clicked,1";
-            source: "event";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(multi_down) == 0) {
-                  get_state(PART:"bg", st, 30, vl);
-                  if (strcmp(st, "disabled")) {
-                     emit("elm,action,click", "");
-                  }
-               }
-            }
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "bg";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg";
-         }
-         program { name: "multi_down";
-            signal: "elm,action,multi,down";
-            source: "elm";
-            script {
-               set_int(multi_down, 1);
-            }
-         }
-         program { name: "multi_up";
-            signal: "elm,action,multi,up";
-            source: "elm";
-            script {
-               set_int(multi_down, 0);
-            }
-         }
-      }
-   }
-
-  group{ name: "elm/button/base/datetime";
-      inherit: "elm/button/base/default";
-      parts {
-         part { name: "left.padding";
-            type: SPACER;
-            scale: 1;
             description { state: "default" 0.0;
-               min: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC 0;
-               max: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC -1;
-               fixed: 1 0;
-               align: 0.0 0.5;
+               color: 82 198 216 255;
             }
-         }
-         part { name: "right.padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC 0;
-               max: DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC -1;
-               fixed: 1 0;
-               align: 1.0 0.5;
+            description { state: "disabled" 0.0;
+               color: 138 195 204 255;
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+         //Effect Shape Part
+         part { name: "tizen_vg_shape2";
+            type: SWALLOW;
+            clip_to: "tizen_vg_shape_clipper2";
             scale: 1;
             description { state: "default" 0.0;
-               fixed: 0 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "left.padding";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to: "right.padding";
-               }
-               text {
-                  style: "button_date";
-                  min: 1 0;
-                  max: 1 0;
-                  ellipsis: -1;
-               }
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               rel1.relative: 0.15 0.15;
+               rel2.relative: 0.85 0.85;
             }
-            description { state: "visible" 0.0;
+            description { state: "ready" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               text {
-                  style: "button_date_press";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-                text {
-                  style: "button_date_dim";
-               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
             }
          }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_ICON_STYLES(style_name, image_normal, style_normal , style_press , style_dim ,min_width, min_height) \
-   group { name: "elm/button/base/"style_name; \
-      images { \
-         image: image_normal COMP; \
-      } \
-      script { \
-         public mouse_down = 0; \
-         public multi_down = 0; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            type: SPACER; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: min_width min_height; \
-               max: min_width min_height; \
-            } \
-         } \
-         part { name: "button_center_part"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "button_image"; \
-               rel2.to: "button_image"; \
-               image.normal: image_normal; \
-               color_class: style_normal; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               color_class: style_press; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               color_class: style_dim; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            repeat_events: 1; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               rel1.to: "button_image"; \
-               rel2.to: "button_image"; \
-               color: 0 0 0 0; \
-            } \
-         } \
-         part { name: "over2"; \
-            type: RECT; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "button_image"; \
-               rel2.to: "button_image"; \
-               color: 0 0 0 0; \
-            } \
-         } \
-         part { name: "disabler"; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               rel1.to: "button_image"; \
-               rel2.to: "button_image"; \
-               color: 0 0 0 0; \
-               visible: 0; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-      } \
-      programs { \
-         program { name: "button_press"; \
-            signal: "mouse,down,1*"; \
-            source: "over1"; \
-            script { \
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) \
-                 { \
-                     set_int(mouse_down, 1); \
-                     run_program(PROGRAM:"button_press2"); \
-                 } \
-            } \
-         } \
-         program { name: "button_press2"; \
-            action: SIGNAL_EMIT "elm,action,press" ""; \
-            after: "button_press_anim"; \
-         } \
-         program { name: "button_press_anim"; \
-            action: STATE_SET "pressed" 0.0; \
-            target: "button_center_part"; \
-         } \
-         program { name: "key_press"; \
-            signal: "elm,action,pressed"; \
-            source: "elm"; \
-            action: STATE_SET "pressed" 0.0; \
-            target: "button_center_part"; \
-         } \
-         program { name: "key_unpress"; \
-            signal: "elm,action,unpressed"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_center_part"; \
-         } \
-         program { name: "button_unpress"; \
-            signal: "mouse,up,1*"; \
-            source: "over2"; \
-            script { \
-               if (get_int(mouse_down) == 1) \
-                 { \
-                    set_int(mouse_down, 0); \
-                    run_program(PROGRAM:"button_unpress2"); \
-                    run_program(PROGRAM:"button_unpress_anim"); \
-                 } \
-            } \
-         } \
-         program { name: "button_unpress2"; \
-            action: SIGNAL_EMIT "elm,action,unpress" ""; \
-         } \
-         program { name: "button_unpress_anim"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_center_part"; \
-         } \
-         program { name: "button_click"; \
-            signal: "mouse,clicked,1"; \
-            source: "over2"; \
-            script { \
-               if (get_int(multi_down) == 0) { \
-                 run_program(PROGRAM:"button_click2"); \
-               } \
-            } \
-         } \
-         program { name: "button_click2"; \
-            action: SIGNAL_EMIT "elm,action,click" ""; \
-         } \
-         program { name: "disable"; \
-            signal: "elm,state,disabled"; \
-            source: "elm"; \
-            action: STATE_SET "disabled" 0.0; \
-            target: "disabler"; \
-            target: "button_center_part"; \
-         } \
-         program { name: "enable"; \
-            signal: "elm,state,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "disabler"; \
-            target: "button_center_part"; \
-         } \
-         program { \
-            name: "multi_down"; \
-            signal: "elm,action,multi,down"; \
-            source: "elm"; \
-            script { \
-               set_int(multi_down, 1); \
-            } \
-         } \
-         program { \
-            name: "multi_up"; \
-            signal: "elm,action,multi,up"; \
-            source: "elm"; \
-            script { \
-               set_int(multi_down, 0); \
-            } \
-         } \
-      } \
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_ICON_STYLES("icon_reorder", "core_button_reorder.png", "F060L1" ,"F060L1P" , "F060L1D" ,  BUTTON_ICON_WIDTH , BUTTON_ICON_HEIGHT)
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_ICON_STYLES("icon_expand_add", "core_button_add.png", "F060L2" , "F060L2P", "F060L2D",  BUTTON_ICON_WIDTH , BUTTON_ICON_HEIGHT)
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_ICON_STYLES("icon_expand_delete", "core_button_delete.png", "F060L3" , "F060L3P" ,"F060L3D",  BUTTON_ICON_WIDTH , BUTTON_ICON_HEIGHT)
-
-group { name: "elm/button/base/bottom";
-      script {
-         public mouse_down = 0;
-         public multi_down = 0;
-         public text_visible = 0;
-         public disabled = 0;
-      }
-      images {
-         set {
-            name: "core_button_bg.#";
-            image {
-               image: SMALL"images/Controls/core_button_bg.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_button_bg.#.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "base";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_MIN_WIDTH BUTTON_BOTTOM_MIN_HEIGHT;
-               max: BUTTON_MAX_WIDTH BUTTON_BOTTOM_MIN_HEIGHT;
-            }
-         }
-         part { name: "bg";
-            scale: 1;
+         part { name: "tizen_vg_shape_clipper2";
+            type: RECT;
             description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               image.normal: "core_button_bg.#";
-               color: 38 107 191 255; /*(Changeable UI) color_class: "W011";*/
+               visible: 0;
+               color: 48 139 153 0;
             }
-            description { state: "pressed" 0.0;
+            description { state: "ready" 0.0;
                inherit: "default" 0.0;
-               color: 30 85 153 255; /*(Changeable UI) color_class: "W011P";*/
+               visible: 1;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 76 128 191 255; /*(Changeable UI) color_class: "W011D";*/
+            description { state: "pressed" 0.0;
+               color: 48 139 153 255;
             }
          }
-         part { name: "padding_left_top";
-            type: SPACER;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0;
+               min: BUTTON_CIRCLE_ICON_SIZE_INC;
                fixed: 1 1;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               rel1.relative: 0.5 0.5;
+               rel2.relative: 0.5 0.5;
             }
          }
-         part { name: "padding_right_bottom";
+         part { name: "icon_text_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0;
+               rel1.to_y: "tizen_vg_shape";
+               rel2.to_y: "tizen_vg_shape";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+               align: 0.5 0.0;
+               min: 0 0;
                fixed: 1 1;
             }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 0 BUTTON_CIRCLE_PADDING_ICON_BOTTOM_INC;
+            }
          }
-         part { name: "icon_rect";
+         part { name: "text_left_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               align: 0.0 0.5;
+               min: BUTTON_CIRCLE_PADDING_TEXT_LEFT_RIGHT_INC 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
+                  relative: 0.0 1.0;
+                  to: "icon_text_padding";
                }
-               min: 0 0;
-               fixed: 1 1;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: (BUTTON_ICON_HEIGHT + BUTTON_BOTTOM_PADDING_LEFT_RIGHT) BUTTON_ICON_WIDTH;
-               max: (BUTTON_ICON_HEIGHT + BUTTON_BOTTOM_PADDING_LEFT_RIGHT) BUTTON_ICON_WIDTH;
-               fixed: 1 1;
+               rel2.relative: 0.0 1.0;
+               align: 0.0 0.5;
+               fixed: 1 0;
             }
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            clip_to: "elm.swallow.content.clip";
+         part { name: "text_right_padding";
+            type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
+               min: BUTTON_CIRCLE_PADDING_TEXT_LEFT_RIGHT_INC 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  to: "icon_text_padding";
                }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               visible: 1;
-               fixed: 1 1;
-               min: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH;
-               max: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH;
                align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text";
-                  to_y: "padding_right_bottom";
-               }
-            }
-            description { state: "icononly" 0.0;
-               visible: 1;
-               min: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH;
-               max: BUTTON_ICON_HEIGHT BUTTON_ICON_WIDTH;
+               fixed: 1 0;
             }
          }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "icon_rect";
-                  to_y: "padding_left_top";
+                  relative: 1.0 0.0;
+                  to: "text_left_padding";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
+                  relative: 0.0 1.0;
+                  to: "text_right_padding";
                }
                text {
-                  style: "button_bottom";
-                  max: 1 0;
+                  style: "button_circle";
+                  align: 0.5 0;
+                  min: 0 0;
                }
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_bottom_press";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_bottom_dim";
-            }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+               align: 0.5 0;
             }
          }
-         part { name: "elm.swallow.content.clip";
+         part { name: "clipper";
             type: RECT;
-            scale: 1;
             description { state: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3";*/
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3P";*/
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 244 244 244 127; /*(Changeable UI) color_class: "F032L3D";*/
+               color: 255 255 255 127;
             }
          }
          part { name: "event";
-            scale: 1;
             type: RECT;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              color: 0 0 0 0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "elm.text";
+               color: 0 0 0 0;
             }
          }
       }
       programs {
-         program { name: "pressed";
-            signal: "mouse,down,1*";
-            source: "event";
+         program { name: "clicked_effect";
+            action: STATE_SET "ready" 0.0;
+            target: "tizen_vg_shape2";
+            target: "tizen_vg_shape_clipper2";
+            after: "clicked_effect2";
+         }
+         program { name: "clicked_effect2";
             script {
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
-                 {
-                     set_int(mouse_down, 1);
-                     run_program(PROGRAM:"button_press1");
-                 }
+               run_program(PROGRAM:"clicked_effect3");
+               run_program(PROGRAM:"clicked_effect4");
             }
          }
-         program { name: "button_press1";
+         program { name: "clicked_effect3";
+            action: STATE_SET "pressed" 0.0;
+            target: "tizen_vg_shape2";
+            transition: DECELERATE 0.3;
+         }
+         program { name: "clicked_effect4";
+            action: STATE_SET "pressed" 0.0;
+            target: "tizen_vg_shape_clipper2";
+            transition: DECELERATE 0.225;
+            after: "clicked_effect5";
+         }
+         program { name: "clicked_effect5";
+            action: STATE_SET "ready" 0.0;
+            target: "tizen_vg_shape_clipper2";
+            transition: LINEAR 0.45;
+            after: "clicked_effect6";
+         }
+         program { name: "clicked_effect6";
+            action: STATE_SET "default" 0.0;
+            target: "tizen_vg_shape2";
+            target: "tizen_vg_shape_clipper2";
+         }
+         program { name: "pressed";
+            signal: "mouse,down,1*";
+            source: "event";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"bg", "pressed", 0.0);
-                  set_state(PART:"elm.swallow.content.clip", "pressed", 0.0);
-                  if (get_int(text_visible) == 1)
-                    set_state(PART:"elm.text", "pressed", 0.0);
-                  emit("elm,action,press", "");
+               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) {
+                  set_int(mouse_down, 1);
+                  if (get_int(disabled) == 0) {
+                     emit("elm,action,press", "");
+                     run_program(PROGRAM:"clicked_effect");
+                  }
                }
             }
          }
@@ -961,22 +614,10 @@ group { name: "elm/button/base/bottom";
             source: "event";
             script {
                if (get_int(mouse_down) == 1) {
-                 set_int(mouse_down, 0);
-                 run_program(PROGRAM:"button_unpress1");
-               }
-            }
-         }
-         program { name: "button_unpress1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"elm.swallow.content.clip", "default", 0.0);
-                  if (get_int(text_visible) == 1)
-                    set_state(PART:"elm.text", "default", 0.0);
-                  emit("elm,action,unpress", "");
+                  set_int(mouse_down, 0);
+                  if (get_int(disabled) == 0) {
+                     emit("elm,action,unpress", "");
+                  }
                }
             }
          }
@@ -984,78 +625,40 @@ group { name: "elm/button/base/bottom";
             signal: "mouse,clicked,1";
             source: "event";
             script {
-               new st[31];
-               new Float:vl;
                if (get_int(multi_down) == 0) {
-                  get_state(PART:"bg", st, 30, vl);
-                  if (strcmp(st, "disabled")) {
+                  if (get_int(disabled) == 0) {
+                     run_program(PROGRAM:"touch_sound");
                      emit("elm,action,click", "");
                   }
                }
             }
          }
+         program { name: "touch_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "text_show";
             signal: "elm,state,text,visible";
             source: "elm";
             script {
-               new st[31];
-               new Float:vl;
-               set_int(text_visible, 1);
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                 }
-               if(get_int(disabled) == 0)
-                 set_state(PART:"elm.text", "default", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
+               set_state(PART:"base", "extended", 0.0);
+               set_state(PART:"icon_text_padding", "visible", 0.0);
             }
          }
          program { name: "text_hide";
             signal: "elm,state,text,hidden";
             source: "elm";
             script {
-               new st[31];
-               new Float:vl;
-               set_int(text_visible, 0);
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "default", 0.0);
-                 }
-               set_state(PART:"elm.text", "invisible", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-              set_state(PART:"icon_rect", "visible", 0.0);
-              if (get_int(text_visible) == 1)
-                set_state(PART:"elm.swallow.content", "visible", 0.0);
-              else
-                set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"icon_text_padding", "default", 0.0);
             }
          }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "icon_rect";
-         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             script {
               set_int(disabled, 1);
-              set_state(PART:"bg", "disabled", 0.0);
-              set_state(PART:"elm.swallow.content.clip", "disabled", 0.0);
-              if ( get_int(text_visible) == 1)
-                set_state(PART:"elm.text", "disabled", 0.0);
+              set_state(PART:"clipper", "disabled", 0.0);
+              set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
             }
          }
          program { name: "enable";
@@ -1063,10 +666,8 @@ group { name: "elm/button/base/bottom";
             source: "elm";
             script {
               set_int(disabled, 0);
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"elm.swallow.content.clip", "default", 0.0);
-              if (get_int(text_visible) == 1)
-                set_state(PART:"elm.text", "default", 0.0);
+              set_state(PART:"clipper", "default", 0.0);
+              set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
             }
          }
          program { name: "multi_down";
@@ -1086,398 +687,153 @@ group { name: "elm/button/base/bottom";
       }
    }
 
-group { name: "elm/button/base/popup";
-      script {
-         public mouse_down = 0;
-         public multi_down = 0;
-      }
-      images {
-         set {
-            name: "core_button_bg.#";
-            image {
-               image: SMALL"images/Controls/core_button_bg.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_button_bg.#.png" COMP;
-            }
-         }
-
-      }
+   group { name: "elm/button/base/floatingbutton";
+      inherit: "elm/button/base/default";
+      data.item: "vector_ux" "floatingbutton";
       parts {
          part { name: "base";
             scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_MIN_WIDTH BUTTON_BOTTOM_MIN_HEIGHT;
-               max: BUTTON_MAX_WIDTH BUTTON_BOTTOM_MIN_HEIGHT;
-               image.normal: "core_button_bg.#";
-               color: 255 255 255 255; /*(Changeable UI) color_class: "W011E1";*/
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 0 ;
-            }
-         }
-         part { name: "bg";
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               image.normal: "core_button_bg.#";
-               color: 38 107 191 255; /*(Changeable UI) color_class: "W011";*/
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               color: 30 85 153 255; /*(Changeable UI) color_class: "W011P";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 76 128 191 255; /*(Changeable UI) color_class: "W011D";*/
-            }
-         }
-         part { name: "padding_left_top";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_PADDING_LEFT_RIGHT 0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
             type: SPACER;
-            scale: 1;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_PADDING_LEFT_RIGHT 0;
-               fixed: 1 1;
+               min: BUTTON_FLOATINGBUTTON_SIZE_INC;
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
+         part { name: "tizen_vg_shape_clipper";
+            type: RECT;
             description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               text {
-                  style: "button_popup";
-               }
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_popup_press";
+               visible: 0;
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_popup_dim";
-            }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
                visible: 0;
             }
          }
-         part { name: "event";
-            scale: 1;
+         part { name: "tizen_vg_shape_clipper2";
             type: RECT;
             description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "pressed";
-            signal: "mouse,down,1*";
-            source: "event";
-            script {
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
-                 {
-                     set_int(mouse_down, 1);
-                     run_program(PROGRAM:"button_press1");
-                 }
-            }
-         }
-         program { name: "button_press1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"base", "pressed", 0.0);
-                  set_state(PART:"bg", "pressed", 0.0);
-                  set_state(PART:"elm.text", "pressed", 0.0);
-                  emit("elm,action,press", "");
-               }
-            }
-         }
-         program { name: "unpressed";
-            signal: "mouse,up,1";
-            source: "event";
-            script {
-               if (get_int(mouse_down) == 1) {
-                 set_int(mouse_down, 0);
-                 run_program(PROGRAM:"button_unpress1");
-               }
-            }
-         }
-         program { name: "button_unpress1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"base", "default", 0.0);
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"elm.text", "default", 0.0);
-                  emit("elm,action,unpress", "");
-               }
+               visible: 0;
+               color: 57 78 160 0;
             }
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "event";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(multi_down) == 0) {
-                  get_state(PART:"bg", st, 30, vl);
-                  if (strcmp(st, "disabled")) {
-                     emit("elm,action,click", "");
-                  }
-               }
+            description { state: "ready" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "invisible" 0.0;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "bg";
-            target: "elm.text";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg";
-            target: "elm.text";
-         }
-         program { name: "multi_down";
-            signal: "elm,action,multi,down";
-            source: "elm";
-            script {
-               set_int(multi_down, 1);
+            description { state: "pressed" 0.0;
+               color: 57 78 160 255;
             }
          }
-         program { name: "multi_up";
-            signal: "elm,action,multi,up";
+      }
+      programs {
+         program {
+            signal: "elm,floatingbutton,state,default";
             source: "elm";
             script {
-               set_int(multi_down, 0);
+               set_int(mouse_down, 0);
             }
          }
       }
    }
 
-group { name: "elm/button/base/circle";
-      script {
-         public mouse_down = 0;
-         public multi_down = 0;
-      }
-      images {
-         set {
-            name: "core_icon_container";
-            image {
-               image: SMALL"images/Controls/core_icon_container.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_icon_container.png" COMP;
-            }
-         }
-      }
+   group { name: "elm/button/base/bottom";
+      inherit: "elm/button/base/default";
+      alias: "elm/button/base/popup";
+      data.item: "vector_ux" "bottom";
       parts {
-         part { name: "background";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_LABEL_SIZE;
-            }
-         }
-         part { name: "top_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 BUTTON_CIRCLE_TOP_PADDING_HEIGHT;
-               fixed: 0 1;
-               align: 0.5 0.0;
-               rel1.to : "background";
-               rel2.relative: 1.0 0.0;
-            }
-         }
-         part { name: "left_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_LEFT_RIGHT_PADDING_WIDTH 0;
-               fixed: 1 0;
-               align: 0.0 0.0;
-               rel1.to: "background";
-               rel2 {
-                  to: "background";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part{ name: "right_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_LEFT_RIGHT_PADDING_WIDTH 0;
-               fixed: 1 0;
-               align: 1.0 0.0;
-               rel1 {
-                  to: "background";
-                  relative: 1.0 0.0;
-               }
-               rel2.to: "background";
-            }
-         }
          part { name: "base";
             scale: 1;
             type: SPACER;
             description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_SIZE;
-               max: BUTTON_CIRCLE_SIZE;
-               rel1 {
-                 relative: 0.0 1.0;
-                 to_y: "top_padding";
-               }
-               align: 0.5 0.0;
+               min: BUTTON_BOTTOM_MIN_WIDTH_INC BUTTON_BOTTOM_MIN_HEIGHT_INC;
             }
          }
-         part { name: "bg";
+         part { name: "tizen_vg_shape";
+            type: SWALLOW;
+            clip_to: "tizen_vg_shape_clipper";
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               image.normal: "core_icon_container";
-               color: 38 107 191 255; /*(Changeable UI) color_class: "W015L6";*/
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               color: 30 85 153 255; /*(Changeable UI) color_class: "W015L6P";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 76 128 191 255; /*(Changeable UI) color_class: "W015L6D";*/
+               min: 0 BUTTON_BOTTOM_MIN_HEIGHT_INC;
             }
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            clip_to: "elm.icon.clipper";
-            scale: 1;
+         //Base Shape Part
+         part { name: "tizen_vg_shape_clipper";
+            type: RECT;
             description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_ICON_SIZE;
-               max: BUTTON_CIRCLE_ICON_SIZE;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               color: 76 103 211 255;
             }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+            description { state: "disabled" 0.0;
+               color: 134 155 239 255;
             }
          }
-         part { name: "elm.icon.clipper";
+         part { name: "tizen_vg_shape_clipper2";
             type: RECT;
             description { state: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3";*/
+               visible: 0;
+               color: 57 78 160 0;
             }
-            description { state: "pressed" 0.0;
+            description { state: "ready" 0.0;
                inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L3P";*/
+               visible: 1;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 244 244 244 127; /*(Changeable UI) color_class: "F032L3D";*/
+            description { state: "pressed" 0.0;
+               color: 57 78 160 255;
             }
          }
-         part { name: "mid_padding";
+         part { name: "padding_left_top";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 BUTTON_CIRCLE_MIDDDLE_PADDING_HEIGHT;
-               max: -1 BUTTON_CIRCLE_MIDDDLE_PADDING_HEIGHT;
-               fixed: 0 1;
-               rel1 {
-                 to_y : "base";
-                 relative: 0.0 1.0;
-               }
-               align: 0.5 0.0;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_BOTTOM_PADDING_TOP_HEIGHT_INC;
+               fixed: 1 1;
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+         part { name: "padding_right_bottom";
+            type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 BUTTON_CIRCLE_TEXT_HEIGHT;
-               max: -1 BUTTON_CIRCLE_TEXT_HEIGHT;
+               rel1.to: "tizen_vg_shape";
+               rel2.to: "tizen_vg_shape";
+               align: 1.0 1.0;
+               rel1.relative: 1.0 1.0;
+               min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_BOTTOM_PADDING_BOTTOM_HEIGHT_INC;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "left_padding";
-                  to_y: "mid_padding";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "right_padding";
-                  to_y: "bottom_padding";
-               }
-               text {
-                  min: 0 1;
-                  align: 0.5 0.0;
-                  style: "button_circle";
-               }
             }
          }
-         part { name: "bottom_padding";
+      }
+   }
+
+  /* This transparent button style is used by applications which use webview. */
+   group{ name: "elm/button/base/transparent";
+       script {
+         public mouse_down = 0;
+         public multi_down = 0;
+       }
+       parts {
+         part { name: "bg";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 BUTTON_CIRCLE_BOTTOM_PADDING_HEIGHT;
-               rel2.to : "background";
-               rel1.relative: 0.0 1.0;
-               fixed: 0 1;
-               align: 0.0 1.0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
             }
          }
-         part { name: "event";
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
+            description { state: "default" 0.0;
+            }
+         }
+        part { name: "event";
             type: RECT;
+            scale: 1;
+            /* Do not remove the following line.
+             * elm.swallow.content part should receive mouse events. */
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-              rel1.to:"background";
-              rel2.to:"background";
               color: 0 0 0 0;
             }
          }
@@ -1500,8 +856,6 @@ group { name: "elm/button/base/circle";
                new Float:vl;
                get_state(PART:"bg", st, 30, vl);
                if (strcmp(st, "disabled")) {
-                  set_state(PART:"bg", "pressed", 0.0);
-                  set_state(PART:"elm.icon.clipper", "pressed", 0.0);
                   emit("elm,action,press", "");
                }
             }
@@ -1522,13 +876,11 @@ group { name: "elm/button/base/circle";
                new Float:vl;
                get_state(PART:"bg", st, 30, vl);
                if (strcmp(st, "disabled")) {
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"elm.icon.clipper", "default", 0.0);
                   emit("elm,action,unpress", "");
                }
             }
          }
-         program { name: "touch_snd";
+         program { name: "clicked";
             signal: "mouse,clicked,1";
             source: "event";
             script {
@@ -1542,31 +894,17 @@ group { name: "elm/button/base/circle";
                }
             }
          }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "invisible" 0.0;
-            target: "elm.swallow.content";
-         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "bg";
-            target: "elm.icon.clipper";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg";
-            target: "elm.icon.clipper";
          }
          program { name: "multi_down";
             signal: "elm,action,multi,down";
@@ -1585,6 +923,184 @@ group { name: "elm/button/base/circle";
       }
    }
 
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_ICON_STYLES(style_name, image_normal, style_normal , style_press , style_dim ,min_width, min_height) \
+   group { name: "elm/button/base/"style_name; \
+      images { \
+         image: image_normal COMP; \
+      } \
+      script { \
+         public mouse_down = 0; \
+         public multi_down = 0; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            type: SPACER; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: min_width min_height; \
+               max: min_width min_height; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+               image.normal: image_normal; \
+               color_class: style_normal; \
+            } \
+            description { state: "pressed" 0.0; \
+               inherit: "default" 0.0; \
+               color_class: style_press; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color_class: style_dim; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            repeat_events: 1; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "over2"; \
+            type: RECT; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "disabler"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+               color: 0 0 0 0; \
+               visible: 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_press"; \
+            signal: "mouse,down,1*"; \
+            source: "over1"; \
+            script { \
+               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0)) \
+                 { \
+                     set_int(mouse_down, 1); \
+                     run_program(PROGRAM:"button_press2"); \
+                 } \
+            } \
+         } \
+         program { name: "button_press2"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_press_anim"; \
+         } \
+         program { name: "button_press_anim"; \
+            action: STATE_SET "pressed" 0.0; \
+            target: "button_center_part"; \
+         } \
+         program { name: "key_press"; \
+            signal: "elm,action,pressed"; \
+            source: "elm"; \
+            action: STATE_SET "pressed" 0.0; \
+            target: "button_center_part"; \
+         } \
+         program { name: "key_unpress"; \
+            signal: "elm,action,unpressed"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_center_part"; \
+         } \
+         program { name: "button_unpress"; \
+            signal: "mouse,up,1*"; \
+            source: "over2"; \
+            script { \
+               if (get_int(mouse_down) == 1) \
+                 { \
+                    set_int(mouse_down, 0); \
+                    run_program(PROGRAM:"button_unpress2"); \
+                    run_program(PROGRAM:"button_unpress_anim"); \
+                 } \
+            } \
+         } \
+         program { name: "button_unpress2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+         } \
+         program { name: "button_unpress_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_center_part"; \
+         } \
+         program { name: "button_click"; \
+            signal: "mouse,clicked,1"; \
+            source: "over2"; \
+            script { \
+               if (get_int(multi_down) == 0) { \
+                 run_program(PROGRAM:"touch_sound"); \
+                 run_program(PROGRAM:"button_click2"); \
+               } \
+            } \
+         } \
+         program { name: "touch_sound"; \
+            action: RUN_PLUGIN "touch_sound"; \
+         } \
+         program { name: "button_click2"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disabler"; \
+            target: "button_center_part"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_center_part"; \
+         } \
+         program { \
+            name: "multi_down"; \
+            signal: "elm,action,multi,down"; \
+            source: "elm"; \
+            script { \
+               set_int(multi_down, 1); \
+            } \
+         } \
+         program { \
+            name: "multi_up"; \
+            signal: "elm,action,multi,up"; \
+            source: "elm"; \
+            script { \
+               set_int(multi_down, 0); \
+            } \
+         } \
+      } \
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_ICON_STYLES("icon_reorder", "core_button_reorder.png", "F060L1" ,"F060L1P" , "F060L1D" ,  BUTTON_ICON_WIDTH_INC, BUTTON_ICON_HEIGHT_INC)
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_ICON_STYLES("icon_expand_add", "core_button_add.png", "F060L2" , "F060L2P", "F060L2D",  BUTTON_ICON_WIDTH_INC, BUTTON_ICON_HEIGHT_INC)
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_ICON_STYLES("icon_expand_delete", "core_button_delete.png", "F060L3" , "F060L3P" ,"F060L3D",  BUTTON_ICON_WIDTH_INC, BUTTON_ICON_HEIGHT_INC)
+
+
 group { name: "elm/button/base/contacts";
       data {
          item: "focus_highlight" "on";
@@ -1593,10 +1109,10 @@ group { name: "elm/button/base/contacts";
          set {
          name: "core_list_button_bg.#";
             image {
-               image: SMALL"images/Controls/core_list_button_bg.#.png" COMP;
+               image: SMALL"images/User_Input_Elements/core_list_button_bg.#.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_list_button_bg.#.png" COMP;
+               image: MEDIUM"images/User_Input_Elements/core_list_button_bg.#.png" COMP;
             }
          }
       }
@@ -1618,8 +1134,8 @@ group { name: "elm/button/base/contacts";
                   to_x: "padding.right";
                   to_y: "elm.text";
                }
-               min: 0 BUTTON_MIN_HEIGHT;
-               max: -1 BUTTON_MIN_HEIGHT;
+               min: 0 BUTTON_MIN_HEIGHT_INC;
+               max: -1 BUTTON_MIN_HEIGHT_INC;
             }
          }
          part { name: "button_image";
@@ -1628,22 +1144,22 @@ group { name: "elm/button/base/contacts";
                rel1.to: "button_image_base";
                rel2.to: "button_image_base";
                image.normal: "core_list_button_bg.#";
-               color: 38 107 191 255; /*(Changeable UI) color_class: "W012";*/
+               color: 38 107 191 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 30 85 153 255; /*(Changeable UI) color_class: "W012P";*/
+               color: 30 85 153 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 76 128 191 255; /*(Changeable UI) color_class: "W012D";*/
+               color: 76 128 191 255;
             }
          }
          part { name: "padding.left";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_PADDING_LEFT_RIGHT 0;
+               min: BUTTON_PADDING_LEFT_RIGHT_INC 0;
                fixed: 1 0;
                rel2 {
                   relative: 0.0 1.0;
@@ -1656,7 +1172,7 @@ group { name: "elm/button/base/contacts";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_PADDING_LEFT_RIGHT 0;
+               min: BUTTON_PADDING_LEFT_RIGHT_INC 0;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
@@ -1675,7 +1191,6 @@ group { name: "elm/button/base/contacts";
                text {
                   style: "button_contacts";
                   min: 1 1;
-                  ellipsis: -1;
                }
             }
             description { state: "visible" 0.0;
@@ -1814,10 +1329,14 @@ group { name: "elm/button/base/contacts";
             source: "over3";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "button_click2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
@@ -1897,10 +1416,6 @@ group { name: "elm/button/base/contacts";
    }
 
    group { name: "elm/button/base/naviframe/title";
-      alias: "elm/button/base/naviframe/back_btn/default";
-      alias: "elm/button/base/naviframe/prev_btn/default";
-      alias: "elm/button/base/naviframe/end_btn/default";
-      alias: "elm/button/base/naviframe/more/default";
       script {
          public mouse_down = 0;
          public multi_down = 0;
@@ -1933,15 +1448,15 @@ group { name: "elm/button/base/contacts";
             description { state: "default" 0.0;
                rel1.to: "button_bg";
                rel2.to: "button_bg";
-               color: 255 255 255 255; /*(Changeable UI) color_class: "B0541";*/
+               color: 255 255 255 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 104 141 186 255; /*(Changeable UI) color_class: "B0541P";*/
+               color: 104 141 186 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 43 93 155 255; /*(Changeable UI) color_class: "B0541D";*/
+               color: 43 93 155 255;
             }
          }
          part { name: "button_icon";
@@ -1952,7 +1467,7 @@ group { name: "elm/button/base/contacts";
                min: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC;
                max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC;
                fixed: 1 1;
-               color: 52 158 91 255; /*(Changeable UI) color_class: "B0561L1";*/
+               color: 52 158 91 255;
             }
          }
          part { name: "over2";
@@ -2017,10 +1532,14 @@ group { name: "elm/button/base/contacts";
             source: "over2";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
                  emit("elm,action,click", "");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "key_press";
             signal: "elm,action,pressed";
             source: "elm";
@@ -2070,19 +1589,19 @@ group { name: "elm/button/base/contacts";
          set {
             name: "core_title_button_bg";
             image {
-               image: SMALL"images/Navigation_elements/core_title_button_bg.png" COMP;
+               image: SMALL"images/Old/core_title_button_bg.png" COMP;
             }
             image {
-               image: MEDIUM"images/Navigation_elements/core_title_button_bg.png" COMP;
+               image: MEDIUM"images/Old/core_title_button_bg.png" COMP;
             }
          }
          set {
             name: "core_title_icon_done";
             image {
-               image: SMALL"images/Navigation_elements/core_title_icon_done.png" COMP;
+               image: SMALL"images/Old/core_title_icon_done.png" COMP;
             }
             image {
-               image: MEDIUM"images/Navigation_elements/core_title_icon_done.png" COMP;
+               image: MEDIUM"images/Old/core_title_icon_done.png" COMP;
             }
          }
       }
@@ -2097,15 +1616,15 @@ group { name: "elm/button/base/contacts";
                max: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC;
                fixed: 1 1;
                image.normal: "core_title_button_bg";
-               color: 255 255 255 255; /*(Changeable UI) color_class: "B0541";*/
+               color: 255 255 255 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 104 141 186 255; /*(Changeable UI) color_class: "B0541P";*/
+               color: 104 141 186 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 43 93 155 255; /*(Changeable UI) color_class: "B0541D";*/
+               color: 43 93 155 255;
             }
          }
          part { name: "button_icon";
@@ -2117,15 +1636,15 @@ group { name: "elm/button/base/contacts";
                max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC;
                fixed: 1 1;
                image.normal: "core_title_icon_done";
-               color: 52 158 91 255; /*(Changeable UI) color_class: "B0561L1";*/
+               color: 52 158 91 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B0561L1P";*/
+               color: 2 61 132 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B0561L1D";*/
+               color: 2 61 132 255;
             }
          }
       }
@@ -2163,10 +1682,14 @@ group { name: "elm/button/base/contacts";
             source: "over2";
             script {
                if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0)) {
+                 run_program(PROGRAM:"play_sound");
                  emit("elm,action,click", "");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "key_press";
             signal: "elm,action,pressed";
             source: "elm";
@@ -2236,19 +1759,19 @@ group { name: "elm/button/base/contacts";
          set {
             name: "core_title_button_bg";
             image {
-               image: SMALL"images/Navigation_elements/core_title_button_bg.png" COMP;
+               image: SMALL"images/Old/core_title_button_bg.png" COMP;
             }
             image {
-               image: MEDIUM"images/Navigation_elements/core_title_button_bg.png" COMP;
+               image: MEDIUM"images/Old/core_title_button_bg.png" COMP;
             }
          }
          set {
             name: "core_title_icon_cancel";
             image {
-               image: SMALL"images/Navigation_elements/core_title_icon_cancel.png" COMP;
+               image: SMALL"images/Old/core_title_icon_cancel.png" COMP;
             }
             image {
-               image: MEDIUM"images/Navigation_elements/core_title_icon_cancel.png" COMP;
+               image: MEDIUM"images/Old/core_title_icon_cancel.png" COMP;
             }
          }
       }
@@ -2263,15 +1786,15 @@ group { name: "elm/button/base/contacts";
                max: BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC;
                fixed: 1 1;
                image.normal: "core_title_button_bg";
-               color: 255 255 255 255; /*(Changeable UI) color_class: "B0541";*/
+               color: 255 255 255 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 104 141 186 255; /*(Changeable UI) color_class: "B0541P";*/
+               color: 104 141 186 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 43 93 155 255; /*(Changeable UI) color_class: "B0541D";*/
+               color: 43 93 155 255;
             }
          }
          part { name: "button_icon";
@@ -2283,15 +1806,15 @@ group { name: "elm/button/base/contacts";
                max: BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC;
                fixed: 1 1;
                image.normal: "core_title_icon_cancel";
-               color: 224 33 33 255; /*(Changeable UI) color_class: "B0562L1";*/
+               color: 224 33 33 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B0562L1P";*/
+               color: 2 61 132 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B0562L1D";*/
+               color: 2 61 132 255;
             }
          }
       }
@@ -2329,10 +1852,14 @@ group { name: "elm/button/base/contacts";
             source: "over2";
             script {
                if ((get_int(check_disabled) == 0) && (get_int(multi_down) == 0)) {
+                 run_program(PROGRAM:"play_sound");
                  emit("elm,action,click", "");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "key_press";
             signal: "elm,action,pressed";
             source: "elm";
@@ -2396,15 +1923,440 @@ group { name: "elm/button/base/contacts";
       }
    }
 
+   group { name: "elm/button/base/naviframe/title_left";
+      script {
+         public mouse_down = 0;
+         public multi_down = 0;
+         public check_disabled = 0;
+      }
+      parts {
+         part { name: "button_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "button_bg_clipper";
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_SIZE_INC;
+               max: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_SIZE_INC;
+               fixed: 1 1;
+               color: 61 185 204 255;
+            }
+         }
+         part { name: "button_bg_clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 255 255 255 255;
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               color: 193 193 193 255;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 61 185 204 77;
+            }
+         }
+         part { name: "left_padding";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_LEFT_PADDING_WIDTH_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_LEFT_PADDING_WIDTH_INC -1;
+               align: 0.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "button_bg"; relative: 0.0 0.0; }
+               rel2 { to: "button_bg"; relative: 0.0 1.0; }
+            }
+         }
+         part { name: "right_padding";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_RIGHT_PADDING_WIDTH_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_LEFT_BUTTON_RIGHT_PADDING_WIDTH_INC -1;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "button_bg"; relative: 1.0 0.0; }
+               rel2 { to: "button_bg"; relative: 1.0 1.0; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               rel1 { to: "left_padding"; relative: 1.0 0.0; }
+               rel2 { to: "right_padding"; relative: 0.0 1.0; }
+               text {
+                  style: "button_title_left";
+                  min: 0 1;
+               }
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               text.style: "button_title_left_press";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text.style: "button_title_left_dim";
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "over3";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "button_press";
+            signal: "mouse,down,1*";
+            source: "over2";
+            script {
+               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
+                 {
+                    set_int(mouse_down, 1);
+                    set_state(PART:"button_bg_clipper", "pressed", 0.0);
+                    emit("elm,action,press", "");
+                 }
+            }
+         }
+         program { name: "button_unpress";
+            signal: "mouse,up,1*";
+            source: "over3";
+            script {
+               if (get_int(mouse_down) == 1)
+                 {
+                    set_int(mouse_down, 0);
+                    set_state(PART:"button_bg_clipper", "default", 0.0);
+                    emit("elm,action,unpress", "");
+                 }
+            }
+         }
+         program { name: "button_click";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            script {
+               if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
+                 emit("elm,action,click", "");
+               }
+            }
+         }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
+         program { name: "key_press";
+            signal: "elm,action,pressed";
+            source: "elm";
+            action: STATE_SET "pressed" 0.0;
+            target: "button_bg_clipper";
+         }
+         program { name: "key_unpress";
+            signal: "elm,action,unpressed";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_bg_clipper";
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_bg_clipper";
+            target: "elm.text";
+            target: "disabler";
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_bg_clipper";
+            target: "elm.text";
+            target: "disabler";
+         }
+         program {
+            name: "multi_down";
+            signal: "elm,action,multi,down";
+            source: "elm";
+            script {
+               set_int(multi_down, 1);
+            }
+         }
+         program {
+            name: "multi_up";
+            signal: "elm,action,multi,up";
+            source: "elm";
+            script {
+               set_int(multi_down, 0);
+            }
+         }
+      }
+   }
+
+   group { name: "elm/button/base/naviframe/title_right";
+      inherit: "elm/button/base/naviframe/title_left";
+      parts {
+         part { name: "left_padding";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_LEFT_PADDING_WIDTH_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_LEFT_PADDING_WIDTH_INC -1;
+               align: 0.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "button_bg"; relative: 0.0 0.0; }
+               rel2 { to: "button_bg"; relative: 0.0 1.0; }
+            }
+         }
+         part { name: "right_padding";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_RIGHT_PADDING_WIDTH_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_RIGHT_BUTTON_RIGHT_PADDING_WIDTH_INC -1;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "button_bg"; relative: 1.0 0.0; }
+               rel2 { to: "button_bg"; relative: 1.0 1.0; }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 0.5;
+               rel1 { to: "left_padding"; relative: 1.0 0.0; }
+               rel2 { to: "right_padding"; relative: 0.0 1.0; }
+               text {
+                  style: "button_title_right";
+                  min: 0 1;
+               }
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               text.style: "button_title_right_press";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               text.style: "button_title_right_dim";
+            }
+         }
+      }
+   }
+
+   group { name: "elm/button/base/naviframe/back_btn/default";
+      alias: "elm/button/base/naviframe/end_btn/default";
+      images {
+         set {
+            name: "core_icon_back";
+            image {
+               image: SMALL"images/Navigation_elements/core_icon_back.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/Navigation_elements/core_icon_back.png" COMP;
+            }
+         }
+      }
+      script {
+         public mouse_down = 0;
+         public multi_down = 0;
+         public check_disabled = 0;
+      }
+      parts {
+         part { name: "button_bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "button_bg_clipper";
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC;
+               fixed: 1 1;
+               color: 61 185 204 255;
+            }
+         }
+         part { name: "button_bg_clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 255 255 255 255;
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               color: 193 193 193 255;
+            }
+         }
+         part { name: "button_icon";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC;
+               fixed: 1 1;
+               color: 255 255 255 255;
+               image.normal: "core_icon_back";
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "over3";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "button_press";
+            signal: "mouse,down,1*";
+            source: "over2";
+            script {
+               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
+                 {
+                    set_int(mouse_down, 1);
+                    set_state(PART:"button_bg_clipper", "pressed", 0.0);
+                    emit("elm,action,press", "");
+                 }
+            }
+         }
+         program { name: "button_unpress";
+            signal: "mouse,up,1*";
+            source: "over3";
+            script {
+               if (get_int(mouse_down) == 1)
+                 {
+                    set_int(mouse_down, 0);
+                    set_state(PART:"button_bg_clipper", "default", 0.0);
+                    emit("elm,action,unpress", "");
+                 }
+            }
+         }
+         program { name: "button_click";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            script {
+               if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
+                 emit("elm,action,click", "");
+               }
+            }
+         }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
+         program { name: "key_press";
+            signal: "elm,action,pressed";
+            source: "elm";
+            action: STATE_SET "pressed" 0.0;
+            target: "button_bg_clipper";
+         }
+         program { name: "key_unpress";
+            signal: "elm,action,unpressed";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_bg_clipper";
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_bg_clipper";
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_bg_clipper";
+         }
+         program {
+            name: "multi_down";
+            signal: "elm,action,multi,down";
+            source: "elm";
+            script {
+               set_int(multi_down, 1);
+            }
+         }
+         program {
+            name: "multi_up";
+            signal: "elm,action,multi,up";
+            source: "elm";
+            script {
+               set_int(multi_down, 0);
+            }
+         }
+      }
+   }
+
+
    group { name: "elm/button/base/naviframe/drawers";
       images {
          set {
             name: "core_icon_drawer";
             image {
-               image: SMALL"images/Navigation_elements/core_icon_drawer.png" COMP;
+               image: SMALL"images/Old/core_icon_drawer.png" COMP;
             }
             image {
-               image: MEDIUM"images/Navigation_elements/core_icon_drawer.png" COMP;
+               image: MEDIUM"images/Old/core_icon_drawer.png" COMP;
             }
          }
       }
@@ -2434,7 +2386,7 @@ group { name: "elm/button/base/contacts";
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 2 48 104 255; /*(Changeable UI) color_class: "F043P";*/
+               color: 2 48 104 255;
                visible: 1;
             }
          }
@@ -2528,10 +2480,14 @@ group { name: "elm/button/base/contacts";
             source: "over2";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"touch_sound");
                  emit("elm,action,click", "");
                }
             }
          }
+         program { name: "touch_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "key_press";
             signal: "elm,action,pressed";
             source: "elm";
@@ -2582,6 +2538,17 @@ group { name: "elm/button/base/contacts";
       data { \
          item: "focus_highlight" "on"; \
       } \
+      images { \
+         set { \
+         name: "core_focus.#"; \
+            image { \
+               image: SMALL"images/Presentation_views/core_focus.#.png" COMP; \
+            } \
+            image { \
+               image: MEDIUM"images/Presentation_views/core_focus.#.png" COMP; \
+            } \
+         } \
+      } \
       script { \
          public mouse_down = 0; \
          public multi_down = 0; \
@@ -2595,16 +2562,17 @@ group { name: "elm/button/base/contacts";
          } \
          part { name: "focus_image"; \
             scale: 1; \
-            type: RECT; \
+            type: IMAGE; \
             mouse_events: 0; \
             repeat_events: 1; \
             description { state: "default" 0.0; \
+               image.normal: "core_focus.#"; \
                visible: 0; \
-               color_class: "transparent"; \
             } \
             description { state: "focused" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
+               color: 61 185 204 255; \
             } \
          } \
          part { name: "over2"; \
@@ -2694,10 +2662,10 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
          set {
             name: "core_button_icon_clear";
             image {
-               image: SMALL"images/Content_views/core_button_icon_clear.png" COMP;
+               image: SMALL"images/Presentation_views/core_button_icon_clear.png" COMP;
             }
             image {
-               image: MEDIUM"images/Content_views/core_button_icon_clear.png" COMP;
+               image: MEDIUM"images/Presentation_views/core_button_icon_clear.png" COMP;
             }
          }
       }
@@ -2744,13 +2712,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
          part { name: "clear_button.clipper";
             type: RECT;
             description { state: "default" 0.0;
-               color: 7 7 7 255; /*(Changeable UI) color_class: "F053";*/
+               color: 61 184 204 255;
             }
             description { state: "pressed" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "F053P";*/
+               color: 34 104 114 255;
             }
             description { state: "disabled" 0.0;
-               color: 7 7 7 76; /*(Changeable UI) color_class: "F053D";*/
+               color: 0 0 0 76;
             }
          }
          part { name: "over2";
@@ -2831,10 +2799,14 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             source: "over2";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "button_click2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
@@ -2878,10 +2850,10 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
          set {
             name: "core_title_icon_option";
             image {
-               image: SMALL"images/Content_views/core_title_icon_option.png" COMP;
+               image: SMALL"images/Old/core_title_icon_option.png" COMP;
             }
             image {
-               image: MEDIUM"images/Content_views/core_title_icon_option.png" COMP;
+               image: MEDIUM"images/Old/core_title_icon_option.png" COMP;
             }
          }
       }
@@ -2928,13 +2900,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
          part { name: "option_button.clipper";
             type: RECT;
             description { state: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B0563L1";*/
+               color: 2 61 132 255;
             }
             description { state: "pressed" 0.0;
-               color: 1 43 94 255; /*(Changeable UI) color_class: "B0563L1P";*/
+               color: 1 43 94 255;
             }
             description { state: "disabled" 0.0;
-               color: 7 7 7 76; /*(Changeable UI) color_class: "B0563L1D";*/
+               color: 7 7 7 76;
             }
          }
          part { name: "over2";
@@ -3015,10 +2987,14 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             source: "over2";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "button_click2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
@@ -3058,204 +3034,55 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
    }
 
    group { name: "elm/button/base/datetime/ampm";
-      script {
-         public mouse_down = 0;
-         public multi_down = 0;
-      }
+      inherit: "elm/button/base/default";
       parts {
-         part { name: "bg";
-            type: SPACER;
-            scale: 1;
+         part { name: "base";
             description { state: "default" 0.0;
-               min: DATETIME_AMPM_BUTTON_SIZE_INC;
-               max: DATETIME_AMPM_BUTTON_SIZE_INC;
+               min: DATETIME_AMPM_BUTTON_WIDTH_SIZE_INC DATETIME_AMPM_BUTTON_HEIGHT_SIZE_INC;
             }
          }
-         part { name: "top_padding";
-            type: SPACER;
-            scale: 1;
+         part { name: "tizen_vg_shape";
             description { state: "default" 0.0;
-               min: 0 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC;
-               max: -1 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC;
-               fixed: 0 1;
-               align: 0.5 0.0;
-               rel1.to: "bg";
-               rel2 {
-                  to: "bg";
-                  relative: 1.0 0.0;
-               }
-            }
-         }
-         part { name: "pressed_area";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: DATETIME_AMPM_BUTTON_PRESSED_AREA_SIZE_INC;
-               max: DATETIME_AMPM_BUTTON_PRESSED_AREA_SIZE_INC;
-               color_class: "transparent";
-               align: 0.5 0.0;
-               fixed: 1 1;
-               rel1 {
-                  to: "top_padding";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "top_padding";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               color: 2 61 132 127; /*(Changeable UI) color_class: "B042";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
+               min: 0 DATETIME_AMPM_BUTTON_HEIGHT_SIZE_INC;
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 1;
-               rel1.to: "pressed_area";
-               rel2.to: "pressed_area";
-               fixed: 1 1;
-               text {
-                  style: "button_ampm";
-                  min: 1 0;
-                  max: 1 0;
-                  ellipsis: -1;
-               }
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "button_ampm_press";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-                text {
-                  style: "button_ampm_dim";
-               }
-            }
+          part { name: "tizen_vg_shape_clipper";
+              description { state: "unselected" 0.0;
+                 color: 204 204 204 255;
+              }
          }
-         part { name: "bottom_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC;
-               max: -1 DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC;
-               fixed: 0 1;
-               align: 0.5 1.0;
-               rel1 {
-                  to: "pressed_area";
-                  relative: 0.0 1.0;
-               }
-               rel2.to: "bg";
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
+         part { name: "padding_left_top";
             description { state: "default" 0.0;
-               color: 0 0 0 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               min: DATETIME_AMPM_BUTTON_TOP_LEFT_PADDING_INC;
             }
          }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
+         part { name: "padding_right_bottom";
             description { state: "default" 0.0;
-               color: 0 0 0 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
+               min: DATETIME_AMPM_BUTTON_BOTTOM_RIGHT_PADDING_INC;
             }
          }
-         part { name: "disabler";
-            type: RECT;
+         part { name: "elm.text";
             description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               color: 0 0 0 0;
-               visible: 0;
+               text.style: "button_ampm";
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+            description { state: "unselected" 0.0;
+               text.style: "button_ampm_dim";
             }
          }
       }
-      programs {
-         program { name: "button_press";
-            signal: "mouse,down,1*";
-            source: "over2";
-            script {
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
-                 {
-                    set_int(mouse_down, 1);
-                    set_state(PART:"pressed_area", "pressed", 0.0);
-                    set_state(PART:"elm.text", "pressed", 0.0);
-                    emit("elm,action,press", "");
-                 }
-            }
-         }
-         program { name: "button_unpress";
-            signal: "mouse,up,1*";
-            source: "over3";
-            script {
-               if (get_int(mouse_down) == 1)
-                 {
-                    set_int(mouse_down, 0);
-                    set_state(PART:"pressed_area", "default", 0.0);
-                    set_state(PART:"elm.text", "default", 0.0);
-                    emit("elm,action,unpress", "");
-                 }
-            }
-         }
-         program { name: "button_click";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            script {
-               if (get_int(multi_down) == 0) {
-                 emit("elm,action,click", "");
-               }
-            }
-         }
-         program {
-            name: "multi_down";
-            signal: "elm,action,multi,down";
-            source: "elm";
-            script {
-               set_int(multi_down, 1);
-            }
-         }
-         program {
-            name: "multi_up";
-            signal: "elm,action,multi,up";
-            source: "elm";
-            script {
-               set_int(multi_down, 0);
-            }
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "pressed_area";
-            target: "elm.text";
-            target: "disabler";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "pressed_area";
-            target: "elm.text";
-            target: "disabler";
-         }
+      program { name: "unselected";
+         signal: "elm,action,button,unselected";
+         source: "elm";
+         action: STATE_SET "unselected" 0.0;
+         target: "tizen_vg_shape_clipper";
+         target: "elm.text";
+      }
+      program { name: "selected";
+         signal: "elm,action,button,selected";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "tizen_vg_shape_clipper";
+         target: "elm.text";
       }
    }
 
@@ -3283,7 +3110,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 127; /*(Changeable UI) color_class: "B042";*/
+               color: 2 61 132 127;
                visible: 1;
             }
             description { state: "disabled" 0.0;
@@ -3297,16 +3124,16 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
                rel2.to: "arrow.image.bg";
                min: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;
                max: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;
-               color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/
+               color: 111 125 142 255;
                image.normal: "core_icon_picker_arrow_right.png";
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/
+               color: 244 244 244 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/
+               color: 111 125 142 127;
             }
          }
          part { name: "focus_image";
@@ -3385,10 +3212,19 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             source: "over";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
+         program { name: "longpress_sound";
+            signal: "elm,action,longpress";
+            source: "elm";
+            action: RUN_PLUGIN "touch_haptic";
+         }
          program { name: "action_unpressed";
             signal: "elm,action,unpressed";
             source: "elm";
@@ -3477,16 +3313,16 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
                rel2.to: "arrow.image.bg";
                min: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;
                max: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;
-               color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/
+               color: 111 125 142 255;
                image.normal: "core_icon_picker_arrow_left.png";
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/
+               color: 244 244 244 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/
+               color: 111 125 142 127;
             }
          }
       }
@@ -3500,23 +3336,20 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: SPINNER_LEFT_RIGHT_BG_IMAGE_SIZE_INC;
+               min: SPINNER_VERTICAL_TEXT_BUTTON_BG_SIZE_INC;
             }
          }
          part { name: "elm.text";
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 1;
-               color: 7 7 7 255; /*(Changeable UI) color_class: "T1233";*/
-               min: 0 SPINNER_TEXT_HEIGHT_INC;
-               max: -1 SPINNER_TEXT_HEIGHT_INC;
+               fixed: 1 1;
+               color: 7 7 7 255;
                rel1.to: "bg";
                rel2.to: "bg";
                text {
-                  min: 0 0;
-                  max: 1 0;
-                  font: "Tizen:style=Light"; size: "60"; /*(Changeable UI) text_class: "T1233";*/
+                  font: "Tizen:style=Light";
+                  size: 106;
                   text_class: "tizen";
                }
             }
@@ -3559,9 +3392,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             signal: "mouse,clicked,1";
             source: "over";
             script {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "button_click2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
@@ -3598,6 +3435,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
 // Vertical /////////////
 /////////////////////////
    group { name: "elm/button/base/spinner/increase/vertical";
+      alias: "elm/button/base/spinner/increase/vertical_time_picker";
       alias: "elm/button/base/spinner/increase/vertical_date_picker";
       alias: "elm/button/base/spinner/increase/datetime";
       data.item: "focus_highlight" "on";
@@ -3620,7 +3458,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 127; /*(Changeable UI) color_class: "B042";*/
+               color: 61 184 204 76;
                visible: 1;
             }
             description { state: "disabled" 0.0;
@@ -3634,16 +3472,16 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
                rel2.to: "arrow.image.bg";
                min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
                max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
-               color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/
+               color: 204 204 204 255;
                image.normal: "core_icon_picker_arrow_up.png";
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/
+               color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/
+               color: 204 204 204 127;
             }
          }
          part { name: "focus_image";
@@ -3722,10 +3560,19 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             source: "over";
             script {
                if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
                }
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
+         program { name: "longpress_sound";
+            signal: "elm,action,longpress";
+            source: "elm";
+            action: RUN_PLUGIN "touch_haptic";
+         }
          program { name: "action_unpressed";
             signal: "elm,action,unpressed";
             source: "elm";
@@ -3802,6 +3649,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
 
    group { name: "elm/button/base/spinner/decrease/vertical";
       inherit: "elm/button/base/spinner/increase/vertical";
+      alias: "elm/button/base/spinner/decrease/vertical_time_picker";
       alias: "elm/button/base/spinner/decrease/vertical_date_picker";
       alias: "elm/button/base/spinner/decrease/datetime";
       images {
@@ -3815,45 +3663,45 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
                rel2.to: "arrow.image.bg";
                min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
                max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC;
-               color: 111 125 142 255; /*(Changeable UI) color_class: "F032L1";*/
+               color: 204 204 204 255;
                image.normal: "core_icon_picker_arrow_down.png";
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
-               color: 244 244 244 255; /*(Changeable UI) color_class: "F032L1P";*/
+               color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 111 125 142 127; /*(Changeable UI) color_class: "F032L1D";*/
+               color: 204 204 204 127;
             }
          }
       }
    }
 
    group { name: "elm/button/base/spinner/vertical";
+      alias: "elm/button/base/spinner/vertical_time_picker";
+      alias: "elm/button/base/spinner/datetime";
       data.item: "focus_highlight" "on";
       parts {
          part { name: "bg";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC;
+               min: SPINNER_VERTICAL_TEXT_BUTTON_BG_SIZE_INC;
             }
          }
          part { name: "elm.text";
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 1;
-               color: 7 7 7 255; /*(Changeable UI) color_class: "T1233";*/
-               min: 0 SPINNER_TEXT_HEIGHT_INC;
-               max: -1 SPINNER_TEXT_HEIGHT_INC;
+               fixed: 1 1;
+               color: 0 0 0 255;
                rel1.to: "bg";
                rel2.to: "bg";
                text {
-                  min: 0 0;
-                  max: 1 0;
-                  font: "Tizen:style=Light"; size: "60"; /*(Changeable UI) text_class: "T1233";*/
+                  // FIXME: It should be changed to SNum-3L font.
+                  font: "Tizen:style=Light";
+                  size: 106;
                   text_class: "tizen";
                }
             }
@@ -3896,9 +3744,13 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
             signal: "mouse,clicked,1";
             source: "over";
             script {
+                 run_program(PROGRAM:"play_sound");
                  run_program(PROGRAM:"button_click2");
             }
          }
+         program { name: "play_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "button_click2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
@@ -3933,21 +3785,27 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
 
 group { name: "elm/button/base/spinner/vertical_date_picker";
    inherit: "elm/button/base/spinner/vertical";
-   alias: "elm/button/base/spinner/datetime";
    parts {
+      part { name: "bg";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC;
+         }
+      }
       part { name: "elm.text";
          type: TEXT;
          scale: 1;
          description { state: "default" 0.0;
-            visible: 1;
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T1233";*/
-            min: 0 SPINNER_TEXT_HEIGHT_INC;
-            max: -1 SPINNER_TEXT_HEIGHT_INC;
+            fixed: 1 1;
+            color: 0 0 0 255;
+            rel1.to: "bg";
+            rel2.to: "bg";
             text {
-               min: 0 0;
-               max: 1 0;
-               font: "Tizen:style=Light"; size: "60"; /*(Changeable UI) text_class: "T1233";*/
-               text_class: "tizen";
+               font: "TizenSans:style=Light";
+               size: 60;
+               size_range: 60 90;
+               fit: 1 0;
             }
          }
          description { state: "active" 0.0;
@@ -3958,3 +3816,325 @@ group { name: "elm/button/base/spinner/vertical_date_picker";
    }
 }
 /***********************SPINNER BUTTONS STYLES******************************/
+
+group { name: "elm/button/base/hoversel_vertical_entry/default";
+   alias: "elm/button/base/hoversel_vertical_entry/entry";
+   alias: "elm/button/base/hoversel_horizontal_entry/default";
+   alias: "elm/button/base/hoversel_horizontal_entry/entry";
+   script {
+      public disabled = 0;
+   }
+   parts {
+      part { name: "button_image";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 HOVERSEL_ITEM_MIN_HEIGHT_INC;
+            color: 0 0 0 0;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 77;
+         }
+         description { state: "disabled" 0.0;
+            inherit:  "default" 0.0;
+         }
+      }
+      part { name: "text_left_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: HOVERSEL_ITEM_TEXT_LR_PADDING_INC 0;
+            fixed: 1 1;
+            align: 0.0 0.5;
+            rel1 { to: "button_image"; relative: 0.0 0.0; }
+            rel2 { to: "button_image"; relative: 0.0 1.0; }
+         }
+      }
+      part { name: "text_right_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: HOVERSEL_ITEM_TEXT_LR_PADDING_INC 0;
+            fixed: 1 1;
+            align: 1.0 0.5;
+            rel1 { to: "button_image"; relative: 1.0 0.0; }
+            rel2 { to: "button_image"; relative: 1.0 1.0; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.5 0.5;
+            rel1 { to_x: "text_left_padding"; to_y: "button_image"; relative: 1.0 0.0; }
+            rel2 { to_x: "text_right_padding"; to_y: "button_image"; relative: 0.0 1.0; }
+            text {
+               font: "Tizen:style=Regular";
+               size: "26";
+               align: 0.0 0.5;
+               min: 1 1;
+            }
+            color: 0 0 0 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 115;
+         }
+      }
+      part { name: "over2";
+         type: RECT;
+         mouse_events: 1;
+         repeat_events: 1;
+         ignore_flags: ON_HOLD;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit:  "default" 0.0;
+            visible: 0;
+         }
+      }
+   }
+   programs {
+      program { name: "button_click";
+         signal: "mouse,down,1";
+         source: "over2";
+         script {
+            if (get_int(disabled) == 0) {
+               emit("elm,action,press", "");
+               run_program(PROGRAM:"button_click_anim");
+            }
+         }
+      }
+      program { name: "button_click_anim";
+         action: STATE_SET "pressed" 0.0;
+         target: "button_image";
+      }
+      program { name: "button_unclick_anim";
+         signal: "mouse,up,1";
+         source: "over2";
+         script {
+            if (get_int(disabled) == 0) {
+               set_state(PART:"button_image", "default", 0.0);
+               run_program(PROGRAM:"button_unclick");
+            }
+         }
+      }
+      program { name: "button_unclick";
+         action: SIGNAL_EMIT "elm,action,click" "";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"button_image", "disabled", 0.0);
+            set_state(PART:"over2", "disabled", 0.0);
+            set_state(PART:"elm.text", "disabled", 0.0);
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(disabled, 0);
+            set_state(PART:"button_image", "default", 0.0);
+            set_state(PART:"over2", "default", 0.0);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+   }
+}
+
+group { name: "elm/button/base/hoversel_vertical/default";
+   alias: "elm/button/base/hoversel_vertical/entry";
+   alias: "elm/button/base/hoversel_horizontal/default";
+   alias: "elm/button/base/hoversel_horizontal/entry";
+   images {
+      set {
+         name: "core_dropdown_label_icon_arrow";
+         image {
+            image: SMALL"images/User_Input_Elements/core_dropdown_label_icon_arrow.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/User_Input_Elements/core_dropdown_label_icon_arrow.png" COMP;
+         }
+      }
+   }
+   script {
+      public disabled = 0;
+   }
+   parts {
+      part { name: "base";
+         scale: 1;
+         type: SPACER;
+         description { state: "default" 0.0;
+            min: BUTTON_HOVERSEL_MIN_SIZE_INC;
+         }
+      }
+      part { name: "button_image";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 77;
+         }
+         description { state: "disabled" 0.0;
+            inherit:  "default" 0.0;
+         }
+      }
+      part { name: "text_left_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BUTTON_HOVERSEL_TEXT_LEFT_PADDING_INC 0;
+            fixed: 1 0;
+            align: 0.0 0.5;
+            rel1 { to: "button_image"; relative: 0.0 0.0; }
+            rel2 { to: "button_image"; relative: 0.0 1.0; }
+         }
+      }
+      part { name: "elm.text";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1 { to: "text_left_padding"; relative: 1.0 0.0; }
+            rel2 { to: "text_right_padding"; relative: 0.0 1.0; }
+            color: 61 185 204 255;
+            text {
+               font: "Tizen:style=Regular";
+               size: "40";
+               min: 1 0;
+               ellipsis: -1;
+               align: -1.0 0.5;
+            }
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 163;
+         }
+      }
+      part { name: "underline";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            min: 0 BUTTON_HOVERSEL_UNDERLINE_HEIGHT_INC;
+            fixed: 0 1;
+            align: 0.5 1.0;
+            rel1 { to: "button_image"; relative: 0.0 1.0; }
+            rel2 { to: "button_image"; relative: 1.0 1.0; }
+            color: 61 185 204 255;
+         }
+      }
+      part { name: "underline_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default";
+            fixed: 0 1;
+            align: 0.5 1.0;
+            min: 0 BUTTON_HOVERSEL_UNDERLINE_PADDING_INC;
+            rel1 { to: "underline"; relative: 0.0 0.0; }
+            rel2 { to: "underline"; relative: 1.0 0.0; }
+         }
+      }
+      part { name: "arrow";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BUTTON_HOVERSEL_ARROW_ICON_SIZE_INC;
+            fixed: 1 1;
+            align: 1.0 1.0;
+            rel1 { to_x: "button_image"; to_y: "underline_padding"; relative: 1.0 0.0; }
+            rel1 { to_x: "button_image"; to_y: "underline_padding"; relative: 1.0 0.0; }
+            image.normal: "core_dropdown_label_icon_arrow";
+            color: 61 185 204 255;
+         }
+      }
+      part { name: "text_right_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BUTTON_HOVERSEL_TEXT_RIGHT_PADDING_INC 0;
+            fixed: 1 0;
+            align: 1.0 0.5;
+            rel1 { to_x: "arrow"; to_y: "button_image"; relative: 0.0 0.0; }
+            rel2 { to_x: "arrow"; to_y: "button_image"; relative: 0.0 1.0; }
+         }
+      }
+     part { name: "over2";
+         type: RECT;
+         mouse_events: 1;
+         repeat_events: 1;
+         ignore_flags: ON_HOLD;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit:  "default" 0.0;
+            visible: 0;
+         }
+      }
+   }
+   programs {
+      program { name: "button_click";
+         signal: "mouse,down,1";
+         source: "over2";
+         script {
+            if (get_int(disabled) == 0) {
+               emit("elm,action,press", "");
+               run_program(PROGRAM:"button_click_anim");
+            }
+         }
+      }
+      program { name: "button_click_anim";
+         action: STATE_SET "pressed" 0.0;
+         target: "button_image";
+      }
+      program { name: "button_unclick_anim";
+         signal: "mouse,up,1";
+         source: "over2";
+         script {
+            if (get_int(disabled) == 0) {
+               set_state(PART:"button_image", "default", 0.0);
+               run_program(PROGRAM:"button_unclick");
+            }
+         }
+      }
+      program { name: "button_unclick";
+         action: SIGNAL_EMIT "elm,action,click" "";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"button_image", "disabled", 0.0);
+            set_state(PART:"over2", "disabled", 0.0);
+            set_state(PART:"elm.text", "disabled", 0.0);
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(disabled, 0);
+            set_state(PART:"button_image", "default", 0.0);
+            set_state(PART:"over2", "default", 0.0);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+   }
+}
diff --git a/mobile/widgets/calendar.edc b/mobile/widgets/calendar.edc
new file mode 100644
index 00000000..8ff432b1
--- /dev/null
+++ b/mobile/widgets/calendar.edc
@@ -0,0 +1,626 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define CIT_STYLES\
+      style { name: "calendar_date_style";\
+         base: "font=Tizen:style=Light font_size="CALENDAR_DATE_TEXT_SIZE" color=#000000ff align=center text_class=tizen";\
+      }\
+      style { name: "calendar_date_selected_style";\
+         base: "font=Tizen:style=Light font_size="CALENDAR_DATE_TEXT_SIZE" color=#ffffffff align=center text_class=tizen";\
+      }\
+      style { name: "calendar_date_hilighted_style";\
+         base: "font=Tizen:style=Light font_size="CALENDAR_DATE_TEXT_SIZE" color=#ffffffff align=center text_class=tizen";\
+      }\
+      style { name: "calendar_date_holiday_style";\
+         base: "font=Tizen:style=Light font_size="CALENDAR_DATE_TEXT_SIZE" color=#cc3d3dff align=center text_class=tizen";\
+      }\
+      style { name: "calendar_date_today_style";\
+         base: "font=Tizen:style=Light font_size="CALENDAR_DATE_TEXT_SIZE" color=#3399ff align=center text_class=tizen";\
+      }\
+      style { name: "calendar_date_disabled_style";\
+         base: "font=Tizen:style=Light font_size="CALENDAR_DATE_TEXT_SIZE" color=#00000038 align=center text_class=tizen";\
+      }\
+
+#define CAL_SPIN(_sufix, _signal_sufix, _text, _relative)\
+      part { name: "left_bt"#_sufix; type: RECT;\
+         scale: 1;\
+         description { state: "default" 0.0;\
+            fixed: 1 1;\
+            rel1.to: #_relative;\
+            rel2.to: #_relative;\
+            align: 0.0 0.5;\
+            min: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            max: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            color: 0 0 0 0;\
+         }\
+      }\
+      part { name: "left_bt"#_sufix"_over"; repeat_events: 1;\
+         scale: 1;\
+         description { state: "default" 0.0;\
+            min: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            max: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            align: 0.5 0.5;\
+            rel1.to: "left_bt"#_sufix;\
+            rel2.to: "left_bt"#_sufix;\
+            image.normal: "core_date_picker_arrow_l.png";\
+            color: 61 184 204 255; \
+         }\
+         description { state: "rtl" 0.0;\
+            inherit: "default" 0.0;\
+            image.normal: "core_date_picker_arrow_r.png";\
+         }\
+      }\
+      part { name: "right_bt"#_sufix; type: RECT;\
+         scale: 1;\
+         description { state: "default" 0.0;\
+            fixed: 1 1;\
+            rel1.to: #_relative;\
+            rel2.to: #_relative;\
+            align: 1.0 0.5;\
+            min: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            max: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            color: 0 0 0 0;\
+         }\
+      }\
+      part { name: "right_bt"#_sufix"_over"; repeat_events: 1;\
+         scale: 1;\
+         description { state: "default" 0.0;\
+            min: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            max: CALENDAR_DATE_PICKER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC;\
+            rel1.to: "right_bt"#_sufix;\
+            rel2.to: "right_bt"#_sufix;\
+            image.normal: "core_date_picker_arrow_r.png";\
+            color: 61 184 204 255; \
+         }\
+         description { state: "rtl" 0.0;\
+            inherit: "default" 0.0;\
+            image.normal: "core_date_picker_arrow_l.png";\
+         }\
+      }\
+      part { name: #_text; type: TEXT; mouse_events: 0;\
+         scale: 1;\
+         description { state: "default" 0.0;\
+            fixed: 1 1;\
+            rel1 { relative: 1.0 0.0;\
+               to: "left_bt"#_sufix;\
+            }\
+            rel2 { relative: 0.0 1.0;\
+               to: "right_bt"#_sufix;\
+            }\
+            color: 0 0 0 255;\
+            text { font: "Tizen:style=Light"; size: CALENDAR_MONTH_TEXT_SIZE;\
+               text_class: "tizen"; \
+               min: 0 1;\
+            }\
+         }\
+      }\
+      programs {\
+         program {\
+            signal: "mouse,down,1"; source: "left_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,decrement,start"#_signal_sufix "elm";\
+         }\
+         program {\
+            signal: "mouse,up,1"; source: "left_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,stop"#_signal_sufix "elm"; \
+         }\
+         program {\
+            signal: "mouse,down,1"; source: "right_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,increment,start"#_signal_sufix "elm";\
+         }\
+         program {\
+            signal: "mouse,up,1"; source: "right_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,stop"#_signal_sufix "elm";     \
+         }\
+         program { name:   "rtl"#_sufix;\
+            signal: "edje,state,rtl"; source: "edje";\
+            script {\
+               set_int(rtl, 1);\
+               set_state(PART:"left_bt"#_sufix"_over", "rtl", 0.0);\
+               set_state(PART:"right_bt"#_sufix"_over", "rtl", 0.0);\
+            }\
+         }\
+         program { name:   "ltr"#_sufix;\
+            signal: "edje,state,ltr"; source: "edje";\
+            script {\
+               set_int(rtl, 0);\
+               set_state(PART:"left_bt"#_sufix"_over", "default", 0.0);\
+               set_state(PART:"right_bt"#_sufix"_over", "default", 0.0);\
+            }\
+         }\
+         program {\
+            signal: "mouse,clicked,1"; \
+            source: "left_bt"#_sufix; \
+            script { \
+               run_program(PROGRAM:"touch_sound"); \
+            } \
+         } \
+         program {\
+            signal: "mouse,clicked,1"; \
+            source: "right_bt"#_sufix; \
+            script { \
+               run_program(PROGRAM:"touch_sound"); \
+            } \
+         } \
+         program { \
+            name: "touch_sound"; \
+            action: RUN_PLUGIN "touch_sound"; \
+         } \
+      }
+
+#define CH(_pos) \
+   part { name: "ch_"#_pos".base"; type: SPACER; \
+      description { state: "default" 0.0; \
+         rel1 { \
+            relative: (_pos % 7 / 7) 0.0; \
+            to: "header"; \
+         } \
+         rel2 { \
+            relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
+            to: "header"; \
+         } \
+      } \
+   } \
+   part { name: "ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
+      scale: 1; \
+      clip_to: "ch_"#_pos".clipper"; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         rel1.to: "ch_"#_pos".base"; \
+         rel2.to: "ch_"#_pos".base"; \
+         color: 0 0 0 204;\
+         text { font: "Tizen:style=Light"; size: CALENDAR_DATE_TITLE_TEXT_SIZE; \
+            min: 1 1; \
+            ellipsis: -1; \
+         } \
+      } \
+   } \
+   part { name: "ch_"#_pos".clipper"; type: RECT; \
+      description { state: "default" 0.0; \
+         rel1.to: "ch_"#_pos".base"; \
+         rel2.to: "ch_"#_pos".base"; \
+      } \
+   }
+
+#define CIT(_pos) \
+   part { name: "cit_"#_pos".rect"; type: SPACER; \
+      description { state: "default" 0.0; \
+         rel1 { \
+            relative: (_pos % 7 / 7) \
+            (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
+            to: "base"; \
+         } \
+         rel2 { \
+            relative: (_pos % 7 / 7 + 1 / 7) \
+            (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
+            to: "base"; \
+         } \
+      } \
+   } \
+   part { name: "cit_"#_pos".event"; type: RECT; repeat_events: 1; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         rel1.to: "cit_"#_pos".rect"; \
+         rel2.to: "cit_"#_pos".rect"; \
+         color: 0 0 0 0; \
+      } \
+   } \
+   part { name: "cit_"#_pos".selected"; mouse_events: 0; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         min: CALENDAR_SELECTED_IMAGE_SIZE_INC; \
+         max: CALENDAR_SELECTED_IMAGE_SIZE_INC; \
+         rel1.to: "cit_"#_pos".rect"; \
+         rel2.to: "cit_"#_pos".rect"; \
+         image.normal: "core_date_picker_press.png"; \
+         color: 61 184 204 255; \
+         visible: 0; \
+      } \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
+   part { name: "cit_"#_pos".selected2"; mouse_events: 0; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         min: CALENDAR_SELECTED_IMAGE_SIZE_INC; \
+         max: CALENDAR_SELECTED_IMAGE_SIZE_INC; \
+         rel1.to: "cit_"#_pos".rect"; \
+         rel2.to: "cit_"#_pos".rect"; \
+         image.normal: "core_date_picker_press.png"; \
+         color: 61 184 204 255; \
+         visible: 0; \
+      } \
+      description { state: "hilighted" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
+   part { name: "cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         rel1.to: "cit_"#_pos".rect"; \
+         rel2.to: "cit_"#_pos".rect"; \
+         text.style: "calendar_date_style"; \
+         text.min: 1 1; \
+         text.ellipsis: -1; \
+      } \
+      description { state: "holiday" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_holiday_style"; \
+      } \
+      description { state: "today" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_today_style"; \
+      } \
+      description { state: "disabled" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_disabled_style"; \
+      } \
+      description { state: "hilighted" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_hilighted_style"; \
+      } \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_selected_style"; \
+      } \
+      description { state: "holiday_hilighted" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_hilighted_style"; \
+      } \
+      description { state: "holiday_selected" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_selected_style"; \
+      } \
+      description { state: "today_hilighted" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_hilighted_style"; \
+      } \
+      description { state: "today_selected" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "calendar_date_selected_style"; \
+      } \
+   } \
+   part { name: "cit_"#_pos".check"; \
+      type: RECT; \
+      mouse_events: 0; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         rel1 { \
+            to: "cit_"#_pos".rect"; \
+            relative: 0.6 0.5; \
+         } \
+         rel2 { \
+            to: "cit_"#_pos".rect"; \
+            relative: 0.6 0.5; \
+         } \
+         min: 16 16; \
+         max: 16 16; \
+         aspect: 1 1; \
+         align: 0.0 1.0;\
+         color: 0 0 0 0; \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
+   part { name: "cit_"#_pos".access"; type: RECT; repeat_events: 1; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         rel1.to: "cit_"#_pos".event"; \
+         rel2.to: "cit_"#_pos".event"; \
+         color: 0 0 0 0; \
+      } \
+   } \
+   programs { \
+      program { \
+         name:    "cit_"#_pos".go_active"; \
+         signal:  "cit_"#_pos",selected"; \
+         source:  "elm"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (!strncmp(st, "holiday", 7)) \
+              set_state(PART:"cit_"#_pos".text", "holiday_selected", 0.0); \
+            else if (!strncmp(st, "today", 5)) \
+              set_state(PART:"cit_"#_pos".text", "today_selected", 0.0); \
+            else \
+              set_state(PART:"cit_"#_pos".text", "selected", 0.0); \
+            set_state(PART:"cit_"#_pos".selected", "selected", 0.0); \
+         } \
+      } \
+      program { \
+         name:    "cit_"#_pos".go_passive"; \
+         signal:  "cit_"#_pos",unselected"; \
+         source:  "elm"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (!strncmp(st, "holiday", 7)) \
+              set_state(PART:"cit_"#_pos".text", "holiday", 0.0); \
+            else if (!strncmp(st, "today", 5)) \
+              set_state(PART:"cit_"#_pos".text", "today", 0.0); \
+            else \
+              set_state(PART:"cit_"#_pos".text", "default", 0.0); \
+            set_state(PART:"cit_"#_pos".selected", "default", 0.0); \
+         } \
+      } \
+      program { \
+         name:    "cit_"#_pos".is_today"; \
+         signal:  "cit_"#_pos",today"; \
+         source:  "elm"; \
+         action:  STATE_SET "today" 0.0; \
+         target:  "cit_"#_pos".text"; \
+      } \
+      program { \
+         name:    "cit_"#_pos".not_today"; \
+         signal:  "cit_"#_pos",not_today"; \
+         source:  "elm"; \
+         action:  STATE_SET "default" 0.0; \
+         target:  "cit_"#_pos".text"; \
+      } \
+      program { \
+         name: "cit_"#_pos".mouse.down"; \
+         signal: "mouse,down,1"; \
+         source: "cit_"#_pos".event"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (strcmp(st, "disabled")) { \
+               if (strstr(st, "selected") == -1) { \
+                  if (!strncmp(st, "holiday", 7)) \
+                     set_state(PART:"cit_"#_pos".text", "holiday_hilighted", 0.0); \
+                  else if (!strncmp(st, "today", 5)) \
+                     set_state(PART:"cit_"#_pos".text", "today_hilighted", 0.0); \
+                  else \
+                     set_state(PART:"cit_"#_pos".text", "hilighted", 0.0); \
+               } \
+               set_state(PART:"cit_"#_pos".selected2", "hilighted", 0.0); \
+            } \
+         } \
+      } \
+      program { \
+         name: "cit_"#_pos".mouse.up"; \
+         signal: "mouse,up,1"; \
+         source: "cit_"#_pos".event"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (strcmp(st, "disabled")) { \
+               if (strstr(st, "selected") == -1) { \
+                  if (!strncmp(st, "holiday", 7)) \
+                     set_state(PART:"cit_"#_pos".text", "holiday", 0.0); \
+                  else if (!strncmp(st, "today", 5)) \
+                     set_state(PART:"cit_"#_pos".text", "today", 0.0); \
+                  else \
+                     set_state(PART:"cit_"#_pos".text", "default", 0.0); \
+               } \
+               set_state(PART:"cit_"#_pos".selected2", "default", 0.0); \
+            } \
+         } \
+      } \
+      program { \
+         name:    "cit_"#_pos".enable"; \
+         signal:  "cit_"#_pos",enable"; \
+         source:  "elm"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (!strcmp(st, "disabled")) \
+              set_state(PART:"cit_"#_pos".text", "default", 0.0); \
+         } \
+      } \
+      program { \
+         name:    "cit_"#_pos".disable"; \
+         signal:  "cit_"#_pos",disable"; \
+         source:  "elm"; \
+         action:  STATE_SET "disabled" 0.0; \
+         target:  "cit_"#_pos".text"; \
+      } \
+      program { \
+         name: "cit_"#_pos".clicked"; \
+         signal: "mouse,clicked,1"; \
+         source: "cit_"#_pos".event"; \
+         action: SIGNAL_EMIT "elm,action,selected" #_pos; \
+      } \
+      program { \
+         name:    "cit_"#_pos".clear"; \
+         signal:  "cit_"#_pos",clear"; \
+         source:  "elm"; \
+         action:  STATE_SET "default" 0.0; \
+         target:  "cit_"#_pos".check"; \
+         after:   "cit_"#_pos".holiday_clear"; \
+      } \
+      program { \
+         name:    "cit_"#_pos".holiday_clear"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (!strcmp(st, "holiday")) \
+              set_state(PART:"cit_"#_pos".text", "default", 0.0); \
+         } \
+      } \
+      program { \
+         name:    "cit_"#_pos".checked"; \
+         signal:  "cit_"#_pos",checked"; \
+         source:  "elm"; \
+         action:  STATE_SET "visible" 0.0; \
+         target:  "cit_"#_pos".check"; \
+      } \
+      program { \
+         name:    "cit_"#_pos".holiday"; \
+         signal:  "cit_"#_pos",holiday"; \
+         source:  "elm"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"cit_"#_pos".text", st, 30, vl); \
+            if (strcmp(st, "today")) \
+              set_state(PART:"cit_"#_pos".text", "holiday", 0.0); \
+         } \
+      } \
+      program {\
+         signal: "mouse,clicked,1"; \
+         source: "cit_"#_pos".event"; \
+         script { \
+            run_program(PROGRAM:"touch_sound"); \
+         } \
+      } \
+   }
+
+group { name: "elm/calendar/base/default";
+   images.image: "core_date_picker_arrow_l.png" COMP;
+   images.image: "core_date_picker_arrow_r.png" COMP;
+   images.image: "core_date_picker_press.png" COMP;
+   script {
+      public rtl;
+   }
+   styles {
+      CIT_STYLES
+   }
+   parts {
+      part { name: "bg";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CALENDAR_BG_SIZE_INC;
+            max: CALENDAR_BG_SIZE_INC;
+         }
+      }
+      part { name: "spinner-base1";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CALENDAR_SPINNER_BASE_SIZE_INC;
+            max: CALENDAR_SPINNER_BASE_SIZE_INC;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "table-base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CALENDAR_TABLE_BASE_SIZE_INC;
+            max: CALENDAR_TABLE_BASE_SIZE_INC;
+            rel1.to_x: "bg";
+            rel1.to_y: "spinner-base1";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "bg";
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "header";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CALENDAR_HEADER_SIZE_INC;
+            max: CALENDAR_HEADER_SIZE_INC;
+            rel1.to: "table-base";
+            rel2.to: "table-base";
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "header_separator";
+         type: RECT;
+         mouse_events:  0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: CALENDAR_HEADER_SEPARATOR_SIZE_INC;
+            rel1.to: "header";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "header";
+            color: 61 184 204 38;
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "base_top_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            min: CALENDAR_BASE_TOP_PADDING_SIZE_INC;
+            rel1.to_x: "bg";
+            rel1.to_y: "header_separator";
+            rel1.relative: 0.0 1.0;
+            rel2.to_x: "bg";
+            rel2.to_y: "header_separator";
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            rel1.to_x: "table-base";
+            rel1.to_y: "base_top_padding";
+            rel1.relative: 0.0 1.0;
+            rel2.to_x: "table-base";
+            rel2.to_y: "base_bottom_padding";
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      part { name: "base_bottom_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            min: CALENDAR_BASE_BOTTOM_PADDING_SIZE_INC;
+            rel1.to: "bg";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "bg";
+            align: 0.5 1.0;
+         }
+      }
+
+      CAL_SPIN(,,month_text, spinner-base1)
+      CH(0)   CH(1)   CH(2)   CH(3)   CH(4)   CH(5)   CH(6)
+      CIT(0)  CIT(1)  CIT(2)  CIT(3)  CIT(4)  CIT(5)  CIT(6)
+      CIT(7)  CIT(8)  CIT(9)  CIT(10) CIT(11) CIT(12) CIT(13)
+      CIT(14) CIT(15) CIT(16) CIT(17) CIT(18) CIT(19) CIT(20)
+      CIT(21) CIT(22) CIT(23) CIT(24) CIT(25) CIT(26) CIT(27)
+      CIT(28) CIT(29) CIT(30) CIT(31) CIT(32) CIT(33) CIT(34)
+      CIT(35) CIT(36) CIT(37) CIT(38) CIT(39) CIT(40) CIT(41)
+   }
+}
+
+#undef CAL_SPIN
+#undef CIT
+#undef CH
diff --git a/mobile/widgets/check.edc b/mobile/widgets/check.edc
new file mode 100644
index 00000000..fbdc8c29
--- /dev/null
+++ b/mobile/widgets/check.edc
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+group { name: "elm/check/base/default";
+   alias: "elm/check/base/popup";
+   data.item: "vector_ux" "default";
+   script {
+      public check_state;
+      public disabled;
+      public text;
+      public animate = 0;
+   }
+   parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CHECK_DEFAULT_SIZE;
+         }
+      }
+      //Outline + Rectangle Fill
+      part { name: "tizen_vg_shape";
+         type: SWALLOW;
+         clip_to: "tizen_vg_shape_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CHECK_DEFAULT_SIZE;
+            rel1.relative: 0 0.5;
+            rel2.relative: 0 0.5;
+            align: 0 0.5;
+            fixed: 1 1;
+         }
+      }
+      part { name: "tizen_vg_shape_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 61 184 204 255;
+         }
+         description { state: "disabled" 0.0;
+            color: 61 184 204 77;
+         }
+      }
+      //Check Line
+      part { name: "tizen_vg_shape2";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "tizen_vg_shape";
+            rel2.to: "tizen_vg_shape";
+         }
+      }
+      part { name: "padding_before_text";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            min: 0 0;
+            rel1 {
+               to: "tizen_vg_shape";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to: "tizen_vg_shape";
+               relative: 1.0 1.0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: CHECK_PAD_BEFORE_TEXT_INC;
+            fixed: 1 1;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 0 1;
+            rel1 {
+               relative: 1.0 0.5;
+               to_x : "padding_before_text";
+            }
+            rel2 {
+               relative: 1.0 0.5;
+            }
+            align: 0.0 0.5;
+            text {
+               style: "check_default";
+               min: 0 0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text.min: 1 1;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text {
+               style: "check_default_dim";
+               min: 0 1;
+            }
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text {
+               style: "check_default_press";
+               min: 0 1;
+            }
+         }
+      }
+      part { name: "event";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program { name: "click";
+         signal: "mouse,clicked,1";
+         source: "event";
+         script {
+            if (get_int(disabled) == 0) {
+               emit("elm,action,check,toggle", "");
+               run_program(PROGRAM:"touch_sound");
+            }
+         }
+      }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program { name: "check_on_activate";
+         signal: "elm,activate,check,on";
+         source: "elm";
+         script {
+            set_int(animate, 1);
+         }
+      }
+      program { name: "check_off_activate";
+         signal: "elm,activate,check,off";
+         source: "elm";
+         script {
+            set_int(animate, 1);
+         }
+      }
+      program { name: "check_on";
+         signal: "elm,state,check,on";
+         source: "elm";
+         script {
+            if (get_int(animate) == 0) {
+               emit("elm,check,state,toggle", "tizen_vg");
+            } else {
+               emit("elm,check,action,toggle", "tizen_vg");
+            }
+            set_int(animate, 0);
+            set_int(check_state, 1);
+         }
+      }
+      program { name: "check_off";
+         signal: "elm,state,check,off";
+         source: "elm";
+         script {
+            if (get_int(animate) == 0) {
+               emit("elm,check,state,toggle", "tizen_vg");
+            } else {
+               emit("elm,check,action,toggle", "tizen_vg");
+            }
+            set_int(animate, 0);
+            set_int(check_state, 0);
+         }
+      }
+      program { name: "disabled";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(disabled, 0);
+            set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+      program { name: "text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         script {
+            set_int(text, 1);
+            set_state(PART:"padding_before_text", "visible", 0.0);
+            if (get_int(disabled) == 1) {
+              set_state(PART:"elm.text", "disabled", 0.0);
+            }else {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+      program { name: "text_hide";
+         signal: "elm,state,text,hidden";
+         source: "elm";
+         script {
+            set_int(text, 0);
+            set_state(PART:"padding_before_text", "default", 0.0);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+      program { name: "pressed";
+         signal: "mouse,down,1";
+         source: "event";
+         script {
+            if (get_int(disabled) == 1) return;
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "pressed", 0.0);
+            }
+         }
+      }
+      program { name: "unpressed";
+         signal: "mouse,up,1";
+         source: "event";
+         script {
+            if (get_int(disabled) == 1) return;
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/check/base/favorite";
+   inherit: "elm/check/base/default";
+   data.item: "vector_ux" "favorite";
+   parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CHECK_FAVORITE_SIZE;
+         }
+      }
+      //Outline Star
+      part { name: "tizen_vg_shape";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "tizen_vg_shape_clipper";
+         description { state: "default" 0.0;
+            min: CHECK_FAVORITE_SIZE;
+            rel1.relative: 0 0.5;
+            rel2.relative: 0 0.5;
+            align: 0 0.5;
+            fixed: 1 1;
+         }
+      }
+      part { name: "tizen_vg_shape_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 255 178 0 255;
+         }
+         description { state: "disabled" 0.0;
+            color: 0 0 0 38;
+         }
+      }
+      //Inner Star Body
+      part { name: "tizen_vg_shape2";
+         clip_to: "tizen_vg_shape_clipper2";
+         scale: 1;
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1.to: "tizen_vg_shape";
+            rel2.to: "tizen_vg_shape";
+         }
+      }
+      part { name: "tizen_vg_shape_clipper2";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 255 178 0 0;
+         }
+         description { state: "on" 0.0;
+            color: 255 178 0 255;
+         }
+         description { state: "disabled" 0.0;
+            color: 0 0 0 38;
+         }
+      }
+  }
+   programs {
+      program { name: "toggle_on_effect";
+         action: STATE_SET "on" 0.0;
+         target: "tizen_vg_shape_clipper2";
+         transition: DECELERATE 0.5;
+      }
+      program { name: "check_on";
+         signal: "elm,state,check,on";
+         source: "elm";
+         script {
+            if (get_int(animate) == 0) {
+               emit("elm,check,state,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+               }
+            } else {
+               emit("elm,check,action,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  run_program(PROGRAM:"toggle_on_effect");
+               }
+            }
+            set_int(animate, 0);
+            set_int(check_state, 1);
+         }
+      }
+      program { name: "toggle_off_effect";
+         action: STATE_SET "default" 0.0;
+         target: "tizen_vg_shape_clipper2";
+         transition: DECELERATE 0.3;
+      }
+      program { name: "check_off";
+         signal: "elm,state,check,off";
+         source: "elm";
+         script {
+            if (get_int(animate) == 0) {
+               emit("elm,check,state,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+               }
+            } else {
+               emit("elm,check,action,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  run_program(PROGRAM:"toggle_off_effect");
+               }
+            }
+            set_int(animate, 0);
+            set_int(check_state, 0);
+         }
+      }
+      program { name: "disabled";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
+            set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0);
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(disabled, 0);
+            set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
+            if (get_int(check_state) == 0) {
+              set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+            } else {
+              set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+            }
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/check/base/on&off";
+   inherit: "elm/check/base/default";
+   data.item: "vector_ux" "on&off";
+   parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: CHECK_ONOFF_SIZE;
+         }
+      }
+      //Circle BG
+      part { name: "tizen_vg_shape";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "tizen_vg_shape_clipper";
+         description { state: "default" 0.0;
+            min: CHECK_ONOFF_SIZE;
+            rel1.relative: 0 0.5;
+            rel2.relative: 0 0.5;
+            align: 0 0.5;
+            fixed: 1 1;
+         }
+      }
+      part { name: "tizen_vg_shape_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 102;
+         }
+         description { state: "on" 0.0;
+           color: 0 0 0 102;
+         }
+         description { state: "disabled" 0.0;
+            color: 0 0 0 40;
+         }
+      }
+      //Overlapped Circle
+      part { name: "tizen_vg_shape2";
+         type: SWALLOW;
+         clip_to: "tizen_vg_shape_clipper2";
+         description { state: "default" 0.0;
+            rel1.to: "tizen_vg_shape";
+            rel2.to: "tizen_vg_shape";
+         }
+      }
+      part { name: "tizen_vg_shape_clipper2";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 89 175 58 0;
+         }
+         description { state: "on" 0.0;
+            color: 89 175 58 255;
+         }
+         description { state: "disabled" 0.0;
+            visible: 0;
+         }
+      }
+      //Line <-> Circle
+      part { name: "tizen_vg_shape3";
+         type: SWALLOW;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "tizen_vg_shape";
+            rel2.to: "tizen_vg_shape";
+            min: CHECK_ONOFF_ICON_SIZE;
+            fixed: 1 1;
+            align: 0.5 0.5;
+            rel1.relative: 0.5 0.5;
+            rel2.relative: 0.5 0.5;
+         }
+      }
+   }
+   programs {
+      program { name: "toggle_on_effect";
+         action: STATE_SET "on" 0.0;
+         target: "tizen_vg_shape_clipper2";
+         transition: DECELERATE 0.45;
+      }
+      program { name: "check_on";
+         signal: "elm,state,check,on";
+         source: "elm";
+         script {
+            if (get_int(animate) == 0) {
+               emit("elm,check,state,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+               }
+            } else {
+               emit("elm,check,action,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  run_program(PROGRAM:"toggle_on_effect");
+               }
+            }
+            set_int(animate, 0);
+            set_int(check_state, 1);
+         }
+      }
+      program { name: "toggle_off_effect";
+         action: STATE_SET "default" 0.0;
+         target: "tizen_vg_shape_clipper2";
+         transition: DECELERATE 0.45;
+      }
+      program { name: "check_off";
+         signal: "elm,state,check,off";
+         source: "elm";
+         script {
+            if (get_int(animate) == 0) {
+               emit("elm,check,state,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+               }
+            } else {
+               emit("elm,check,action,toggle", "tizen_vg");
+               if (!get_int(disabled)) {
+                  run_program(PROGRAM:"toggle_off_effect");
+               }
+            }
+            set_int(animate, 0);
+            set_int(check_state, 0);
+         }
+      }
+      program { name: "disabled";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
+            set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0);
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(disabled, 0);
+            if (get_int(check_state) == 0) {
+               set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+            } else {
+               set_state(PART:"tizen_vg_shape_clipper", "on", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+            }
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+   }
+}
diff --git a/themes/widgets/colorselector.edc b/mobile/widgets/colorselector.edc
index f064a8eb..a3d8b784 100644
--- a/themes/widgets/colorselector.edc
+++ b/mobile/widgets/colorselector.edc
@@ -33,6 +33,7 @@ group {
    parts {
       part { name: "base";
          type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
             min: COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC COLORSELECTOR_PALETTE_COLORPLANE_HEIGHT_INC;
@@ -58,6 +59,7 @@ group {
       }
       part { name: "palette";
          type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
             fixed: 0 1;
@@ -92,37 +94,37 @@ group {
       set {
          name: "core_color_picker_palette_selected";
          image {
-            image: SMALL"images/Controls/core_color_picker_palette_selected.png" COMP;
+            image: SMALL"images/User_Input_Elements/core_color_picker_palette_selected.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_color_picker_palette_selected.png" COMP;
+            image: MEDIUM"images/User_Input_Elements/core_color_picker_palette_selected.png" COMP;
          }
       }
       set {
          name: "core_color_picker_palette_selected_bg";
          image {
-            image: SMALL"images/Controls/core_color_picker_palette_selected_bg.png" COMP;
+            image: SMALL"images/User_Input_Elements/core_color_picker_palette_selected_bg.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_color_picker_palette_selected_bg.png" COMP;
+            image: MEDIUM"images/User_Input_Elements/core_color_picker_palette_selected_bg.png" COMP;
          }
       }
       set {
          name: "core_color_picker_color_shadow";
          image {
-            image: SMALL"images/Controls/core_color_picker_color_shadow.png" COMP;
+            image: SMALL"images/User_Input_Elements/core_color_picker_color_shadow.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_color_picker_color_shadow.png" COMP;
+            image: MEDIUM"images/User_Input_Elements/core_color_picker_color_shadow.png" COMP;
          }
       }
       set {
          name: "core_color_picker_palette_focused";
          image {
-            image: SMALL"images/Controls/core_color_picker_palette_focused.png" COMP;
+            image: SMALL"images/User_Input_Elements/core_color_picker_palette_focused.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_color_picker_palette_focused.png" COMP;
+            image: MEDIUM"images/User_Input_Elements/core_color_picker_palette_focused.png" COMP;
          }
       }
    }
@@ -170,7 +172,7 @@ group {
             state: "selected" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 7 7 7 127; /*(Changeable UI) color_class: "W162";*/
+            color: 0 0 0 128;
          }
       }
       part {
@@ -192,7 +194,7 @@ group {
             state: "selected" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "W162L1";*/
+            color: 255 255 255 255;
          }
       }
       part { name: "over1";
@@ -211,7 +213,7 @@ group {
          description { state: "default" 0.0;
             visible: 0;
             image.normal: "core_color_picker_palette_focused";
-            color: 4 110 239 255; /*(Changeable UI) color_class: "W161";*/
+            color: 61 185 204 255;
          }
          description { state: "highlighted" 0.0;
             inherit: "default" 0.0;
@@ -273,6 +275,11 @@ group {
          action: STATE_SET "default" 0.0;
          target: "highlight";
       }
+      program { name: "touch_sound_over1";
+        signal: "mouse,clicked,1";
+        source: "over1";
+        action: RUN_PLUGIN "touch_sound";
+      }
    }
 }
 
@@ -284,10 +291,10 @@ group {
       set {
          name: "core_color_picker_palette";
          image {
-            image: SMALL"images/Controls/core_color_picker_palette.png" COMP;
+            image: SMALL"images/User_Input_Elements/core_color_picker_palette.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_color_picker_palette.png" COMP;
+            image: MEDIUM"images/User_Input_Elements/core_color_picker_palette.png" COMP;
          }
       }
    }
diff --git a/mobile/widgets/conform.edc b/mobile/widgets/conform.edc
new file mode 100644
index 00000000..d43e54c1
--- /dev/null
+++ b/mobile/widgets/conform.edc
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define ATTACH_PANEL_TRANS_TIME 0.5
+#define ATTACH_PANEL_STATE_HIDE 0
+#define ATTACH_PANEL_STATE_HALF 1
+#define ATTACH_PANEL_STATE_FULL 2
+
+group { name: "elm/conformant/base/default";
+   script {
+      public indicator_visible = 0;     //Indicator visible check
+      public transparent_mode = 0;
+      public clipboard_disable = 0;     //check clipboard enable/disable
+      public keypad_disable = 0;        //check virtualkeypad enable/disable
+      public attach_panel_state = ATTACH_PANEL_STATE_HIDE;  //check attach_panel state
+      public landscape_mode = 0;        //Landscape mode status
+      public overlap_mode = 0;          //Overlap mode
+   }
+   parts {
+      part { name: "base";
+         type: SPACER;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "indicator_base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.5 0.0;
+            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
+            rel2.relative: 1.0 0.0;
+         }
+         description { state: "hide" 0.0;
+            inherit: "default" 0.0;
+            min: 0 0;
+         }
+      }
+      part { name: "indicator_adapter";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.5 0.0;
+            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
+            rel2.relative: 1.0 0.0;
+         }
+         //just in case: hide
+        description { state: "hide" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 1.0;
+            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 1.0;
+            rel1.to: "indicator_base";
+            rel2.relative: 1.0 0.0;
+            rel2.to: "sip_area";
+         }
+         description { state: "disable_sip" 0.0;
+            inherit: "default" 0.0;
+            rel2.relative: 1.0 1.0;
+            rel2.to: "base";
+         }
+         description { state: "show_attach_panel" 0.0; //attach_panel: visible
+            inherit: "default" 0.0;
+            rel2.to: "elm.swallow.attach_panel_base";
+         }
+      }
+      part { name: "elm.swallow.ug";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+         }
+      }
+      part { name: "indicator_bg";
+         type: RECT;
+         clip_to: "overlap_clipper";
+         description { state: "default" 0.0;
+            rel1 { to: "indicator_adapter"; }
+            rel2 { to: "indicator_adapter"; }
+            color: 61 184 204 255;
+         }
+         description { state: "transparent" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 255;
+         }
+      }
+      part { name: "elm.swallow.indicator_bg";
+         type: SWALLOW;
+         clip_to: "overlap_clipper";
+         description { state: "default" 0.0;
+            rel1.to: "indicator_bg";
+            rel2.to: "indicator_bg";
+         }
+         description { state: "transparent" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "overlap_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "indicator_bg";
+            rel2.to: "indicator_bg";
+         }
+         description { state: "overlap" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.swallow.indicator";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "indicator_adapter";
+            rel2.to: "indicator_adapter";
+         }
+      }
+      part { name: "elm.swallow.attach_panel_base";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.0 1.0;
+            rel1.relative: 0.0 1.0;
+         }
+      }
+      part { name: "elm.swallow.attach_panel";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            rel1.to_y: "elm.swallow.attach_panel_base";
+            rel2.to_y: "elm.swallow.attach_panel_base";
+            visible: 0;
+         }
+         description { state: "half" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "full" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_y: "indicator_bg";
+            rel1.relative: 0.0 1.0;
+            visible: 1;
+         }
+      }
+      part { name: "sip_area";
+         type: SPACER;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            min: 0 0;
+            rel1.to_y: "elm.swallow.virtualkeypad";
+            rel2.to_y: "elm.swallow.virtualkeypad";
+         }
+         description { state: "clipboard_on" 0.0;
+            inherit: "default" 0.0;
+            rel1.to_y: "elm.swallow.clipboard";
+            rel2.to_y: "elm.swallow.clipboard";
+         }
+      }
+      part { name: "elm.swallow.clipboard";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.0 1.0;
+            rel1.relative: 0.0 1.0;
+         }
+      }
+      part { name: "elm.swallow.virtualkeypad";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.0 1.0;
+            rel1.relative: 0.0 1.0;
+         }
+      }
+   }
+   programs {
+      program { name: "show_indicator";
+         signal: "elm,state,indicator,show";
+         source: "elm";
+         script {
+            set_int(indicator_visible, 1);
+            run_program(PROGRAM:"update_indicator_adapter");
+         }
+      }
+      program { name: "hide_indicator";
+         signal: "elm,state,indicator,hide";
+         source: "elm";
+         script {
+            set_int(indicator_visible, 0);
+            run_program(PROGRAM:"update_indicator_adapter");
+         }
+      }
+      program { name: "show_indicator_effect"; //show indicator using effect
+          signal: "indicator,show,effect";
+          source: "elm";
+          action: STATE_SET "default" 0.0;
+          target: "indicator_adapter";
+          transition: DECELERATE 0.2;
+      }
+      program { name: "hide_indicator_effect"; //hide indicator using effect
+          signal: "indicator,hide,effect";
+          source: "elm";
+          action: STATE_SET "hide" 0.0;
+          target: "indicator_adapter";
+          transition: DECELERATE 0.2;
+      }
+      program { name: "opaque_indicator";
+          signal: "elm,state,indicator,opaque";
+          source: "elm";
+          script {
+             set_int(transparent_mode, 0);
+             set_state(PART:"indicator_bg", "default", 0.0);
+             set_state(PART:"elm.swallow.indicator_bg", "default", 0.0);
+             run_program(PROGRAM:"update_indicator_adapter");
+          }
+      }
+      program { name: "transparent_indicator";
+          signal: "elm,state,indicator,transparent";
+          source: "elm";
+          script {
+             set_int(transparent_mode, 1);
+             set_state(PART:"indicator_bg", "transparent", 0.0);
+             set_state(PART:"elm.swallow.indicator_bg", "transparent", 0.0);
+             run_program(PROGRAM:"update_indicator_adapter");
+          }
+      }
+      program { name: "show_full_attach_panel";
+         signal: "elm,state,attach_panel,show,full";
+         source: "";
+         script {
+            set_int(attach_panel_state, ATTACH_PANEL_STATE_FULL);
+         }
+         after: "show_full_attach_panel2";
+      }
+      program { name: "show_full_attach_panel2";
+         action: STATE_SET "full" 0.0;
+         target: "elm.swallow.attach_panel";
+         transition: DECELERATE ATTACH_PANEL_TRANS_TIME;
+      }
+      program { name: "show_half_attach_panel";
+         signal: "elm,state,attach_panel,show,half";
+         source: "";
+         script {
+            set_int(attach_panel_state, ATTACH_PANEL_STATE_HALF);
+         }
+         after: "show_half_attach_panel2";
+      }
+      program { name: "show_half_attach_panel2";
+         action: STATE_SET "half" 0.0;
+         target: "elm.swallow.attach_panel";
+         transition: DECELERATE ATTACH_PANEL_TRANS_TIME;
+      }
+      program { name: "show_attach_panel_started";
+         signal: "elm,state,attach_panel,show,started";
+         source: "";
+         script {
+            set_int(attach_panel_state, ATTACH_PANEL_STATE_HALF);
+            //set attach_panel state
+            set_state(PART:"elm.swallow.attach_panel", "half", 0.0);
+            //set content state
+            set_state(PART:"elm.swallow.content", "show_attach_panel", 0.0);
+         }
+      }
+      program { name: "hide_attach_panel_finished";
+         signal: "elm,state,attach_panel,hide,finished";
+         source: "";
+         script {
+            set_int(attach_panel_state, ATTACH_PANEL_STATE_HIDE);
+            //set attach_panel state
+            set_state(PART:"elm.swallow.attach_panel", "default", 0.0);
+            //set content state
+            if (get_int(keypad_disable) == 1 && get_int(clipboard_disable) == 1)
+              set_state(PART:"elm.swallow.content", "disable_sip", 0.0);
+            else
+              set_state(PART:"elm.swallow.content", "default", 0.0);
+         }
+      }
+      program { name: "enable_clipboard";
+         signal: "elm,state,clipboard,enable";
+         source: "";
+         script {
+            set_int(clipboard_disable, 0);
+            //set content state
+            set_state(PART:"elm.swallow.content", "default", 0.0);
+         }
+      }
+      program { name: "disable_clipboard";
+         signal: "elm,state,clipboard,disable";
+         source: "";
+         script {
+            set_int(clipboard_disable, 1);
+            set_state(PART:"sip_area", "default", 0.0);
+            if (get_int(attach_panel_state) != ATTACH_PANEL_STATE_HIDE) {
+               set_state(PART:"elm.swallow.content", "show_attach_panel", 0.0);
+            }
+            else {
+               if (get_int(keypad_disable) == 1)
+                 set_state(PART:"elm.swallow.content", "disable_sip", 0.0);
+               else
+                 set_state(PART:"elm.swallow.content", "default", 0.0);
+            }
+         }
+      }
+      program { name: "enable_virtualkeypad";
+         signal: "elm,state,virtualkeypad,enable";
+         source: "";
+         script {
+            set_int(keypad_disable, 0);
+            set_state(PART:"elm.swallow.content", "default", 0.0);
+         }
+      }
+      program { name: "disable_virtualkeypad";
+         signal: "elm,state,virtualkeypad,disable";
+         source: "";
+         script {
+            set_int(keypad_disable, 1);
+            if (get_int(attach_panel_state) != ATTACH_PANEL_STATE_HIDE) {
+               set_state(PART:"elm.swallow.content", "show_attach_panel", 0.0);
+            }
+            else {
+               if (get_int(clipboard_disable) == 1)
+                 {
+                    set_state(PART:"sip_area", "clipboard_on", 0.0);
+                    set_state(PART:"elm.swallow.content", "disable_sip", 0.0);
+                 }
+               else
+                 set_state(PART:"elm.swallow.content", "default", 0.0);
+            }
+         }
+      }
+      program { name: "change_to_landscape";
+         script {
+            set_int(landscape_mode, 1);
+            run_program(PROGRAM:"update_indicator_adapter");
+            set_state(PART:"indicator_bg", "transparent", 0.0);
+         }
+      }
+      program { name: "change_to_portrait";
+         script {
+            set_int(landscape_mode, 0);
+            run_program(PROGRAM:"update_indicator_adapter");
+            if (get_int(transparent_mode) == 0) {
+               set_state(PART:"indicator_bg", "default", 0.0);
+            }
+         }
+      }
+      program { name: "overlap_mode";
+         signal: "elm,state,indicator,overlap";
+         source: "elm";
+         script {
+            set_int(overlap_mode, 1);
+            set_state(PART:"overlap_clipper", "overlap", 0.0);
+            run_program(PROGRAM:"update_indicator_adapter");
+         }
+      }
+      program { name: "nooverlap_mode";
+         signal: "elm,state,indicator,nooverlap";
+         source: "elm";
+         script {
+            set_int(overlap_mode, 0);
+            set_state(PART:"overlap_clipper", "default", 0.0);
+            run_program(PROGRAM:"update_indicator_adapter");
+         }
+      }
+      program { name: "update_indicator_adapter";
+         script {
+            //update indicator base
+            if ((get_int(transparent_mode) == 1) ||
+                (get_int(indicator_visible) == 0) ||
+                (get_int(overlap_mode) == 1) ||
+                (get_int(landscape_mode) == 1)) {
+               set_state(PART:"indicator_base", "hide", 0.0);
+            } else {
+               set_state(PART:"indicator_base", "default", 0.0);
+            }
+            //update indicator adapter
+            if ((get_int(transparent_mode) == 1) ||
+                (get_int(indicator_visible) == 0) ||
+                (get_int(landscape_mode)))
+              set_state(PART:"indicator_adapter", "hide", 0.0);
+            else
+              set_state(PART:"indicator_adapter", "default", 0.0);
+         }
+      }
+      program { name: "landscape_mode";
+         source: "elm";
+         signal: "elm,state,orient,90";
+         after: "change_to_landscape";
+      }
+      program { name: "landscape_mode2";
+         source: "elm";
+         signal: "elm,state,orient,270";
+         after: "change_to_landscape";
+      }
+      program { name: "portrait_mode";
+         source: "elm";
+         signal: "elm,state,orient,0";
+         after: "change_to_portrait";
+      }
+      program { name: "portrait_mode2";
+         source: "elm";
+         signal: "elm,state,orient,180";
+         after: "change_to_portrait";
+      }
+      program {
+          name: "clipboard_on";
+          signal: "elm,state,clipboard,on";
+          source: "elm";
+          action: STATE_SET "clipboard_on" 0.0;
+          target: "sip_area";
+      }
+      program {
+          name: "clipboard_off";
+          signal: "elm,state,clipboard,off";
+          source: "elm";
+          action: STATE_SET "default" 0.0;
+          target: "sip_area";
+      }
+   }
+}
diff --git a/themes/widgets/ctxpopup.edc b/mobile/widgets/ctxpopup.edc
index 79e4f561..46132402 100644
--- a/themes/widgets/ctxpopup.edc
+++ b/mobile/widgets/ctxpopup.edc
@@ -28,8 +28,7 @@ group {
    name: "elm/ctxpopup/layout/default";
    alias: "elm/ctxpopup/layout/copypaste";
 
-   data.item: "visible_maxw" CTXPOPUP_WIDTH;
-   data.item: "visible_maxh" (CTXPOPUP_ITEM_HEIGHT_MIN*6);
+   data.item: "visible_maxw" CTXPOPUP_WIDTH_INC;
    parts {
       part {
          name:"top_padding";
@@ -356,8 +355,7 @@ group {
    name: "elm/ctxpopup/layout/landscape/default";
    inherit: "elm/ctxpopup/layout/default";
 
-   data.item: "visible_maxw" CTXPOPUP_WIDTH;
-   data.item: "visible_maxh" (CTXPOPUP_ITEM_HEIGHT_MIN*4);
+   data.item: "visible_maxw" CTXPOPUP_WIDTH_INC;
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
@@ -365,14 +363,13 @@ group {
    inherit: "elm/ctxpopup/layout/default";
 
    data.item: "visible_maxw" (CTXPOPUP_COPYPASTE_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING);
-   data.item: "visible_maxh" (CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC*2);
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/layout/more/default";
 
-   data.item: "visible_maxw" CTXPOPUP_WIDTH;
-   data.item: "visible_maxh" (CTXPOPUP_ITEM_HEIGHT_MIN*6);
+   data.item: "visible_maxw" CTXPOPUP_WIDTH_INC;
+   data.item: "visible_maxh" (CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC*7);
 
    parts {
       part {
@@ -475,26 +472,31 @@ group {
    name: "elm/ctxpopup/layout/landscape/more/default";
    inherit: "elm/ctxpopup/layout/more/default";
 
-   data.item: "visible_maxw" CTXPOPUP_WIDTH;
-   data.item: "visible_maxh" (CTXPOPUP_ITEM_HEIGHT_MIN*4);
+   data.item: "visible_maxw" CTXPOPUP_WIDTH_INC;
+   data.item: "visible_maxh" (CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC*5);
 
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/bg/more/default";
+   images {
+      image: "core_theme_bg_dim.png" COMP;
+   }
    parts {
       part {
          name: "bg";
-         type: RECT;
+         type: IMAGE;
          scale: 1;
          mouse_events: 1;
          description {
             state: "default" 0.0;
             visible: 0;
+            image.normal: "core_theme_bg_dim.png";
+            color: 255 255 255 255;
          }
          description {
             state: "visible" 0.0;
-            color: 7 7 7 102; /*(Changeable UI) color_class: "B016";*/
+            inherit: "default" 0.0;
             align: 0.0 0.0;
             visible: 1;
          }
@@ -639,159 +641,6 @@ group {
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
-   name: "elm/ctxpopup/base/default";
-   parts {
-      part {
-         name:"frame_shadow_left_top_padding";
-         type: SPACER;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
-            max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
-            rel2.relative: 0 0;
-            align: 0 0;
-            fixed: 1 1;
-         }
-      }
-      part {
-         name:"frame_shadow_right_bottom_padding";
-         type: SPACER;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
-            max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
-            rel1.relative: 1 1;
-            align: 1 1;
-            fixed: 1 1;
-         }
-      }
-      part {
-         name: "frame_bg";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            rel1.to:"frame_shadow_left_top_padding";
-            rel2.to:"frame_shadow_right_bottom_padding";
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B066";*/
-         }
-      }
-      part {
-         name: "frame_top_line";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            rel1.to: "frame_bg";
-            rel2 {to: "frame_bg"; relative: 1.0 0.0;}
-            min: 0 CTXPOPUP_OUTLINE_SIZE;
-            max: -1 CTXPOPUP_OUTLINE_SIZE;
-            color: 2 64 140 255; /*(Changeable UI) color_class: "B067";*/
-            align: 0.5 0.0;
-            fixed: 0 1;
-         }
-      }
-      part {
-         name: "frame_bottom_line";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            rel1 {to: "frame_bg"; relative: 0.0 1.0;}
-            rel2.to: "frame_bg";
-            min: 0 CTXPOPUP_OUTLINE_SIZE;
-            max: -1 CTXPOPUP_OUTLINE_SIZE;
-            color: 2 64 140 255; /*(Changeable UI) color_class: "B067";*/
-            align: 0.5 1.0;
-            fixed: 0 1;
-         }
-      }
-      part {
-         name: "frame_left_line";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            rel1.to: "frame_bg";
-            rel2 {to: "frame_bg"; relative: 0.0 1.0;}
-            min: CTXPOPUP_OUTLINE_SIZE 0;
-            max: CTXPOPUP_OUTLINE_SIZE -1;
-            color: 2 64 140 255; /*(Changeable UI) color_class: "B067";*/
-            align: 0.0 0.5;
-            fixed: 1 0;
-         }
-      }
-      part {
-         name: "frame_right_line";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            rel1 {to: "frame_bg"; relative: 1.0 0.0;}
-            rel2.to: "frame_bg";
-            min: CTXPOPUP_OUTLINE_SIZE 0;
-            max: CTXPOPUP_OUTLINE_SIZE -1;
-            color: 2 64 140 255; /*(Changeable UI) color_class: "B067";*/
-            align: 1.0 0.5;
-            fixed: 1 0;
-         }
-      }
-      part {
-         name: "content_left_top_padding";
-         type: SPACER;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            rel1.to: "frame_bg";
-            rel2 {to: "frame_bg"; relative: 0.0 0.0;}
-            align: 0.0 0.0;
-            fixed: 1 1;
-         }
-      }
-      part {
-         name: "content_right_bottom_padding";
-         type: SPACER;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            rel1 {to: "frame_bg"; relative: 1.0 1.0;}
-            rel2.to: "frame_bg";
-            align: 1.0 1.0;
-            fixed: 1 1;
-         }
-      }
-      part { name: "access.outline";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "frame_bg";
-            rel2.to: "frame_bg";
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0 0;
-            rel1 {to: "content_left_top_padding"; relative: 1.0 1.0;}
-            rel2 {to: "content_right_bottom_padding"; relative: 0.0 0.0;}
-         }
-      }
-   }
-}
-///////////////////////////////////////////////////////////////////////////////
-group {
    name: "elm/ctxpopup/base/more/default";
    parts {
       part {
@@ -801,8 +650,8 @@ group {
          mouse_events: 0;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_WIDTH 0;
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B061L41";*/
+            min: CTXPOPUP_WIDTH_INC 0;
+            color: 255 255 255 255;
          }
       }
       part { name: "access.outline";
@@ -830,16 +679,25 @@ group {
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
-   name: "elm/ctxpopup/base/copypaste";
+   name: "elm/ctxpopup/base/default";
+   alias: "elm/ctxpopup/base/copypaste";
    images {
-      image: "copy&paste_popup_bg_line.#.png" COMP;
       set {
-         name: "copy&paste_popup_bg_ef.#";
+         name: "core_contextual_popup_bg.#.png";
          image {
-            image: SMALL"images/Copy_Paste/copy&paste_popup_bg_ef.#.png" COMP;
+            image: SMALL"images/Assist_Views/core_contextual_popup_bg.#.png" COMP;
          }
          image {
-            image: MEDIUM"images/Copy_Paste/copy&paste_popup_bg_ef.#.png" COMP;
+            image: MEDIUM"images/Assist_Views/core_contextual_popup_bg.#.png" COMP;
+         }
+      }
+      set {
+         name: "core_contextual_popup_bg_stroke.#.png";
+         image {
+            image: SMALL"images/Assist_Views/core_contextual_popup_bg_stroke.#.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Assist_Views/core_contextual_popup_bg_stroke.#.png" COMP;
          }
       }
    }
@@ -858,54 +716,61 @@ group {
          }
       }
       part {
-         name:"frame_shadow_right_bottom_padding";
+         name:"content_left_top_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
-            max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
-            rel1{relative: 1 1;}
-            align: 1 1;
+            min: CTXPOPUP_CONTENT_LEFT_PADDING CTXPOPUP_CONTENT_TOP_PADDING;
+            max: CTXPOPUP_CONTENT_LEFT_PADDING CTXPOPUP_CONTENT_TOP_PADDING;
+            rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
+            align: 0 0;
             fixed: 1 1;
          }
       }
       part {
-         name: "frame_bg";
-         type: RECT;
+         name:"content_right_bottom_padding";
+         type: SPACER;
          scale: 1;
-         mouse_events: 0;
          description {
             state: "default" 0.0;
-            rel1 {to: "content_left_top_padding"; relative: 1.0 1.0; }
-            rel2 {to: "content_right_bottom_padding"; relative: 0.0 0.0; }
-            min: CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC 0;
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B061L41";*/ //FIXME change color code
+            min: CTXPOPUP_CONTENT_RIGHT_PADDING CTXPOPUP_CONTENT_BOTTOM_PADDING;
+            max: CTXPOPUP_CONTENT_RIGHT_PADDING CTXPOPUP_CONTENT_BOTTOM_PADDING;
+            rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
+            align: 1 1;
+            fixed: 1 1;
          }
       }
       part {
-         name: "frame_line_bg";
+         name:"frame_shadow_right_bottom_padding";
+         type: SPACER;
          scale: 1;
-         mouse_events: 0;
          description {
             state: "default" 0.0;
-            rel1 {to:"frame_shadow_left_top_padding"; relative: 1.0 1.0;}
-            rel2 {to:"frame_shadow_right_bottom_padding"; relative: 0.0 0.0;}
-            image.normal: "copy&paste_popup_bg_line.#.png";
-            color: 2 64 140 255; /*(Changeable UI) color_class: "B067";*/
+            min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
+            max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
+            rel1{relative: 1 1;}
+            align: 1 1;
+            fixed: 1 1;
          }
       }
       part {
-         name: "frame_effect_bg";
+         name: "frame_bg";
          scale: 1;
          mouse_events: 0;
          description {
             state: "default" 0.0;
-            rel1.to: "frame_line_bg";
-            rel2.to: "frame_line_bg";
-            image.normal: "copy&paste_popup_bg_ef.#";
+            rel1 {to: "content_left_top_padding"; relative: 1.0 1.0; }
+            rel2 {to: "content_right_bottom_padding"; relative: 0.0 0.0; }
+            min: CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC 0;
+            image.normal: "core_contextual_popup_bg.#.png";
+            color: 255 255 255 255;
          }
       }
+      part {
+         name: "frame_clipper";
+         inherit: "frame_bg";
+      }
       part { name: "access.outline";
          type: RECT;
          scale: 1;
@@ -1064,8 +929,8 @@ group {
             state: "default" 0.0;
             align: 0 0;
             fixed: 1 1;
-            min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
-            max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
+            min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING_WIDTH_INC CTXPOPUP_FRAME_CORNER_ARROW_PADDING_HEIGHT_INC;
+            max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING_WIDTH_INC CTXPOPUP_FRAME_CORNER_ARROW_PADDING_HEIGHT_INC;
             rel1 {relative: 1 1; to: "frame_shadow_left_top_padding";}
          }
       }
@@ -1077,139 +942,389 @@ group {
             state: "default" 0.0;
             align: 1 1;
             fixed: 1 1;
-            min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
-            max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
+            min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING_WIDTH_INC CTXPOPUP_FRAME_CORNER_ARROW_PADDING_HEIGHT_INC;
+            max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING_WIDTH_INC CTXPOPUP_FRAME_CORNER_ARROW_PADDING_HEIGHT_INC;
             rel2 {relative: 0 0; to: "frame_shadow_right_bottom_padding";}
          }
       }
       part {
-         name:"content_left_top_padding";
+         name: "arrow_left_top_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_LEFT_PADDING CTXPOPUP_CONTENT_TOP_PADDING;
-            max: CTXPOPUP_CONTENT_LEFT_PADDING CTXPOPUP_CONTENT_TOP_PADDING;
+            min: CTXPOPUP_ARROW_PADDING_INC CTXPOPUP_ARROW_PADDING_INC;
+            max: CTXPOPUP_ARROW_PADDING_INC CTXPOPUP_ARROW_PADDING_INC;
             rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
             align: 0 0;
-            fixed: 1 1;
          }
       }
       part {
-         name:"content_right_bottom_padding";
+         name: "arrow_right_bottom_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_RIGHT_PADDING CTXPOPUP_CONTENT_BOTTOM_PADDING;
-            max: CTXPOPUP_CONTENT_RIGHT_PADDING CTXPOPUP_CONTENT_BOTTOM_PADDING;
+            min: CTXPOPUP_ARROW_PADDING_INC CTXPOPUP_ARROW_PADDING_INC;
+            max: CTXPOPUP_ARROW_PADDING_INC CTXPOPUP_ARROW_PADDING_INC;
             rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
             align: 1 1;
-            fixed: 1 1;
          }
       }
       part {
-         name: "arrow_left_top_padding";
-         type: SPACER;
+         name: "elm.swallow.content";
+         type: SWALLOW;
          scale: 1;
+         clip_to: "frame_clipper";
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
-            max: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
-            rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
             align: 0 0;
+            rel1 {to:"content_left_top_padding";  relative: 1.0 1.0;}
+            rel2 {to:"content_right_bottom_padding";  relative: 0.0 0.0;}
          }
       }
       part {
-         name: "arrow_right_bottom_padding";
-         type: SPACER;
+         name: "frame_line_bg";
          scale: 1;
+         mouse_events: 0;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
-            max: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
-            rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
-            align: 1 1;
+            rel1 {to:"content_left_top_padding"; relative: 1.0 1.0;}
+            rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;}
+            image.normal: "core_contextual_popup_bg_stroke.#.png";
+            color: 61 185 204 255;
+         }
+      }
+   }
+}
+///////////////////////////////////////////////////////////////////////////////
+group {
+   name: "elm/ctxpopup/arrow/default";
+   alias: "elm/ctxpopup/arrow/copypaste";
+   alias: "elm/ctxpopup/arrow/more/default";
+   }
+//////////////////////////////////////////////////////////////////////////////
+group {
+   name: "elm/ctxpopup/text_style_item/default";
+
+   script {
+      public mouse_down = 0;
+      public multi_down = 0;
+   }
+
+   data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC;
+   parts {
+      part {
+         name: "event_blocker";
+         type: RECT;
+         mouse_events: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
          }
       }
       part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
+         name: "bg";
+         mouse_events: 0;
+         type: RECT;
          scale: 1;
          description {
             state: "default" 0.0;
-            align: 0 0;
-            rel1 {to:"content_left_top_padding";  relative: 1.0 1.0;}
-            rel2 {to:"content_right_bottom_padding";  relative: 0.0 0.0;}
+            min: (CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC*2) CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            max: CTXPOPUP_WIDTH_INC (CTXPOPUP_ITEM_HEIGHT_MAX_INC-CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC*2);
+            rel1 {to_y: "separator"; relative: 0.0 1.0;}
+            color: 255 255 255 255;
+         }
+         description {
+            state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 77;
          }
       }
-   }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-group {
-   name: "elm/ctxpopup/arrow/copypaste";
-   parts {
       part {
-         name: "ctxpopup_arrow";
+         name: "separator";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            color: 61 185 204 77;
+            rel2.relative: 1.0 0.0;
+            min: 0 2;
+            fixed: 0 1;
+            align: 0.5 0.0;
+            visible: 0;
+         }
+         description {
+            state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "left_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
+            min: CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC 1;
+            align: 0 0.5;
             fixed: 1 1;
+         }
+      }
+      part {
+         name: "elm.text";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: 1 CTXPOPUP_ITEM_TEXT_HEIGHT_MIN_INC;
+            max: CTXPOPUP_TEXT_MAX_INC (CTXPOPUP_ITEM_HEIGHT_MAX_INC-CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC*2);
             align: 0.5 0.5;
+            rel1 {
+               relative: 1.0 0.0;
+               to_x: "left_padding";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               to_x: "right_padding";
+            }
+            color: 0 0 0 255;
+            text {
+               font: "Tizen:style=Regular"; size: "30";
+               text_class: "tizen";
+               align: 0 0.5;
+               min: 1 1;
+            }
          }
          description {
-            state: "bottom" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 0.5 0.0;
+            state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            text.font: "Tizen:style=Regular"; text.size: "30";
+            text.text_class: "tizen";
+            color: 0 0 0 255;
          }
          description {
-            state: "top" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
+            state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text.font: "Tizen:style=Regular"; text.size: "30";
+            text.text_class: "tizen";
+            color: 0 0 0 115;
+         }
+         description {
+            state: "ellipsis" 0.0;
+            inherit: "default" 0.0;
+            min: CTXPOPUP_TEXT_MAX_INC CTXPOPUP_ITEM_TEXT_HEIGHT_MIN_INC;
+            text.min: 0 1;
+         }
+         description {
+            state: "ellipsis_clicked" 0.0;
+            inherit: "ellipsis" 0.0;
+            text.font: "Tizen:style=Regular"; text.size: "30";
+            text.text_class: "tizen";
+            color: 0 0 0 255;
+         }
+         description {
+            state: "ellipsis_disabled" 0.0;
+            inherit: "ellipsis" 0.0;
+            text.font: "Tizen:style=Regular"; text.size: "30";
+            text.text_class: "tizen";
+            color: 0 0 0 115;
+         }
+      }
+      part {
+         name: "right_padding";
+         type: SPACER;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_STYLE_TEXT_LR_PADDING_INC 1;
             fixed: 1 1;
-            align: 0.5 1.0;
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "events";
+         type: RECT;
+         mouse_events: 1;
+         repeat_events: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "disclip";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+         }
+         description {
+            state: "disabled" 0.0;
+            visible: 1;
+            color: 0 0 0 0;
          }
       }
    }
    programs {
       program {
-         name: "enable_bottom_arrow";
-         signal: "elm,state,bottom";
+         name: "text_default";
+         signal: "elm,state,text,default";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "disabled") || !strcmp(st, "ellipsis_disabled"))
+              set_state(PART:"elm.text", "disabled", 0.0);
+            else
+              set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+      program {
+         name: "text_ellipsis";
+         signal: "elm,state,text,ellipsis";
          source: "elm";
-         action: STATE_SET "bottom" 0.0;
-         target: "ctxpopup_arrow";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "disabled") || !strcmp(st, "elipsis_disabled"))
+              set_state(PART:"elm.text", "ellipsis_disabled", 0.0);
+            else
+              set_state(PART:"elm.text", "ellipsis", 0.0);
+         }
       }
       program {
-         name: "enable_top_arrow";
-         signal: "elm,state,top";
+         name: "hide_separator";
+         signal: "elm,state,default";
          source: "elm";
-         action: STATE_SET "top" 0.0;
-         target: "ctxpopup_arrow";
+         action: STATE_SET "default" 0.0;
+         target: "separator";
+      }
+      program {
+         name: "show_separator";
+         signal: "elm,state,separator";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "separator";
+      }
+      program {
+         name: "item_clicked";
+         signal: "mouse,clicked,1";
+         source: "events";
+         script {
+            if (get_int(multi_down) == 0) {
+               emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_sound");
+            }
+         }
+      }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
+         name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled")))
+              set_state(PART:"elm.text", "ellipsis_disabled", 0.0);
+            else
+              set_state(PART:"elm.text", "disabled", 0.0);
+            set_state(PART:"disclip", "disabled", 0.0);
+         }
+      }
+      program {
+         name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled")))
+              set_state(PART:"elm.text", "ellipsis", 0.0);
+            else
+              set_state(PART:"elm.text", "default", 0.0);
+            set_state(PART:"disclip", "default", 0.0);
+         }
+      }
+      program {
+         name: "item_pressed";
+         signal: "mouse,down,1";
+         source: "events";
+         script {
+            if (get_int(multi_down) == 0 && get_int(mouse_down) == 0) {
+               set_int(mouse_down, 1);
+               set_state(PART:"bg", "clicked", 0.0);
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "default"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+               else
+                 set_state(PART:"elm.text", "ellipsis_clicked", 0.0);
+            }
+         }
+      }
+      program { name: "item,unpressed";
+         signal: "elm,action,unpressed";
+         source: "elm";
+         after: "item_released";
+      }
+      program {
+         name: "item_released";
+         signal: "mouse,up,1";
+         source: "events";
+         script {
+            if (get_int(mouse_down) == 1) {
+               set_int(mouse_down, 0);
+               set_state(PART:"bg", "default", 0.0);
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "default") || !strcmp(st, "clicked"))
+                 set_state(PART:"elm.text", "default", 0.0);
+               else
+                 set_state(PART:"elm.text", "ellipsis", 0.0);
+            }
+         }
+      }
+      program {
+         name: "multi_down";
+         signal: "elm,action,multi,down";
+         source: "elm";
+         script {
+            set_int(multi_down, 1);
+         }
+      }
+      program {
+         name: "multi_up";
+         signal: "elm,action,multi,up";
+         source: "elm";
+         script {
+            set_int(multi_down, 0);
+         }
       }
    }
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
-   name: "elm/ctxpopup/arrow/default";
-   alias: "elm/ctxpopup/arrow/more/default";
-   }
-//////////////////////////////////////////////////////////////////////////////
-group {
-   name: "elm/ctxpopup/text_style_item/default";
-   alias: "elm/ctxpopup/text_style_item/more/default";
-
+   name: "elm/ctxpopup/text_style_item/more/default";
    script {
       public mouse_down = 0;
       public multi_down = 0;
    }
 
-   data.item: "item_max_size" CTXPOPUP_TEXT_MAX;
+   data.item: "item_max_size" CTXPOPUP_MORE_TEXT_MAX_INC;
    parts {
       part {
          name: "event_blocker";
@@ -1227,27 +1342,28 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_WIDTH 1;
-            max: CTXPOPUP_WIDTH CTXPOPUP_ITEM_HEIGHT_MAX;
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B061L41";*/
+            min: CTXPOPUP_WIDTH_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_WIDTH_INC CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
+            color: 255 255 255 255;
+            fixed: 1 0;
          }
          description {
             state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B061L41P";*/
+            color: 61 185 204 76;
          }
       }
       part {
-         name: "left_top_padding";
+         name: "left_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ITEM_TEXT_LR_PADDING CTXPOPUP_ITEM_TEXT_TB_PADDING;
-            max: CTXPOPUP_ITEM_TEXT_LR_PADDING CTXPOPUP_ITEM_TEXT_TB_PADDING;
+            min: CTXPOPUP_MORE_ITEM_TEXT_LR_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_MORE_ITEM_TEXT_LR_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
             rel1.to: "bg";
             rel2.to: "bg";
-            align: 0 0;
+            align: 0 0.5;
             fixed: 1 1;
          }
       }
@@ -1258,66 +1374,67 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: 1 CTXPOPUP_ITEM_TEXT_HEIGHT_MIN;
-            max: CTXPOPUP_TEXT_MAX (CTXPOPUP_ITEM_HEIGHT_MAX-CTXPOPUP_ITEM_TEXT_TB_PADDING*2);
+            min: 1 CTXPOPUP_MORE_ITEM_TEXT_HEIGHT_MIN_INC;
+            max: (CTXPOPUP_WIDTH_INC-CTXPOPUP_MORE_ITEM_TEXT_LR_PADDING_INC*2) (CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC-CTXPOPUP_MORE_ITEM_TEXT_TB_PADDING_INC*2);
             align: 0.5 0.5;
-            rel1 {relative: 1.0 1.0; to: "left_top_padding";}
-            rel2 {relative: 0.0 0.0; to: "right_bottom_padding";}
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T126";*/
+            rel1 {relative: 1.0 0.0; to_x: "left_padding";}
+            rel2 {relative: 0.0 1.0; to_x: "right_padding";}
+            color: 26 26 26 255;
             text {
-               font: "Tizen:style=Regular"; size: "30"; /*(Changeable UI) text_class: "T126";*/
+               font: "Tizen:style=Regular"; size: "40";
                text_class: "tizen";
-               size_range: CTXPOPUP_ITEM_TEXT_SIZE CTXPOPUP_ITEM_TEXT_MAX_SIZE;
+               size_range: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC (CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC*2);
                align: 0 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
          description {
             state: "clicked" 0.0;
             inherit: "default" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "30"; /*(Changeable UI) text.text_class: "T126P";*/
+            text.font: "Tizen:style=Regular"; text.size: "40";
             text.text_class: "tizen";
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T126P";*/
+            color: 26 26 26 255;
          }
          description {
             state: "disabled" 0.0;
             inherit: "default" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "30"; /*(Changeable UI) text.text_class: "T126D";*/
+            text.font: "Tizen:style=Regular"; text.size: "40";
             text.text_class: "tizen";
-            color: 7 7 7 127; /*(Changeable UI) color_class: "T126D";*/
+            color: 26 26 26 77;
          }
          description {
             state: "ellipsis" 0.0;
             inherit: "default" 0.0;
-            min: CTXPOPUP_TEXT_MAX CTXPOPUP_ITEM_TEXT_HEIGHT_MIN;
+            min: CTXPOPUP_MORE_ITEM_TEXT_MAX_INC CTXPOPUP_MORE_ITEM_TEXT_HEIGHT_MIN_INC;
             text.min: 0 1;
          }
          description {
             state: "ellipsis_clicked" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "30"; /*(Changeable UI) text.text_class: "T126P";*/
+            text.font: "Tizen:style=Regular"; text.size: "40";
             text.text_class: "tizen";
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T126P";*/
+            color: 26 26 26 255;
          }
          description {
             state: "ellipsis_disabled" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "30"; /*(Changeable UI) text.text_class: "T126D";*/
+            text.font: "Tizen:style=Regular"; text.size: "40";
             text.text_class: "tizen";
-            color: 7 7 7 127; /*(Changeable UI) color_class: "T126D";*/
+            color: 26 26 26 77;
          }
       }
       part {
-         name: "right_bottom_padding";
+         name: "right_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ITEM_TEXT_LR_PADDING CTXPOPUP_ITEM_TEXT_TB_PADDING;
-            max: CTXPOPUP_ITEM_TEXT_LR_PADDING CTXPOPUP_ITEM_TEXT_TB_PADDING;
+            min: CTXPOPUP_MORE_ITEM_TEXT_LR_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_MORE_ITEM_TEXT_LR_PADDING_INC CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
+            rel1.to: "bg";
+            rel2.to: "bg";
             fixed: 1 1;
-            align: 1.0 1.0;
+            align: 1.0 0.5;
          }
       }
       part {
@@ -1343,19 +1460,6 @@ group {
             color: 0 0 0 0;
          }
       }
-      part {
-         name: "bottom_line";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            min: 1 1;
-            max: -1 1;
-            fixed: 0 1;
-            align: 0.5 1.0;
-            color: 192 213 222 255;
-            rel1.relative: 0.0 1.0;
-         }
-      }
    }
    programs {
       program {
@@ -1393,9 +1497,13 @@ group {
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_sound");
             }
          }
       }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program {
          name: "disable";
          signal: "elm,state,disabled";
@@ -1556,10 +1664,9 @@ group {
             rel1 {relative: 1.0 0.0; to: "left_padding";}
             rel2 {relative: 0.0 1.0; to: "right_padding";}
             text {
-               font: "Tizen:style=Regular"; size: "24"; /*(Changeable UI) text_class: "T130";*/
+               font: "Tizen:style=Regular"; size: "26"; /*(Changeable UI) text_class: "T130";*/
                text_class: "tizen";
                min: 1 1;
-               ellipsis: -1;
             }
             color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
          }
@@ -1620,10 +1727,15 @@ group {
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_snd");
             }
          }
       }
       program {
+         name: "touch_snd";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
          name: "disable";
          signal: "elm,state,disabled";
          source: "elm";
@@ -1710,31 +1822,237 @@ group {
    parts {
       part {
          name: "bg";
+         mouse_events: 0;
+         type: RECT;
          scale: 1;
+         description {
+            state: "default" 0.0;
+            min: (CTXPOPUP_ITEM_ICON_STYLE_LR_PADDING_INC*2+CTXPOPUP_ICON_WIDTH_INC) CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            rel1 {to_y: "separator"; relative: 0.0 1.0;}
+            color: 255 255 255 255;
+         }
+         description {
+            state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 77;
+         }
+      }
+      part {
+         name: "separator";
          mouse_events: 0;
          type: RECT;
+         scale: 1;
          description {
             state: "default" 0.0;
+            color: 61 185 204 77;
+            rel2.relative: 1.0 0.0;
+            min: 0 2;
+            align: 0.5 0.0;
+            fixed: 0 1;
             visible: 0;
-            min: (CTXPOPUP_ITEM_ICON_HORIZONTAL_WIDTH_INC-1) CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC;
-            rel1 {to: "separator"; relative: 1.0 0.0;}
          }
          description {
-            state: "clicked" 0.0;
+            state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B066P";*/
          }
       }
       part {
-         name: "top_padding";
+         name: "left_padding";
          type: SPACER;
          scale: 1;
          description {
             state: "default" 0.0;
-            min: 0 CTXPOPUP_ITEM_TEXT_TOP_PADDING_INC;
-            max: 0 CTXPOPUP_ITEM_TEXT_TOP_PADDING_INC;
-            align: 0.5 0.0;
+            min: CTXPOPUP_ITEM_ICON_STYLE_LR_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_ICON_STYLE_LR_PADDING_INC 1;
+            align: 0 0.5;
+            fixed: 1 1;
+         }
+      }
+      part {
+         name: "elm.swallow.icon";
+         type: SWALLOW;
+         clip_to: "icon_clip";
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC;
+            max: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC;
+            fixed: 1 1;
+            aspect: 1.0 1.0;
+            rel1 { relative: 1.0 0.0; to_x:"left_padding"; }
+            rel2 { relative: 0.0 1.0; to_x:"right_padding"; }
+         }
+      }
+      part {
+         name: "icon_clip";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            rel1.to: "elm.swallow.icon";
+            rel2.to: "elm.swallow.icon";
+            color: 51 51 51 255;
+         }
+      }
+      part {
+         name: "right_padding";
+         type: SPACER;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ITEM_ICON_STYLE_LR_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_ICON_STYLE_LR_PADDING_INC 1;
+            fixed: 1 1;
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "events";
+         type: RECT;
+         mouse_events: 1;
+         repeat_events: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "disclip";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+         }
+         description {
+            state: "disabled" 0.0;
+            visible: 1;
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "hide_separator";
+         signal: "elm,state,default";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "separator";
+      }
+      program {
+         name: "show_separator";
+         signal: "elm,state,separator";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "separator";
+      }
+      program {
+         name: "item_clicked";
+         signal: "mouse,clicked,1";
+         source: "events";
+         script {
+            if (get_int(multi_down) == 0) {
+               emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_sound");
+            }
+         }
+      }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
+         name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "disclip";
+      }
+      program {
+         name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "disclip";
+      }
+      program {
+         name: "item_pressed";
+         signal: "mouse,down,1";
+         source: "events";
+         script {
+            if (get_int(multi_down) == 0 && get_int(mouse_down) == 0) {
+               set_int(mouse_down, 1);
+               set_state(PART:"bg", "clicked", 0.0);
+            }
+         }
+      }
+      program { name: "item,unpressed";
+         signal: "elm,action,unpressed";
+         source: "elm";
+         after: "item_released";
+      }
+      program {
+         name: "item_released";
+         signal: "mouse,up,1";
+         source: "events";
+         script {
+            if (get_int(mouse_down) == 1) {
+               set_int(mouse_down, 0);
+               set_state(PART:"bg", "default", 0.0);
+            }
+         }
+      }
+      program {
+         name: "multi_down";
+         signal: "elm,action,multi,down";
+         source: "elm";
+         script {
+            set_int(multi_down, 1);
+         }
+      }
+      program {
+         name: "multi_up";
+         signal: "elm,action,multi,up";
+         source: "elm";
+         script {
+            set_int(multi_down, 0);
+         }
+      }
+   }
+}
+///////////////////////////////////////////////////////////////////////////////
+group {
+   name: "elm/ctxpopup/icon_style_item_horizontal/default";
+
+   script {
+      public mouse_down = 0;
+      public multi_down = 0;
+   }
+   parts {
+      part {
+         name: "event_blocker";
+         type: RECT;
+         mouse_events: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "bg";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_ITEM_ICON_HORIZONTAL_WIDTH_MIN_INC CTXPOPUP_ITEM_ICON_HORIZONTAL_HEIGHT_MIN_INC;
+            rel1 {to: "separator"; relative: 1.0 0.0;}
+            color: 61 185 204 77;
+         }
+         description {
+            state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
       }
       part {
@@ -1744,7 +2062,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            color: 7 7 7 51; /*(Changeable UI) color_class: "B069";*/
+            color: 61 185 204 77;
             align: 0 0.5;
             min: 0 0;
             max: 0 -1;
@@ -1753,12 +2071,24 @@ group {
          description {
             state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: CTXPOPUP_SEPARATOR_MIN_SIZE_INC;
+            min: 1 CTXPOPUP_ITEM_ICON_HORIZONTAL_HEIGHT_MIN_INC;
             max: CTXPOPUP_SEPARATOR_MAX_SIZE_INC;
             visible: 1;
          }
       }
       part {
+         name: "top_padding";
+         scale: 1;
+         type: SPACER;
+         description {
+            state: "default" 0.0;
+            min: 1 CTXPOPUP_ITEM_ICON_HORIZONTAL_TB_PADDING_INC;
+            max: 1 CTXPOPUP_ITEM_ICON_HORIZONTAL_TB_PADDING_INC;
+            align: 0.5 0.0;
+            fixed: 1 1;
+         }
+      }
+      part {
          name: "elm.swallow.icon";
          type: SWALLOW;
          clip_to: "icon_clip";
@@ -1780,7 +2110,7 @@ group {
             state: "default" 0.0;
             rel1.to: "elm.swallow.icon";
             rel2.to: "elm.swallow.icon";
-            color: 7 7 7 204; /*(Changeable UI) color_class: "B068";*/
+            color: 51 51 51 255;
          }
       }
       part {
@@ -1789,8 +2119,9 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: 0 CTXPOPUP_ITEM_BOTTOM_PADDING_INC;
-            max: 0 CTXPOPUP_ITEM_BOTTOM_PADDING_INC;
+            min: 1 CTXPOPUP_ITEM_ICON_HORIZONTAL_TB_PADDING_INC;
+            max: 1 CTXPOPUP_ITEM_ICON_HORIZONTAL_TB_PADDING_INC;
+            fixed: 1 1;
             align: 0.5 1.0;
          }
       }
@@ -1817,22 +2148,38 @@ group {
             color: CTXPOPUP_ITEM_DISABLED_COLOR;
          }
       }
-      part {
-         name: "bottom_line";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            min: 1 1;
-            max: -1 1;
-            fixed: 0 1;
-            align: 0.5 1.0;
-            color: 192 213 222 255;
-            rel1.relative: 0.0 1.0;
-         }
-      }
    }
    programs {
       program {
+         name: "item_click";
+         signal: "mouse,clicked,1";
+         source: "events";
+         script {
+            if (get_int(multi_down) == 0) {
+               emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_snd");
+            }
+         }
+      }
+      program {
+         name: "touch_snd";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
+         name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "disclip";
+      }
+      program {
+         name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "disclip";
+      }
+      program {
          name: "hide_separator";
          signal: "elm,state,default";
          source: "elm";
@@ -1847,21 +2194,236 @@ group {
          target: "separator";
       }
       program {
+         name: "item_pressed";
+         signal: "mouse,down,1";
+         source: "events";
+         script {
+            if (get_int(multi_down) == 0 && get_int(mouse_down) == 0) {
+               set_int(mouse_down, 1);
+               set_state(PART:"bg", "clicked", 0.0);
+            }
+         }
+      }
+      program { name: "item,unpressed";
+         signal: "elm,action,unpressed";
+         source: "elm";
+         after: "item_released";
+      }
+      program {
+         name: "item_released";
+         signal: "mouse,up,1";
+         source: "events";
+         script {
+            if (get_int(mouse_down) == 1) {
+               set_int(mouse_down, 0);
+               set_state(PART:"bg", "default", 0.0);
+            }
+         }
+      }
+      program {
+         name: "multi_down";
+         signal: "elm,action,multi,down";
+         source: "elm";
+         script {
+            set_int(multi_down, 1);
+         }
+      }
+      program {
+         name: "multi_up";
+         signal: "elm,action,multi,up";
+         source: "elm";
+         script {
+            set_int(multi_down, 0);
+         }
+      }
+   }
+}
+///////////////////////////////////////////////////////////////////////////////
+group {
+   name: "elm/ctxpopup/icon_text_style_item/default";
+
+   script {
+      public mouse_down = 0;
+      public multi_down = 0;
+   }
+
+   parts {
+      part {
+         name: "bg";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: (CTXPOPUP_ITEM_ICON_LEFT_PADDING_INC+CTXPOPUP_ICON_WIDTH_INC+CTXPOPUP_ITEM_ICON_RIGHT_PADDING_INC+CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC) CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            max: CTXPOPUP_WIDTH_INC CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            rel1 {to_y: "separator"; relative: 0.0 1.0;}
+            color: 255 255 255 255;
+         }
+         description {
+            state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 77;
+         }
+      }
+      part {
+         name: "separator";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            color: 61 185 204 77;
+            rel2.relative: 1.0 0.0;
+            min: 0 2;
+            align: 0.5 0.0;
+            visible: 0;
+            fixed: 0 1;
+         }
+         description {
+            state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "icon_left_padding";
+         scale: 1;
+         type: SPACER;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ITEM_ICON_LEFT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_ICON_LEFT_PADDING_INC 1;
+            fixed: 1 1;
+            align: 0.0 0.5;
+         }
+      }
+      part {
+         name: "elm.swallow.icon";
+         type: SWALLOW;
+         clip_to: "icon_clip";
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC;
+            max: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ICON_HEIGHT_INC;
+            align: 0.0 0.5;
+            aspect: 1.0 1.0;
+            rel1 { relative: 1.0 0.0; to_x:"icon_left_padding"; }
+            rel2 { relative: 1.0 1.0; to_x:"icon_left_padding"; }
+         }
+      }
+      part {
+         name: "icon_clip";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            rel1.to: "elm.swallow.icon";
+            rel2.to: "elm.swallow.icon";
+            color: 51 51 51 255;
+         }
+      }
+      part {
+         name: "icon_right_padding";
+         scale: 1;
+         type: SPACER;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ITEM_ICON_RIGHT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_ICON_RIGHT_PADDING_INC 1;
+            fixed: 1 1;
+            align: 0.0 0.5;
+            rel1 { relative: 1.0 0.0; to_x:"elm.swallow.icon"; }
+            rel2 { relative: 1.0 1.0; to_x:"elm.swallow.icon"; }
+         }
+      }
+      part {
+         name: "elm.text";
+         type:  TEXT;
+         mouse_events:  0;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: (CTXPOPUP_ITEM_HORIZONTAL_WIDTH_MIN_INC-CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC*2) CTXPOPUP_ITEM_TEXT_HEIGHT_MIN_INC;
+            max: -1 CTXPOPUP_ITEM_TEXT_HEIGHT_MIN_INC;
+            align: 0.0 0.5;
+            rel1 {relative: 1.0 0.0; to_x: "icon_right_padding";}
+            rel2 {relative: 0.0 1.0; to_x: "text_right_padding";}
+            color: 0 0 0 255;
+            text {
+               font: "Tizen:style=Regular"; size: "26";
+               text_class: "tizen";
+               align: 0 0.5;
+               min: 1 1;
+            }
+         }
+         description {
+            state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 115;
+            text.font: "Tizen:style=Regular"; text.size: "26";
+            text.text_class: "tizen";
+         }
+      }
+      part {
+         name: "text_right_padding";
+         type: SPACER;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ITEM_TEXT_RIGHT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_RIGHT_PADDING_INC 1;
+            align: 1.0 0.5;
+         }
+      }
+      part {
+         name: "events";
+         type: RECT;
+         mouse_events: 1;
+         repeat_events: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "disclip";
+         type: RECT;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+         }
+         description {
+            state: "disabled" 0.0;
+            visible: 1;
+            color: CTXPOPUP_ITEM_DISABLED_COLOR;
+         }
+      }
+   }
+   programs {
+      program {
          name: "item_click";
          signal: "mouse,clicked,1";
          source: "events";
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_snd");
             }
          }
       }
       program {
+         name: "touch_snd";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
          name: "disable";
          signal: "elm,state,disabled";
          source: "elm";
          action: STATE_SET "disabled" 0.0;
          target: "disclip";
+         target: "elm.text";
       }
       program {
          name: "enable";
@@ -1869,6 +2431,21 @@ group {
          source: "elm";
          action: STATE_SET "default" 0.0;
          target: "disclip";
+         target: "elm.text";
+      }
+      program {
+         name: "hide_separator";
+         signal: "elm,state,default";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "separator";
+      }
+      program {
+         name: "show_separator";
+         signal: "elm,state,separator";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "separator";
       }
       program {
          name: "item_pressed";
@@ -1917,7 +2494,7 @@ group {
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
-   name: "elm/ctxpopup/icon_text_style_item/default";
+   name: "elm/ctxpopup/icon_text_style_item_horizontal/default";
 
    script {
       public mouse_down = 0;
@@ -1933,14 +2510,14 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: (CTXPOPUP_ITEM_HORIZONTAL_WIDTH_MIN_INC-1) CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC;
+            min: (CTXPOPUP_ITEM_TEXT_PADDING_INC*2) CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_MIN_INC;
             rel1 {to: "separator"; relative: 1.0 0.0;}
          }
          description {
             state: "clicked" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B066P";*/
+            color: 61 185 204 77;
          }
       }
       part {
@@ -1950,7 +2527,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            color: 7 7 7 51; /*(Changeable UI) color_class: "B069";*/
+            color: 61 185 204 77;
             align: 0 0.5;
             min: 0 0;
             max: 0 -1;
@@ -1959,7 +2536,7 @@ group {
          description {
             state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: CTXPOPUP_SEPARATOR_MIN_SIZE_INC;
+            min: 1 CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_MIN_INC;
             max: CTXPOPUP_SEPARATOR_MAX_SIZE_INC;
             visible: 1;
          }
@@ -1970,8 +2547,8 @@ group {
          type: SPACER;
          description {
             state: "default" 0.0;
-            min: 1 CTXPOPUP_ITEM_TOP_PADDING_INC;
-            max: 1 CTXPOPUP_ITEM_TOP_PADDING_INC;
+            min: 1 CTXPOPUP_ITEM_ICON_TEXT_STYLE_TB_PADDING_INC;
+            max: 1 CTXPOPUP_ITEM_ICON_TEXT_STYLE_TB_PADDING_INC;
             align: 0.5 0.0;
          }
       }
@@ -1997,7 +2574,7 @@ group {
             state: "default" 0.0;
             rel1.to: "elm.swallow.icon";
             rel2.to: "elm.swallow.icon";
-            color: 7 7 7 204; /*(Changeable UI) color_class: "B068";*/
+            color: 51 51 51 255;
          }
       }
       part {
@@ -2006,8 +2583,8 @@ group {
          type: SPACER;
          description {
             state: "default" 0.0;
-            min: 1 CTXPOPUP_ITEM_ICON_BOTTOM_PADDING_INC;
-            max: 1 CTXPOPUP_ITEM_ICON_BOTTOM_PADDING_INC;
+            min: 1 CTXPOPUP_ITEM_ICON_TEXT_STYLE_ICON_PADDING_INC;
+            max: 1 CTXPOPUP_ITEM_ICON_TEXT_STYLE_ICON_PADDING_INC;
             align: 0.5 0.0;
             rel1 { relative: 0.0 1.0; to_y:"elm.swallow.icon"; }
          }
@@ -2019,16 +2596,15 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: (CTXPOPUP_ITEM_HORIZONTAL_WIDTH_MIN_INC-CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC*2) (CTXPOPUP_ITEM_HEIGHT_INC-CTXPOPUP_ICON_HEIGHT_INC-CTXPOPUP_ITEM_TOP_PADDING_INC-CTXPOPUP_ITEM_ICON_BOTTOM_PADDING_INC-CTXPOPUP_ITEM_BOTTOM_PADDING_INC);
+            min: 0 CTXPOPUP_ITEM_ICON_TEXT_STYLE_TEXT_SIZE_INC;
             align: 0.5 0.0;
             rel1 {relative: 1.0 1.0; to_x: "text_left_padding"; to_y: "icon_bottom_padding";}
             rel2 {relative: 0.0 0.0; to_x: "text_right_padding"; to_y:"text_bottom_padding";}
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
+            color: 0 0 0 255;
             text {
-               font: "Tizen:style=Regular"; size: "24"; /*(Changeable UI) text_class: "T130";*/
+               font: "Tizen:style=Regular"; size: "26";
                text_class: "tizen";
                min: 1 1;
-               ellipsis: -1;
             }
          }
       }
@@ -2038,8 +2614,8 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC 1;
-            max: CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC 1;
+            min: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
             align: 0.0 0.5;
          }
       }
@@ -2049,8 +2625,8 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC 1;
-            max: CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC 1;
+            min: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
             align: 1.0 0.5;
          }
       }
@@ -2060,8 +2636,8 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ITEM_BOTTOM_PADDING_INC;
-            max: CTXPOPUP_ICON_WIDTH_INC CTXPOPUP_ITEM_BOTTOM_PADDING_INC;
+            min: 1 CTXPOPUP_ITEM_ICON_TEXT_STYLE_TB_PADDING_INC;
+            max: 1 CTXPOPUP_ITEM_ICON_TEXT_STYLE_TB_PADDING_INC;
             align: 0.5 1.0;
          }
       }
@@ -2088,19 +2664,6 @@ group {
             color: CTXPOPUP_ITEM_DISABLED_COLOR;
          }
       }
-      part {
-         name: "bottom_line";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            min: 1 1;
-            max: -1 1;
-            fixed: 0 1;
-            align: 0.5 1.0;
-            color: 192 213 222 255;
-            rel1.relative: 0.0 1.0;
-         }
-      }
    }
    programs {
       program {
@@ -2110,10 +2673,15 @@ group {
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_snd");
             }
          }
       }
       program {
+         name: "touch_snd";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
          name: "disable";
          signal: "elm,state,disabled";
          source: "elm";
@@ -2190,15 +2758,17 @@ group {
 group {
    name: "elm/ctxpopup/text_style_item_horizontal/copypaste";
    alias: "elm/ctxpopup/icon_text_style_item/copypaste";
+   alias: "elm/ctxpopup/icon_text_style_item_horizontal/copypaste";
    alias: "elm/ctxpopup/text_style_item/copypaste";
    alias: "elm/ctxpopup/icon_style_item/copypaste";
+   alias: "elm/ctxpopup/icon_style_item_horizontal/copypaste";
 
    script {
       public mouse_down = 0;
       public multi_down = 0;
    }
 
-   data.item: "item_max_size" (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MAX_INC-CTXPOPUP_ITEM_TEXT_LR_PADDING*2);
+   data.item: "item_max_size" (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MAX_INC-CTXPOPUP_ITEM_TEXT_PADDING_INC*2);
 
    parts {
       part {
@@ -2218,9 +2788,9 @@ group {
          description {
             state: "default" 0.0;
             visible: 0;
-            min: (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC-1) CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC;
+            min: (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC-1) CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_HEIGHT_MIN_INC;
             rel1 {to: "separator"; relative: 1.0 0.0;}
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B061L41P";*/
+            color: 61 185 204 77;
          }
          description {
             state: "clicked" 0.0;
@@ -2235,7 +2805,7 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            color: 7 7 7 51; /*(Changeable UI) color_class: "B069";*/
+            color: 61 185 204 77;
             align: 0 0.5;
             min: 0 0;
             max: 0 -1;
@@ -2244,19 +2814,19 @@ group {
          description {
             state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_SEPARATOR_MIN_SIZE_INC;
-            max: CTXPOPUP_COPYPASTE_SEPARATOR_MAX_SIZE_INC;
+            min: 2 CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_HEIGHT_MIN_INC;
+            max: CTXPOPUP_SEPARATOR_MAX_SIZE_INC;
             visible: 1;
          }
       }
       part {
          name: "text_top_padding";
          scale: 1;
-         type: SPACER;
+         type:  SPACER;
          description {
             state: "default" 0.0;
-            min: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_TOP_PADDING_INC;
-            max: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_TOP_PADDING_INC;
+            min: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC;
+            max: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC;
             align: 0.5 0.0;
             fixed: 1 1;
          }
@@ -2268,18 +2838,16 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC-CTXPOPUP_ITEM_TEXT_LR_PADDING_INC*2) (CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC-CTXPOPUP_COPYPASTE_ITEM_TEXT_TOP_PADDING_INC-CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC);
+            min: 0 CTXPOPUP_COPYPASTE_TEXT_STYLE_TEXT_SIZE_INC;
             align: 0.5 0.0;
             rel1 {relative: 1.0 1.0; to_x: "text_left_padding"; to_y: "text_top_padding";}
             rel2 {relative: 0.0 0.0; to_x: "text_right_padding"; to_y:"text_bottom_padding";}
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
+            color: 0 0 0 255;
             text {
-               size_range: CTXPOPUP_COPYPASTE_TEXT_SIZE_INC CTXPOPUP_COPYPASTE_TEXT_SIZE_INC;
                align: 0.5 0.5;
                min: 1 1;
-               font: "Tizen:style=Regular"; size: "24"; /*(Changeable UI) text_class: "T130";*/
+               font: "Tizen:style=Regular"; size: "26";
                text_class: "tizen";
-               ellipsis: -1;
             }
          }
          description {
@@ -2287,34 +2855,35 @@ group {
             inherit: "default" 0.0;
             text {
                min: 0 1;
-               font: "Regular"; size: "24"; /*(Changeable UI) text_class: "T130";*/
+               font: "Regular"; size: "26";
+               text_class: "tizen";
             }
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
+            color: 0 0 0 255;
          }
          description {
             state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
-            text.font: "Tizen:style=Regular"; text.size: "24"; /*(Changeable UI) text.text_class: "T130";*/
+            color: 0 0 0 115;
+            text.font: "Tizen:style=Regular"; text.size: "26";
             text.text_class: "tizen";
          }
          description {
             state: "ellipsis" 0.0;
             inherit: "default" 0.0;
-            min: (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MAX_INC-CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC*2) (CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC-CTXPOPUP_COPYPASTE_ITEM_TEXT_TOP_PADDING_INC-CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC);
+            min: (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MAX_INC-CTXPOPUP_ITEM_TEXT_PADDING_INC*2) CTXPOPUP_COPYPASTE_TEXT_STYLE_TEXT_SIZE_INC;
             text.min: 0 1;
          }
          description {
             state: "ellipsis_clicked" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Regular"; text.size: "24"; /*(Changeable UI) text.text_class: "T130";*/
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
+            text.font: "Regular"; text.size: "26";
+            color: 0 0 0 255;
          }
          description {
             state: "ellipsis_disabled" 0.0;
             inherit: "ellipsis" 0.0;
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T130";*/
-            text.font: "Tizen:style=Regular"; text.size: "24"; /*(Changeable UI) text.text_class: "T130";*/
+            color: 0 0 0 255;
+            text.font: "Tizen:style=Regular"; text.size: "26";
             text.text_class: "tizen";
          }
       }
@@ -2324,8 +2893,8 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 1;
-            max: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 1;
+            min: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
             fixed: 1 0;
             align: 0.0 0.5;
          }
@@ -2336,8 +2905,8 @@ group {
          scale: 1;
          description {
             state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 1;
-            max: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 1;
+            min: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
+            max: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
             fixed: 1 0;
             align: 1.0 0.5;
          }
@@ -2377,19 +2946,6 @@ group {
             color: CTXPOPUP_ITEM_DISABLED_COLOR;
          }
       }
-      part {
-         name: "bottom_line";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            min: 1 1;
-            max: -1 1;
-            fixed: 0 1;
-            align: 0.5 1.0;
-            color: 192 213 222 255;
-            rel1.relative: 0.0 1.0;
-         }
-      }
    }
    programs {
       program {
@@ -2427,10 +2983,15 @@ group {
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_snd");
             }
          }
       }
       program {
+         name: "touch_snd";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
          name: "disable";
          signal: "elm,state,disabled";
          source: "elm";
@@ -2533,7 +3094,6 @@ group {
       }
    }
 }
-
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/layout/dropdown/list";
@@ -2967,25 +3527,24 @@ group {
             rel2 {relative: 0.0 0.0; to: "right_bottom_padding";}
             color: 7 7 7 255; /*(Changeable UI) color_class: "T12351";*/
             text {
-               font: "Tizen:style=Regular"; size: "27"; /*(Changeable UI) text_class: "T12351";*/
+               font: "Tizen:style=Regular"; size: "34"; /*(Changeable UI) text_class: "T12351";*/
                text_class: "list_item";
                size_range: CTXPOPUP_DROPDOWN_ITEM_TEXT_SIZE CTXPOPUP_DROPDOWN_ITEM_TEXT_MAX_SIZE;
                align: 0 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
          description {
             state: "clicked" 0.0;
             inherit: "default" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351P";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351P";*/
             text.text_class: "list_item";
             color: 7 7 7 255; /*(Changeable UI) color_class: "T12351P";*/
          }
          description {
             state: "disabled" 0.0;
             inherit: "default" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351D";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351D";*/
             text.text_class: "list_item";
             color: 7 7 7 76; /*(Changeable UI) color_class: "T12351D";*/
          }
@@ -2998,14 +3557,14 @@ group {
          description {
             state: "ellipsis_clicked" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351P";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351P";*/
             text.text_class: "list_item";
             color: 7 7 7 255; /*(Changeable UI) color_class: "T12351P";*/
          }
          description {
             state: "ellipsis_disabled" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351D";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351D";*/
             text.text_class: "list_item";
             color: 7 7 7 76; /*(Changeable UI) color_class: "T12351D";*/
          }
@@ -3109,9 +3668,13 @@ group {
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_sound");
             }
          }
       }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program {
          name: "disable";
          signal: "elm,state,disabled";
@@ -3296,25 +3859,24 @@ group {
             rel2 {relative: 0.0 0.0; to: "right_bottom_padding";}
             color: 7 7 7 255; /*(Changeable UI) color_class: "T12351";*/
             text {
-               font: "Tizen:style=Regular"; size: "27"; /*(Changeable UI) text_class: "T12351";*/
+               font: "Tizen:style=Regular"; size: "34"; /*(Changeable UI) text_class: "T12351";*/
                text_class: "list_item";
                size_range: CTXPOPUP_DROPDOWN_ITEM_TEXT_SIZE CTXPOPUP_DROPDOWN_ITEM_TEXT_MAX_SIZE;
                align: 0 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
          description {
             state: "clicked" 0.0;
             inherit: "default" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351P";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351P";*/
             text.text_class: "list_item";
             color: 7 7 7 255; /*(Changeable UI) color_class: "T12351P";*/
          }
          description {
             state: "disabled" 0.0;
             inherit: "default" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351D";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351D";*/
             text.text_class: "list_item";
             color: 7 7 7 76; /*(Changeable UI) color_class: "T12351D";*/
          }
@@ -3327,14 +3889,14 @@ group {
          description {
             state: "ellipsis_clicked" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351P";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351P";*/
             text.text_class: "list_item";
             color: 7 7 7 255; /*(Changeable UI) color_class: "T12351P";*/
          }
          description {
             state: "ellipsis_disabled" 0.0;
             inherit: "ellipsis" 0.0;
-            text.font: "Tizen:style=Regular"; text.size: "27"; /*(Changeable UI) text.text_class: "T12351D";*/
+            text.font: "Tizen:style=Regular"; text.size: "34"; /*(Changeable UI) text.text_class: "T12351D";*/
             text.text_class: "list_item";
             color: 7 7 7 76; /*(Changeable UI) color_class: "T12351D";*/
          }
@@ -3438,9 +4000,13 @@ group {
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "");
+               run_program(PROGRAM:"touch_sound");
             }
          }
       }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program {
          name: "disable";
          signal: "elm,state,disabled";
diff --git a/themes/widgets/datetime.edc b/mobile/widgets/datetime.edc
index a59bf2a2..d70f7959 100644
--- a/themes/widgets/datetime.edc
+++ b/mobile/widgets/datetime.edc
@@ -26,127 +26,74 @@
 ///////////////////////////////////////////////////////////////////////////////
 // datetime
 ///////////////////////////////////////////////////////////////////////////////
-
-#define size1 70
-#define size2 140
-#define DATETIME_FIELD(_pos,width) \
-   part { \
-      name: "field"#_pos; type: SWALLOW; \
-      scale: 1; \
-      clip_to: "clip"; \
-      description { state: "default" 0.0; \
-         visible: 0; \
-         min: 0 250; \
-         max: 0 250; \
-         fixed: 1 0; \
-         align: 0.0 0.5; \
-         rel1.relative: 1.0 0.0; \
-         rel1.to: "separator"#_pos; \
-         rel2.relative: 1.0 1.0; \
-         rel2.to: "separator"#_pos; \
-      } \
-      description { state: "enable" 0.0; \
-         inherit: "default" 0.0; \
-         min: width 250; \
-         max: width 250; \
-         visible: 1; \
-      } \
-   } \
-   programs{ \
-      program { name: "field_"#_pos"enabled"; \
-         signal: "field"#_pos",enable"; source: "elm"; \
-         action: STATE_SET "enable" 0.0; \
-         target: "field"#_pos; \
-      } \
-      program { name: "field_"#_pos"disabled"; \
-         signal: "field"#_pos",disable"; source: "elm"; \
-         action: STATE_SET "default" 0.0; \
-         target: "field"#_pos; \
-      } \
-    }
-#define DATETIME_SEPARATOR(_pos, _after) \
-   part { \
-      name: "separator"#_pos; type: TEXT; \
-      scale: 1; \
-      effect: SHADOW BOTTOM; \
-      clip_to: "disclip"; \
-      description { state: "default" 0.0; \
-         visible: 0; \
-         min: 0 0; \
-         align: 0.0 0.5; \
-         fixed: 1 0; \
-         rel1 { \
-            relative: 1.0 0.0; \
-            to: "field"#_after; \
-         } \
-         rel2 { \
-            relative: 1.0 1.0; \
-            to: "field"#_after; \
-         } \
-         color: 7 7 7 255; /*(Changeable UI) color_class: "T1232";*/ \
-         text { \
-            font: "Sans"; size: 100; \
-            min: 1 0; \
-            ellipsis: -1; \
-            align: 0.5 0.5; \
-            font: "Tizen:style=Light"; size: "90"; /*(Changeable UI) text_class: "T1232";*/ \
-            text_class: "tizen"; \
-         } \
-      } \
-      description { state: "enable" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-         min: 8 10; \
-      } \
-   } \
-   part { \
-      name: "separator"#_pos"d"; type: TEXT; \
-      scale: 1; \
-      effect: SHADOW BOTTOM; \
-      clip_to: "disclip2"; \
-      description { state: "default" 0.0; \
-         visible: 0; \
-         rel1.to: "separator"#_pos; \
-         rel2.to: "separator"#_pos; \
-         color_class: "datetime_text"; \
-         text { \
-            text_source: "separator"#_pos; \
-            font: "Sans"; size: 100; \
-         } \
-      } \
-      description { state: "enable" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   } \
-   programs { \
-      program { \
-         signal: "field"#_after",enable"; source: "elm"; \
-         action: STATE_SET "enable" 0.0; \
-         target: "separator"#_pos; \
-         target: "separator"#_pos"d"; \
-      } \
-      program { \
-         signal: "field"#_after",disable"; source: "elm"; \
-         action: STATE_SET "default" 0.0; \
-         target: "separator"#_pos; \
-         target: "separator"#_pos"d"; \
-      } \
-   }
-
-#undef DATETIME_SEPARATOR
-#undef DATETIME_FIELD
-
 group { name: "elm/datetime/base/default";
    alias: "elm/datetime/base/date_layout";
    parts {
+      part { name: "base_bg";
+        type: RECT;
+        scale: 1;
+        description { state: "default" 0.0;
+           color: 250 250 250 255;
+        }
+      }
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: DATETIME_LAYOUT_BASE_BG_SIZE_INC;
+         }
+      }
+      part { name: "bg.top.padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 DATETIME_BG_TOP_BOTTOM_PADDING;
+            max: -1 DATETIME_BG_TOP_BOTTOM_PADDING;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 0.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               to: "base";
+            }
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bg.bottom.padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 DATETIME_BG_TOP_BOTTOM_PADDING;
+            max: -1 DATETIME_BG_TOP_BOTTOM_PADDING;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "base";
+            }
+            align: 0.5 1.0;
+         }
+      }
       part { name: "bg";
          type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             min: DATETIME_LAYOUT_CONTENT_SIZE_INC;
             max: DATETIME_LAYOUT_CONTENT_SIZE_INC;
-            color_class: "B0211";
+            rel1 {
+               relative: 0.0 1.0;
+               to: "bg.top.padding";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               to: "bg.bottom.padding";
+            }
+            color: 250 250 250 255;
          }
       }
       part { name: "left.padding";
@@ -318,13 +265,71 @@ group { name: "elm/datetime/base/default";
 
 group { name: "elm/datetime/base/time_layout";
    parts {
+      part { name: "base_bg";
+        type: RECT;
+        scale: 1;
+        description { state: "default" 0.0;
+           color: 250 250 250 255;
+        }
+      }
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: TIME_LAYOUT_BASE_BG_SIZE_INC;
+         }
+      }
+      part { name: "bg.top.padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 DATETIME_BG_TOP_BOTTOM_PADDING;
+            max: -1 DATETIME_BG_TOP_BOTTOM_PADDING;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 0.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               to: "base";
+            }
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bg.bottom.padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 DATETIME_BG_TOP_BOTTOM_PADDING;
+            max: -1 DATETIME_BG_TOP_BOTTOM_PADDING;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "base";
+            }
+            align: 0.5 1.0;
+         }
+      }
       part { name: "bg";
          type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: DATETIME_LAYOUT_CONTENT_SIZE_INC;
-            max: DATETIME_LAYOUT_CONTENT_SIZE_INC;
-            color_class: "B0211";
+            min: TIME_LAYOUT_CONTENT_SIZE_INC;
+            max: TIME_LAYOUT_CONTENT_SIZE_INC;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "bg.top.padding";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               to: "bg.bottom.padding";
+            }
+            color: 250 250 250 255;
          }
       }
       part { name: "left.padding";
@@ -413,16 +418,14 @@ group { name: "elm/datetime/base/time_layout";
          description { state: "default" 0.0;
             rel1.to: "text_bg";
             rel2.to: "text_bg";
-            color: 7 7 7 255; /*(Changeable UI) color_class: "T1232";*/
-            align: 0.5 0.4;
+            color: 0 0 0 255;
+            fixed: 1 1;
             text {
-               min: 1 1;
-               fit: 1 1;
-               font: "Tizen:style=Light"; size: "90"; /*(Changeable UI) text_class: "T1232";*/
-               text_class: "tizen";
+               min: 1 0;
+               font: "TizenSans:style=Light";
+               size: "106";
                text: ":";
-               align: 0.5 0.4;
-               ellipsis: -1;
+               align: 0.5 0.44;
             }
          }
       }
@@ -460,8 +463,8 @@ group { name: "elm/datetime/base/time_layout";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            min: TIME_LAYOUT_CONTENT_RIGHT_PADDING_WIDTH_INC 0;
-            max: TIME_LAYOUT_CONTENT_RIGHT_PADDING_WIDTH_INC -1;
+            min: TIME_LAYOUT_MINITE_RIGHT_PADDING_WIDTH_INC 0;
+            max: TIME_LAYOUT_MINITE_RIGHT_PADDING_WIDTH_INC -1;
              rel1 {
                relative: 1.0 0.0;
                to: "field4";
@@ -475,8 +478,8 @@ group { name: "elm/datetime/base/time_layout";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            min: TIME_LAYOUT_CONTENT_FIELD_WIDTH_INC 0;
-            max: TIME_LAYOUT_CONTENT_FIELD_WIDTH_INC -1;
+            min: TIME_LAYOUT_CONTENT_AMPM_FIELD_WIDTH_INC 0;
+            max: TIME_LAYOUT_CONTENT_AMPM_FIELD_WIDTH_INC -1;
              rel1 {
                relative: 1.0 0.0;
                to: "center.padding3";
@@ -544,6 +547,13 @@ group { name: "elm/datetime/base/time_layout_24hr";
    inherit: "elm/datetime/base/time_layout";
 
    parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: TIME24_LAYOUT_BASE_BG_SIZE_INC;
+         }
+      }
       part { name: "left.padding";
          type: SPACER;
          scale: 1;
@@ -580,34 +590,21 @@ group { name: "elm/datetime/base/time_layout_24hr";
             align: 1.0 1.0;
          }
       }
-      part { name: "center.padding1";
-         type: SPACER;
+      part { name: "bg";
+         type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 0;
-            min: TIME_LAYOUT_CONTENT_TIME_24HR_CENTER_PADDING_WIDTH_INC 0;
-            max: TIME_LAYOUT_CONTENT_TIME_24HR_CENTER_PADDING_WIDTH_INC -1;
+            min: TIME24_LAYOUT_CONTENT_SIZE_INC;
+            max: TIME24_LAYOUT_CONTENT_SIZE_INC;
             rel1 {
-               relative: 1.0 0.0;
-               to: "field3";
+               relative: 0.0 1.0;
+               to: "bg.top.padding";
             }
-            rel2.to: "field3";
-            align: 0.0 0.5;
-         }
-      }
-      part { name: "center.padding2";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            min: TIME_LAYOUT_CONTENT_TIME_24HR_CENTER_PADDING_WIDTH_INC 0;
-            max: TIME_LAYOUT_CONTENT_TIME_24HR_CENTER_PADDING_WIDTH_INC -1;
-            rel1 {
+            rel2 {
                relative: 1.0 0.0;
-               to: "text_bg";
+               to: "bg.bottom.padding";
             }
-            rel2.to: "text_bg";
-            align: 0.0 0.5;
+            color: 250 250 250 255;
          }
       }
       part { name: "field5";
diff --git a/mobile/widgets/entry.edc b/mobile/widgets/entry.edc
new file mode 100644
index 00000000..96ce5094
--- /dev/null
+++ b/mobile/widgets/entry.edc
@@ -0,0 +1,3442 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define MAGNIFIER_SCALE 1.5
+
+#define ENTRY_SOUND_PROGRAM \
+   program { name: "touch_snd"; \
+      signal: "mouse,clicked,1"; \
+      source: "elm.text"; \
+      script { \
+         new st[31]; \
+         new Float:vl; \
+         get_state(PART:"elm.text", st, 30, vl); \
+         if (strcmp(st, "disabled")) \
+            run_program(PROGRAM:"touch_sound"); \
+      } \
+   } \
+   program { name: "touch_sound"; \
+      action: RUN_PLUGIN "touch_sound"; \
+   }
+
+group { name: "elm/entry/emoticon/angry/default"; images.image:
+   "emo-angry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-angry.png"; } } } }
+group { name: "elm/entry/emoticon/angry-shout/default"; images.image:
+   "emo-angry-shout.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-angry-shout.png"; } } } }
+group { name: "elm/entry/emoticon/guilty/default"; images.image:
+   "emo-guilty.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-guilty.png"; } } } }
+group { name: "elm/entry/emoticon/haha/default"; images.image:
+   "emo-haha.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-haha.png"; } } } }
+group { name: "elm/entry/emoticon/half-smile/default"; images.image:
+   "emo-half-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-half-smile.png"; } } } }
+group { name: "elm/entry/emoticon/happy/default"; images.image:
+   "emo-happy.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-happy.png"; } } } }
+group { name: "elm/entry/emoticon/kiss/default"; images.image:
+   "emo-kiss.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-kiss.png"; } } } }
+group { name: "elm/entry/emoticon/little-bit-sorry/default"; images.image:
+   "emo-little-bit-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-little-bit-sorry.png"; } } } }
+group { name: "elm/entry/emoticon/love/default"; images.image:
+   "emo-love.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-love.png"; } } } }
+group { name: "elm/entry/emoticon/minimal-smile/default"; images.image:
+   "emo-minimal-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-minimal-smile.png"; } } } }
+group { name: "elm/entry/emoticon/omg/default"; images.image:
+   "emo-omg.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-omg.png"; } } } }
+group { name: "elm/entry/emoticon/smile/default"; images.image:
+   "emo-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-smile.png"; } } } }
+group { name: "elm/entry/emoticon/sorry/default"; images.image:
+   "emo-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-sorry.png"; } } } }
+group { name: "elm/entry/emoticon/surprised/default"; images.image:
+   "emo-surprised.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-surprised.png"; } } } }
+group { name: "elm/entry/emoticon/tongue-dangling/default"; images.image:
+   "emo-tongue-dangling.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-tongue-dangling.png"; } } } }
+group { name: "elm/entry/emoticon/very-sorry/default"; images.image:
+   "emo-very-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-very-sorry.png"; } } } }
+group { name: "elm/entry/emoticon/wink/default"; images.image:
+   "emo-wink.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-wink.png"; } } } }
+group { name: "elm/entry/emoticon/worried/default"; images.image:
+   "emo-worried.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE_INC; image.normal:
+            "emo-worried.png"; } } } }
+
+
+group { name: "elm/entry/base/default";
+   alias: "elm/entry/base-mixedwrap/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data.item: "focus_highlight" "on";
+   styles {
+      style { name: "entry_textblock_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_textblock_focused_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_textblock_disabled_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_textblock_guide_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" wrap=mixed text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=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: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+               min: 0 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/base/vcenter_align";
+   alias: "elm/entry/base-mixedwrap/vcenter_align";
+   inherit: "elm/entry/base/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+               min: 0 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-charwrap/default";
+   alias: "elm/entry/base/char_wrap";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   styles {
+      style { name: "entry_textblock_char_wrap_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_textblock_char_wrap_focused_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_textblock_char_wrap_disabled_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_textblock_char_wrap_guide_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 wrap=char left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=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: "entry_textblock_char_wrap_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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_char_wrap_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_focused_style";
+               min: 0 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+	 program { name: "focus";
+        signal: "load";
+	    source: "";
+	    action: FOCUS_SET;
+	    target: "elm.text";
+	 }
+	 program { name: "disable";
+	    signal: "elm,state,disabled";
+	    source: "elm";
+	    action: STATE_SET "disabled" 0.0;
+	    target: "elm.text";
+	 }
+	 program { name: "enable";
+	    signal: "elm,state,enabled";
+	    source: "elm";
+	    action: STATE_SET "default" 0.0;
+	    target: "elm.text";
+	 }
+     program { name: "gdisable";
+        signal: "elm,guide,disabled";
+        source: "elm";
+        action: STATE_SET "hidden" 0.0;
+        target: "elm.guide";
+     }
+     program { name: "genable";
+        signal: "elm,guide,enabled";
+        source: "elm";
+        action: STATE_SET "default" 0.0;
+        target: "elm.guide";
+     }
+     ENTRY_SOUND_PROGRAM
+  }
+}
+
+group { name: "elm/entry/base-charwrap/vcenter_align";
+   alias: "elm/entry/base/vcenter_align";
+   inherit: "elm/entry/base-charwrap/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_char_wrap_guide_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_char_wrap_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_focused_style";
+               min: 0 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-nowrap/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_textblock_style";
+               min: 1 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+               min: 1 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/base-nowrap/vcenter_align";
+   inherit: "elm/entry/base-nowrap/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_textblock_style";
+               min: 1 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+               min: 1 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+               min: 0 1;
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-single/default";
+   alias: "elm/entry/base-single/vcenter_align";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   styles {
+      style { name: "entry_single_textblock_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_textblock_focused_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_textblock_disabled_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_textblock_guide_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 wrap=none left_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" right_margin="ENTRY_LEFT_RIGHT_MARGIN_INC" text_class=entry ellipsis=1.0";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+      }
+   }
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_single_textblock_guide_style";
+               min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_single_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/base-single/spinner/default";
+   alias: "elm/entry/base-single/spinner/horizontal";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   // FIXME: SamsungNum3L has to be applied.
+   styles {
+      style { name: "entry_single_spinner_textblock_style";
+         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_textblock_focused_style";
+         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_textblock_disabled_style";
+         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_textblock_guide_style";
+         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+      }
+   }
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_single_spinner_textblock_guide_style";
+               min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_single_spinner_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_spinner_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_spinner_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/base-single/spinner/vertical";
+   alias: "elm/entry/base-single/spinner/vertical_time_picker";
+   alias: "elm/entry/base-single/spinner/datetime";
+   styles {
+      style { name: "entry_single_spinner_vertical_textblock_style";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_vertical_textblock_focused_style";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_vertical_textblock_disabled_style";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000a3 align=center";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_vertical_textblock_guide_style";
+         base: "font=TizenSans:style=Light font_size=106 color=#000000a3 align=center";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+   }
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_single_spinner_vertical_textblock_guide_style";
+               min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_single_spinner_vertical_textblock_style";
+               min: 1 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_spinner_vertical_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_spinner_vertical_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/base-single/spinner/vertical_date_picker";
+   inherit: "elm/entry/base-single/spinner/vertical";
+   styles {
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_style";
+         base: "font=Tizen:style=Light font_size=90 color=#000000ff align=center text_class=tizen";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
+         base: "font=Tizen:style=Light font_size=90 color=#000000ff align=center text_class=tizen";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
+         base: "font=Tizen:style=Light font_size=90 color=#000000a3 align=center text_class=tizen";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
+         base: "font=Tizen:style=Light font_size=90 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            text {
+               style: "entry_single_spinner_vertical_date_picker_textblock_guide_style";
+               min: 0 1;
+               max: 0 0;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            min: SPINNER_VERTICAL_DATE_PICKER_TEXT_BUTTON_SIZE_INC;
+            text {
+               style: "entry_single_spinner_vertical_date_picker_textblock_style";
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_spinner_vertical_date_picker_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_spinner_vertical_date_picker_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+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: "multibuttonentry_single_textblock_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#000000ff wrap=none left_margin=1 right_margin=3 text_class=entry";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "multibuttonentry_single_textblock_disabled_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#0000005e wrap=none left_margin=1 right_margin=3 text_class=entry";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#00000080 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
+         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
+      }
+      style { name: "multibuttonentry_single_textblock_guide_style";
+         base: "font=Tizen:style=Regular font_size="ENTRY_FONT_SIZE_INC" color=#00000091 wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
+         tag:  "br" "";
+         tag:  "em" "+ font_style=Oblique";
+         tag:  "b" "+ font_weight=Bold";
+         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+         tag:  "hilight" "+ font_weight=Bold";
+      }
+   }
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "multibuttonentry_single_textblock_guide_style";
+               min: 0 1;
+               max: 0 1;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: EDITABLE;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "multibuttonentry_single_textblock_style";
+               min: 1 1;
+               max: 0 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "multibuttonentry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/base-single-noedit/default";
+   alias: "elm/entry/base-single-noedit/vcenter_align";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_single_textblock_guide_style";
+               min: 0 1;
+               max: 0 1;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_single_textblock_style";
+               min: 1 1;
+               max: 0 1;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+   }
+}
+
+group { name: "elm/entry/base-noedit/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+   }
+}
+
+group { name: "elm/entry/base-noedit/vcenter_align";
+   inherit: "elm/entry/base-noedit/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-noedit-charwrap/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_char_wrap_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         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: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_char_wrap_style";
+               min: 0 1;
+            align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+   }
+}
+
+group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
+   inherit: "elm/entry/base-noedit-charwrap/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_char_wrap_guide_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_char_wrap_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_char_wrap_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-noedit-mixedwrap/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+   }
+}
+
+group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
+   inherit: "elm/entry/base-noedit-mixedwrap/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            text {
+               style: "entry_textblock_style";
+               min: 0 1;
+               align: 0.0 0.5;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-nowrap-noedit/default";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_textblock_style";
+               min: 1 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+   }
+}
+
+group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
+   inherit: "elm/entry/base-nowrap-noedit/default";
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_textblock_guide_style";
+               min: 0 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PLAIN;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 1;
+         source: "elm/entry/selection/default"; // selection under
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_textblock_style";
+               min: 1 1;
+               align: 0.0 0.0;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_textblock_disabled_style";
+            }
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/base-password/default";
+   alias: "elm/entry/base-password/vcenter_align";
+   data.item: "default_font_size" "24";
+   data.item: "min_font_size" "8";
+   data.item: "max_font_size" "60";
+   data {
+      item: context_menu_orientation "horizontal";
+   }
+   parts {
+      part { name: "elm.guide";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "elm.text";
+            rel2.to: "elm.text";
+            text {
+               style: "entry_single_textblock_guide_style";
+               min: 0 1;
+               max: 0 1;
+            }
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PASSWORD;
+         select_mode: EXPLICIT;
+         cursor_mode: BEFORE;
+         multiline: 0;
+         source: "elm/entry/selection/default"; // selection under
+         source4: "elm/entry/cursor/default"; // cursorover
+         source5: "elm/entry/anchor/default"; // anchor under
+         description { state: "default" 0.0;
+            text {
+               style: "entry_single_textblock_style";
+               repch: "•";
+               min: 1 1;
+               max: 0 1;
+            }
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_focused_style";
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text {
+               style: "entry_single_textblock_disabled_style";
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "action_focus";
+         signal: "elm,action,focus";
+         source: "elm";
+         action: STATE_SET "focused" 0.0;
+         target: "elm.text";
+      }
+      program { name: "action_unfocus";
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "focus";
+         signal: "load";
+         source: "";
+         action: FOCUS_SET;
+         target: "elm.text";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "elm.text";
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "gdisable";
+         signal: "elm,guide,disabled";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.guide";
+      }
+      program { name: "genable";
+         signal: "elm,guide,enabled";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.guide";
+      }
+      ENTRY_SOUND_PROGRAM
+   }
+}
+
+group { name: "elm/entry/cursor/default";
+   min: 1 0;
+   parts {
+      part { name: "cursor";
+         type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            min: ENTRY_CURSOR_SIZE_INC;
+            fixed: 1 0;
+            align: 0.5 0.5;
+            rel1 {
+               relative: 0.0  0.0;
+               offset: 0 -2;
+            }
+            rel2 {
+               relative: 0.0  1.0;
+               offset: 0 -2;
+            }
+            color: 0 184 230 255; /*(Changeable UI) color_class: "F052";*/
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "clipper"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "cursor";
+            rel2.to: "cursor";
+            fixed: 1 1;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "selection,start";
+         source: "elm.text";
+         action: STATE_SET "hidden" 0.0;
+         target: "clipper";
+      }
+      program {
+         signal: "selection,cleared";
+         source: "elm.text";
+         action: STATE_SET "default" 0.0;
+         target: "clipper";
+      }
+      program {
+         signal: "elm,action,focus";
+         source: "elm";
+         action: ACTION_STOP;
+         target: "cursor_show";
+         target: "cursor_hide";
+         target: "cursor_show_timer";
+         target: "cursor_hide_timer";
+         after: "cursor_show";
+      }
+      program {
+         signal: "elm,action,unfocus";
+         source: "elm";
+         action: ACTION_STOP;
+         target: "cursor_show";
+         target: "cursor_hide";
+         target: "cursor_show_timer";
+         target: "cursor_hide_timer";
+         after: "cursor_hide_stop";
+      }
+      program {
+         signal: "elm,action,show,cursor";
+         source: "elm";
+         action: ACTION_STOP;
+         target: "cursor_show";
+         target: "cursor_hide";
+         target: "cursor_show_timer";
+         target: "cursor_hide_timer";
+         after: "cursor_show";
+      }
+      program { name: "cursor_hide_stop";
+         action: STATE_SET "default" 0.0;
+         target: "cursor";
+      }
+      program { name: "cursor_show";
+         action: STATE_SET "visible" 0.0;
+         target: "cursor";
+         after: "cursor_show_timer";
+      }
+      program { name: "cursor_hide";
+         action: STATE_SET "default" 0.0;
+         target: "cursor";
+         after: "cursor_hide_timer";
+      }
+      program { name: "cursor_show_timer";
+         in: 0.6 0.0;
+         after: "cursor_hide";
+      }
+      program { name: "cursor_hide_timer";
+         in: 0.6 0.0;
+         after: "cursor_show";
+      }
+   }
+}
+
+group { name: "elm/entry/selection/default";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 0 221 255 153;
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/selection/block_handle_left";
+   data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+   data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC;
+   images {
+      image: "copy&paste_handler_left_bottom.png" COMP;
+      image: "copy&paste_handler_left_top.png" COMP;
+   }
+   parts {
+      part { name: "handle";
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 0;
+            rel2.offset: 0 0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+            color: 0 184 230 255;
+            image {
+               normal: "copy&paste_handler_left_bottom.png";
+               border: 0 0 0 0;
+            }
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_left_top.png";
+            }
+         }
+         description { state: "bottom_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 0;
+         }
+         description { state: "top_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_left_top.png";
+            }
+         }
+      }
+   }
+   script {
+      public handler_ontop;
+      public handler_focused;
+      public handler_disabled;
+   }
+   programs {
+      program { name: "focused";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            set_int(handler_focused, 1);
+         }
+      }
+      program { name: "unfocused";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_int(handler_focused, 0);
+            set_state(PART:"handle", "default", 0.0);
+         }
+      }
+      program { name: "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "bottom_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "top_reversed";
+         signal: "elm,state,top,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "top_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "top";
+         signal: "elm,state,top";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "top", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "bottom";
+         signal: "elm,state,bottom";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "show", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "disabled";
+         signal: "app,selection,handler,disable";
+         source: "app";
+         script {
+            set_int(handler_disabled, 1);
+         }
+      }
+      program { name: "enabled";
+         signal: "app,selection,handler,enable";
+         source: "app";
+         script {
+            set_int(handler_disabled, 0);
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/selection/block_handle_right";
+   data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+   data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WEIGHT_INC;
+   images {
+      image: "copy&paste_handler_right_bottom.png" COMP;
+      image: "copy&paste_handler_right_top.png" COMP;
+   }
+   parts {
+      part { name: "handle";
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 0;
+            rel1.offset: 0 0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
+            color: 0 184 230 255;
+            image {
+               normal: "copy&paste_handler_right_bottom.png";
+               border: 0 0 0 0;
+            }
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_right_top.png";
+            }
+         }
+         description { state: "bottom_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 0;
+         }
+         description { state: "top_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1;
+            image {
+               normal: "copy&paste_handler_right_top.png";
+            }
+         }
+      }
+   }
+   script {
+      public handler_ontop;
+      public handler_focused;
+      public handler_disabled;
+   }
+   programs {
+      program { name: "focused";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            set_int(handler_focused, 1);
+         }
+      }
+      program { name: "unfocused";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_int(handler_focused, 0);
+            set_state(PART:"handle", "default", 0.0);
+         }
+      }
+      program { name: "top";
+         signal: "elm,state,top";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "top", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "bottom";
+         signal: "elm,state,bottom";
+         source: "elm";
+         script {
+            new focused, disabled;
+            focused = get_int(handler_focused);
+            disabled = get_int(handler_disabled);
+            set_int(handler_ontop, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "show", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "bottom_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "top_reversed";
+         signal: "elm,state,top,reversed";
+         source: "elm";
+         script {
+            new disabled;
+            disabled = get_int(handler_disabled);
+            if (disabled == 0) {
+               set_state(PART:"handle", "top_reversed", 0.0);
+            } else {
+               set_state(PART:"handle", "default", 0.0);
+            }
+         }
+      }
+      program { name: "disabled";
+         signal: "app,selection,handler,disable";
+         source: "app";
+         script {
+            set_int(handler_disabled, 1);
+         }
+      }
+      program { name: "enabled";
+         signal: "app,selection,handler,enable";
+         source: "app";
+         script {
+            set_int(handler_disabled, 0);
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/cursor_handle/default";
+   images {
+      set {
+         name: "copy&paste_handler_center_circle";
+         image {
+            image: SMALL"images/Copy_Paste/copy&paste_handler_center.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Copy_Paste/copy&paste_handler_center.png" COMP;
+         }
+      }
+   }
+   parts {
+      part { name: "sens";
+         type: RECT;
+         scale: 1;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 0 0 0 0;
+            rel1 { relative: -0.25 0.0; to: "handle";}
+            rel2 { relative: 1.25 1.0; to: "handle";}
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "handle";
+         scale: 1;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
+            max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
+            align: 0 0;
+            visible: 0;
+            align: 0.5 0;
+            color: 0 184 230 255;
+            image {
+               normal: "copy&paste_handler_center_circle";
+               border: 0 0 0 0;
+            }
+            image.middle: SOLID;
+            fill.smooth: 0;
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0.5 1.0;
+         }
+      }
+   }
+   script {
+      public on_top;
+   }
+   programs {
+      program { name: "focused";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            new on_top_val = get_int(on_top);
+            if (on_top_val) {
+               set_state(PART:"handle", "top", 0.0);
+            } else {
+               set_state(PART:"handle", "show", 0.0);
+            }
+            set_state(PART:"sens", "show", 0.0);
+         }
+      }
+      program { name: "unfocused";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"sens", "default", 0.0);
+         }
+      }
+      program { name: "show";
+         signal: "edje,cursor,handle,show";
+         source: "edje";
+         script {
+            set_int(on_top, 0);
+            set_state(PART:"handle", "show", 0.0);
+            set_state(PART:"sens", "show", 0.0);
+         }
+      }
+      program { name: "hide";
+         signal: "edje,cursor,handle,hide";
+         source: "edje";
+         script {
+            set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"sens", "default", 0.0);
+         }
+      }
+      program { name: "top";
+         signal: "edje,cursor,handle,top";
+         source: "edje";
+         script {
+            set_int(on_top, 1);
+            set_state(PART:"handle", "top", 0.0);
+            set_state(PART:"sens", "show", 0.0);
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/selection/block_handle_edge_left";
+   parts {
+      part { name: "align";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 0;
+            max: 0 0;
+            align: 0 0;
+         }
+      }
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            color: 0 81 181 255;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
+            rel2 { relative: 0 1; to_x: "align"; }
+            align: 0 0;
+            visible: 0;
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "show";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "show", 0.0);
+         }
+      }
+      program { name: "hide";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "default", 0.0);
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/selection/block_handle_edge_right";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 0 81 181 255;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
+            visible: 0;
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "show";
+         signal: "edje,focus,in";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "show", 0.0);
+         }
+      }
+      program { name: "hide";
+         signal: "edje,focus,out";
+         source: "edje";
+         script {
+            set_state(PART:"bg", "default", 0.0);
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/anchor/default";
+   parts {
+      part { name: "bg";
+         type: SPACER;
+         description { state: "default" 0.0;
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/preedit/default";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 128 128 128 255;
+         }
+      }
+   }
+}
+
+group { name: "elm/entry/magnifier/fixed-size";
+   data.item: "height" MAGNIFIER_HEIGHT_MIN;
+   data.item: "scale" MAGNIFIER_SCALE;
+   data.item: "arrow" MAGNIFIER_ARROW_HEIGHT_INC;
+   images {
+      image: "copy&paste_magnifier_line.#.png" COMP;
+      image: "copy&paste_magnifier_mask.#.png" COMP;
+   }
+   parts {
+      part { name: "bg_mask";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "copy&paste_magnifier_mask.#.png";
+            image.border: 8 8 8 8;
+            color: 255 255 255 255;
+         }
+         description { state: "custom_cc" 0.0;
+            inherit: "default" 0.0;
+            color_class: "mgf_custom_cc";
+         }
+      }
+      part { name: "bg";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MIN;
+            max: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MAX;
+            image.normal: "copy&paste_magnifier_line.#.png";
+            image.border: 8 8 8 8;
+            color: 61 185 204 255;
+            align: 0.0 0.0;
+         }
+      }
+      part { name: "left_offset";
+         type: SPACER;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: MAGNIFIER_LEFT_OFFSET_INC;
+            max: MAGNIFIER_LEFT_OFFSET_INC;
+            rel1 {
+               to: "bg";
+               relative: 0.0 0.0;
+            }
+            align: 0.0 0.0;
+         }
+      }
+      part { name: "right_offset";
+         type: SPACER;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: MAGNIFIER_RIGHT_OFFSET_INC;
+            max: MAGNIFIER_RIGHT_OFFSET_INC;
+            rel1 {
+               to: "bg";
+               relative: 1.0 1.0;
+            }
+            rel2 {
+               to: "bg";
+               relative: 1.0 1.0;
+            }
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "swallow";
+         type: SWALLOW;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            align: 0.0 0.0;
+            rel1 {
+               to: "left_offset";
+               relative: 1.0 1.0;
+            }
+            rel2 {
+               to: "right_offset";
+               relative: 0.0 0.0;
+            }
+         }
+      }
+   }
+   script {
+      public message(Msg_Type:type, id, ...) {
+         if (type == MSG_INT_SET) {
+            new r, g, b, a;
+
+            r = getarg(2);
+            g = getarg(3);
+            b = getarg(4);
+            a = getarg(5);
+
+            set_state(PART:"bg_mask", "custom_cc", 0.0);
+            set_color_class("mgf_custom_cc", r, g, b, a);
+         }
+      }
+   }
+}
+
+group { name: "elm/scroller/entry/default";
+   data {
+      item: "focus_highlight" "off";
+   }
+   script {
+      public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
+      public timer0(val) {
+         new v;
+         v = get_int(sbvis_v);
+         if (v) {
+            v = get_int(sbalways_v);
+            if (!v) {
+               emit("do-hide-vbar", "");
+               set_int(sbvis_v, 0);
+            }
+         }
+         v = get_int(sbvis_h);
+         if (v) {
+            v = get_int(sbalways_h);
+            if (!v) {
+               emit("do-hide-hbar", "");
+               set_int(sbvis_h, 0);
+            }
+         }
+         set_int(sbvis_timer, 0);
+         return 0;
+      }
+   }
+   images {
+      image: "core_scroll_bar_v.#.png" COMP;
+      image: "core_scroll_bar_h.#.png" COMP;
+   }
+   parts {
+      part { name: "bg";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "clipper";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "elm.swallow.icon";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            fixed: 1 1;
+            rel1 {
+               to: "bg";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "bg";
+               relative: 0.0 1.0;
+            }
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.end";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            align: 1.0 0.5;
+            fixed: 1 1;
+            rel1 {
+               to: "bg";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to: "bg";
+               relative: 1.0 1.0;
+            }
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "content_clipper";
+         scale: 1;
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+         }
+      }
+      part { name: "elm.swallow.content";
+         clip_to: "content_clipper";
+         scale: 1;
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+               to_x: "elm.swallow.icon";
+               to_y: "bg";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to_x: "elm.swallow.end";
+               to_y: "bg";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+      part { name: "sb_vbar_clip_master";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "sb_vbar_clip";
+         clip_to: "sb_vbar_clip_master";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "sb_vbar";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
+            align: 1.0 0.0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to_y: "sb_hbar";
+               to_x: "elm.swallow.content";
+               relative: 1.0 0.0;
+            }
+         }
+      }
+      part { name: "elm.dragable.vbar";
+         scale: 1;
+         clip_to: "sb_vbar_clip";
+         mouse_events: 0;
+         dragable {
+            x: 0 0 0;
+            y: 1 1 0;
+            confine: "sb_vbar";
+         }
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
+            max: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC;
+            rel1 {
+               relative: 0.5 0.5;
+               to: "sb_vbar";
+            }
+            rel2 {
+               relative: 0.5 0.5;
+               to: "sb_vbar";
+            }
+            image {
+               normal: "core_scroll_bar_v.#.png";
+               middle: DEFAULT;
+            }
+            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
+         }
+      }
+      part { name: "sb_hbar_clip_master";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+         }
+         description { state: "hidden" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "sb_hbar_clip";
+         clip_to: "sb_hbar_clip_master";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+         }
+         description { state: "hidden" 0.0;
+            visible: 0;
+            color: 255 255 255 0;
+         }
+      }
+      part { name: "sb_hbar";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
+            align: 0.0 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to_x: "elm.swallow.content";
+               to_y: "elm.swallow.content";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               to_x: "sb_vbar";
+               to_y: "elm.swallow.content";
+            }
+         }
+      }
+      part { name: "elm.dragable.hbar";
+         scale: 1;
+         clip_to: "sb_hbar_clip";
+         mouse_events: 0;
+         dragable {
+            x: 1 1 0;
+            y: 0 0 0;
+            confine: "sb_hbar";
+         }
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
+            max: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC;
+            rel1 {
+               relative: 0.5  0.5;
+               to: "sb_hbar";
+            }
+            rel2 {
+               relative: 0.5  0.5;
+               to: "sb_hbar";
+            }
+            image {
+               normal: "core_scroll_bar_h.#.png";
+               middle: DEFAULT;
+            }
+            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
+         }
+      }
+   }
+   programs {
+      program { name: "load";
+         signal: "load";
+         source: "";
+         script {
+            set_state(PART:"sb_hbar_clip", "hidden", 0.0);
+            set_state(PART:"sb_vbar_clip", "hidden", 0.0);
+            set_int(sbvis_h, 0);
+            set_int(sbvis_v, 0);
+            set_int(sbalways_v, 0);
+            set_int(sbalways_h, 0);
+            set_int(sbvis_timer, 0);
+            emit("reload", "elm");
+         }
+      }
+      program { name: "icon_show";
+         signal: "elm,action,show,icon";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.swallow.icon";
+      }
+      program { name: "icon_hide";
+         signal: "elm,action,hide,icon";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.icon";
+      }
+      program { name: "end_show";
+         signal: "elm,action,show,end";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.swallow.end";
+      }
+      program { name: "end_hide";
+         signal: "elm,action,hide,end";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.end";
+      }
+      program { name: "vbar_show";
+         signal: "elm,action,show,vbar";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "sb_vbar_clip_master";
+      }
+      program { name: "vbar_hide";
+         signal: "elm,action,hide,vbar";
+         source: "elm";
+         action:  STATE_SET "hidden" 0.0;
+         target: "sb_vbar_clip_master";
+      }
+      program { name: "vbar_show_always";
+         signal: "elm,action,show_always,vbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_v);
+            if (!v) {
+               set_int(sbalways_v, 1);\
+               v = get_int(sbvis_v);
+               if (!v) {
+                  emit("do-show-vbar", "");
+                  set_int(sbvis_v, 1);
+               }
+            }
+         }
+      }
+      program { name: "vbar_show_notalways";
+         signal: "elm,action,show_notalways,vbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_v);
+            if (v) {
+               set_int(sbalways_v, 0);
+               v = get_int(sbvis_v);
+               if (!v) {
+                  emit("do-hide-vbar", "");
+                  set_int(sbvis_v, 0);
+               }
+            }
+         }
+      }
+      program { name: "sb_vbar_show";
+         signal: "do-show-vbar";
+         source: "";
+         action:  STATE_SET "default" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_vbar_clip";
+      }
+      program { name: "sb_vbar_hide";
+         signal: "do-hide-vbar";
+         source: "";
+         action:  STATE_SET "hidden" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_vbar_clip";
+      }
+      program { name: "hbar_show";
+         signal: "elm,action,show,hbar";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "sb_hbar_clip_master";
+      }
+      program { name: "hbar_hide";
+         signal: "elm,action,hide,hbar";
+         source: "elm";
+         action:  STATE_SET "hidden" 0.0;
+         target: "sb_hbar_clip_master";
+      }
+      program { name: "hbar_show_always";
+         signal: "elm,action,show_always,hbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_h);
+            if (!v) {
+               set_int(sbalways_h, 1);
+               v = get_int(sbvis_h);
+               if (!v) {
+                  emit("do-show-hbar", "");
+                  set_int(sbvis_h, 1);
+               }
+            }
+         }
+      }
+      program { name: "hbar_show_notalways";
+         signal: "elm,action,show_notalways,hbar";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbalways_h);
+            if (v) {
+               set_int(sbalways_h, 0);
+               v = get_int(sbvis_h);
+               if (!v) {
+                  emit("do-hide-hbar", "");
+                  set_int(sbvis_h, 0);
+               }
+            }
+         }
+      }
+      program { name: "sb_hbar_show";
+         signal: "do-show-hbar";
+         source: "";
+         action:  STATE_SET "default" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_hbar_clip";
+      }
+      program { name: "sb_hbar_hide";
+         signal: "do-hide-hbar";
+         source: "";
+         action:  STATE_SET "hidden" 0.0;
+         transition: LINEAR 0.5;
+         target: "sb_hbar_clip";
+      }
+      program { name: "scroll";
+         signal: "elm,action,scroll";
+         source: "elm";
+         script {
+            new v;
+            v = get_int(sbvis_v);
+            v |= get_int(sbalways_v);
+            if (!v) {
+               emit("do-show-vbar", "");
+               set_int(sbvis_v, 1);
+            }
+            v = get_int(sbvis_h);
+            v |= get_int(sbalways_h);
+            if (!v) {
+               emit("do-show-hbar", "");
+               set_int(sbvis_h, 1);
+            }
+            v = get_int(sbvis_timer);
+            if (v > 0) cancel_timer(v);
+            v = timer(1.0, "timer0", 0);
+            set_int(sbvis_timer, v);
+         }
+      }
+   }
+}
+
diff --git a/mobile/widgets/flipselector.edc b/mobile/widgets/flipselector.edc
new file mode 100644
index 00000000..f2956761
--- /dev/null
+++ b/mobile/widgets/flipselector.edc
@@ -0,0 +1,566 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define FLIP_PICKER_MAX_LEN (3)
+#define FLIP_PICKER_MAX_LEN_STR "3"
+
+group { name: "elm/flipselector/base/default";
+   images.image: "core_picker_up.png" COMP;
+   images.image: "core_picker_up_bg.png" COMP;
+   images.image: "core_picker_down.png" COMP;
+   images.image: "core_picker_arrow_up.png" COMP;
+   images.image: "core_picker_arrow_down.png" COMP;
+
+   data.item: "max_len" FLIP_PICKER_MAX_LEN_STR;
+
+   //FIXME: quick successive clicks on, say, up, lead to nastiness
+   script {
+      public cur, prev, next, lock;
+
+      flip_up(str[]) {
+         new tmp[FLIP_PICKER_MAX_LEN];
+         if (get_int(lock) == 1) {
+            replace_str(next, 0, str);
+            return;
+         }
+         fetch_str(cur, 0, tmp, FLIP_PICKER_MAX_LEN);
+
+         set_text(PART:"bottom_text_prev", tmp);
+         set_state(PART:"elm.top", "shrink", 0.0);
+         set_text(PART:"elm.top", tmp);
+         set_state(PART:"elm.top", "default", 0.0);
+         set_text(PART:"elm.top", tmp);
+
+         replace_str(prev, 0, tmp);
+
+         set_state(PART:"elm.bottom", "default", 0.0);
+         set_text(PART:"elm.bottom", str);
+         set_state(PART:"elm.bottom", "shrink", 0.0);
+         set_text(PART:"elm.bottom", str);
+         set_text(PART:"top_text_prev", str);
+
+         replace_str(cur, 0, str);
+
+         set_state(PART:"bottom_prev", "default", 0.0);
+         set_state(PART:"top_prev", "shrink", 0.0);
+
+         set_int(lock, 1);
+         anim(0.2, "animator_top_down", 1);
+      }
+      flip_dn(str[]) {
+         new tmp[FLIP_PICKER_MAX_LEN];
+         if (get_int(lock) == 1) {
+            replace_str(next, 0, str);
+            return;
+         }
+
+         fetch_str(cur, 0, tmp, FLIP_PICKER_MAX_LEN);
+
+         set_text(PART:"top_text_prev", tmp);
+         set_state(PART:"elm.bottom", "shrink", 0.0);
+         set_text(PART:"elm.bottom", tmp);
+         set_state(PART:"elm.bottom", "default", 0.0);
+         set_text(PART:"elm.bottom", tmp);
+
+         replace_str(prev, 0, tmp);
+
+         set_state(PART:"elm.top", "default", 0.0);
+         set_text(PART:"elm.top", str);
+         set_state(PART:"elm.top", "shrink", 0.0);
+         set_text(PART:"elm.top", str);
+         set_text(PART:"bottom_text_prev", str);
+
+         replace_str(cur, 0, str);
+
+         set_state(PART:"bottom_prev", "shrink", 0.0);
+         set_state(PART:"top_prev", "default", 0.0);
+
+         set_int(lock, 1);
+         anim(0.2, "animator_bottom_up", 1);
+      }
+      public animator_bottom_down(val, Float:pos) {
+         new tmp[FLIP_PICKER_MAX_LEN];
+
+         set_tween_state(PART:"elm.bottom", pos, "shrink", 0.0, "default", 0.0);
+         set_tween_state(PART:"bottom_prev", pos, "default", 0.0, "shrink", 0.0);
+
+         if (pos >= 1.0) {
+            set_int(lock, 0);
+            fetch_str(next, 0, tmp, FLIP_PICKER_MAX_LEN);
+            if (strncmp(tmp, "", FLIP_PICKER_MAX_LEN) != 0) {
+               replace_str(next, 0, "");
+               flip_up(tmp);
+            }
+         }
+      }
+      public animator_top_down(val, Float:pos) {
+         set_tween_state(PART:"elm.top", pos, "default", 0.0, "shrink", 0.0);
+         set_tween_state(PART:"top_prev", pos, "shrink", 0.0, "default", 0.0);
+         if (pos >= 1.0)
+           {
+              anim(0.2, "animator_bottom_down", val);
+           }
+      }
+      public animator_bottom_up(val, Float:pos) {
+         set_tween_state(PART:"elm.bottom", pos, "default", 0.0, "shrink", 0.0);
+         set_tween_state(PART:"bottom_prev", pos, "shrink", 0.0, "default", 0.0);
+
+         if (pos >= 1.0) anim(0.2, "animator_top_up", val);
+      }
+      public animator_top_up(val, Float:pos) {
+         new tmp[FLIP_PICKER_MAX_LEN];
+
+         set_tween_state(PART:"elm.top", pos, "shrink", 0.0, "default", 0.0);
+         set_tween_state(PART:"top_prev", pos, "default", 0.0, "shrink", 0.0);
+
+         if (pos >= 1.0) {
+            set_int(lock, 0);
+
+            fetch_str(next, 0, tmp, FLIP_PICKER_MAX_LEN);
+            if (strncmp(tmp, "", FLIP_PICKER_MAX_LEN) != 0) {
+               replace_str(next, 0, "");
+               flip_dn(tmp);
+            }
+         }
+      }
+      public message(Msg_Type:type, id, ...) {
+         /* flip down */
+         if ((type == MSG_STRING) && (id == 1)) {
+            new value[FLIP_PICKER_MAX_LEN];
+            snprintf(value, FLIP_PICKER_MAX_LEN, "%s", getarg(2));
+            flip_up(value);
+         /* flip up */
+         } else  if ((type == MSG_STRING) && (id == 2)) {
+            new value[FLIP_PICKER_MAX_LEN];
+            snprintf(value, FLIP_PICKER_MAX_LEN, "%s", getarg(2));
+            flip_dn(value);
+         }
+      }
+   }
+   parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: FLIPSELECTOR_BASE_SIZE_INC;
+            max: FLIPSELECTOR_BASE_SIZE_INC;
+         }
+      }
+      part { name: "bottom";
+         type: IMAGE;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: FLIPSELECTOR_BOTTOM_SIZE_INC;
+            align: 0.5 1.0;
+            fixed: 0 1;
+            rel1 { to: "base"; relative: 0.0 1.0; }
+            rel2.to: "base";
+            image.normal: "core_picker_down.png";
+            color: 0 0 0 38;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "top_bg";
+         type: IMAGE;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "top";
+            rel2.to: "top";
+            image.normal: "core_picker_up_bg.png";
+            color: 0 0 0 38;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "top";
+         type: IMAGE;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: FLIPSELECTOR_TOP_SIZE_INC;
+            align: 0.5 0.0;
+            fixed: 0 1;
+            rel1.to: "base";
+            rel2 { to: "base"; relative: 1.0 0.0; }
+            image.normal: "core_picker_up.png";
+            color: 0 0 0 38;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "divider";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: FLIPSELECTOR_DIVIDER_SIZE_INC;
+            align: 0.5 0.0;
+            fixed: 0 1;
+            rel1.to: "top";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "top";
+            color: 0 0 0 38;
+         }
+      }
+      part { name: "bottom_text_prev";
+         type: TEXT;
+         mouse_events: 0;
+         clip_to: "bottom_prev";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "divider";
+            rel2.to: "divider";
+            rel2.relative: 1.0 0.0;
+            text {
+               // FIXME: It should be changed to SNum-3L font.
+               font: "Tizen:style=Regular";
+               size: FLIPSELECTOR_TEXT_SIZE_INC;
+               min: 1 1;
+               ellipsis: -1;
+               align: 0.5 0.5;
+            }
+            color: 0 0 0 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 127;
+         }
+      }
+      part { name: "bottom_prev";
+         type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "divider";
+            rel2.to: "bottom";
+         }
+         description { state: "shrink" 0.0;
+            inherit: "default" 0.0;
+            rel1.to: "bottom";
+            rel1.relative: 0.0 1.0;
+         }
+      }
+      part { name: "elm.bottom";
+         type: TEXT;
+         mouse_events: 0;
+         clip_to: "bottom_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "divider";
+            rel2.to: "divider";
+            rel2.relative: 1.0 0.0;
+            text {
+               // FIXME: It should be changed to SNum-3L font.
+               font: "Tizen:style=Regular";
+               size: FLIPSELECTOR_TEXT_SIZE_INC;
+               min: 1 1;
+               ellipsis: -1;
+               align: 0.5 0.5;
+            }
+            color: 0 0 0 255;
+         }
+         description { state: "shrink" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 127;
+         }
+      }
+      part { name: "top_text_prev";
+         type: TEXT;
+         mouse_events: 0;
+         clip_to: "top_prev";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "divider";
+            rel2.to: "divider";
+            rel2.relative: 1.0 0.0;
+            text {
+               // FIXME: It should be changed to SNum-3L font.
+               font: "Tizen:style=Regular";
+               size: FLIPSELECTOR_TEXT_SIZE_INC;
+               min: 1 1;
+               ellipsis: -1;
+               align: 0.5 0.5;
+               source: "elm.top";
+            }
+            color: 0 0 0 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 127;
+         }
+      }
+      part { name: "top_prev";
+         type: RECT;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "top";
+            rel2.to: "divider";
+            color: 255 255 255 255;
+         }
+         description { state: "shrink" 0.0;
+            inherit: "default" 0.0;
+            rel2.to: "top";
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      part { name: "elm.top";
+         type: TEXT;
+         mouse_events: 0;
+         clip_to: "top_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "divider";
+            rel2.to: "divider";
+            rel2.relative: 1.0 0.0;
+            text {
+               // FIXME: It should be changed to SNum-3L font.
+               font: "Tizen:style=Regular";
+               size: FLIPSELECTOR_TEXT_SIZE_INC;
+               min: 1 1;
+               ellipsis: -1;
+               align: 0.5 0.5;
+            }
+            color: 0 0 0 255;
+         }
+         description { state: "shrink" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 127;
+         }
+      }
+      part { name: "arrow_top_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.5 0.0;
+            min: FLIPSELECTOR_ARROW_TOP_PADDING_SIZE_INC;
+            max: FLIPSELECTOR_ARROW_TOP_PADDING_SIZE_INC;
+            rel1.to: "top";
+            rel2.to: "top";
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      part { name: "arrow_top";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: FLIPSELECTOR_ARROW_TOP_BOTTOM_SIZE_INC;
+            max: FLIPSELECTOR_ARROW_TOP_BOTTOM_SIZE_INC;
+            align: 0.5 0.0;
+            rel1.to: "arrow_top_padding";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "arrow_top_padding";
+            image.normal: "core_picker_arrow_up.png";
+            color: 0 0 0 89;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 38;
+         }
+      }
+      part { name: "arrow_bottom_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            align: 0.5 1.0;
+            min: FLIPSELECTOR_ARROW_BOTTOM_PADDING_SIZE_INC;
+            max: FLIPSELECTOR_ARROW_BOTTOM_PADDING_SIZE_INC;
+            rel1.to: "bottom";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "bottom";
+         }
+      }
+      part { name: "arrow_bottom";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: FLIPSELECTOR_ARROW_TOP_BOTTOM_SIZE_INC;
+            max: FLIPSELECTOR_ARROW_TOP_BOTTOM_SIZE_INC;
+            align: 0.5 1.0;
+            rel1.to: "arrow_bottom_padding";
+            rel2.to: "arrow_bottom_padding";
+            rel2.relative: 1.0 0.0;
+            image.normal: "core_picker_arrow_down.png";
+            color: 0 0 0 89;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 38;
+         }
+      }
+      part { name: "top_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "top";
+            rel2.to: "divider";
+         }
+      }
+      part { name: "bottom_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "divider";
+            rel2.to: "bottom";
+         }
+      }
+      part { name: "event_blocker";
+         type: RECT;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            color: 0 0 0 0;
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "load";
+         source: "";
+         script {
+            append_str(cur, "");
+            append_str(prev, "");
+            append_str(next, "");
+            set_int(lock, 0);
+         }
+      }
+      program {
+         signal: "elm,state,button,hidden";
+         source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "arrow_top";
+         target: "arrow_bottom";
+         target: "top";
+         target: "top_bg";
+         target: "bottom";
+      }
+      program {
+         signal: "elm,state,button,visible";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "arrow_top";
+         target: "arrow_bottom";
+         target: "top";
+         target: "top_bg";
+         target: "bottom";
+      }
+      program { name: "up";
+         signal: "mouse,down,1";
+         source: "top";
+         action: SIGNAL_EMIT "elm,action,up,start" "elm";
+      }
+      program { name: "up,stop";
+         signal: "mouse,up,1";
+         source: "top";
+         action: SIGNAL_EMIT "elm,action,up,stop" "elm";
+      }
+      program { name: "down";
+         signal: "mouse,down,1";
+         source: "bottom";
+         action: SIGNAL_EMIT "elm,action,down,start" "elm";
+      }
+      program { name: "down,stop";
+         signal: "mouse,up,1";
+         source: "bottom";
+         action: SIGNAL_EMIT "elm,action,down,stop" "elm";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            set_state(PART:"event_blocker", "disabled", 0.0);
+            set_state(PART:"elm.bottom", "disabled", 0.0);
+            set_state(PART:"elm.top", "disabled", 0.0);
+            set_state(PART:"bottom_text_prev", "disabled", 0.0);
+            set_state(PART:"top_text_prev", "disabled", 0.0);
+
+            get_state(PART:"arrow_bottom", st, 30, vl);
+            if (strcmp(st, "hidden"))
+              set_state(PART:"arrow_bottom", "disabled", 0.0);
+
+            get_state(PART:"arrow_top", st, 30, vl);
+            if (strcmp(st, "hidden"))
+              set_state(PART:"arrow_top", "disabled", 0.0);
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            set_state(PART:"event_blocker", "default", 0.0);
+            set_state(PART:"elm.bottom", "default", 0.0);
+            set_state(PART:"elm.top", "default", 0.0);
+            set_state(PART:"bottom_text_prev", "default", 0.0);
+            set_state(PART:"top_text_prev", "default", 0.0);
+
+            get_state(PART:"arrow_bottom", st, 30, vl);
+            if (strcmp(st, "hidden"))
+              set_state(PART:"arrow_bottom", "default", 0.0);
+
+            get_state(PART:"arrow_top", st, 30, vl);
+            if (strcmp(st, "hidden"))
+              set_state(PART:"arrow_top", "default", 0.0);
+         }
+      }
+   }
+}
diff --git a/mobile/widgets/focus_highlight.edc b/mobile/widgets/focus_highlight.edc
new file mode 100644
index 00000000..0f169e9a
--- /dev/null
+++ b/mobile/widgets/focus_highlight.edc
@@ -0,0 +1,59 @@
+group { name: "elm/focus_highlight/top/default";
+   images {
+      image: "core_focus.#.png" COMP;
+   }
+   data {
+      item: "animate" "off";
+   }
+   parts {
+      part { name: "base";
+         type: RECT;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+            visible: 0;
+         }
+      }
+      part { name: "shine";
+         type: IMAGE;
+         mouse_events: 0;
+         repeat_events: 1;
+         ignore_flags: ON_HOLD;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            rel1.offset: -4 -4;
+            rel2.offset: 4 4;
+            image.normal: "core_focus.#.png";
+            color: 0 221 255 255;
+         }
+         description { state: "show" 0.0;
+            inherit:  "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "show";
+         signal: "elm,action,focus,show";
+         source: "elm";
+         action: STATE_SET "show" 0.0;
+         target: "shine";
+         after: "show_end";
+      }
+      program { name: "show_end";
+         action: SIGNAL_EMIT "elm,action,focus,show,end" "";
+      }
+      program { name: "hide";
+         signal: "elm,action,focus,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "shine";
+         after: "hide_end";
+      }
+      program { name: "hide_end";
+         action: SIGNAL_EMIT "elm,action,focus,hide,end" "";
+      }
+   }
+}
diff --git a/themes/widgets/gengrid.edc b/mobile/widgets/gengrid.edc
index c51bdf38..c98a3d33 100644
--- a/themes/widgets/gengrid.edc
+++ b/mobile/widgets/gengrid.edc
@@ -44,8 +44,21 @@
 
 styles {
    style { name: "grid_popup_style";
-      base: "font=Tizen:style=Regular font_size=24 color=#070707FF text_class=tizen align=center wrap=mixed ellipsis=1.0 linegap=-3";
-      //base: "font=Tizen:style=Regular font_size="GRID_POPUP_TEXT_FONT_SIZE" color=#ffffff color_class=T0601 text_class=T0601 align=center wrap=mixed ellipsis=1.0 linegap=-3";
+      base: "font=Tizen:style=Regular font_size=32 color=#070707FF text_class=tizen align=center wrap=mixed ellipsis=1.0 linegap=-3";
+      tag: "br" "\n";
+      tag: "ps" "ps";
+      tag: "tab" "\t";
+      tag: "b" "+ font_weight=Bold";
+      }
+   style { name: "grid_out_text_style";
+      base: "font=Tizen:style=Regular font_size=29 color=#000000FF align=center wrap=mixed ellipsis=1.0";
+      tag: "br" "\n";
+      tag: "ps" "ps";
+      tag: "tab" "\t";
+      tag: "b" "+ font_weight=Bold";
+      }
+   style { name: "grid_in_text_style";
+      base: "font=Tizen:style=Regular font_size=29 color=#FFFFFFFF align=center wrap=mixed ellipsis=1.0";
       tag: "br" "\n";
       tag: "ps" "ps";
       tag: "tab" "\t";
@@ -60,8 +73,10 @@ styles {
 
 
    group { name: "elm/gengrid/item/default/default";
+      alias: "elm/gengrid/item/type1/default";
       data.item: "contents" "elm.swallow.icon elm.swallow.end";
       data.item: "focus_highlight" "on";
+      data.item: "texts" "elm.text";
 
       parts {
          part { name: "bg";
@@ -110,7 +125,7 @@ styles {
                   relative: 0.0 0.0;
                   to: "right_bottom_padding";
                }
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+               color: 2 61 132 255;
             }
          }
          part { name: "elm.swallow.icon";
@@ -120,11 +135,38 @@ styles {
                rel2.to: "item_bg";
             }
          }
+         part { name: "end_top_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_PADDING_END_TOP_RIGHT_SIZE;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "item_bg";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to: "item_bg";
+               }
+            }
+         }
          part { name: "elm.swallow.end";
             type: SWALLOW;
+            scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "elm.swallow.icon";
-               rel2.to: "elm.swallow.icon";
+               min: GRID_END_SIZE;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to: "end_top_right_padding";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "end_top_right_padding";
+               }
             }
          }
          part { name: "select_bg";
@@ -133,7 +175,7 @@ styles {
                visible: 0;
                rel1.to: "item_bg";
                rel2.to: "item_bg";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+               color: 2 61 132 255;
             }
             description { state: "pressed" 0.0;
                inherit: "default" 0.0;
@@ -163,8 +205,70 @@ styles {
                inherit: "default" 0.0;
             }
          }
+         part { name: "text_bottom_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_PADDING_IN_TEXT_LEFT_RIGHT_SIZE;
+               align: 0.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to: "item_bg";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "item_bg";
+               }
+            }
+         }
+         part { name: "text_bottom_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_PADDING_IN_TEXT_LEFT_RIGHT_SIZE;
+               align: 1.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "item_bg";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to: "item_bg";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_IN_OUT_TEXT_ONE_LINE_HEIGHT;
+               fixed: 0 1;
+               align: 0.5 1.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "text_bottom_left_padding";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "text_bottom_right_padding";
+               }
+               text {
+                  style: "grid_in_text_style";
+                  align: 0.5 1.0;
+                  min: 0 1;
+               }
+            }
+         }
       }
       programs {
+         program { name: "touch_sound";
+            signal: "mouse,clicked,1";
+            source: "reorder_bg";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "selected";
             signal: "elm,state,selected";
             source: "elm";
@@ -193,10 +297,90 @@ styles {
             target: "elm.swallow.icon";
             target: "elm.swallow.end";
             target: "select_bg";
+            target: "elm.text";
          )
       }
    }
 
+   group { name: "elm/gengrid/item/type2/default";
+      inherit: "elm/gengrid/item/default/default";
+      parts {
+        part { name: "right_bottom_padding";
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: GRID_PADDING_OUT_TEXT_BOTTOM_RIGHT_SIZE;
+               align: 1.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "bg";
+               }
+               rel2.to: "bg";
+            }
+         }
+         part { name: "text_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_PADDING_OUT_TEXT_LEFT_RIGHT_SIZE;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "item_bg";
+                  to_y: "bg";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "item_bg";
+                  to_y: "bg";
+              }
+           }
+         }
+         part { name: "text_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_PADDING_OUT_TEXT_LEFT_RIGHT_SIZE;
+               align: 1.0 0.5;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "item_bg";
+                  to_y: "bg";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "item_bg";
+                  to_y: "bg";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            multiline : 1;
+            description { state: "default" 0.0;
+               min: GRID_IN_OUT_TEXT_ONE_LINE_HEIGHT;
+               align: 0.5 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "text_left_padding";
+                  to_y: "right_bottom_padding";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "text_right_padding";
+                  to_y: "right_bottom_padding";
+               }
+               text {
+                  style: "grid_out_text_style";
+                  min: 0 1;
+                  align: 0.5 0.0;
+               }
+            }
+         }
+      }
+   }
 
    group { name: "elm/gengrid/item/default/popup";
       data.item: "texts" "elm.text";
@@ -206,10 +390,10 @@ styles {
          set {
             name: "core_focus.#";
                image {
-                  image: SMALL"images/Content_views/core_focus.#.png" COMP;
+                  image: SMALL"images/Presentation_views/core_focus.#.png" COMP;
                }
                image {
-                  image: MEDIUM"images/Content_views/core_focus.#.png" COMP;
+                  image: MEDIUM"images/Presentation_views/core_focus.#.png" COMP;
                }
          }
       }
@@ -245,6 +429,7 @@ styles {
          }
          part { name: "item_real_bg";
             type: SPACER;
+            scale: 1;
             description { state: "default" 0.0;
                align: 0.5 0.0;
                min: GRID_POPUP_ITEM_REAL_BG_SIZE;
@@ -266,7 +451,7 @@ styles {
                }
             }
          }
-         part { name: "right_bottom_padding";
+         part { name: "icon_text_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
@@ -285,8 +470,45 @@ styles {
                }
             }
          }
+         part { name: "right_bottom_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_POPUP_PADDING_BOTTOM_SIZE;
+               min: GRID_POPUP_PADDING_BOTTOM_SIZE;
+               align: 1.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "item_real_bg";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to: "item_real_bg";
+               }
+            }
+         }
+         part { name: "left_bottom_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GRID_POPUP_PADDING_BOTTOM_SIZE;
+               min: GRID_POPUP_PADDING_BOTTOM_SIZE;
+               align: 0.0 1.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to: "item_real_bg";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "item_real_bg";
+               }
+            }
+         }
          part { name: "elm.swallow.icon";
             type: SWALLOW;
+            scale: 1;
             description { state: "default" 0.0;
                min: GRID_POPUP_SWALLOW_ICON_SIZE;
                max: GRID_POPUP_SWALLOW_ICON_SIZE;
@@ -297,13 +519,14 @@ styles {
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to: "right_bottom_padding";
+                  to: "icon_text_padding";
                }
             }
             clip_to: "select_clip";
          }
          part { name: "elm.swallow.end";
             type: SWALLOW;
+            scale: 1;
             description { state: "default" 0.0;
                rel1.to: "elm.swallow.icon";
                rel2.to: "elm.swallow.icon";
@@ -314,17 +537,17 @@ styles {
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GRID_POPUP_TEXT_SIZE;
-               max: GRID_POPUP_TEXT_SIZE;
-               fixed: 0 1;
+               min: 164 GRID_POPUP_TEXT_HEIGHT;
+               max: 164 GRID_POPUP_TEXT_HEIGHT;
+               fixed: 1 1;
                align: 0.5 1.0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to: "item_real_bg";
+                  relative: 1.0 0.0;
+                  to: "left_bottom_padding";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to: "item_real_bg";
+                  relative: 0.0 0.0;
+                  to: "right_bottom_padding";
                }
                text {
                   style: "grid_popup_style";
@@ -348,7 +571,7 @@ styles {
                rel1.to: "item_real_bg";
                rel2.to: "item_real_bg";
                image.normal: "core_focus.#";
-               color: 4 110 239 255; /*(Changeable UI) color_class: "W161";*/
+               color: 4 110 239 255;
             }
             description { state: "enabled" 0.0;
                inherit: "default" 0.0;
@@ -361,7 +584,7 @@ styles {
                rel1.to: "item_real_bg";
                rel2.to: "item_real_bg";
                image.normal: "core_focus.#";
-               color: 4 110 239 255; /*(Changeable UI) color_class: "W161";*/
+               color: 4 110 239 255;
             }
             description { state: "enabled" 0.0;
                inherit: "default" 0.0;
@@ -371,6 +594,11 @@ styles {
       }
       programs
       {
+         program { name: "touch_snd";
+            signal: "mouse,clicked,1";
+            source: "reorder_bg";
+            action: RUN_PLUGIN "touch_sound";
+         }
          program { name: "selected";
             signal: "elm,state,selected";
             source: "elm";
diff --git a/themes/widgets/genlist.edc b/mobile/widgets/genlist.edc
index 02540646..2dd1c738 100644
--- a/themes/widgets/genlist.edc
+++ b/mobile/widgets/genlist.edc
@@ -24,132 +24,1028 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
-*********************** WARNING *********************
+#include "genlist_macro.edc"
 
-* STYLES IN THIS FILE ARE SUPPORTED ONLY IN TIZEN 2.3.
-* THESE STYLES WILL BE DEPRECATED IN THE NEXT RELEASE.
-* WE ARE NOT RESPONSIBLE FOR ANY USE OF THESE STYLES
-* IN OTHER THAN TIZEN 2.3.
+group { name: "elm/genlist/item/type1/default";
+   alias: "elm/genlist/item_compress/type1/default";
 
-*****************************************************
-*/
+   data.item: "banded_bg_area" "elm.swallow.bg";
 
-#include "genlist_macro.edc"
+   data.item: "texts" "elm.text elm.text.end elm.text.sub elm.text.sub.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.icon.0 elm.swallow.icon.1 elm.swallow.end";
+
+   script {
+      public end_icon_visible = 0;
+      public sub_end_text_visible = 0;
+   }
+
+   parts {
+      // for banded bg
+      swallow { "elm.swallow.bg"; scale;
+         desc { "default";
+         }
+      }
+      // FIXME: "bg" part is used by genlist event macro. this will be removed.
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 61 185 204 77;
+         }
+         description { state: "disabled" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "reorder" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      // base spacer for item min height
+      spacer { "base"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_1LINE_HEIGHT_INC;
+         }
+         desc { "sub_text_visible";
+            min: 0 GENLIST_ITEM_2LINE_HEIGHT_INC;
+         }
+      }
+      // padding outside
+      spacer { "elm.padding.left"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_LR_PADDING_INC 0;
+            align: 0.0 0.5;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+         }
+      }
+      spacer { "elm.padding.right"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_LR_PADDING_INC 0;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      spacer { "elm.padding.top"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_TB_PADDING_INC;
+            max: -1 GENLIST_ITEM_TB_PADDING_INC;
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      spacer { "elm.padding.bottom"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_TB_PADDING_INC;
+            max: -1 GENLIST_ITEM_TB_PADDING_INC;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      // left swallow (Type B)
+      swallow { "elm.swallow.icon"; scale;
+         desc { state: "default";
+            align: 0.0 0.5;
+            rel1 { to: "elm.padding.left"; relative: 1.0 0.5; }
+            rel2 { to: "elm.padding.left"; relative: 1.0 0.5; }
+         }
+      }
+      // padding between left swallow & center contents
+      spacer { "elm.padding.center.left"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 0.0 0.5;
+            rel1 { to: "elm.swallow.icon"; relative: 1.0 0.5; }
+            rel2 { to: "elm.swallow.icon"; relative: 1.0 0.5; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_CENTER_LEFT_PADDING_INC 0;
+         }
+      }
+      // right swallow (Type C)
+      swallow { "elm.swallow.end"; scale;
+         desc { state: "default";
+            align: 1.0 0.5;
+            rel1 { to: "elm.padding.right"; relative: 0.0 0.5; }
+            rel2 { to: "elm.padding.right"; relative: 0.0 0.5; }
+         }
+      }
+      // padding between center contents & right swallow
+      spacer { "elm.padding.center.right"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 1.0 0.5;
+            rel1 { to: "elm.swallow.end"; relative: 0.0 0.5; }
+            rel2 { to: "elm.swallow.end"; relative: 0.0 0.5; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_CENTER_LEFT_PADDING_INC 0;
+         }
+      }
+      // center contents (Type A)
+      // main line
+      swallow { "elm.swallow.icon.0"; scale;
+         desc { "default";
+            align: 0.0 0.5;
+            rel1 { to_x: "elm.padding.center.left"; to_y: "elm.padding.main.icon.text"; relative: 1.0 0.5; }
+            rel2 { to_x: "elm.padding.center.left"; to_y: "elm.padding.main.icon.text"; relative: 1.0 0.5; }
+         }
+      }
+      spacer { "elm.padding.main.icon.text"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 0.0 0.5;
+            rel1 { to_x: "elm.swallow.icon.0"; to_y: "elm.text"; relative: 1.0 0.0; }
+            rel2 { to_x: "elm.swallow.icon.0"; to_y: "elm.text"; relative: 1.0 1.0; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_ICON_TEXT_PADDING_INC 0;
+         }
+      }
+      textblock { "elm.text"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_MAIN_LINE_HEIGHT_INC;
+            align: 0.5 0.5;
+            rel1 { to_x: "elm.padding.main.icon.text"; to_y: "elm.padding.top"; relative: 1.0 1.0; }
+            rel2 { to_x: "elm.padding.main.text.end"; to_y: "base_line"; relative: 0.0 0.0; }
+            text.style: "list_text_main";
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_main_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_main_dim";
+         }
+      }
+      // bottom line of "elm.text"
+      spacer { "base_line";
+         desc { "default";
+            rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; }
+            rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; }
+         }
+         desc { "sub_text_visible"; inherit: "default";
+            rel1 { to_y: "elm.text.sub"; relative: 0.0 0.0; }
+            rel2 { to_y: "elm.text.sub"; relative: 1.0 0.0; }
+         }
+      }
+      //
+      spacer { "elm.padding.main.text.end"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.swallow.icon.1"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+         }
+         desc { "text_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+            rel1 { to_x: "elm.text.end"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.text.end"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+         desc { "sub_text_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+            rel1 { to_x: "elm.text.sub.end"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.text.sub.end"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+      }
+      swallow { "elm.swallow.icon.1"; scale;
+         desc { "default";
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.padding.center.right"; to_y: "elm.padding.top"; relative: 0.0 1.0; }
+            rel2 { to_x: "elm.padding.center.right"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+         }
+         desc { "text_visible"; inherit: "default";
+            rel1 { to_x: "elm.padding.center.right"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.padding.center.right"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
+         }
+      }
+      textblock { "elm.text.end"; scale;
+         desc { "default";
+            max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.padding.center.right"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.padding.center.right"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
+            text.style: "list_text_end";
+            text.min: 1 1;
+            text.max: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_end_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_end_dim";
+         }
+      }
+      // sub line
+      textblock { "elm.text.sub"; scale;
+         desc { "default";
+            align: 0.5 1.0;
+            rel1 { to_x: "elm.padding.center.left"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; }
+            rel2 { to_x: "elm.padding.sub.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+            text.style: "list_text_sub_01";
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_sub_01_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_sub_01_dim";
+         }
+      }
+      spacer { "elm.padding.sub.text.end"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.swallow.icon.1"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0;
+         }
+         desc { "text_visible"; inherit: "default";
+            min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0;
+            rel1 { to_x: "elm.text.sub.end"; to_y: "elm.text.sub"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.text.sub.end"; to_y: "elm.text.sub"; relative: 0.0 1.0; }
+         }
+      }
+      textblock { "elm.text.sub.end"; scale;
+         desc { "default";
+            max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.padding.center.right"; to_y: "elm.padding.sub.text.end"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.padding.center.right"; to_y: "elm.padding.sub.text.end"; relative: 0.0 0.5; }
+            text.style: "list_text_end";
+            text.min: 1 1;
+            text.max: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_end_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_end_dim";
+         }
+      }
+   }
+   LIST_PROGRAMS( target: "elm.text"; \
+                  target: "elm.text.end"; \
+                  target: "elm.text.sub"; \
+                  target: "elm.text.sub.end"; )
+   programs {
+      program {
+         signal: "elm,state,elm.swallow.icon,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.center.left";
+      }
+      program {
+         signal: "elm,state,elm.swallow.end,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.center.right";
+      }
+      program {
+         signal: "elm,state,elm.swallow.icon.0,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.main.icon.text";
+      }
+      program {
+         signal: "elm,state,elm.swallow.icon.1,visible";
+         source: "elm";
+         script {
+            if (get_int(sub_end_text_visible) == 0) {
+               set_state(PART:"elm.padding.main.text.end", "icon_visible", 0.0);
+               set_state(PART:"elm.padding.sub.text.end", "icon_visible", 0.0);
+            }
+            else {
+               set_state(PART:"elm.padding.main.text.end", "sub_text_visible", 0.0);
+               set_state(PART:"elm.padding.sub.text.end", "text_visible", 0.0);
+            }
+            set_int(end_icon_visible, 1);
+         }
+      }
+      program {
+         signal: "elm,state,elm.text.sub,visible";
+         source: "elm";
+         action: STATE_SET "sub_text_visible" 0.0;
+         target: "base";
+         target: "base_line";
+      }
+      program {
+         signal: "elm,state,elm.text.end,visible";
+         source: "elm";
+         script {
+            if (get_int(end_icon_visible) == 1 && get_int(sub_end_text_visible) == 1) {
+               set_state(PART:"elm.padding.main.text.end", "sub_text_visible", 0.0);
+            }
+            else {
+               set_state(PART:"elm.padding.main.text.end", "text_visible", 0.0);
+            }
+         }
+      }
+      program {
+         signal: "elm,state,elm.text.sub.end,visible";
+         source: "elm";
+         script {
+            set_int(sub_end_text_visible, 1);
+            set_state(PART:"elm.padding.sub.text.end", "text_visible", 0.0);
+            set_state(PART:"elm.swallow.icon.1", "text_visible", 0.0);
+         }
+      }
+      program { name: "restore_default";
+         signal: "elm,state,default";
+         source: "elm";
+         script {
+            set_state(PART:"base", "default", 0.0);
+            set_state(PART:"base_line", "default", 0.0);
+            set_state(PART:"elm.swallow.icon.1", "default", 0.0);
+            set_state(PART:"elm.padding.center.left", "default", 0.0);
+            set_state(PART:"elm.padding.center.right", "default", 0.0);
+            set_state(PART:"elm.padding.main.icon.text", "default", 0.0);
+            set_state(PART:"elm.padding.main.text.end", "default", 0.0);
+            set_state(PART:"elm.padding.sub.text.end", "default", 0.0);
+            set_int(sub_end_text_visible, 0);
+         }
+      }
+   }
+}
 
-// elm_list default style
-// ------------------------------------------------
-// | elm.swallow.icon | elm.text | elm.swallow.end |
-// ------------------------------------------------
 group { name: "elm/genlist/item/default/default";
-   alias: "elm/list/item/default";
-   alias: "elm/list/item_odd/default";
-   alias: "elm/list/item_compress/default";
-   alias: "elm/list/item_compress_odd/default";
-   alias: "elm/genlist/item_compress/default";
+   alias: "elm/genlist/item_compress/default/default";
    alias: "elm/genlist/item/default_style/default";
-   alias: "elm/genlist/item_compress/default_style";
-
-   data.item: "treesize" GENLIST_TREESIZE_DEFAULT;
+   alias: "elm/genlist/item_compress/default_style/default";
+   inherit: "elm/genlist/item/type1/default";
    data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
+}
+
+group { name: "elm/genlist/item/double_label/default";
+   alias: "elm/genlist/item_compress/double_label/default";
+   inherit: "elm/genlist/item/type1/default";
+   data.item: "texts" "elm.text elm.text.sub";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
+}
+
+group { name: "elm/genlist/item/one_icon/default";
+   alias: "elm/genlist/item_compress/one_icon/default";
+   inherit: "elm/genlist/item/type1/default";
+   data.item: "texts" "elm.text";
+   data.item: "contents" "elm.swallow.icon";
+}
+
+group { name: "elm/genlist/item/end_icon/default";
+   alias: "elm/genlist/item_compress/end_icon/default";
+   inherit: "elm/genlist/item/type1/default";
+   data.item: "texts" "elm.text";
+   data.item: "contents" "elm.swallow.end";
+}
+
+group { name: "elm/genlist/item/type2/default";
+   alias: "elm/genlist/item_compress/type2/default";
+   inherit: "elm/genlist/item/type1/default";
+   data.item: "texts" "elm.text elm.text.end elm.text.sub elm.text.sub.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.icon.0 elm.swallow.icon.1 elm.swallow.end";
 
    parts {
-      LIST_PART_BG_NOCLASS
-      PART(SWALLOW, "elm.swallow.pad",
-         DSC_FROM_L("default" 0.0, );
-         mouse_events: 0;
-      )
-      PART(SPACER, "elm.padding.top",
-         DSC_FROM_T("default" 0.0,
-            min: 0 LIST_PADDING_TOP_SIZE;
-            max: -1 LIST_PADDING_TOP_SIZE;
-         )
-      )
-      PART(SPACER, "elm.padding.bottom",
-         DSC_FROM_B("default" 0.0,
-            min: 0 LIST_PADDING_BOTTOM_SIZE;
-            max: -1 LIST_PADDING_BOTTOM_SIZE;
-         )
-      )
-      PART(SWALLOW, "elm.padding.left",
-         DSC_L("default" 0.0,
-            "elm.swallow.pad",
-            min: LIST_LEFT_PADDING_SIZE 0;
-            max: LIST_LEFT_PADDING_SIZE -1;
-         )
-      )
-      PART(SWALLOW, "elm.padding.right",
-         DSC_FROM_R("default" 0.0,
-            min: LIST_RIGHT_PADDING_SIZE 0;
-            max: LIST_RIGHT_PADDING_SIZE -1;
-         )
-      )
-      PART(SWALLOW, "elm.swallow.icon",
-         DSC_L("default" 0.0,
-            "elm.padding.left",
-         )
-      )
-      PART(SWALLOW, "elm.swallow.end",
-         DSC_R("default" 0.0,
-            "elm.padding.right",
-         )
-      )
-      PART(SPACER, "elm.padding.center.left",
-         DSC_L("default" 0.0,
-            "elm.swallow.icon",
-            min: 0 -0;
-            max: 0 -1;
-         )
-         description { state: "enabled" 0.0;
+      textblock { "elm.text"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_MAIN_LINE_HEIGHT_INC;
+            align: 0.5 0.5;
+            rel1 { to_x: "elm.padding.main.icon.text"; to_y: "base_line"; relative: 1.0 1.0; }
+            rel2 { to_x: "elm.padding.main.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+            text.style: "list_text_main";
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list.text_main_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list.text_main_dim";
+         }
+      }
+      spacer { "base_line";
+         desc { "default";
+            rel1 { to: "elm.padding.top"; relative: 0.0 1.0; }
+            rel2 { to: "elm.padding.top"; relative: 1.0 1.0; }
+         }
+         desc { "sub_text_visible";
+            rel1 { to: "elm.text.sub"; relative: 0.0 1.0; }
+            rel2 { to: "elm.text.sub"; relative: 1.0 1.0; }
+         }
+      }
+      textblock { "elm.text.sub"; scale;
+         desc { "default";
+            align: 0.5 0.0;
+            rel1 { to_x: "elm.padding.center.left"; to_y: "elm.padding.top"; relative: 1.0 1.0; }
+            rel2 { to_x: "elm.padding.sub.text.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; }
+            text.style: "list_text_sub_01";
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_sub_01_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_sub_01_dim";
+         }
+      }
+   }
+}
+
+group { name: "elm/genlist/item/multiline/default";
+   alias: "elm/genlist/item_compress/multiline/default";
+
+   data.item: "banded_bg_area" "elm.swallow.bg";
+
+   data.item: "texts" "elm.text elm.text.multiline";
+   data.item: "contents" "elm.swallow.icon elm.swallow.icon.0 elm.swallow.icon.1 elm.swallow.end";
+
+   script {
+      public main_text_visible = 0;
+      public multiline_text_visible = 0;
+   }
+
+   parts {
+      swallow { "elm.swallow.bg"; scale;
+         desc { "default";
+         }
+      }
+      // "bg" part is used by genlist event macro. this will be removed.
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            min: LIST_PADDING_CENTER_LEFT_SIZE -0;
-            max: LIST_PADDING_CENTER_LEFT_SIZE -1;
+            color: 61 185 204 77;
          }
-      )
-      PART(SPACER, "elm.padding.center.right",
-         DSC_R("default" 0.0,
-            "elm.swallow.end",
+         description { state: "disabled" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "reorder" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      spacer { "base"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_MULTILINE_1LINE_HEIGHT_INC;
+            align: 0.5 0.5;
+         }
+      }
+      spacer { "elm.padding.left"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_LR_PADDING_INC 0;
+            align: 0.0 0.5;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+         }
+      }
+      spacer { "elm.padding.right"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_LR_PADDING_INC 0;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      spacer { "elm.padding.top"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_TB_PADDING_INC;
+            max: -1 GENLIST_ITEM_TB_PADDING_INC;
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      spacer { "elm.padding.bottom"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_TB_PADDING_INC;
+            max: -1 GENLIST_ITEM_TB_PADDING_INC;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      swallow { "elm.swallow.icon"; scale;
+         desc { state: "default";
+            align: 0.0 0.5;
+            rel1 { to: "elm.padding.left"; relative: 1.0 0.5; }
+            rel2 { to: "elm.padding.left"; relative: 1.0 0.5; }
+         }
+      }
+      spacer { "elm.padding.center.left"; scale;
+         desc { "default";
             min: 0 0;
-            max: 0 -1;
-         )
-         description { state: "enabled" 0.0;
-            inherit: "default" 0.0;
-            min: LIST_PADDING_CENTER_RIGHT_SIZE 0;
-            max: LIST_PADDING_CENTER_RIGHT_SIZE -1;
+            align: 0.0 0.5;
+            rel1 { to: "elm.swallow.icon"; relative: 1.0 0.5; }
+            rel2 { to: "elm.swallow.icon"; relative: 1.0 0.5; }
          }
-      )
-      PART(TEXTBLOCK, "elm.text",
-         DSC_LRTB("default" 0.0,
-            "elm.padding.center.left", "elm.padding.center.right", "elm.padding.top", "elm.padding.bottom",
-            min: 0 LIST_TEXT_MAIN_HEIGHT;
-            text.min: 0 1;
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_CENTER_LEFT_PADDING_INC 0;
+         }
+      }
+      swallow { "elm.swallow.end"; scale;
+         desc { state: "default";
+            align: 1.0 0.5;
+            rel1 { to: "elm.padding.right"; relative: 0.0 0.5; }
+            rel2 { to: "elm.padding.right"; relative: 0.0 0.5; }
+         }
+      }
+      spacer { "elm.padding.center.right"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 1.0 0.5;
+            rel1 { to: "elm.swallow.end"; relative: 0.0 0.5; }
+            rel2 { to: "elm.swallow.end"; relative: 0.0 0.5; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_CENTER_LEFT_PADDING_INC 0;
+         }
+      }
+      swallow { "elm.swallow.icon.0"; scale;
+         desc { "default";
+            align: 0.0 0.5;
+            rel1 { to_x: "elm.padding.center.left"; to_y: "elm.padding.main.icon.text"; relative: 1.0 0.5; }
+            rel2 { to_x: "elm.padding.center.left"; to_y: "elm.padding.main.icon.text"; relative: 1.0 0.5; }
+         }
+      }
+      spacer { "elm.padding.main.icon.text"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 0.0 0.5;
+            rel1 { to_x: "elm.swallow.icon.0"; relative: 1.0 0.5; }
+            rel2 { to_x: "elm.swallow.icon.0"; relative: 1.0 0.5; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+         }
+      }
+      textblock { "elm.text"; scale;
+         desc { "default";
+            align: 0.5 0.0;
+            rel1 { to_x: "elm.padding.main.icon.text"; to_y: "elm.padding.top"; relative: 1.0 1.0; }
+            rel2 { to_x: "elm.padding.main.text.end"; to_y: "base_line"; relative: 0.0 0.0; }
             text.style: "list_text_main";
-            fixed: 1 0;;
-         )
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list.text_main_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list.text_main_dim";
+         }
+      }
+      spacer { "base_line";
+         desc { "default";
+            rel1 { to: "elm.padding.top"; relative: 0.0 0.0; }
+            rel2 { to: "elm.padding.top"; relative: 1.0 0.0; }
+         }
+         desc { "main_text_visible";
+            rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; }
+            rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; }
+         }
+         desc { "multiline_text_visible";
+            rel1 { to: "elm.text.multiline"; relative: 0.0 0.0; }
+            rel2 { to: "elm.text.multiline"; relative: 1.0 0.0; }
+         }
+      }
+      spacer { "elm.padding.main.text.end"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.swallow.icon.1"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.swallow.icon.1"; relative: 0.0 0.5; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+         }
+      }
+      swallow { "elm.swallow.icon.1"; scale;
+         desc { "default";
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.padding.center.right"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.padding.center.right"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
+         }
+      }
+      spacer { "multiline_base_line";
+         desc { "default";
+            rel1 { to: "elm.padding.top"; relative: 0.0 1.0; }
+            rel2 { to: "elm.padding.top"; relative: 1.0 1.0; }
+         }
+         desc { "main_text_visible";
+            rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; }
+            rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; }
+         }
+      }
+      textblock { "elm.text.multiline"; scale;
+         desc { "default";
+            align: 0.5 1.0;
+            rel1 { to_x: "elm.padding.main.icon.text"; to_y: "multiline_base_line"; relative: 1.0 1.0; }
+            rel2 { to_x: "elm.padding.main.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+            text.style: "list_text_multiline";
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_multiline_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_multiline_dim";
+         }
+      }
+   }
+   LIST_PROGRAMS( target: "elm.text"; \
+                  target: "elm.text.multiline"; )
+   programs {
+      program {
+         signal: "elm,state,elm.swallow.icon,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.center.left";
+      }
+      program {
+         signal: "elm,state,elm.swallow.end,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.center.right";
+      }
+      program {
+         signal: "elm,state,elm.swallow.icon.0,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.main.icon.text";
+      }
+      program {
+         signal: "elm,state,elm.swallow.icon.1,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.main.text.end";
+      }
+      program { name: "main_text_visible";
+         signal: "elm,state,elm.text,visible";
+         source: "elm";
+         script {
+            if (get_int(multiline_text_visible) == 1) {
+               set_state(PART:"base_line", "multiline_text_visible", 0.0);
+               set_state(PART:"multiline_base_line", "main_text_visible", 0.0);
+            }
+            else {
+               set_state(PART:"base_line", "main_text_visible", 0.0);
+               set_state(PART:"multiline_base_line", "default", 0.0);
+            }
+            set_int(main_text_visible, 1);
+         }
+      }
+      program { name: "multiline_text_visible";
+         signal: "elm,state,elm.text.multiline,visible";
+         source: "elm";
+          script {
+            if (get_int(main_text_visible) == 1) {
+               set_state(PART:"base_line", "multiline_text_visible", 0.0);
+               set_state(PART:"multiline_base_line", "main_text_visible", 0.0);
+            }
+            else {
+               set_state(PART:"base_line", "main_text_visible", 0.0);
+               set_state(PART:"multiline_base_line", "default", 0.0);
+            }
+            set_int(multiline_text_visible, 1);
+         }
+      }
+      program { name: "restore_default";
+         signal: "elm,state,default";
+         source: "elm";
+         script {
+            set_state(PART:"base_line", "default", 0.0);
+            set_state(PART:"multiline_base_line", "default", 0.0);
+            set_state(PART:"elm.padding.center.left", "default", 0.0);
+            set_state(PART:"elm.padding.center.right", "default", 0.0);
+            set_state(PART:"elm.padding.main.icon.text", "default", 0.0);
+            set_state(PART:"elm.padding.main.text.end", "default", 0.0);
+            set_int(main_text_visible, 0);
+            set_int(multiline_text_visible, 0);
+         }
+      }
+   }
+}
+
+group { name: "elm/genlist/item/full/default";
+   alias: "elm/genlist/item_compress/full/default";
+
+   data.item: "banded_bg_area" "elm.swallow.bg";
+
+   data.item: "contents" "elm.swallow.content";
+
+   parts {
+      swallow { "elm.swallow.bg"; scale;
+         desc { "default";
+         }
+      }
+      // "bg" part is used by genlist event macro. this will be removed.
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            text.style: "list_text_main_press";
+            color: 61 185 204 77;
          }
          description { state: "disabled" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "reorder" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      swallow { "elm.swallow.content"; scale;
+         desc { "default";
+         }
+      }
+   }
+   LIST_PROGRAMS( ; )
+}
+
+group { name: "elm/genlist/item/group_index/default";
+   alias: "elm/genlist/item_compress/group_index/default";
+
+   data.item: "banded_bg_area" "elm.swallow.bg";
+
+   data.item: "texts" "elm.text elm.text.end";
+   data.item: "contents" "elm.swallow.end";
+
+   parts {
+      swallow { "elm.swallow.bg"; scale;
+         desc { "default";
+         }
+      }
+      // FIXME: "bg" part is used by genlist event macro. this will be removed.
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            text.style: "list_text_main_dim";
+            color: 61 185 204 77;
          }
-      )
-      PART(RECT, "elm.bottomline",
-         DSC_FROM_B("default" 0.0,
+         description { state: "disabled" 0.0;
+            color: 0 0 0 0;
+         }
+         description { state: "reorder" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      spacer { "base"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_GROUP_INDEX_HEIGHT_INC;
+            align: 0.5 0.5;
+         }
+      }
+      spacer { "elm.padding.left"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_LR_PADDING_INC 0;
+            align: 0.0 0.5;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+         }
+      }
+      spacer { "elm.padding.right"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_LR_PADDING_INC 0;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      spacer { "elm.padding.top"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_GROUP_INDEX_TOP_PADDING_INC;
+            max: -1 GENLIST_ITEM_GROUP_INDEX_TOP_PADDING_INC;
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      spacer { "elm.padding.bottom"; scale;
+         desc { "default";
+            min: 0 GENLIST_ITEM_GROUP_INDEX_BOTTOM_PADDING_INC;
+            max: -1 GENLIST_ITEM_GROUP_INDEX_BOTTOM_PADDING_INC;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      textblock { "elm.text"; scale;
+         desc { "default";
+            align: 0.5 0.5;
+            rel1 { to_x: "elm.padding.left"; to_y: "elm.padding.top"; relative: 1.0 1.0; }
+            rel2 { to_x: "elm.padding.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
+            text.style: "list_text_group_index_main";
+            text.min: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_group_index_main_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_group_index_main_dim";
+         }
+      }
+      spacer { name: "elm.padding.text.end"; scale;
+         desc { "default";
+            min: 0 0;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.swallow.end"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.swallow.end"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+         desc { "icon_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+         }
+         desc { "text_visible"; inherit: "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+            rel1 { to_x: "elm.text.end"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.text.end"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+      }
+      swallow { "elm.swallow.end"; scale;
+         desc { "default";
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.padding.right"; to_y: "elm.padding.text.end"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.padding.right"; to_y: "elm.padding.text.end"; relative: 0.0 0.5; }
+         }
+      }
+      textblock { "elm.text.end"; scale;
+         desc { "default";
+            max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.padding.right"; to_y: "elm.padding.text.end"; relative: 0.0 0.5; }
+            rel2 { to_x: "elm.padding.right"; to_y: "elm.padding.text.end"; relative: 0.0 0.5; }
+            text.style: "list_text_group_index_sub";
+            text.min: 1 1;
+            text.max: 0 1;
+         }
+         desc { "pressed"; inherit: "default";
+            text.style: "list_text_group_index_sub_press";
+         }
+         desc { "disabled"; inherit: "default";
+            text.style: "list_text_group_index_sub_dim";
+         }
+      }
+      rect { "elm.topline"; scale;
+         desc { "default";
             min: 0 LIST_BOTTOMLINE_HEIGHT;
             max: -1  LIST_BOTTOMLINE_HEIGHT;
-            color: 192 213 222 255;
-         )
-      )
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            color: 61 185 204 38;
+         }
+      }
    }
    LIST_PROGRAMS( target: "elm.text"; )
    programs {
-      LIST_PROGRAM_PAD
+      program { name: "end_icon_visible";
+         signal: "elm,state,elm.swallow.end,visible";
+         source: "elm";
+         action: STATE_SET "icon_visible" 0.0;
+         target: "elm.padding.text.end";
+      }
+      program { name: "end_text_visible";
+         signal: "elm,state,elm.text.end,visible";
+         source: "elm";
+         action: STATE_SET "text_visible" 0.0;
+         target: "elm.padding.text.end";
+      }
+      program { name: "restore_default";
+         signal: "elm,state,default";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.padding.text.end";
+      }
    }
 }
 
+group { name: "elm/genlist/item/group_index/expandable/default";
+   inherit: "elm/genlist/item/group_index/default";
+   alias: "elm/genlist/item_compress/group_index/expandable/default";
+
+   data.item: "texts" "elm.text";
+   data.item: "contents" "";
+
+   images {
+      set {
+         name: "core_icon_expand_open";
+         image {
+            image: SMALL"images/Navigation_elements/core_icon_expand_open.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Navigation_elements/core_icon_expand_open.png" COMP;
+         }
+      }
+      set {
+         name: "core_icon_expand_close";
+         image {
+            image: SMALL"images/Navigation_elements/core_icon_expand_close.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Navigation_elements/core_icon_expand_close.png" COMP;
+         }
+      }
+   }
+
+   parts {
+      spacer { "elm.padding.text.end"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
+            align: 1.0 0.5;
+            rel1 { to_x: "elm.expand.icon"; to_y: "elm.text"; relative: 0.0 0.0; }
+            rel2 { to_x: "elm.expand.icon"; to_y: "elm.text"; relative: 0.0 1.0; }
+         }
+      }
+      spacer { "elm.expand.padding.right"; scale;
+         desc { "default";
+            min: GENLIST_ITEM_GROUP_INDEX_RIGHT_PADDING_INC 0;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      image { "elm.expand.icon"; scale;
+         clip: "elm.expand.clipper";
+         desc { "default";
+            min: GENLIST_ITEM_GROUP_INDEX_EXPAND_ICON_SIZE_INC;
+            align: 1.0 0.5;
+            rel1 { to: "elm.expand.padding.right"; relative: 0.0 0.0; }
+            rel2 { to: "elm.expand.padding.right"; relative: 0.0 1.0; }
+            image.normal: "core_icon_expand_close";
+         }
+         desc { "expanded"; inherit: "default";
+            image.normal: "core_icon_expand_open";
+         }
+      }
+      rect { "elm.expand.clipper";
+         desc { "default";
+            rel1.to: "elm.expand.icon";
+            rel2.to: "elm.expand.icon";
+            color: 61 185 204 255;
+         }
+         desc { "pressed"; inherit: "default";
+            color: 61 185 244 77;
+         }
+      }
+   }
+   programs {
+      program { name: "pressed";
+         signal: "elm,state,selected";
+         source: "elm";
+         action: STATE_SET "pressed" 0.0;
+         target: "elm.expand.clipper";
+      }
+      program { name: "unpressed";
+         signal: "elm,state,unselected";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.expand.clipper";
+      }
+      program { name: "expanded";
+         signal: "elm,state,expanded";
+         source: "elm";
+         action: STATE_SET "expanded" 0.0;
+         target: "elm.expand.icon";
+      }
+      program { name: "contracted";
+         signal: "elm,state,contracted";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.expand.icon";
+      }
+      program { name: "default";
+         signal: "elm,state,default";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.padding.text.end";
+         target: "elm.expand.icon";
+         target: "elm.expand.clipper";
+      }
+   }
+}
+
+/*
+*********************** WARNING *********************
+
+* STYLES BELOW THIS LINE ARE SUPPORTED ONLY IN TIZEN 2.3.
+* THESE STYLES WILL BE DEPRECATED IN THE NEXT RELEASE.
+* WE ARE NOT RESPONSIBLE FOR ANY USE OF THESE STYLES
+* IN OTHER THAN TIZEN 2.3.
+
+*****************************************************
+*/
+
 group { name: "elm/genlist/item/1icon/default";
 
    data.item: "contents" "elm.icon";
@@ -354,7 +1250,7 @@ group { name: "elm/genlist/item/select_all/default";
             "elm.padding.left", "elm.padding.center",
             min: 0 LIST_SELECT_ALL_HEIGHT;
             text.min: 0 1;
-            text.style: "list_text_main";
+            text.style: "list_text_group_index_main";
             fixed: 1 0;
          )
       )
@@ -367,6 +1263,11 @@ group { name: "elm/genlist/item/select_all/default";
       )
    }
    programs{
+      program { name: "play_sound";
+         signal: "mouse,clicked,1";
+         source: "event";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program { name: "unselect";
          signal: "mouse,up,1";
          source: "event";
@@ -2152,7 +3053,7 @@ group { name: "elm/genlist/item/entry/default";
    parts {
       PART(RECT, "bg",
          description { state: "default" 0.0;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       )
       PART(SWALLOW, "elm.icon.1",
@@ -2207,7 +3108,7 @@ group { name: "elm/genlist/item/entry.sub/default";
    parts {
       PART(RECT, "bg",
          description { state: "default" 0.0;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       )
       PART(SWALLOW, "elm.icon.1",
@@ -2281,7 +3182,7 @@ group { name: "elm/genlist/item/entry.icon/default";
    parts {
       PART(RECT, "bg",
          description { state: "default" 0.0;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       )
       PART(SWALLOW, "elm.icon.1",
@@ -2351,7 +3252,7 @@ group { name: "elm/genlist/item/entry.main/default";
    parts {
       PART(RECT, "bg",
          description { state: "default" 0.0;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       )
       PART(SWALLOW, "elm.icon.1",
@@ -2413,91 +3314,6 @@ group { name: "elm/genlist/item/entry.main/default";
    )
 }
 
-// 2.1.1.A58
-// Need to delete - hs619.choi@samsung.com(2014/07/24)
-group { name: "elm/genlist/item/empty_area/default";
-
-     data.item: "bg_color" "B0211";
-
-   images {
-      image: "core_group_list_bg_ef.#.png" COMP;
-   }
-   parts {
-      PART(RECT, "bg",
-         description { state: "default" 0.0;
-            min: 0 LIST_GROUP_HEIGHT;
-            max: -1 LIST_GROUP_HEIGHT;
-            align: 0.5 0.0;
-            color: 151 172 198 255; /*(Changeable UI) color_class: "B074";*/
-         }
-      )
-      PART(IMAGE, "bg_image",
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "core_group_list_bg_ef.#.png";
-         }
-      )
-   }
-}
-
-// 2.1.1.A59
-// Need to delete - hs619.choi@samsung.com(2014/07/24)
-group { name: "elm/genlist/item/description/default";
-
-   data.item: "texts" "elm.text.main";
-   data.item: "bg_color" "B0211";
-
-   images {
-      image: "core_group_list_bg_ef.#.png" COMP;
-   }
-   parts {
-      PART(RECT, "bg",
-         description { state: "default" 0.0;
-            color: 151 172 198 255; /*(Changeable UI) color_class: "B074";*/
-         }
-      )
-      PART(IMAGE, "bg_image",
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "core_group_list_bg_ef.#.png";
-         }
-      )
-      PART(SPACER, "elm.padding.top",
-         DSC_FROM_T("default" 0.0,
-            min: 0 LIST_DESC_PADDING_TOP_SIZE;
-            max: -1 LIST_DESC_PADDING_TOP_SIZE;
-         )
-      )
-      PART(SPACER, "elm.padding.bottom",
-         DSC_FROM_B("default" 0.0,
-            min: 0 LIST_DESC_PADDING_BOTTOM_SIZE;
-            max: -1 LIST_DESC_PADDING_BOTTOM_SIZE;
-         )
-      )
-      PART(SPACER, "elm.padding.left",
-         DSC_FROM_L("default" 0.0,
-            min: LIST_DESC_PADDING_LEFT_RIGHT_SIZE 0;
-            max: LIST_DESC_PADDING_LEFT_RIGHT_SIZE -1;
-         )
-      )
-      PART(SPACER, "elm.padding.right",
-          DSC_FROM_R("default" 0.0,
-            min: LIST_DESC_PADDING_LEFT_RIGHT_SIZE 0;
-            max: LIST_DESC_PADDING_LEFT_RIGHT_SIZE -1;
-         )
-      )
-      PART(TEXTBLOCK, "elm.text.main",
-         DSC_LRTB("default" 0.0,
-            "elm.padding.left", "elm.padding.right", "elm.padding.top", "elm.padding.bottom",
-            text.min: 0 1;
-            text.style: "list_text_desc";
-         )
-      )
-   }
-}
-
 // 2.2.1.A49
 // 2.2.1.A60
 group { name: "elm/genlist/item/progress.main/default";
diff --git a/themes/widgets/genlist_macro.edc b/mobile/widgets/genlist_macro.edc
index fec4e630..a5ed3df1 100644
--- a/themes/widgets/genlist_macro.edc
+++ b/mobile/widgets/genlist_macro.edc
@@ -388,14 +388,14 @@
 #define LIST_PART_BG \
    PART(RECT, "bg", \
       description { state: "default" 0.0; \
-         color_class: "B0211"; \
+         color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/ \
       } \
       description { state: "pressed" 0.0; \
          inherit: "default" 0.0; \
-         color_class: "B0211P"; \
+         color: 2 61 132 76; /*(Changeable UI) color_class: "B0211P";*/ \
       } \
       description { state: "disabled" 0.0; \
-         color_class: "B0211"; \
+         color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/ \
       } \
       description { state: "reorder" 0.0; \
          color: 0 0 0 0; \
@@ -486,6 +486,18 @@
       TARGET \
    }
 
+#define LIST_PROGRAM_SOUND \
+   program { name: "play_sound"; \
+      signal: "elm,state,clicked"; \
+      source: "elm"; \
+      script { \
+         run_program(PROGRAM:"touch_sound"); \
+      } \
+   } \
+   program { name: "touch_sound"; \
+      action: RUN_PLUGIN "touch_sound"; \
+   }
+
 #define LIST_PROGRAMS( TARGET ) \
    programs { \
       LIST_PROGRAM_DEFAULT( TARGET \
@@ -500,6 +512,7 @@
       LIST_PROGRAM_REORDER( TARGET \
          target: "bg"; \
       ) \
+      LIST_PROGRAM_SOUND \
    }
 
 #define PARAM_TEXT(STYLE) \
diff --git a/mobile/widgets/hover.edc b/mobile/widgets/hover.edc
new file mode 100644
index 00000000..3e5ce6dc
--- /dev/null
+++ b/mobile/widgets/hover.edc
@@ -0,0 +1,411 @@
+group { name: "elm/hover/base/hoversel_vertical/default";
+   alias: "elm/hover/base/hoversel_vertical/entry";
+   images {
+      set {
+         name: "core_contextual_popup_list_bg_press_bottom.#.png";
+         image {
+            image: SMALL"images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png" COMP;
+         }
+      }
+      set {
+         name: "core_dropdown_label_bg_stroke.#.png";
+         image {
+            image: SMALL"images/Old/core_dropdown_label_bg_stroke.#.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Old/core_dropdown_label_bg_stroke.#.png" COMP;
+         }
+      }
+   }
+   parts {
+      part { name: "elm.swallow.offset";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 0.0;
+         }
+      }
+      part { name: "elm.swallow.size";
+         type: SWALLOW;
+         scale: 1;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            rel1 {
+               to: "elm.swallow.offset";
+               relative: 1.0 1.0;
+            }
+            rel2 {
+               to: "elm.swallow.offset";
+               relative: 1.0 1.0;
+            }
+         }
+      }
+      part { name: "elm.padding.bg-top.left-top";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1 1;
+            fixed: 1 1;
+            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
+            rel1.to: "elm.swallow.slot.top";
+            rel2 {
+               to: "elm.swallow.slot.top";
+               relative: 0 0;
+            }
+         }
+      }
+      part { name: "elm.padding.bg-top.right-bottom";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0 0;
+            fixed: 1 1;
+            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
+            rel1 {
+               to_x: "elm.swallow.slot.top";
+               to_y: "elm.swallow.slot.bottom";
+               relative: 1 0;
+            }
+            rel2 {
+               to_x: "elm.swallow.slot.top";
+               to_y: "elm.swallow.slot.bottom";
+            }
+         }
+      }
+      part { name: "elm.padding.bg-bottom.left-top";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 1 1;
+            fixed: 1 1;
+            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
+            rel1 {
+               to_x: "elm.swallow.slot.bottom";
+               to_y: "elm.swallow.slot.top";
+            }
+            rel2 {
+               to_x: "elm.swallow.slot.bottom";
+               to_y: "elm.swallow.slot.top";
+               relative: 0 1;
+            }
+         }
+      }
+      part { name: "elm.padding.bg-bottom.right-bottom";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0 0;
+            fixed: 1 1;
+            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
+            rel1 {
+               to: "elm.swallow.slot.bottom";
+               relative: 1 1;
+            }
+            rel2.to: "elm.swallow.slot.bottom";
+         }
+      }
+      part { name: "button_image";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1 {
+               to: "elm.padding.bg-top.left-top";
+               relative: 0 0;
+            }
+            rel2 {
+               to: "elm.padding.bg-top.right-bottom";
+               relative: 1 1;
+            }
+            color: 0 0 0 0;
+         }
+         description { state: "bottom" 0.0;
+            rel1 {
+               to: "elm.padding.bg-bottom.left-top";
+               relative: 0 0;
+            }
+            rel2 {
+               to: "elm.padding.bg-bottom.right-bottom";
+               relative: 1 1;
+            }
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "base";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "clipper";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "top_bg";
+         type: RECT;
+         clip_to: "top_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "top_clipper";
+            rel2.to: "top_clipper";
+            color: 255 255 255 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "top_clipper";
+         type: IMAGE;
+         clip_to: "clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.swallow.slot.top";
+            rel2 { to: "elm.swallow.slot.middle"; relative: 1.0 0.0; }
+            image.normal: "core_contextual_popup_list_bg_press_bottom.#.png";
+            color: 255 255 255 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "top_border";
+         type: IMAGE;
+         clip_to: "top_clipper";
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "top_clipper";
+            rel2.to: "top_clipper";
+            image.normal: "core_dropdown_label_bg_stroke.#.png";
+            color: 61 185 204 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.slot.top";
+         type: SWALLOW;
+         clip_to: "top_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 1;
+            align: 0.5 0.8;
+            rel1 {
+               to: "elm.swallow.slot.middle";
+               relative: 0.0 0.0;
+               offset: 0 -1;
+            }
+            rel2 {
+               to: "elm.swallow.slot.middle";
+               relative: 1.0 0.0;
+               offset: -1 -1;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 1.0;
+         }
+      }
+      part { name: "bottom_bg";
+         type: RECT;
+         clip_to: "bottom_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "bottom_clipper";
+            rel2.to: "bottom_clipper";
+            color: 255 255 255 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "bottom_clipper";
+         type: IMAGE;
+         clip_to: "clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1 { to: "elm.swallow.slot.middle"; relative: 0.0 1.0; }
+            rel2.to: "elm.swallow.slot.bottom";
+            image.normal: "core_contextual_popup_list_bg_press_bottom.#.png";
+            color: 255 255 255 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "bottom_border";
+         type: IMAGE;
+         clip_to: "bottom_clipper";
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "bottom_clipper";
+            rel2.to: "bottom_clipper";
+            image.normal: "core_dropdown_label_bg_stroke.#.png";
+            color: 61 185 204 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.slot.bottom";
+         type: SWALLOW;
+         clip_to: "bottom_clipper";
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.2;
+            rel1 {
+               to: "elm.swallow.slot.middle";
+               relative: 0.0 1.0;
+            }
+            rel2 {
+               to: "elm.swallow.slot.middle";
+               relative: 1.0 1.0;
+               offset: 2 0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            align: 0.0 0.0;
+         }
+      }
+      part { name: "over1";
+         type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "button_image";
+            rel2.to: "button_image";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "elm.swallow.slot.middle";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1.to: "elm.swallow.size";
+            rel2.to: "elm.swallow.size";
+         }
+      }
+   }
+   programs {
+      program { name: "end";
+         signal: "mouse,up,1";
+         source: "base";
+         action: SIGNAL_EMIT "elm,action,dismiss" "";
+      }
+      program { name: "show";
+         signal: "elm,action,show";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         transition: SIN_FAC 0.25 0.5;
+         target: "clipper";
+      }
+      program { name: "hide";
+         signal: "elm,action,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: SIN_FAC 0.25 0.5;
+         target: "clipper";
+      }
+      program { name: "topshow";
+         signal: "elm,action,slot,top,show";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "top_bg";
+         target: "top_clipper";
+         target: "top_border";
+         after: "topshow2";
+      }
+      program { name: "topshow2";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.25;
+         target: "elm.swallow.slot.top";
+      }
+      program { name: "topshow3";
+         signal: "elm,action,slot,top,show";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "button_image";
+      }
+      program { name: "tophide";
+         signal: "elm,action,slot,top,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.25;
+         target: "elm.swallow.slot.top";
+         after: "tophide2";
+      }
+      program { name: "tophide2";
+         action: STATE_SET "default" 0.0;
+         target: "top_bg";
+         target: "top_clipper";
+         target: "top_border";
+      }
+      program { name: "bottomshow";
+         signal: "elm,action,slot,bottom,show";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "bottom_bg";
+         target: "bottom_clipper";
+         target: "bottom_border";
+         after: "bottomshow2";
+      }
+      program { name: "bottomshow2";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.25;
+         target: "elm.swallow.slot.bottom";
+      }
+      program { name: "bottomshow3";
+         signal: "elm,action,slot,bottom,show";
+         source: "elm";
+         action: STATE_SET "bottom" 0.0;
+         target: "button_image";
+      }
+      program { name: "bottomhide";
+         signal: "elm,action,slot,bottom,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.25;
+         target: "elm.swallow.slot.bottom";
+         after: "bottomhide2";
+      }
+      program { name: "bottomhide2";
+         action: STATE_SET "default" 0.0;
+         target: "bottom_bg";
+         target: "bottom_clipper";
+         target: "bottom_border";
+      }
+   }
+}
diff --git a/themes/widgets/index.edc b/mobile/widgets/index.edc
index 3e45d008..cab3d511 100644
--- a/themes/widgets/index.edc
+++ b/mobile/widgets/index.edc
@@ -25,24 +25,21 @@
  */
    styles {
       style { name: "Index_scroll_1depth_popup_left_align";
-         base: "font=Tizen:style=Regular font_size=54 align=left text_class=tizen color=#000000FF ellipsis=0.0";
-         // (Changeable UI) base: "font=Tizen:style=Medium font_size="INDEX_POPUP_TEXT_SIZE_INC" align=left color=#FFFFFF text_class=T115 color_class=T115 ellipsis=0.0";
+         base: "font=Tizen:style=Light font_size="INDEX_POPUP_TEXT_SIZE_INC" align=left text_class=tizen color=#FFFFFFFF ellipsis=0.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
          tag:  "b" "+ font_weight=Bold";
       }
       style { name: "Index_scroll_bar_2depth_popup";
-         base: "font=Tizen:style=Regular font_size=54 align=right text_class=tizen color=#000000FF ellipsis=0.0";
-         // (Changeable UI) base: "font=Tizen:style=Medium font_size="INDEX_POPUP_TEXT_SIZE_INC" align=right color=#FFFFFF text_class=T115 color_class=T115 ellipsis=0.0";
+         base: "font=Tizen:style=Light font_size="INDEX_POPUP_TEXT_SIZE_INC" align=right text_class=tizen color=#FFFFFFFF ellipsis=0.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
          tag:  "b" "+ font_weight=Bold";
       }
       style { name: "Index_scroll_1depth_popup";
-         base: "font=Tizen:style=Regular font_size=54 align=center text_class=tizen color=#000000FF ellipsis=0.0";
-         // (Changeable UI) base: "font=Tizen:style=Medium font_size="INDEX_POPUP_TEXT_SIZE_INC" align=center color=#FFFFFF text_class=T115 color_class=T115 ellipsis=0.0";
+         base: "font=Tizen:style=Light font_size="INDEX_POPUP_TEXT_SIZE_INC" align=center text_class=tizen color=#FFFFFFFF ellipsis=0.0";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -52,30 +49,12 @@
    group { name: "elm/index/base/vertical/default";
       images {
          set {
-            name: "core_index_scroll_popup_bg.#";
+            name: "core_index_scroll_popup_bg";
             image {
-               image: SMALL"images/Controls/core_index_scroll_popup_bg.#.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_popup_bg.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_popup_bg.#.png" COMP;
-            }
-         }
-         set {
-            name: "core_index_scroll_popup_bg_ef.#";
-            image {
-               image: SMALL"images/Controls/core_index_scroll_popup_bg_ef.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_index_scroll_popup_bg_ef.#.png" COMP;
-            }
-         }
-         set {
-            name: "core_index_scroll_popup_bg_stroke.#";
-            image {
-               image: SMALL"images/Controls/core_index_scroll_popup_bg_stroke.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_index_scroll_popup_bg_stroke.#.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_popup_bg.png" COMP;
             }
          }
       }
@@ -169,7 +148,7 @@
                   to: "elm.swallow.index.1";
                   relative: 0.0 1.0;
                }
-               color: 255 255 255 204; /*(Changeable UI) color_class: "B0722";*/
+               color: 61 185 204 77;
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
@@ -235,7 +214,7 @@
                align: 0.0 1.0;
                min: 0 INDEX_PADDING_SIZE_INC;
                fixed: 0 1;
-               color: 255 255 255 204; /*(Changeable UI) color_class: "B0722";*/
+               color: 255 255 255 255;
                rel1 {
                   to: "left.line.index.1";
                   relative: 0.0 0.0;
@@ -258,7 +237,7 @@
                align: 0.0 0.0;
                visible : 0;
                min: 0 INDEX_PADDING_SIZE_INC;
-               color: 255 255 255 204; /*(Changeable UI) color_class: "B0722";*/
+               color: 255 255 255 255;
                fixed: 0 1;
                rel1 {
                   to: "left.line.index.1";
@@ -315,7 +294,30 @@
             description { state: "default" 0.0;
                rel1.to: "index.top.padding";
                rel2.to: "index.bottom.padding";
-               color: 255 255 255 204; /*(Changeable UI) color_class: "B0722";*/
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "left.line";
+            type: RECT;
+            clip_to: "clip";
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               min: INDEX_SCROLL_BG_LINE_WIDTH_INC 0;
+               fixed: 1 1;
+               rel1 {
+                  to: "bg";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "bg";
+                  relative: 0.0 1.0;
+               }
+               color: 61 185 204 77;
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               color: 61 185 204 77;
             }
          }
          part { name: "elm.swallow.index.0";
@@ -343,10 +345,11 @@
             description { state: "default" 0.0;
                fixed: 1 1;
                min: INDEX_SCROLL_POPUP_SIZE;
-               color: 255 255 255 255; /*(Changeable UI) color_class: "B0731L1";*/
-               image.normal: "core_index_scroll_popup_bg.#";
+               color: 61 185 204 255;
+               image.normal: "core_index_scroll_popup_bg";
                rel1.to: "text.left.padding";
-               rel2.to: "text.right.padding";
+               rel2.to_x: "text.right.padding";
+               rel2.to_y: "text.bottom.padding";
             }
             description {
                state: "active" 0.0;
@@ -354,25 +357,6 @@
                min: INDEX_SCROLL_POPUP_ACTIVE_SIZE;
             }
          }
-         part { name: "popup_bg_stroke";
-            scale: 1;
-            clip_to: "clip2";
-            description { state: "default" 0.0;
-               rel1.to: "popup_bg";
-               rel2.to: "popup_bg";
-               image.normal: "core_index_scroll_popup_bg_stroke.#";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B0731L2";*/
-            }
-         }
-         part { name: "popup_bg_effect";
-            scale: 1;
-            clip_to: "clip2";
-            description { state: "default" 0.0;
-               rel1.to: "popup_bg";
-               rel2.to: "popup_bg";
-               image.normal: "core_index_scroll_popup_bg_ef.#";
-            }
-         }
          part {
             name: "align_prop";
             type: "SPACER";
@@ -399,7 +383,6 @@
                text.style: "Index_scroll_1depth_popup";
                text.min: 1 1;
                text.max: 1 1;
-               text.ellipsis: -1;
             }
             description {
                state: "active" 0.0;
@@ -427,7 +410,6 @@
                text.style: "Index_scroll_bar_2depth_popup";
                text.min: 1 1;
                text.max: 1 1;
-               text.ellipsis: -1;
                visible: 0;
             }
             description {
@@ -482,6 +464,21 @@
                rel2.to: "elm.text.1";
             }
          }
+         part { name: "text.bottom.padding";
+            type: SPACER;
+            scale: 1;
+            clip_to: "clip2";
+            description {
+               state: "default" 0.0;
+               min: 0 INDEX_TEXT_BOTTOM_PADDING_SIZE_INC;
+               fixed: 0 1;
+               rel1 {
+                  to: "elm.text.1";
+                  relative: 0.0 1.0;
+               }
+               rel2.to: "elm.text.1";
+            }
+         }
          part { name: "elm.swallow.event.0";
             type: SWALLOW;
             scale: 1;
@@ -609,6 +606,18 @@
             action: STATE_SET "default" 0.0;
             target: "clip";
          }
+         program { name: "left.line.active";
+            signal: "mouse,down,1";
+            source: "elm.swallow.event.0";
+            action: STATE_SET "active" 0.0;
+            target: "left.line";
+         }
+         program { name: "left.line.dim";
+            signal: "mouse,up,1";
+            source: "elm.swallow.event.0";
+            action: STATE_SET "default" 0.0;
+            target: "left.line";
+         }
          program { name: "index.active";
             signal: "elm,indicator,state,active";
             source: "elm";
@@ -682,39 +691,73 @@
       alias: "elm/index/item1_odd/vertical/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
+      images {
+         image: "core_index_fastscroll_rollover_line_focus.#.png" COMP;
+      }
       parts {
-         part { name: "focus.top";
-            type: SPACER;
+         part { name: "scroll.bg";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "focus.top";
+               rel2.to: "focus.bottom";
+               color: 255 255 255 255;
+               visible: 0;
+            }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "divider";
+            type: RECT;
             mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
                align: 0.5 1.0;
-               min: 0 INDEX_SCROLL_BG_LINE_WIDTH_INC;
+               min: 0 INDEX_DIVIDER_WIDTH_INC;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-               }
+               rel1.to: "focus.bottom";
                rel2 {
+                  to: "focus.bottom";
                   relative: 1.0 0.0;
                }
+               color: 61 185 204 26;
+            }
+            description {
+               state: "inactive" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
             }
          }
-         part { name: "focus.bottom";
+         part { name: "focus.top";
             type: SPACER;
             mouse_events: 0;
             scale: 1;
             description {
                state: "default" 0.0;
                align: 0.5 0.0;
-               min: 0 INDEX_SCROLL_BG_LINE_WIDTH_INC;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-               }
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               min: 0 0;
+               fixed: 1 1;
+            }
+         }
+         part { name: "focus.bottom";
+            type: SPACER;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               fixed: 1 1;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+               min: 0 0;
+               fixed: 1 1;
             }
          }
          part { name: "elm.text";
@@ -725,13 +768,96 @@
                min: INDEX_ITEM_WIDTH_INC INDEX_ITEM_HEIGHT_INC;
                align: 0.5 0.5;
                state: "default" 0.0;
-               color: 2 61 132 153; /*(Changeable UI) color_class: "T113";*/
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.0;
+               rel2.to: "divider";
+               color: 61 185 204 204;
                text {
                   align: 0.5 0.5;
-                  font: "Tizen:style=Bold"; size: "18"; /*(Changeable UI) text_class: "T113";*/
+                  font: "Tizen:style=Light"; size: "24";
                   text_class: "tizen";
                }
             }
+            description { state: "active" 0.0;
+               inherit: "default" 0.0;
+               color: 61 185 204 204;
+               text.font: "Tizen:style=Light"; text.size: "24";
+               text.text_class: "tizen";
+            }
+         }
+         part { name: "right.padding";
+            type: SPACER;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 1.0 0.5;
+               min: INDEX_SCROLL_BG_LINE_WIDTH_INC 0;
+               fixed: 1 1;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "item.bg.top.offset";
+            type: SPACER;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               align: 0.5 1.0;
+               rel1.to: "focus.top";
+               rel2.to: "focus.top";
+               min: 0 INDEX_SCROLL_BG_LINE_WIDTH_INC;
+               fixed: 1 1;
+            }
+         }
+         part { name: "item.bg";
+            type: IMAGE;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               visible: 0;
+               image {
+                  normal: "core_index_fastscroll_rollover_line_focus.#.png";
+               }
+               color: 61 185 204 77;
+               rel1.to: "item.bg.top.offset";
+               rel2.to_x: "right.padding";
+               rel2.to_y: "focus.bottom";
+               rel2.relative: 0.0 0.0;
+            }
+            description {
+               state: "active" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "active";
+            signal: "elm,state,active";
+            source: "elm";
+            action: STATE_SET "active" 0.0;
+            transition: DECELERATE 0.0;
+            target: "elm.text";
+            target: "item.bg";
+            target: "scroll.bg";
+         }
+         program { name: "inactive";
+            signal: "elm,state,inactive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.0;
+            target: "elm.text";
+            target: "item.bg";
+            target: "scroll.bg";
+         }
+         program {
+            signal: "elm,last,item";
+            source: "elm";
+            action: STATE_SET "inactive" 0.0;
+            target: "divider";
          }
       }
    }
@@ -750,7 +876,7 @@
                   relative: 1.0 0.0;
                   to: "divider";
                }
-               color: 255 255 255 204; /*(Changeable UI) color_class: "B0722";*/
+               color: 255 255 255 255;
             }
          }
          part { name: "focus.top";
@@ -817,17 +943,17 @@
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
                rel2.to: "divider";
-               color: 2 61 132 153; /*(Changeable UI) color_class: "T113";*/
+               color: 61 185 204 204;
                text {
                   align: 0.5 0.5;
-                  font: "Tizen:style=Bold"; size: "18"; /*(Changeable UI) text_class: "T113";*/
+                  font: "Tizen:style=Light"; size: "24";
                   text_class: "tizen";
                }
             }
             description { state: "active" 0.0;
                inherit: "default" 0.0;
-               color: 2 61 132 153; /*(Changeable UI) color_class: "T113";*/
-               text.font: "Tizen:style=Bold"; text.size: "18"; /*(Changeable UI) text.text_class: "T113";*/
+               color: 61 185 204 204;
+               text.font: "Tizen:style=Light"; text.size: "24";
                text.text_class: "tizen";
             }
          }
@@ -837,13 +963,13 @@
             scale: 1;
             description {
                state: "default" 0.0;
-               align: 0.0 1.0;
+               align: 0.5 1.0;
                min: 0 INDEX_DIVIDER_WIDTH_INC;
-               fixed: 0 1;
+               fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
-               }
-               color_class: "B0725";
+              }
+              color: 61 185 204 26;
             }
             description {
                state: "inactive" 0.0;
@@ -951,15 +1077,6 @@
                image: MEDIUM"images/Navigation_elements/core_page_indicator_off.png" COMP;
             }
          }
-         set {
-            name: "core_page_indicator_off_ef";
-            image {
-               image: SMALL"images/Navigation_elements/core_page_indicator_off_ef.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Navigation_elements/core_page_indicator_off_ef.png" COMP;
-            }
-         }
       }
       parts {
          part { name:"bg";
@@ -982,24 +1099,7 @@
                min: INDEX_PAGECONTROL_IND_MIN_INC;
                max: INDEX_PAGECONTROL_IND_MIN_INC;
                image.normal: "core_page_indicator_off";
-               color: 244 244 244 76; /*(Changeable UI) color_class: "W158E1";*/
-               visible: 1;
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "indicator_ff_shadow";
-            scale: 1;
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "indicator_off";
-               rel2.to: "indicator_off";
-               min: INDEX_PAGECONTROL_IND_MIN_INC;
-               max: INDEX_PAGECONTROL_IND_MIN_INC;
-               image.normal: "core_page_indicator_off_ef";
-               color: 244 244 244 76; /*(Changeable UI) color_class: "W158E1";*/
+               color: 250 250 250 128;
                visible: 1;
             }
             description { state: "active" 0.0;
@@ -1016,7 +1116,7 @@
                min: INDEX_PAGECONTROL_IND_MIN_INC;
                max: INDEX_PAGECONTROL_IND_MIN_INC;
                image.normal: "core_page_indicator_on";
-               color: 244 244 244 255; /*(Changeable UI) color_class: "W158";*/
+               color: 250 250 250 255;
                visible: 0;
             }
             description { state: "active" 0.0;
@@ -1031,7 +1131,6 @@
             source: "elm";
             action: STATE_SET "active" 0.0;
             target: "indicator_off";
-            target: "indicator_ff_shadow";
             target: "indicator_on";
          }
          program { name: "inactive";
@@ -1039,7 +1138,6 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "indicator_off";
-            target: "indicator_ff_shadow";
             target: "indicator_on";
          }
       }
diff --git a/themes/widgets/label.edc b/mobile/widgets/label.edc
index f50a8d23..db604c71 100644
--- a/themes/widgets/label.edc
+++ b/mobile/widgets/label.edc
@@ -175,7 +175,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style2";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
             }
@@ -194,7 +193,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style2";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
             }
@@ -290,7 +288,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
                description { state: "slide_begin" 0.0;
@@ -302,7 +299,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
             }
@@ -433,7 +429,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                description { state: "no_ellipsis" 0.0;
                   inherit: "default" 0.0;
                   text.min: 1 1;
-                  text.ellipsis: -1;
                }
             }
             part { name: "slide_text_clip";
@@ -474,7 +469,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                description { state: "slide_begin" 0.0;
                   inherit: "default" 0.0;
                   text.min: 1 1;
-                  text.ellipsis: -1;
                   rel1.relative: 0.0 0.0;
                   rel2.relative: 0.0 1.0;
                }
@@ -483,7 +477,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                   align: 1.0 0.5;
                   text.min: 1 1;
                   text.align: 1.0 0.5;
-                  text.ellipsis: -1;
                   rel1 { relative: 0.0 0.0; to: "slide_text_gap"; }
                   rel2 { relative: 1.0 1.0; to: "slide_text_gap"; }
                }
@@ -608,7 +601,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
                description { state: "slide_begin" 0.0;
@@ -620,7 +612,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
             }
@@ -744,7 +735,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
                description { state: "slide_begin" 0.0;
@@ -756,7 +746,6 @@ base: "font=Tizen:style=Regular font_size="LABEL_FONT_SIZE_INC" color=#ffffff co
                      style: "textblock_style";
                      min: 1 1;
                      align: 0.0 0.0;
-                     ellipsis: -1;
                   }
                }
             }
diff --git a/themes/widgets/layout.edc b/mobile/widgets/layout.edc
index 0961687a..fa8b0aea 100755..100644
--- a/themes/widgets/layout.edc
+++ b/mobile/widgets/layout.edc
@@ -36,6 +36,28 @@ group { name: "elm/layout/application/default";
          scale: 1;
          description { state: "default" 0.0; }
       }
+      part { name: "elm.swallow.floatingbutton";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 FLOATINGBUTTON_HEIGHT_INC;
+            fixed: 0 1;
+            align: 0.5 1.0;
+            rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; }
+            rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; }
+         }
+      }
+      part { name: "elm.padding.bottom";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 FLOATINGBUTTON_BOTTOM_PADDING_INC;
+            fixed: 0 1;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
    }
 }
 
@@ -71,71 +93,85 @@ group { name: "elm/layout/drawer/panel";
 group {
    name: "elm/layout/nocontents/default";
    images {
-      set {
-         name: "core_pattern_empty_bg";
-         image {
-            image: SMALL"images/Content_views/core_pattern_empty_bg.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Content_views/core_pattern_empty_bg.png" COMP;
-         }
-      }
-      set {
-         name: "core_pattern_empty_bg_h";
-         image {
-            image: SMALL"images/Content_views/core_pattern_empty_bg_h.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Content_views/core_pattern_empty_bg_h.png" COMP;
-         }
-      }
+      image: "core_theme_bg_01.png" COMP;
    }
    parts {
       part { name: "bg";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            color_class: B011;
          }
       }
-      part { name: "bg_con";
-         type: RECT;
+      part { name: "bg_image";
+         type: IMAGE;
          scale: 1;
+         clip_to: "bg_image_clipper";
          description { state: "default" 0.0;
+            min: 0 NO_CONTENT_BG_HEIGHT_INC;
             rel1.to: "bg";
             rel2.to: "bg";
-            color: 255 255 255 229; /*(Changeable UI) color_class: "B238L1";*/
+            align: 0.5 1.0;
+            fixed: 1 1;
+            image.normal: "core_theme_bg_01.png";
          }
       }
-      part { name: "bg_image";
-         type: IMAGE;
+      part { name: "bg_image_clipper";
+         type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 NO_CONTENT_BG_HEIGHT_INC;
             rel1.to: "bg";
-            rel2 {
-              to: "bg";
-              relative: 1.0 0.0;
-            }
-            align: 0.0 0.0;
+            rel2.to: "bg";
+         }
+      }
+      part { name: "top_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 NO_CONTENT_TOP_PADDING_HEIGHT_INC;
             fixed: 0 1;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B238L2";*/
-            image.normal: "core_pattern_empty_bg";
+            align: 0.5 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            rel2.relative: 1.0 0.0;
          }
          description { state: "landscape" 0.0;
-           inherit: "default" 0.0;
-           min: 0 NO_CONTENT_BG_LANDSCAPE_HEIGHT_INC;
-           image.normal: "core_pattern_empty_bg_h";
+            inherit: "default" 0.0;
+            min: 0 0;
          }
       }
-      part { name: "text_bg";
+      part { name: "bottom_padding";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            max: -1 NO_CONTENT_MAX_HEIGHT_INC;
+            min: 0 NO_CONTENT_BOTTOM_PADDING_HEIGHT_INC;
+            fixed: 0 1;
+            align: 0.5 1.0;
             rel1.to: "bg";
+            rel1.relative: 0.0 1.0;
             rel2.to: "bg";
          }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: 0 0;
+         }
+      }
+      part { name: "text_bg";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            max: -1 NO_CONTENT_TEXT_BG_MAX_HEIGHT_INC;
+            rel1 {
+               to_y: "top_padding";
+               to_x: "bg";
+               relative: 0.0 1.0;
+            }
+            rel2 {
+               to_y: "bottom_padding";
+               to_x: "bg";
+               relative: 1.0 0.0;
+            }
+         }
       }
       part { name: "left_padding";
          type: SPACER;
@@ -230,6 +266,7 @@ group {
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
+            fixed: 0 1;
             rel1 {
                to: "help_text_top_padding";
                relative: 0.0 1.0;
@@ -266,28 +303,32 @@ group {
          source: "elm";
          signal: "elm,state,orient,90";
          script {
-            set_state(PART:"bg_image", "landscape", 0.0);
+            set_state(PART:"top_padding", "landscape", 0.0);
+            set_state(PART:"bottom_padding", "landscape", 0.0);
          }
       }
       program { name: "landscape_mode2";
          source: "elm";
          signal: "elm,state,orient,270";
          script {
-            set_state(PART:"bg_image", "landscape", 0.0);
+            set_state(PART:"top_padding", "landscape", 0.0);
+            set_state(PART:"bottom_padding", "landscape", 0.0);
          }
       }
       program { name: "portrait_mode";
          source: "elm";
          signal: "elm,state,orient,0";
          script {
-            set_state(PART:"bg_image", "default", 0.0);
+            set_state(PART:"top_padding", "default", 0.0);
+            set_state(PART:"bottom_padding", "default", 0.0);
          }
       }
       program { name: "portrait_mode2";
          source: "elm";
          signal: "elm,state,orient,180";
          script {
-            set_state(PART:"bg_image", "default", 0.0);
+            set_state(PART:"top_padding", "default", 0.0);
+            set_state(PART:"bottom_padding", "default", 0.0);
          }
       }
       program { name: "align_center";
@@ -534,6 +575,19 @@ group { name: "elm/layout/searchbar/default";
          }
       }
       program {
+         name: "sound_play";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         script {
+            if (get_int(multi_down) == 0)
+               run_program(PROGRAM:"play_sample");
+         }
+      }
+      program {
+         name: "play_sample";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program {
          name: "multi_down";
          signal: "elm,action,multi,down";
          source: "elm";
@@ -716,6 +770,19 @@ group { name: "elm/layout/searchbar/cancel_button";
       }
    }
    programs {
+      program {
+         name: "sound_play";
+         signal: "mouse,clicked,1";
+         source: "elm.text";
+         script {
+            if (get_int(multi_down) == 0)
+               run_program(PROGRAM:"play_sample");
+         }
+      }
+      program {
+         name: "play_sample";
+         action: RUN_PLUGIN "touch_sound";
+      }
      program {
          name: "bg_clicked";
          signal: "mouse,clicked,1";
@@ -774,11 +841,10 @@ group { name: "elm/layout/editfield/singleline";
    alias: "elm/layout/searchfield/singleline";
    parts {
       part { name: "bg";
-         type: RECT;
+         type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
             min: 0 EDITFIELD_BASE_HEIGHT_INC;
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B0215";*/
          }
       }
      part { name: "top_left_padding";
@@ -805,6 +871,30 @@ group { name: "elm/layout/editfield/singleline";
             rel2.to: "bg";
          }
       }
+      part { name: "line_left_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: EDITFIELD_LINE_LEFT_PADDING_MIN_INC;
+            fixed: 1 0;
+            align: 0.0 0.5;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            rel2.relative: 0.0 1.0;
+         }
+      }
+      part { name: "line_right_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: EDITFIELD_LINE_RIGHT_PADDING_MIN_INC;
+            fixed: 1 0;
+            align: 1.0 0.5;
+            rel1.to: "bg";
+            rel1.relative: 1.0 0.0;
+            rel2.to: "bg";
+         }
+      }
       part { name: "line_bottom_padding";
          type: SPACER;
          scale: 1;
@@ -825,20 +915,20 @@ group { name: "elm/layout/editfield/singleline";
             fixed: 1 1;
             align: 0.5 1.0;
             rel1 {
-               to_x: "top_left_padding";
+               to_x: "line_left_padding";
                to_y: "line_bottom_padding";
                relative: 1.0 0.0;
             }
             rel2 {
-               to_x: "bottom_right_padding";
+               to_x: "line_right_padding";
                to_y: "line_bottom_padding";
                relative: 0.0 0.0;
             }
-            color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/
+            color: 61 184 204 51;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/
+            color: 61 184 204 255;
          }
       }
       part { name: "button_field";
@@ -849,10 +939,10 @@ group { name: "elm/layout/editfield/singleline";
             fixed: 1 1;
             align: 1.0 0.5;
             rel1 {
-               to_x: "bottom_right_padding";
+               to_x: "line_right_padding";
             }
             rel2 {
-               to_x: "bottom_right_padding";
+               to_x: "line_right_padding";
                relative: 0.0 1.0;
             }
          }
@@ -948,26 +1038,6 @@ group { name: "elm/layout/editfield/singleline";
 group { name: "elm/layout/editfield/multiline";
    inherit: "elm/layout/editfield/singleline";
    parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 0 EDITFIELD_BASE_HEIGHT_MULTILINE_INC;
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B0215";*/
-         }
-      }
-      part { name: "line_bottom_padding";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: EDITFIELD_LINE_BOTTOM_PADDING_MIN_MULTILINE_INC;
-            fixed: 0 1;
-            align: 0.5 1.0;
-            rel1.to: "bg";
-            rel1.relative: 0.0 1.0;
-            rel2.to: "bg";
-         }
-      }
       part { name: "top_left_padding";
          type: SPACER;
          scale: 1;
@@ -994,3 +1064,90 @@ group { name: "elm/layout/editfield/multiline";
       }
    }
 }
+
+group { name: "elm/layout/badge/default";
+   images {
+      image: "core_icon_badge_container.#.png" COMP;
+   }
+   parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BADGE_LAYOUT_SIZE_MIN_INC;
+         }
+      }
+      part { name: "bg";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "left.padding.text";
+            rel2.to: "right.padding.text";
+            color: 252 116 58 255;
+            image.normal: "core_icon_badge_container.#.png";
+         }
+         description { state: "toolbar_badge" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 38;
+         }
+      }
+      part { name: "right.padding.text";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC;
+            fixed: 1 1;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BADGE_LAYOUT_TEXT_MIN_SIZE_INC;
+            fixed: 1 0;
+            align: 1.0 0.5;
+            rel1 {
+               to: "right.padding.text";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "right.padding.text";
+               relative: 0.0 1.0;
+            }
+            color: 255 255 255 255;
+            text {
+               font: "Tizen:style=Regular"; size: "32";
+               text_class: "tizen";
+               min: 1 0;
+            }
+         }
+      }
+      part { name: "left.padding.text";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BADGE_LAYOUT_LEFT_RIGHT_PADDING_INC;
+            fixed: 1 1;
+            align: 1.0 0.5;
+            rel1 {
+               to: "elm.text";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "elm.text";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "toolbar_badge";
+         source: "elm";
+         signal: "elm,state,badge,toolbar";
+         action: STATE_SET "toolbar_badge" 0.0;
+         target: "bg";
+      }
+   }
+}
diff --git a/mobile/widgets/list.edc b/mobile/widgets/list.edc
new file mode 100644
index 00000000..f08645ac
--- /dev/null
+++ b/mobile/widgets/list.edc
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "genlist_macro.edc"
+
+group { name: "elm/list/item/default";
+   alias: "elm/list/item_odd/default";
+   alias: "elm/list/item_compress/default";
+   alias: "elm/list/item_compress_odd/default";
+
+   parts {
+      LIST_PART_BG
+      PART(SWALLOW, "elm.swallow.pad",
+         DSC_FROM_L("default" 0.0, );
+         mouse_events: 0;
+      )
+      PART(SPACER, "elm.padding.top",
+         DSC_FROM_T("default" 0.0,
+            min: 0 LIST_PADDING_TOP_SIZE;
+            max: -1 LIST_PADDING_TOP_SIZE;
+         )
+      )
+      PART(SPACER, "elm.padding.bottom",
+         DSC_FROM_B("default" 0.0,
+            min: 0 LIST_PADDING_BOTTOM_SIZE;
+            max: -1 LIST_PADDING_BOTTOM_SIZE;
+         )
+      )
+      PART(SWALLOW, "elm.swallow.icon",
+         DSC_L("default" 0.0,
+            "elm.swallow.pad",
+         )
+      )
+      PART(SWALLOW, "elm.swallow.end",
+         DSC_FROM_R("default" 0.0, )
+      )
+      PART(SPACER, "elm.padding.center.left",
+         DSC_L("default" 0.0,
+            "elm.swallow.icon",
+            min: LIST_PADDING_CENTER_LEFT_SIZE -0;
+            max: LIST_PADDING_CENTER_LEFT_SIZE -1;
+         )
+      )
+      PART(SPACER, "elm.padding.center.right",
+         DSC_R("default" 0.0,
+            "elm.swallow.end",
+            min: LIST_PADDING_CENTER_RIGHT_SIZE 0;
+            max: LIST_PADDING_CENTER_RIGHT_SIZE -1;
+         )
+      )
+      PART(TEXTBLOCK, "elm.text",
+         DSC_LRTB("default" 0.0,
+            "elm.padding.center.left", "elm.padding.center.right", "elm.padding.top", "elm.padding.bottom",
+            min: 0 LIST_TEXT_MAIN_HEIGHT;
+            text.min: 0 1;
+            text.style: "list_text_main";
+            fixed: 1 0;;
+         )
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            text.style: "list_text_main_press";
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            text.style: "list_text_main_dim";
+         }
+      )
+      PART(RECT, "elm.bottomline",
+         DSC_FROM_B("default" 0.0,
+            min: 0 LIST_BOTTOMLINE_HEIGHT;
+            max: -1  LIST_BOTTOMLINE_HEIGHT;
+            color: 192 213 222 255;
+         )
+      )
+   }
+   LIST_PROGRAMS( target: "elm.text"; )
+}
+
diff --git a/themes/widgets/multibuttonentry.edc b/mobile/widgets/multibuttonentry.edc
index 588b28e4..08bb4cdf 100644
--- a/themes/widgets/multibuttonentry.edc
+++ b/mobile/widgets/multibuttonentry.edc
@@ -81,17 +81,6 @@
             }
          }
       }
-      part { name: "block_events";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description {
-            state: "invisible" 0.0;
-            visible: 0;
-         }
-      }
       part { name: "events";
          type: RECT;
          repeat_events: 1;
@@ -107,21 +96,7 @@
          name: "clicked";
          signal: "mouse,clicked,1";
          source: "events";
-         action: SIGNAL_EMIT "elm,action,clicked" "";
-      }
-      program {
-         name: "event_allow";
-         signal: "elm,state,event,allow";
-         source: "";
-         action: STATE_SET "invisible" 0.0;
-         target: "block_events";
-      }
-      program {
-         name: "event_block";
-         signal: "elm,state,event,block";
-         source: "";
-         action: STATE_SET "default" 0.0;
-         target: "block_events";
+         action: SIGNAL_EMIT "elm,action,click" "";
       }
    }
 }
@@ -182,27 +157,27 @@
    styles {
       style {
          name: "multibuttonentry_btn_text_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF color_class=T051L2 font=Tizen:style=Regular font_size=30 text_class=T051L2 align=center";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF align=center";
       }
       style {
          name: "multibuttonentry_btn_text_pressed_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF color_class=T051L2P font=Tizen:style=Regular font_size=30 text_class=T051L2P align=center";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF align=center";
       }
       style {
          name: "multibuttonentry_btn_text_dim_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF color_class=T051L2D font=Tizen:style=Regular font_size=30 text_class=T051L2D align=center";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF align=center";
       }
       style {
          name: "multibuttonentry_btn_text_ellipsis_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF color_class=T051L2 ellipsis=1 text_class=T051L2";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF ellipsis=1";
       }
       style {
          name: "multibuttonentry_btn_text_ellipsis_pressed_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF color_class=T051L2P ellipsis=1 text_class=T051L2P";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF ellipsis=1";
       }
       style {
          name: "multibuttonentry_btn_text_ellipsis_dim_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF color_class=T051L2D ellipsis=1 text_class=T051L2D";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#FFFFFF ellipsis=1";
       }
    }
    script {
@@ -212,10 +187,10 @@
       set {
          name: "core_list_button_bg.#";
          image {
-            image: SMALL"images/Controls/core_list_button_bg.#.png" COMP;
+            image: SMALL"images/User_Innput_Elements/core_list_button_bg.#.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_list_button_bg.#.png" COMP;
+            image: MEDIUM"images/User_Input_Elements/core_list_button_bg.#.png" COMP;
          }
       }
    }
@@ -230,15 +205,15 @@
          description { state: "default" 0.0;
             min: MULTIBUTTONENTRY_BUTTON_WIDTH_INC MULTIBUTTONENTRY_BUTTON_HEIGHT_INC;
             image.normal: "core_list_button_bg.#";
-            color: 38 107 191 255; /*(Changeable UI) color_class: "W012";*/
+            color: 82 199 217 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 30 85 153 255; /*(Changeable UI) color_class: "W012P";*/
+            color: 108 209 224 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 76 128 191 255; /*(Changeable UI) color_class: "W012D";*/
+            color: 147 208 217 255;
          }
       }
       part {
@@ -276,7 +251,6 @@
             text {
                style: "multibuttonentry_btn_text_style";
                min: 1 0;
-               ellipsis: -1;
             }
             rel1 {
                relative: 1.0 0.0;
@@ -494,7 +468,12 @@
          name: "clicked";
          signal: "mouse,clicked,1";
          source: "events";
-         action: SIGNAL_EMIT "elm,action,clicked" "";
+         action: SIGNAL_EMIT "elm,action,click" "";
+         after: "touch_snd";
+      }
+      program {
+         name: "touch_snd";
+         action: RUN_PLUGIN "touch_sound" ;
       }
       program {
          name: "selected";
@@ -513,11 +492,11 @@
    styles {
       style {
          name: "multibuttonentry_number_text_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#023d84ff text_class=T059L2";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#33CCCC";
       }
       style {
          name: "multibuttonentry_number_text_ellipsis_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#023d84ff ellipsis=1 text_class=T059L2";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color=#33CCCC ellipsis=1";
       }
    }
    parts {
@@ -544,7 +523,6 @@
             text {
                style: "multibuttonentry_number_text_style";
                min: 1 0;
-               ellipsis: -1;
             }
             rel1 {
                relative: 1.0 0.0;
@@ -583,7 +561,7 @@
    styles {
       style {
          name: "multibuttonentry_label_style";
-         base: "font=Tizen:style=Regular font_size="MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC" color=#FFFFFF color_class=T059L1 wrap=char text_class=T059L1";
+         base: "font=Tizen:style=Light font_size="MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC" color=#000000 wrap=char";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "hilight" "+ font_weight=Bold";
@@ -606,7 +584,7 @@
          }
       }
       part {
-         name: "mbe.label";
+         name: "elm.text";
          type: TEXTBLOCK;
          mouse_events: 0;
          scale: 1;
@@ -616,7 +594,6 @@
             text {
                style: "multibuttonentry_label_style";
                min: 1 0;
-               ellipsis: -1;
             }
             rel2 {
                relative: 0.0 1.0;
diff --git a/themes/widgets/naviframe.edc b/mobile/widgets/naviframe.edc
index 7eadd0cc..dcaa47b1 100644
--- a/themes/widgets/naviframe.edc
+++ b/mobile/widgets/naviframe.edc
@@ -24,25 +24,22 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NAVIFRAME_VIEW_PUSH_TRANS_TIME 0.2
-#define NAVIFRAME_VIEW_POP_TRANS_TIME 0.2
+#define NAVIFRAME_VIEW_PUSH_TRANS_TIME 0.5
+#define NAVIFRAME_VIEW_POP_TRANS_TIME 0.5
 
    styles {
       style { name: "naviframe_title_style";
-         base: "font=Tizen:style=Regular align=center font_size=36 color=#F4F4F4FF wrap=mixed ellipsis=1.0 text_class=tizen style=far_shadow,bottom shadow_color="NAVIFRAME_TITLE_TEXT_SHADOW_COLOR_INC"";
-         // (Changeable UI) base: "font=Tizen:style=Regular align=center font_size="NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" color=#FFFFFF color_class=T020 wrap=mixed ellipsis=1.0 style=far_shadow,bottom shadow_color="NAVIFRAME_TITLE_TEXT_SHADOW_COLOR_INC"";
+         base: "font=Samsung Condensed:style=Regular align=center font_size="NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=mixed ellipsis=1.0 text_class=tizen";
          tag:  "br" "\n";
          tag:  "tab" "\t";
       }
       style { name: "naviframe_subtitle_visible_style";
-         base: "font=Tizen:style=Regular align=center font_size=30 color=#F4F4F4FF wrap=mixed ellipsis=1.0 text_class=tizen style=far_shadow,bottom shadow_color="NAVIFRAME_SUBTITLE_VISIBLE_TEXT_SHADOW_COLOR_INC"";
-         // (Changeable UI) base: "font=Tizen:style=Regular align=center font_size="NAVIFRAME_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFF color_class=T0203 wrap=mixed ellipsis=1.0 style=far_shadow,bottom shadow_color="NAVIFRAME_SUBTITLE_VISIBLE_TEXT_SHADOW_COLOR_INC"";
+         base: "font=Samsung Condensed:style=Regular align=center font_size="NAVIFRAME_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=mixed ellipsis=1.0 text_class=tizen";
          tag:  "br" "\n";
          tag:  "tab" "\t";
       }
       style { name: "naviframe_subtitle_style";
-         base: "font=Tizen:style=Regular align=center font_size=21 color=#F4F4F4FF wrap=mixed ellipsis=1.0 text_class=tizen style=far_shadow,bottom shadow_color="NAVIFRAME_SUBTITLE_TEXT_SHADOW_COLOR_INC"";
-         // (Changeable UI) base: "font=Tizen:style=Regular align=center font_size="NAVIFRAME_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFF color_class=T0204 wrap=mixed ellipsis=1.0 style=far_shadow,bottom shadow_color="NAVIFRAME_SUBTITLE_TEXT_SHADOW_COLOR_INC"";
+         base: "font=Samsung Condensed:style=Regular align=center font_size="NAVIFRAME_VISIBLE_TEXT_FONT_SIZE_INC" color=#FFFFFFFF wrap=mixed ellipsis=1.0 text_class=tizen";
          tag:  "br" "\n";
          tag:  "tab" "\t";
       }
@@ -59,32 +56,22 @@
    }
 
    group { name: "elm/naviframe/item/basic/default";
-      data.item: "tizen_zoom" 1;
       images {
          set {
             name: "core_icon_badge_container.#";
                image {
-                  image: SMALL"images/Navigation_elements/core_icon_badge_container.#.png" COMP;
-               }
-               image {
-                  image: MEDIUM"images/Navigation_elements/core_icon_badge_container.#.png" COMP;
-               }
-         }
-         set {
-            name: "core_icon_badge_container_outer.#";
-               image {
-                  image: SMALL"images/Navigation_elements/core_icon_badge_container_outer.#.png" COMP;
+                  image: SMALL"images/Assist_Views/core_icon_badge_container.#.png" COMP;
                }
                image {
-                  image: MEDIUM"images/Navigation_elements/core_icon_badge_container_outer.#.png" COMP;
+                  image: MEDIUM"images/Assist_Views/core_icon_badge_container.#.png" COMP;
                }
          }
       }
       script {
          public landscape_mode = 0;          //Landscape status
+         public prev_btn_visible = 0;        //Previous button visible status
          public title_left_btn_visible = 0;  //Title left button visible status
          public title_right_btn_visible = 0; //Title right button visible status
-         public subtitle_visible = 0;        //Subtitle visible status
          public tabbar_visible = 0;          //Tabbar visible status (This value is used for tabbar group)
       }
       parts {
@@ -93,12 +80,21 @@
             mouse_events:  0;
             clip_to: "clipper";
             description { state: "default" 0.0;
-               color_class: "B0211";
+               color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
+            }
+            description { state: "hidden" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 2.0 1.0;
+            }
+            description { state: "leftout" 0.0;
+               rel1.relative: -0.2 0.0;
+               rel2.relative: 0.8 1.0;
             }
          }
          part { name: "clipper";
             type: RECT;
             mouse_events: 0;
+            clip_to: "pop_clipper";
             description { state: "default" 0.0;
                visible: 1;
             }
@@ -106,6 +102,17 @@
                visible: 0;
             }
          }
+         part { name: "pop_clipper";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
+            }
+            description { state: "leftout" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 1.0;
+            }
+         }
          part { name: "title_bg";
             type: RECT;
             scale: 1;
@@ -118,7 +125,7 @@
                fixed: 0 1;
                rel1 { to: "base"; relative: 0.0 0.0; }
                rel2 { to: "base"; relative: 1.0 0.0; }
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+               color: 61 185 204 255;
             }
             description { state: "hidden" 0.0;
                inherit: "default" 0.0;
@@ -144,24 +151,32 @@
             scale: 1;
             description { state: "default" 0.0;
                rel1.to: "title_bg";
-               rel2.to: "title_left_btn_right_padding";
+               rel2.to: "title_left_btn_bg";
             }
             description { state: "title_badge_visible" 0.0;
                rel1.to: "title_bg";
                rel2.to: "title_badge2_padding";
             }
+            description { state: "prev_btn_visible" 0.0;
+               rel1.to: "title_bg";
+               rel2 { to_x: "prev_btn_right_padding"; to_y: "title_bg"; relative: 1.0 1.0; }
+            }
          }
          part { name: "title_text_right_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to: "title_right_btn_left_padding";
+               rel1.to: "title_right_btn_bg";
                rel2.to: "title_bg";
             }
             description { state: "title_badge_visible" 0.0;
                rel1.to: "badge_icon_left_padding";
                rel2.to: "title_bg";
             }
+            description { state: "prev_btn_visible" 0.0;
+               rel1.to: "prev_btn_title_right_padding";
+               rel2.to: "title_bg";
+            }
          }
          part { name: "elm.text.title";
             type: TEXTBLOCK;
@@ -212,8 +227,8 @@
                max: -1 NAVIFRAME_SUBTITLE_HEIGHT_INC;
                fixed: 0 1;
                align: 0.5 1.0;
-               rel1 { to_x: "title_left_btn_right_padding"; to_y: "subtitle_bottom_padding"; relative: 1.0 0.0; }
-               rel2 { to_x: "title_right_btn_left_padding"; to_y: "subtitle_bottom_padding"; relative: 0.0 0.0; }
+               rel1 { to_x: "title_text_left_padding"; to_y: "subtitle_bottom_padding"; relative: 1.0 0.0; }
+               rel2 { to_x: "title_text_right_padding"; to_y: "subtitle_bottom_padding"; relative: 0.0 0.0; }
             }
          }
          part { name: "subtitle_text_clipper";
@@ -262,8 +277,8 @@
                max: 0 0;
                fixed: 1 0;
                align: 0.0 0.5;
-               rel1 { relative: 1.0 0.0; to: "title_left_btn_right_padding"; }
-               rel2 { relative: 1.0 1.0; to: "title_left_btn_right_padding"; }
+               rel1 { relative: 1.0 0.0; to: "title_left_padding"; }
+               rel2 { relative: 1.0 1.0; to: "title_left_padding"; }
                visible: 0;
             }
          }
@@ -295,39 +310,18 @@
                fixed: 1 1;
                rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
                rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               color: 195 219 226 255; /*(Changeable UI) color_class: "B052L7";*/
+               color: 195 219 226 255;
                image.normal: "core_icon_badge_container.#";
                visible: 0;
             }
             description { state: "visible" 0.0;
                rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
                rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               color: 195 219 226 255; /*(Changeable UI) color_class: "B052L7";*/
+               color: 195 219 226 255;
                image.normal: "core_icon_badge_container.#";
                visible: 1;
             }
          }
-         part { name: "badge_outer_icon";
-            type: IMAGE;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "title_clipper";
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               fixed: 1 1;
-               rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
-               rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               image.normal: "core_icon_badge_container_outer.#";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
-               rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               image.normal: "core_icon_badge_container_outer.#";
-               visible: 1;
-            }
-         }
          part { name: "badge_text_left_padding";
             type: SPACER;
             scale: 1;
@@ -353,8 +347,8 @@
                max: 0 -1;
                fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { to_x: "title_right_btn_left_padding"; to_y: "title_bg"; relative: 0.0 0.0; }
-               rel2 { to_x: "title_right_btn_left_padding"; to_y: "title_bg"; relative: 0.0 1.0; }
+               rel1 { to_x: "title_right_padding"; to_y: "title_bg"; relative: 0.0 0.0; }
+               rel2 { to_x: "title_right_padding"; to_y: "title_bg"; relative: 0.0 1.0; }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -369,14 +363,14 @@
             clip_to: "title_clipper";
             description { state: "default" 0.0;
                text {
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T1121";*/
+                  font: "Tizen:style=Regular"; size: "32";
                   text_class: "tizen";
                   min: 1 0;
                   max: 1 0;
                   align: 1.0 0.5;
                   ellipsis: -1;
                }
-               color: 7 7 7 255; /*(Changeable UI) color_class: "T1121";*/
+               color: 7 7 7 255;
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
                max: -1 NAVIFRAME_BADGE_HEIGHT_INC;
                fixed: 1 1;
@@ -392,20 +386,20 @@
             clip_to: "title_clipper";
             description { state: "default" 0.0;
                text {
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T1121";*/
+                  font: "Tizen:style=Regular"; size: "32";
                   text_class: "tizen";
                   min: 1 0;
                   max: 1 0;
                   align: 0.0 0.5;
                   ellipsis: -1;
                }
-               color: 7 7 7 255; /*(Changeable UI) color_class: "T1121";*/
+               color: 7 7 7 255;
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
                max: -1 NAVIFRAME_BADGE_HEIGHT_INC;
                fixed: 1 1;
                align: 0.0 0.5;
-               rel1 { to_x: "title_left_btn_right_padding"; to_y: "elm.text.title"; relative: 1.0 0.0; }
-               rel2 { to_x: "title_left_btn_right_padding"; to_y: "elm.text.title"; relative: 1.0 1.0; }
+               rel1 { to_x: "title_left_padding"; to_y: "elm.text.title"; relative: 1.0 0.0; }
+               rel2 { to_x: "title_left_padding"; to_y: "elm.text.title"; relative: 1.0 1.0; }
                visible: 0;
             }
          }
@@ -426,27 +420,32 @@
                max: NAVIFRAME_BADGE2_PADDING_WIDTH_INC -1;
             }
          }
-         part { name: "title_left_btn_left_padding";
+         part { name: "title_left_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
                min: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC 0;
                max: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC -1;
-               fixed: 1 1;
+               fixed: 1 0;
                align: 0.0 0.0;
                rel1 { to: "title_bg"; relative: 0.0 0.0; }
                rel2 { to: "title_bg"; relative: 0.0 1.0; }
             }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+               max: 0 -1;
+            }
          }
          part { name: "title_left_btn_bg";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
-               fixed: 1 1;
+               fixed: 1 0;
                align: 0.0 0.5;
-               rel1 { to: "title_left_btn_left_padding"; relative: 1.0 0.0; }
-               rel2 { to: "title_left_btn_left_padding"; relative: 1.0 1.0; }
+               rel1 { to: "title_left_padding"; relative: 1.0 0.0; }
+               rel2 { to: "title_left_padding"; relative: 1.0 1.0; }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -454,22 +453,6 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
             }
          }
-         part { name: "title_left_btn_right_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 1;
-               align: 0.0 0.0;
-               rel1 { to: "title_left_btn_bg"; relative: 1.0 0.0; }
-               rel2 { to: "title_left_btn_bg"; relative: 1.0 1.0; }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC 0;
-               max: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC -1;
-            }
-         }
          part { name: "title_left_btn";
             type: SWALLOW;
             scale: 1;
@@ -485,31 +468,15 @@
                visible: 1;
             }
          }
-         part { name: "title_right_btn_left_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 1;
-               align: 1.0 0.0;
-               rel1 { to: "title_right_btn_bg"; relative: 0.0 0.0; }
-               rel2 { to: "title_right_btn_bg"; relative: 0.0 1.0; }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC 0;
-               max: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC -1;
-            }
-         }
          part { name: "title_right_btn_bg";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 0;
-               fixed: 1 1;
+               fixed: 1 0;
                align: 1.0 0.5;
-               rel1 { to: "title_right_btn_right_padding"; relative: 0.0 0.0; }
-               rel2 { to: "title_right_btn_right_padding"; relative: 0.0 1.0; }
+               rel1 { to: "title_right_padding"; relative: 0.0 0.0; }
+               rel2 { to: "title_right_padding"; relative: 0.0 1.0; }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -517,17 +484,22 @@
                max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
             }
          }
-         part { name: "title_right_btn_right_padding";
+         part { name: "title_right_padding";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC 0;
-               max: NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC -1;
-               fixed: 1 1;
+               min: NAVIFRAME_TITLE_RIGHT_PADDING_WIDTH_INC 0;
+               max: NAVIFRAME_TITLE_RIGHT_PADDING_WIDTH_INC -1;
+               fixed: 1 0;
                align: 1.0 0.0;
                rel1 { to: "title_bg"; relative: 1.0 0.0; }
                rel2 { to: "title_bg"; relative: 1.0 1.0; }
             }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               min: 0 0;
+               max: 0 -1;
+            }
          }
          part { name: "title_right_btn";
             type: SWALLOW;
@@ -602,19 +574,60 @@
                rel2.to: "toolbar";
             }
          }
+         part { name: "prev_btn_left_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_BACK_BUTTON_LR_PADDING_WIDTH_INC 0;
+               max: NAVIFRAME_BACK_BUTTON_LR_PADDING_WIDTH_INC -1;
+               align: 0.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "title_bg"; relative: 0.0 0.0; }
+               rel2 { to: "title_bg"; relative: 0.0 1.0; }
+            }
+         }
          part { name: "elm.swallow.prev_btn";
             type: SWALLOW;
             clip_to: "title_clipper";
+            scale: 1;
             description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               align: 0.0 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_SIZE_INC;
+               align: 0.0 0.5;
                fixed: 1 1;
-               rel1.to: "base";
-               rel2.to: "base";
+               rel1 { to: "prev_btn_left_padding"; relative: 1.0 0.0; }
+               rel2 { to: "prev_btn_left_padding"; relative: 1.0 1.0; }
+               visible: 1;
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
                visible: 0;
             }
          }
+         part { name: "prev_btn_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_BACK_BUTTON_LR_PADDING_WIDTH_INC 0;
+               max: NAVIFRAME_BACK_BUTTON_LR_PADDING_WIDTH_INC -1;
+               align: 0.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "elm.swallow.prev_btn"; relative: 1.0 0.0; }
+               rel2 { to: "elm.swallow.prev_btn"; relative: 1.0 1.0; }
+            }
+         }
+         part { name: "prev_btn_title_right_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: NAVIFRAME_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 0;
+               max: NAVIFRAME_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC -1;
+               align: 1.0 0.0;
+               fixed: 1 1;
+               rel1 { to: "title_bg"; relative: 1.0 0.0; }
+               rel2 { to: "title_bg"; relative: 1.0 1.0; }
+            }
+         }
          part { name: "toolbar_more_btn";
             type: SWALLOW;
             clip_to: "title_clipper";
@@ -634,31 +647,33 @@
             signal: "elm,state,new,pushed,deferred";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "clipper";
+            target: "base";
             transition: SIN_FAC NAVIFRAME_VIEW_PUSH_TRANS_TIME 1.7;
             after: "show_finished";
          }
          program { name: "content_cur_pushed";
             signal: "elm,state,cur,pushed,deferred";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "clipper";
+            action: STATE_SET "leftout" 0.0;
+            target: "base";
             transition: SIN_FAC NAVIFRAME_VIEW_PUSH_TRANS_TIME 1.7;
             after: "pushed_finished";
+            after: "restore_default";
          }
          program { name: "content_prev_popped";
             signal: "elm,state,prev,popped,deferred";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "clipper";
+            target: "base";
+            target: "pop_clipper";
             transition: SIN_FAC NAVIFRAME_VIEW_POP_TRANS_TIME 1.7;
             after: "show_finished";
          }
          program { name: "content_cur_popped";
             signal: "elm,state,cur,popped,deferred";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "clipper";
+            action: STATE_SET "hidden" 0.0;
+            target: "base";
             transition: SIN_FAC NAVIFRAME_VIEW_POP_TRANS_TIME 1.7;
             after: "popped_finished";
          }
@@ -666,13 +681,16 @@
             signal: "elm,state,new,pushed";
             source: "elm";
             action: STATE_SET "hidden" 0.0;
-            target: "clipper";
+            target: "base";
          }
          program { name: "prev_popped";
             signal: "elm,state,prev,popped";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "clipper";
+            script {
+               set_state(PART:"base", "leftout", 0.0);
+               set_state(PART:"pop_clipper", "leftout", 0.0);
+               set_state(PART:"clipper", "default", 0.0);
+            }
          }
          program { name: "show_finished";
             action: SIGNAL_EMIT "elm,action,show,finished" "";
@@ -680,6 +698,11 @@
          program { name: "pushed_finished";
             action: SIGNAL_EMIT "elm,action,pushed,finished" "";
          }
+         program { name: "restore_default";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+            target: "pop_clipper";
+         }
          program { name: "popped_finished";
             action: SIGNAL_EMIT "elm,action,popped,finished" "";
          }
@@ -702,14 +725,23 @@
                set_state(PART:"title_bg", "default", 0.0);
                set_state(PART:"title_clipper", "default", 0.0);
                if (get_int(title_left_btn_visible)) {
+                  set_state(PART:"title_left_padding", "hidden", 0.0);
                   set_state(PART:"title_left_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_left_btn_right_padding", "visible", 0.0);
                   set_state(PART:"title_left_btn", "visible", 0.0);
+                  set_state(PART:"title_right_btn_bg", "visible", 0.0);
+                  set_state(PART:"title_right_padding", "hidden", 0.0);
+               }
+               else if (get_int(prev_btn_visible)) {
+                  set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+                  set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0);
+                  set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0);
                }
                if (get_int(title_right_btn_visible)) {
+                  set_state(PART:"title_right_padding", "hidden", 0.0);
                   set_state(PART:"title_right_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_right_btn_left_padding", "visible", 0.0);
                   set_state(PART:"title_right_btn", "visible", 0.0);
+                  set_state(PART:"title_left_btn_bg", "visible", 0.0);
+                  set_state(PART:"title_left_padding", "hidden", 0.0);
                }
             }
          }
@@ -724,12 +756,13 @@
             script {
                set_state(PART:"title_bg", "hidden", 0.0);
                set_state(PART:"title_clipper", "hidden", 0.0);
+               set_state(PART:"title_left_padding", "default", 0.0);
                set_state(PART:"title_left_btn_bg", "default", 0.0);
-               set_state(PART:"title_left_btn_right_padding", "default", 0.0);
                set_state(PART:"title_left_btn", "default", 0.0);
                set_state(PART:"title_right_btn_bg", "default", 0.0);
-               set_state(PART:"title_right_btn_left_padding", "default", 0.0);
+               set_state(PART:"title_right_padding", "default", 0.0);
                set_state(PART:"title_right_btn", "default", 0.0);
+               set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0);
             }
          }
          program { name: "title_hide_trans";
@@ -742,7 +775,6 @@
             source: "elm";
             script {
                set_state(PART:"elm.text.title", "subtitle_visible", 0.0);
-               set_int(subtitle_visible, 1);
             }
          }
          program { name: "subtitle_hide";
@@ -750,16 +782,42 @@
             source: "elm";
             script {
                set_state(PART:"elm.text.title", "default", 0.0);
-               set_int(subtitle_visible, 0);
+            }
+         }
+         program { name: "prev_btn_show";
+            signal: "elm,state,prev_btn,show";
+            source: "elm";
+            script {
+               if (get_int(title_left_btn_visible) == 0) {
+                  set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+                  set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0);
+                  set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0);
+                  set_int(prev_btn_visible, 1);
+               }
+            }
+         }
+         program { name: "prev_btn_hide";
+            signal: "elm,state,prev_btn,hide";
+            source: "elm";
+            script {
+               set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0);
+               set_state(PART:"title_text_left_padding", "default", 0.0);
+               set_state(PART:"title_text_right_padding", "default", 0.0);
+               set_int(prev_btn_visible, 0);
             }
          }
          program { name: "title_left_btn_show";
             signal: "elm,state,title_left_btn,show";
             source: "elm";
             script {
+               set_state(PART:"title_left_padding", "hidden", 0.0);
                set_state(PART:"title_left_btn_bg", "visible", 0.0);
-               set_state(PART:"title_left_btn_right_padding", "visible", 0.0);
                set_state(PART:"title_left_btn", "visible", 0.0);
+               set_state(PART:"title_right_btn_bg", "visible", 0.0);
+               set_state(PART:"title_right_padding", "hidden", 0.0);
+               set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0);
+               set_state(PART:"title_text_left_padding", "default", 0.0);
+               set_state(PART:"title_text_right_padding", "default", 0.0);
                set_int(title_left_btn_visible, 1);
             }
          }
@@ -767,19 +825,28 @@
             signal: "elm,state,title_left_btn,hide";
             source: "elm";
             script {
+               set_state(PART:"title_left_padding", "default", 0.0);
                set_state(PART:"title_left_btn_bg", "default", 0.0);
-               set_state(PART:"title_left_btn_right_padding", "default", 0.0);
                set_state(PART:"title_left_btn", "default", 0.0);
+               set_state(PART:"title_right_padding", "default", 0.0);
+               set_state(PART:"title_right_btn_bg", "default", 0.0);
                set_int(title_left_btn_visible, 0);
+               if (get_int(prev_btn_visible) == 1) {
+                  set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
+                  set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0);
+                  set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0);
+               }
             }
          }
          program { name: "title_right_btn_show";
             signal: "elm,state,title_right_btn,show";
             source: "elm";
             script {
+               set_state(PART:"title_right_padding", "hidden", 0.0);
                set_state(PART:"title_right_btn_bg", "visible", 0.0);
-               set_state(PART:"title_right_btn_left_padding", "visible", 0.0);
                set_state(PART:"title_right_btn", "visible", 0.0);
+               set_state(PART:"title_left_btn_bg", "visible", 0.0);
+               set_state(PART:"title_left_padding", "hidden", 0.0);
                set_int(title_right_btn_visible, 1);
             }
          }
@@ -787,9 +854,11 @@
             signal: "elm,state,title_right_btn,hide";
             source: "elm";
             script {
+               set_state(PART:"title_right_padding", "default", 0.0);
                set_state(PART:"title_right_btn_bg", "default", 0.0);
-               set_state(PART:"title_right_btn_left_padding", "default", 0.0);
                set_state(PART:"title_right_btn", "default", 0.0);
+               set_state(PART:"title_left_padding", "default", 0.0);
+               set_state(PART:"title_left_btn_bg", "default", 0.0);
                set_int(title_right_btn_visible, 0);
             }
          }
@@ -802,7 +871,6 @@
                set_state(PART:"badge_text_left_padding", "visible", 0.0);
                set_state(PART:"badge_text_right_padding", "visible", 0.0);
                set_state(PART:"badge_icon", "visible", 0.0);
-               set_state(PART:"badge_outer_icon", "visible", 0.0);
                set_state(PART:"badge_icon_left_padding", "visible", 0.0);
 
                get_text(PART:"title_badge", buf, 128);
@@ -819,7 +887,6 @@
                set_state(PART:"badge_text_left_padding", "default", 0.0);
                set_state(PART:"badge_text_right_padding", "default", 0.0);
                set_state(PART:"badge_icon", "default", 0.0);
-               set_state(PART:"badge_outer_icon", "default", 0.0);
                set_state(PART:"badge_icon_left_padding", "default", 0.0);
 
                set_text(PART:"title_badge2", "");
@@ -905,8 +972,8 @@
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: 0 NAVIFRAME_TABBAR_HEIGHT_INC;
-               max: -1 NAVIFRAME_TABBAR_HEIGHT_INC;
+               min: 0 NAVIFRAME_TABBAR_TITLE_HEIGHT_INC;
+               max: -1 NAVIFRAME_TABBAR_TITLE_HEIGHT_INC;
                visible: 1;
             }
          }
@@ -922,7 +989,7 @@
                align: 0.5 0.0;
                rel1 { to: "tabbar"; relative: 0.0 0.0; }
                rel2 { to: "tabbar"; relative: 1.0 0.0; }
-               color: 244 244 244 25; /*(Changeable UI) color_class: "B012L4";*/
+               color: 244 244 244 25;
                visible: 0;
             }
             description { state: "visible" 0.0;
@@ -962,13 +1029,19 @@
                set_state(PART:"title_clipper", "default", 0.0);
                if (get_int(title_left_btn_visible)) {
                   set_state(PART:"title_left_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_left_btn_right_padding", "visible", 0.0);
+                  set_state(PART:"title_left_padding", "hidden", 0.0);
                   set_state(PART:"title_left_btn", "visible", 0.0);
+                  set_state(PART:"title_right_btn_bg", "visible", 0.0);
+                  set_state(PART:"title_right_padding", "hidden", 0.0);
                }
+               else if (get_int(prev_btn_visible))
+                  set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
                if (get_int(title_right_btn_visible)) {
                   set_state(PART:"title_right_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_right_btn_left_padding", "visible", 0.0);
+                  set_state(PART:"title_right_padding", "hidden", 0.0);
                   set_state(PART:"title_right_btn", "visible", 0.0);
+                  set_state(PART:"title_left_btn_bg", "visible", 0.0);
+                  set_state(PART:"title_left_padding", "hidden", 0.0);
                }
                if (get_int(tabbar_visible)) {
                   set_state(PART:"tabbar", "visible", 0.0);
@@ -983,13 +1056,14 @@
                set_state(PART:"title_bg", "hidden", 0.0);
                set_state(PART:"title_clipper", "hidden", 0.0);
                set_state(PART:"title_left_btn_bg", "default", 0.0);
-               set_state(PART:"title_left_btn_right_padding", "default", 0.0);
+               set_state(PART:"title_left_padding", "default", 0.0);
                set_state(PART:"title_left_btn", "default", 0.0);
                set_state(PART:"title_right_btn_bg", "default", 0.0);
-               set_state(PART:"title_right_btn_left_padding", "default", 0.0);
+               set_state(PART:"title_right_padding", "default", 0.0);
                set_state(PART:"title_right_btn", "default", 0.0);
                set_state(PART:"tabbar", "default", 0.0);
                set_state(PART:"tabbar_top_divider", "default", 0.0);
+               set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0);
             }
          }
          program { name: "tabbar_show";
@@ -1047,7 +1121,7 @@
                align: 0.5 0.0;
                rel1 { to: "navigationbar"; relative: 0.0 0.0; }
                rel2 { to: "navigationbar"; relative: 1.0 0.0; }
-               color: 244 244 244 25; /*(Changeable UI) color_class: "B012L4";*/
+               color: 244 244 244 25;
                visible: 0;
             }
             description { state: "visible" 0.0;
@@ -1087,13 +1161,19 @@
                set_state(PART:"title_clipper", "default", 0.0);
                if (get_int(title_left_btn_visible)) {
                   set_state(PART:"title_left_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_left_btn_right_padding", "visible", 0.0);
+                  set_state(PART:"title_left_padding", "hidden", 0.0);
                   set_state(PART:"title_left_btn", "visible", 0.0);
+                  set_state(PART:"title_right_btn_bg", "visible", 0.0);
+                  set_state(PART:"title_right_padding", "hidden", 0.0);
                }
+               else if (get_int(prev_btn_visible))
+                  set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
                if (get_int(title_right_btn_visible)) {
                   set_state(PART:"title_right_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_right_btn_left_padding", "visible", 0.0);
+                  set_state(PART:"title_right_padding", "hidden", 0.0);
                   set_state(PART:"title_right_btn", "visible", 0.0);
+                  set_state(PART:"title_left_btn_bg", "visible", 0.0);
+                  set_state(PART:"title_left_padding", "hidden", 0.0);
                }
                if (get_int(tabbar_visible)) {
                   set_state(PART:"navigationbar", "visible", 0.0);
@@ -1108,13 +1188,14 @@
                set_state(PART:"title_bg", "hidden", 0.0);
                set_state(PART:"title_clipper", "hidden", 0.0);
                set_state(PART:"title_left_btn_bg", "default", 0.0);
-               set_state(PART:"title_left_btn_right_padding", "default", 0.0);
+               set_state(PART:"title_left_padding", "default", 0.0);
                set_state(PART:"title_left_btn", "default", 0.0);
                set_state(PART:"title_right_btn_bg", "default", 0.0);
-               set_state(PART:"title_right_btn_left_padding", "default", 0.0);
+               set_state(PART:"title_right_padding", "default", 0.0);
                set_state(PART:"title_right_btn", "default", 0.0);
                set_state(PART:"navigationbar", "default", 0.0);
                set_state(PART:"navigationbar_top_divider", "default", 0.0);
+               set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0);
             }
          }
          program { name: "navigationbar_show";
@@ -1150,7 +1231,7 @@
             mouse_events:  0;
             clip_to: "clipper";
             description { state: "default" 0.0;
-               color_class: "B0211";
+               color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
             }
          }
          part { name: "clipper";
@@ -1536,24 +1617,14 @@
          set {
             name: "core_icon_badge_container.#";
                image {
-                  image: SMALL"images/Navigation_elements/core_icon_badge_container.#.png" COMP;
-               }
-               image {
-                  image: MEDIUM"images/Navigation_elements/core_icon_badge_container.#.png" COMP;
-               }
-         }
-         set {
-            name: "core_icon_badge_container_outer.#";
-               image {
-                  image: SMALL"images/Navigation_elements/core_icon_badge_container_outer.#.png" COMP;
+                  image: SMALL"images/Assist_Views/core_icon_badge_container.#.png" COMP;
                }
                image {
-                  image: MEDIUM"images/Navigation_elements/core_icon_badge_container_outer.#.png" COMP;
+                  image: MEDIUM"images/Assist_Views/core_icon_badge_container.#.png" COMP;
                }
          }
       }
       script {
-         public subtitle_visible = 0; //Subtitle visible status
          public drawers_visible  = 0; //Drawers visible status
       }
       parts {
@@ -1562,7 +1633,7 @@
             mouse_events:  0;
             clip_to: "clipper";
             description { state: "default" 0.0;
-               color_class: "B0211";
+               color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
             }
          }
          part { name: "clipper";
@@ -1587,7 +1658,7 @@
                fixed: 0 1;
                rel1 { to: "base"; relative: 0.0 0.0; }
                rel2 { to: "base"; relative: 1.0 0.0; }
-               color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+               color: 61 185 204 255;
             }
             description { state: "hidden" 0.0;
                inherit: "default" 0.0;
@@ -1764,39 +1835,18 @@
                fixed: 1 1;
                rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
                rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               color: 195 219 226 255; /*(Changeable UI) color_class: "B052L7";*/
+               color: 195 219 226 255;
                image.normal: "core_icon_badge_container.#";
                visible: 0;
             }
             description { state: "visible" 0.0;
                rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
                rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               color: 195 219 226 255; /*(Changeable UI) color_class: "B052L7";*/
+               color: 195 219 226 255;
                image.normal: "core_icon_badge_container.#";
                visible: 1;
             }
          }
-         part { name: "badge_outer_icon";
-            type: IMAGE;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "title_clipper";
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               fixed: 1 1;
-               rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
-               rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               image.normal: "core_icon_badge_container_outer.#";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               rel1 { to_x: "badge_text_left_padding"; to_y: "title_badge"; }
-               rel2 { to_x: "badge_text_right_padding"; to_y: "title_badge"; }
-               image.normal: "core_icon_badge_container_outer.#";
-               visible: 1;
-            }
-         }
          part { name: "badge_text_left_padding";
             type: SPACER;
             scale: 1;
@@ -1838,14 +1888,14 @@
             clip_to: "title_clipper";
             description { state: "default" 0.0;
                text {
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T1121";*/
+                  font: "Tizen:style=Regular"; size: "32";
                   text_class: "tizen";
                   min: 1 0;
                   max: 1 0;
                   align: 1.0 0.5;
                   ellipsis: -1;
                }
-               color: 7 7 7 255; /*(Changeable UI) color_class: "T1121";*/
+               color: 7 7 7 255;
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
                max: -1 NAVIFRAME_BADGE_HEIGHT_INC;
                fixed: 1 1;
@@ -1861,14 +1911,14 @@
             clip_to: "title_clipper";
             description { state: "default" 0.0;
                text {
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T1121";*/
+                  font: "Tizen:style=Regular"; size: "32";
                   text_class: "tizen";
                   min: 1 0;
                   max: 1 0;
                   align: 0.0 0.5;
                   ellipsis: -1;
                }
-               color: 7 7 7 255; /*(Changeable UI) color_class: "T1121";*/
+               color: 7 7 7 255;
                min: 0 NAVIFRAME_BADGE_HEIGHT_INC;
                max: -1 NAVIFRAME_BADGE_HEIGHT_INC;
                fixed: 1 1;
@@ -2158,7 +2208,6 @@
             source: "elm";
             script {
                set_state(PART:"elm.text.title", "subtitle_visible", 0.0);
-               set_int(subtitle_visible, 1);
             }
          }
          program { name: "subtitle_hide";
@@ -2166,7 +2215,6 @@
             source: "elm";
             script {
                set_state(PART:"elm.text.title", "default", 0.0);
-               set_int(subtitle_visible, 0);
             }
          }
          program { name: "drawers_show";
@@ -2198,7 +2246,6 @@
                set_state(PART:"badge_text_left_padding", "visible", 0.0);
                set_state(PART:"badge_text_right_padding", "visible", 0.0);
                set_state(PART:"badge_icon", "visible", 0.0);
-               set_state(PART:"badge_outer_icon", "visible", 0.0);
                set_state(PART:"badge_icon_left_padding", "visible", 0.0);
 
                get_text(PART:"title_badge", buf, 128);
@@ -2215,7 +2262,6 @@
                set_state(PART:"badge_text_left_padding", "default", 0.0);
                set_state(PART:"badge_text_right_padding", "default", 0.0);
                set_state(PART:"badge_icon", "default", 0.0);
-               set_state(PART:"badge_outer_icon", "default", 0.0);
                set_state(PART:"badge_icon_left_padding", "default", 0.0);
 
                set_text(PART:"title_badge2", "");
@@ -2256,7 +2302,7 @@
             mouse_events:  0;
             clip_to: "clipper";
             description { state: "default" 0.0;
-               color_class: "B0211";
+               color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
             }
          }
          part { name: "clipper";
diff --git a/themes/widgets/panel.edc b/mobile/widgets/panel.edc
index 4e75b264..4e75b264 100644
--- a/themes/widgets/panel.edc
+++ b/mobile/widgets/panel.edc
diff --git a/themes/widgets/popup.edc b/mobile/widgets/popup.edc
index 1f4ec3ed..e484f0fa 100644
--- a/themes/widgets/popup.edc
+++ b/mobile/widgets/popup.edc
@@ -103,6 +103,17 @@ group { name: "elm/notify/bottom/popup";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.content";
       }
+      program { name: "hide_effect";
+         signal: "effect,hide";
+         source: "elm";
+         transition: SIN_FAC 0.33 1.7;
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.content";
+         after: "hide_effect_done";
+      }
+      program { name: "hide_effect_done";
+         action: SIGNAL_EMIT "effect,hide,finished" "";
+      }
    }
 }
 
@@ -171,24 +182,39 @@ group { name: "elm/notify/bottom/toast";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.content";
       }
+      program { name: "hide_effect";
+         signal: "effect,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.1;
+         target: "elm.swallow.content";
+         after: "hide_effect_done";
+      }
+      program { name: "hide_effect_done";
+         action: SIGNAL_EMIT "effect,hide,finished" "";
+      }
    }
 }
 
 group { name: "elm/notify/block_events/popup";
+   images {
+      image: "core_theme_bg_dim.png" COMP;
+   }
    parts {
       part { name: "block_events_color";
-         type: RECT;
+         type: IMAGE;
          scale: 1;
          description { state: "default" 0.0;
-            color: 7 7 7 102; /*(Changeable UI) color_class: "B015";*/
+            image.normal: "core_theme_bg_dim.png";
+            color: 0 0 0 0;
          }
          description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            color: 7 7 7 102; /*(Changeable UI) color_class: "B015";*/
+            image.normal: "core_theme_bg_dim.png";
+            color: 255 255 255 255;
          }
          description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color: 7 7 7 102; /*(Changeable UI) color_class: "B015";*/
+            image.normal: "core_theme_bg_dim.png";
+            color: 255 255 255 255;
          }
       }
    }
@@ -202,9 +228,20 @@ group { name: "elm/notify/block_events/popup";
       program { name: "show1";
          signal: "show";
          action: STATE_SET "show" 0.0;
-         transition: SIN_FAC 0.166 0.5;
+         transition: SIN_FAC 0.33 1.7;
          target: "block_events_color";
       }
+      program { name: "hide_effect";
+         signal: "effect,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: SIN_FAC 0.33 1.7;
+         target: "block_events_color";
+         after: "hide_effect_done";
+      }
+      program { name: "hide_effect_done";
+         action: SIGNAL_EMIT "effect,hide,finished" "elm";
+      }
       program { name: "block_clicked";
          signal: "mouse,clicked,1";
          source: "block_events_color";
@@ -233,7 +270,7 @@ group { name: "elm/notify/block_events/transparent";
       part { name: "block_events";
          type: RECT;
          description { state: "default" 0.0;
-            color_class: "transparent";
+            color: 0 0 0 0;
          }
       }
    }
@@ -304,7 +341,7 @@ group { name: "elm/label/base/popup/default";
    alias: "elm/label/base/popup/transparent";
    styles {
       style { name: "popup_desc_style";
-         base: "font=Tizen:style=Regular font_size=30 align=left color=#070707FF wrap=mixed text_class=label";
+         base: "font=Tizen:style=Regular font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=left color=#070707FF wrap=mixed text_class=label";
          //(Changeable UI) base: "font=Tizen:style=Regular font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=left color=#FFFFFF color_class=T123 wrap=mixed text_class=T123";
          tag: "br" "\n";
          tag: "ps" "ps";
@@ -400,58 +437,46 @@ group { name: "elm/label/base/popup/default";
 group { name: "elm/label/base/popup/toast";
    styles {
       style { name: "popup_toast_style";
-         base: "font=Tizen:style=Regular font_size=27 align=center color=#070707FF wrap=mixed text_class=label";
+         base: "font=Tizen:style=Regular font_size="POPUP_TOAST_BASE_DEFAULT_TEXT_FONT_SIZE_INC" align=center color=#070707FF wrap=mixed text_class=label";
          //(Changeable UI) base: "font=Tizen:style=Regular font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color=#FFFFFF align=center color_class=T1221 wrap=mixed text_class=T1221";
          tag:  "br" "\n";
          tag:  "tab" "\t";
       }
    }
    parts {
-      part { name: "pad_l";
-        type: SPACER;
-        scale: 1;
-        description { state: "default" 0.0;
-            min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
-            max: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC -1;
-            fixed: 1 0;
-            align: 0.0 0.0;
-            rel2 {
-               relative: 0.0 1.0;
-            }
-         }
-      }
-      part { name: "pad_r";
-        type: SPACER;
-        scale: 1;
-        description { state: "default" 0.0;
-            min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
-            max: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC -1;
-            fixed: 1 0;
-            align: 1.0 1.0;
-            rel1 {
-               relative: 1.0 0.0;
-            }
-         }
-      }
       part { name: "elm.text";
          type: TEXTBLOCK;
+         mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 0;
-            rel1 {
-               to_x: "pad_l";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to_x: "pad_r";
-               relative: 0.0 1.0;
-            }
+            min: POPUP_TOAST_TEXT_MIN_WIDTH_INC POPUP_TOAST_TEXT_MIN_HEIGHT_INC;
+            max: POPUP_TOAST_TEXT_MAX_WIDTH_INC POPUP_TOAST_TEXT_MAX_HEIGHT_INC;
             text {
                style: "popup_toast_style";
-               min: 0 1;
+               min: 1 1;
                max: 0 1;
             }
          }
+         description { state: "multiline" 0.0;
+            inherit: "default" 0.0;
+            min: POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC POPUP_TOAST_TEXT_MIN_HEIGHT_INC;
+            text.min: 0 1;
+         }
+      }
+   }
+    programs {
+      program { name: "multiline";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         script {
+            new tx, ty, tw, th, w;
+            get_geometry(PART:"elm.text", tx, ty, tw, th);
+            w = POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC;
+            if (tw >= w)
+               set_state(PART:"elm.text", "multiline", 0.0);
+            else
+               set_state(PART:"elm.text", "default", 0.0);
+         }
       }
    }
 }
@@ -463,20 +488,16 @@ group { name: "elm/popup/base/default";
       item: "default_orient" "2"; //top, center:1 bottom:2
       item: "title_height" POPUP_TITLE_AREA_HEIGHT;
       item: "popup_outside_pad" POPUP_OUTSIDE_PADDING;
-      item: "max_height" POPUP_SCROLLER_MAX_HEIGHT;
    }
    styles {
       style { name: "popup_title_style";
-         base: "font=Tizen:style=Regular align=center font_size=30 color=#F4F4F4FF wrap=mixed ellipsis=1.0 text_class=label style=far_shadow,bottom shadow_color="POPUP_BASE_DEFAULT_TEXT_SHADOW_COLOR_INC"";
-         // (Changeable UI) base: "font=Tizen:style=Regular align=center font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color=#FFFFFF color_class=T121 wrap=mixed ellipsis=1.0 text_class=T121 style=far_shadow,bottom shadow_color="POPUP_BASE_DEFAULT_TEXT_SHADOW_COLOR_INC"";
-         tag:  "br" "\n";
-         tag:  "tab" "\t";
+         base: "font=Tizen:style=Condensed align=center font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color=#3DB9CCFF ellipsis=1.0 text_class=tizen";
+      }
+      style { name: "popup_title_sub_style";
+         base: "font=Tizen:style=Condensed align=center font_size="POPUP_TITLE_SUB_TEXT_FONT_SIZE_INC" color=#3DB9CCFF ellipsis=1.0 text_class=tizen";
       }
       style { name: "popup_subtitle_style";
-         base: "font=Tizen:style=Regular align=center font_size=21 color=#F4F4F4FF wrap=mixed ellipsis=1.0 text_class=label style=far_shadow,bottom shadow_color="POPUP_SUBTITLE_TEXT_SHADOW_COLOR_INC"";
-         // (Changeable UI) base: "font=Tizen:style=Regular align=center font_size="POPUP_SUBTITLE_TEXT_FONT_SIZE_INC" color=#FFFFFF color_class=T1211 wrap=mixed ellipsis=1.0 text_class=T1211 style=far_shadow,bottom shadow_color="POPUP_SUBTITLE_TEXT_SHADOW_COLOR_INC"";
-         tag:  "br" "\n";
-         tag:  "tab" "\t";
+         base: "font=Tizen:style=Condensed align=center font_size="POPUP_SUBTITLE_TEXT_FONT_SIZE_INC" color=#3DB9CCFF ellipsis=1.0 text_class=tizen";
       }
    }
    parts {
@@ -486,6 +507,7 @@ group { name: "elm/popup/base/default";
          description { state: "default" 0.0;
             min: POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC;
             max: POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC;
+            fixed: 1 0;
          }
          description { state: "landscape" 0.0;
             inherit: "default" 0.0;
@@ -499,7 +521,6 @@ group { name: "elm/popup/base/default";
          description { state: "default" 0.0;
             rel1.to: "base";
             rel2.to: "base";
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B061L1";*/
          }
       }
       part { name: "access.outline";
@@ -522,12 +543,15 @@ group { name: "elm/popup/base/default";
             rel1.to: "base";
             rel2.to: "base";
             rel2.relative: 1.0 0.0;
-            color: 84 125 175 255; /*(Changeable UI) color_class: "B061L3";*/
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             min: POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC;
          }
+         description { state: "subtitle_visible" 0.0;
+            inherit: "default" 0.0;
+            min: POPUP_BASE_DEFAULT_TITLE_SUB_DEFAULT_MIN_INC;
+         }
       }
       part { name: "title_left_top_padding";
          type: SPACER;
@@ -539,6 +563,11 @@ group { name: "elm/popup/base/default";
             min: POPUP_TITLE_LEFT_PADDING POPUP_TITLE_TOP_PADDING;
             max: POPUP_TITLE_LEFT_PADDING POPUP_TITLE_TOP_PADDING;
          }
+         description { state: "subtitle_visible" 0.0;
+            inherit: "default" 0.0;
+            min: POPUP_TITLE_LEFT_PADDING POPUP_TITLE_TOP_SUB_PADDING;
+            max: POPUP_TITLE_LEFT_PADDING POPUP_TITLE_TOP_SUB_PADDING;
+         }
       }
       part { name: "title_right_bottom_padding";
          type: SPACER;
@@ -556,10 +585,7 @@ group { name: "elm/popup/base/default";
          scale:1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            text {
-              style: "popup_title_style";
-              size: POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
-            }
+            text.style: "popup_title_style";
             rel1 {
                relative: 1.0 1.0;
                to: "title_left_top_padding";
@@ -571,6 +597,7 @@ group { name: "elm/popup/base/default";
          }
          description { state: "subtitle_visible" 0.0;
             inherit: "default" 0.0;
+            text.style: "popup_title_sub_style";
             rel2 {
                relative: 1.0 0.0;
                to: "elm.text.subtitle";
@@ -678,7 +705,6 @@ group { name: "elm/popup/base/default";
             inherit: "default" 0.0;
             min: POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC;
             visible: 1;
-            color: 255 255 255 255; /*(Changeable UI) color_class: "B062";*/
          }
       }
       part { name: "elm.swallow.action_area";
@@ -695,6 +721,8 @@ group { name: "elm/popup/base/default";
          signal: "elm,state,subtitle,text,visible";
          source: "elm";
          action: STATE_SET "subtitle_visible" 0.0;
+         target: "title_left_top_padding";
+         target: "elm.bg.title";
          target: "elm.text.title";
          target: "elm.text.subtitle";
       }
@@ -850,13 +878,11 @@ group { name: "elm/popup/content/default";
 }
 
 group { name: "elm/popup/content/toast";
-   data.item: "content_area_width" POPUP_TOAST_TEXT_MAX_WIDTH_INC;
    parts{
       part { name:"elm.swallow.content";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: POPUP_TOAST_TEXT_MAX_WIDTH_INC 0;
          }
       }
    }
@@ -1133,121 +1159,227 @@ group { name: "elm/popup/base/toast";
       set {
          name: "core_popup_noti_bg.#";
          image {
-            image: SMALL"images/Popups/core_popup_noti_bg.#.png" COMP;
+            image: SMALL"images/Assist_Views/core_popup_noti_bg.#.png" COMP;
          }
          image {
-            image: MEDIUM"images/Popups/core_popup_noti_bg.#.png" COMP;
-         }
-      }
-      set {
-         name: "core_popup_noti_bg_ef.#";
-         image {
-            image: SMALL"images/Popups/core_popup_noti_bg_ef.#.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Popups/core_popup_noti_bg_ef.#.png" COMP;
+            image: MEDIUM"images/Assist_Views/core_popup_noti_bg.#.png" COMP;
          }
       }
       set {
          name: "core_popup_noti_bg_stroke.#";
          image {
-            image: SMALL"images/Popups/core_popup_noti_bg_stroke.#.png" COMP;
+            image: SMALL"images/Assist_Views/core_popup_noti_bg_stroke.#.png" COMP;
          }
          image {
-            image: MEDIUM"images/Popups/core_popup_noti_bg_stroke.#.png" COMP;
+            image: MEDIUM"images/Assist_Views/core_popup_noti_bg_stroke.#.png" COMP;
          }
       }
    }
    data {
       item: "default_orient" "2"; //top, center:1 bottom:2
-      item: "title_height" POPUP_TITLE_AREA_HEIGHT;
       item: "popup_outside_pad" POPUP_OUTSIDE_PADDING;
    }
    parts {
       part { name: "bg";
          scale: 1;
+         clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.to: "bg_outer";
             rel2.to: "bg_outer";
             image.normal: "core_popup_noti_bg.#";
-            color: 244 244 242 255; /*(Changeable UI) color_class: "B066";*/
          }
       }
       part { name: "bg_outer";
          scale: 1;
+         clip_to: "clipper";
          description { state: "default" 0.0;
             image.normal: "core_popup_noti_bg_stroke.#";
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
-            min: POPUP_TOAST_TEXT_MAX_WIDTH_INC 0;
-            max: POPUP_TOAST_BG_MAX_WIDTH_INC POPUP_TOAST_BG_MAX_HEIGHT_INC;
+            color: 61 185 204 255;
+            rel1.to_x: "title_left_padding";
+            rel1.to_y: "title_top_padding";
+            rel1.relative: 0.0 0.0;
+            rel2.to_x: "title_right_padding";
+            rel2.to_y: "title_bottom_padding";
+            rel2.relative: 1.0 1.0;
          }
       }
-      part { name: "bg_shadow";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "core_popup_noti_bg_ef.#";
+      part { name: "bottom_padding";
+        type: SPACER;
+        scale: 1;
+        description { state: "default" 0.0;
+            min: 0 POPUP_TOAST_VI_BOTTOM_PAD_INC;
+            max: -1 POPUP_TOAST_VI_BOTTOM_PAD_INC;
+            fixed: 0 1;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+         }
+         description { state: "show_effect";
+            inherit: "default" 0.0;
+            min: 0 POPUP_TOAST_BOTTOM_PAD_INC;
+            max: -1 POPUP_TOAST_BOTTOM_PAD_INC;
          }
       }
       part { name: "title_top_padding";
         type: SPACER;
         scale: 1;
         description { state: "default" 0.0;
-            align: 0.5 0.0;
-            min: 0 POPUP_TOAST_TITLE_TOP_BOTTOM_PAD_INC;
-            max: -1 POPUP_TOAST_TITLE_TOP_BOTTOM_PAD_INC;
+            align: 0.5 1.0;
+            min: 0 POPUP_TOAST_TITLE_TOP_PAD_INC;
+            max: -1 POPUP_TOAST_TITLE_TOP_PAD_INC;
             fixed: 0 1;
-            rel1.to: "bg";
-            rel2 {
-               to: "bg";
-               relative: 1.0 0.0;
-            }
-         }
+            rel1.relative: 0.0 0.0;
+            rel1.to_y: "elm.swallow.content";
+            rel2.relative: 1.0 0.0;
+            rel2.to_y: "elm.swallow.content";
+         }
+        description { state: "part_text_show" 0.0;
+           inherit: "default";
+           rel1.relative: 0.0 0.0;
+           rel1.to_y: "elm.text";
+           rel2.relative: 1.0 0.0;
+           rel2.to_y: "elm.text";
+        }
       }
-      part { name: "bottom_padding";
+      part { name: "title_bottom_padding";
         type: SPACER;
         scale: 1;
         description { state: "default" 0.0;
-            min: 0 POPUP_TOAST_BOTTOM_PAD_INC;
-            max: -1 POPUP_TOAST_BOTTOM_PAD_INC;
+            min: 0 POPUP_TOAST_TITLE_BOTTOM_PAD_INC;
+            max: -1 POPUP_TOAST_TITLE_BOTTOM_PAD_INC;
             fixed: 0 1;
             align: 0.5 1.0;
-            rel1 {
-               to: "bg";
-               relative: 0.0 1.0;
-            }
-            rel2.to: "bg";
+            rel1.to: "bottom_padding";
+            rel1.relative: 0.0 0.0;
+            rel2.to: "bottom_padding";
+            rel2.relative: 1.0 0.0;
          }
       }
-      part { name: "title_bottom_padding";
+      part { name: "title_left_padding";
         type: SPACER;
         scale: 1;
         description { state: "default" 0.0;
-            min: 0 POPUP_TOAST_TITLE_TOP_BOTTOM_PAD_INC;
-            max: -1 POPUP_TOAST_TITLE_TOP_BOTTOM_PAD_INC;
-            fixed: 0 1;
+            min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
+            max: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
+            fixed: 1 0;
+            align: 1.0 0.5;
+            rel1.to: "elm.swallow.content";
+            rel1.relative: 0.0 0.0;
+            rel2.to: "elm.swallow.content";
+            rel2.relative: 0.0 1.0;
+        }
+        description { state: "part_text_show" 0.0;
+            inherit: "default";
+            rel1.to: "elm.text";
+            rel1.relative: 0.0 0.0;
+            rel2.to: "elm.text";
+            rel2.relative: 0.0 1.0;
+        }
+      }
+      part { name: "title_right_padding";
+        type: SPACER;
+        scale: 1;
+        description { state: "default" 0.0;
+            min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
+            max: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
+            fixed: 1 0;
+            align: 0.0 0.5;
+            rel1.to: "elm.swallow.content";
+            rel1.relative: 1.0 0.0;
+            rel2.to: "elm.swallow.content";
+            rel2.relative: 1.0 1.0;
+        }
+        description { state: "part_text_show" 0.0;
+            inherit: "default";
+            align: 0.0 0.5;
+            rel1.to: "elm.text";
+            rel1.relative: 1.0 0.0;
+            rel2.to: "elm.text";
+            rel2.relative: 1.0 1.0;
+        }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         clip_to: "clipper";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: POPUP_TOAST_TEXT_MIN_WIDTH_INC POPUP_TOAST_TEXT_MIN_HEIGHT_INC;
+            max: POPUP_TOAST_TEXT_MAX_WIDTH_INC POPUP_TOAST_TEXT_MAX_HEIGHT_INC;
             align: 0.5 1.0;
-            rel1.to: "bottom_padding";
-            rel2 {
-               to: "bottom_padding";
-               relative: 1.0 0.0;}
+            rel1.to_y: "title_bottom_padding";
+            rel1.relative: 0.0 0.0;
+            rel2.to_y: "title_bottom_padding";
+            rel2.relative: 1.0 0.0;
+            text {
+               style: "popup_toast_style";
+               min: 1 1;
+               max: 0 1;
+            }
+         }
+         description { state: "multiline" 0.0;
+            inherit: "default" 0.0;
+            min: POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC POPUP_TOAST_TEXT_MIN_HEIGHT_INC;
+            text.min: 0 1;
          }
       }
       part { name: "elm.swallow.content";
          type: SWALLOW;
+         clip_to: "clipper";
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 POPUP_TOAST_TEXT_MIN_HEIGHT_INC;
-            rel1 {
-              to_y: "title_top_padding";
-              relative: 0.0 1.0;
-            }
-            rel2 {
-              to_y: "title_bottom_padding";
-              relative: 1.0 0.0;
-            }
+            align: 0.5 1.0;
+            rel1.to_y: "title_bottom_padding";
+            rel1.relative: 0.0 0.0;
+            rel2.to_y: "title_bottom_padding";
+            rel2.relative: 1.0 0.0;
          }
       }
+      part { name: "clipper";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+         description { state: "show_effect" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+   }
+   programs {
+      program { name: "part_text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         script {
+            new tx, ty, tw, th, w;
+            get_geometry(PART:"elm.text", tx, ty, tw, th);
+            w = POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC;
+            if (tw >= w)
+               set_state(PART:"elm.text", "multiline", 0.0);
+            else
+               set_state(PART:"elm.text", "default", 0.0);
+
+            set_state(PART:"title_top_padding", "part_text_show", 0.0);
+            set_state(PART:"title_left_padding", "part_text_show", 0.0);
+            set_state(PART:"title_right_padding", "part_text_show", 0.0);
+         }
+      }
+      program { name: "show_effect";
+         signal: "show";
+         action: STATE_SET "show_effect" 0.0;
+         transition: LINEAR 0.1;
+         target: "clipper";
+         target: "bottom_padding";
+      }
+      program { name: "hide_effect";
+         signal: "elm,state,tizen,content,hide";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: LINEAR 0.1;
+         target: "clipper";
+         target: "bottom_padding";
+      }
    }
 }
diff --git a/mobile/widgets/progressbar.edc b/mobile/widgets/progressbar.edc
new file mode 100644
index 00000000..1603d271
--- /dev/null
+++ b/mobile/widgets/progressbar.edc
@@ -0,0 +1,850 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+   group { name: "elm/progressbar/horizontal/default";
+      data.item: "vector_ux" "default";
+      parts {
+         part { name: "access";
+            type: RECT;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "elm.swallow.bar";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "base";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_DEFAULT_HEIGHT_INC;
+            }
+         }
+         part { name: "elm.text.top.right";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 0.0;
+               rel1.to: "top_padding";
+               rel2.to: "top_padding";
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 1.0 1.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "top_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
+               fixed: 0 1;
+               rel1.to_y: "background";
+               rel2.to_y: "background";
+               rel1.relative: 0 0;
+               rel2.relative: 1 0;
+               align: 0.5 1;
+            }
+         }
+         part { name: "background";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_DEFAULT_HEIGHT_INC;
+               fixed: 0 1;
+               rel1.relative: 0.0 0.5;
+               rel2.relative: 1.0 0.5;
+               align: 0.5 0.5;
+               color: 145 145 145 179;
+            }
+         }
+         part { name: "tizen_vg_shape1";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "background";
+            description { state: "default" 0.0;
+               rel1.to: "background";
+               rel2.to: "background";
+            }
+         }
+         part { name: "drag.background";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  to_x: "background";
+                  to_y: "background";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "background";
+                  to_y: "background";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "tizen_vg_shape2";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "tizen_vg_shape2_clipper";
+            description { state: "default" 0.0;
+               rel1.to: "elm.progress.progressbar";
+               rel2.to: "elm.progress.progressbar";
+            }
+         }
+         part { name: "tizen_vg_shape2_clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color:61 184 204 77;
+            }
+         }
+         part { name: "tizen_vg_shape3";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "elm.progress.progressbar";
+            description { state: "default" 0.0;
+               rel1.to: "elm.progress.progressbar";
+               rel2.to: "elm.progress.progressbar";
+            }
+         }
+         part { name: "elm.progress.progressbar";
+            type: RECT;
+            description { state: "default" 0.0;
+               min: 0 0;
+               fixed: 1 1;
+               rel1 {
+                  to: "background";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_y: "background";
+                  to_x: "elm.cur.progressbar";
+                  offset: -1 -1;
+               }
+               color:61 184 204 255;
+            }
+            description { state: "invert" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to_y: "background";
+                  to_x: "elm.cur.progressbar";
+               }
+               rel2 {
+                  to: "background";
+                  relative: 1.0 1.0;
+               }
+            }
+            description { state: "state_begin" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "background";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to: "background";
+                  relative: 0.1 1.0;
+               }
+            }
+            description { state: "state_end" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "background";
+                  relative: 0.9 0.0;
+               }
+               rel2 {
+                  to: "background";
+                  relative: 1.0 1.0;
+               }
+            }
+         }
+         part { name: "elm.cur.progressbar";
+            mouse_events: 0;
+            scale: 1;
+            dragable {
+               confine: "drag.background";
+               x: 1 1 1;
+               y: 0 0 0;
+            }
+            description { state: "default" 0.0;
+               min: 0 28;
+               fixed: 1 1;
+               visible: 0;
+               rel1.to: "drag.background";
+               rel2.to: "drag.background";
+           }
+         }
+         part { name: "bottom_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
+               fixed: 0 1;
+               rel1.to_y: "background";
+               rel2.to_y: "background";
+               rel1.relative: 0 1;
+               rel2.relative: 1 1;
+               align: 0.5 0;
+            }
+         }
+         part { name: "elm.text.bottom.left";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_y: "bottom_padding";
+               rel2.to_y: "bottom_padding";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 0.0 1.0;
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 0.0 0.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.text.status";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_y: "bottom_padding";
+               rel2.to_y: "bottom_padding";
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 1.0 1.0;
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 1.0 0.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.text.bottom.right";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_y: "bottom_padding";
+               rel2.to_y: "bottom_padding";
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 1.0 1.0;
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 1.0 0.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "text_top_right_show";
+            signal: "elm,state,top.right,visible";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.text.top.right";
+         }
+         program { name: "text_top_right_text_hide";
+            signal: "elm,state,top.right,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.top.right";
+         }
+         program { name: "text_bottom_left_show";
+            signal: "elm,state,bottom.left,visible";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.text.bottom.left";
+         }
+         program { name: "text_bottom_left_text_hide";
+            signal: "elm,state,bottom.left,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.bottom.left";
+         }
+         program { name: "text_bottom_right_show";
+            signal: "elm,state,bottom.right,visible";
+            source: "elm";
+            script {
+               set_state(PART:"elm.text.status", "default", 0.0);
+               set_state(PART:"elm.text.bottom.right", "show", 0.0);
+            }
+         }
+         program { name: "text_status_show";
+            signal: "elm,state,status,visible";
+            source: "elm";
+            script {
+               set_state(PART:"elm.text.bottom.right", "default", 0.0);
+               set_state(PART:"elm.text.status", "show", 0.0);
+            }
+         }
+         program { name: "text_status_text_hide";
+            signal: "elm,state,status,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.status";
+         }
+         program { name: "slide_to_end";
+            action: STATE_SET "state_end" 0.0;
+            transition: LINEAR 0.5;
+            target: "elm.progress.progressbar";
+            after: "slide_to_begin";
+         }
+         program { name: "slide_to_begin";
+            signal: "elm,state,slide,begin";
+            action: STATE_SET "state_begin" 0.0;
+            target: "elm.progress.progressbar";
+            transition: LINEAR 0.5;
+            after: "slide_to_end";
+         }
+         program { name: "start_pulse";
+            signal: "elm,state,pulse,start";
+            source: "elm";
+         }
+         program { name: "stop_pulse";
+            signal: "elm,state,pulse,stop";
+            source: "elm";
+            action: ACTION_STOP;
+            target: "slide_to_begin";
+            target: "slide_to_end";
+            target: "start_pulse";
+         }
+         program { name: "state_pulse";
+            signal: "elm,state,pulse";
+            source: "elm";
+            action: STATE_SET "state_begin" 0.0;
+            target: "elm.progress.progressbar";
+         }
+         program { name: "state_fraction";
+            signal: "elm,state,fraction";
+            source: "elm";
+            action: ACTION_STOP;
+            target: "slide_to_begin";
+            target: "slide_to_end";
+            target: "start_pulse";
+            action: STATE_SET "default" 0.0;
+            target: "elm.progress.progressbar";
+         }
+         program { name: "set_invert_on";
+            signal: "elm,state,inverted,on";
+            source: "elm";
+            action: STATE_SET "invert" 0.0;
+            target: "elm.progress.progressbar";
+         }
+         program { name: "set_invert_off";
+            signal: "elm,state,inverted,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.progress.progressbar";
+         }
+      }
+   }
+
+   group { name: "elm/progressbar/horizontal/pending";
+      script {
+         public state_end = 0;
+      }
+      images {
+         set {
+            name: "core_progress_bar.#";
+            image {
+               image: SMALL"images/User_Input_Elements/core_progress_bar.#.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/User_Input_Elements/core_progress_bar.#.png" COMP;
+            }
+         }
+         set {
+            name: "core_progress_pending_bg_01";
+            image {
+               image: SMALL"images/User_Input_Elements/core_progress_pending_bg_01.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/User_Input_Elements/core_progress_pending_bg_01.png" COMP;
+            }
+         }
+         set {
+            name: "core_progress_pending_bg_02";
+            image {
+               image: SMALL"images/User_Input_Elements/core_progress_pending_bg_02.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/User_Input_Elements/core_progress_pending_bg_02.png" COMP;
+            }
+         }
+      }
+      parts {
+         part { name: "access";
+            type: RECT;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "elm.swallow.bar";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "base";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_PENDING_HEIGHT_INC;
+            }
+         }
+         part { name: "elm.text.top.right";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.relative: 1.0 0.0;
+               rel2.relative: 1.0 0.0;
+               rel1.to: "top_padding";
+               rel2.to: "top_padding";
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 1.0 1.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "top_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
+               fixed: 0 1;
+               rel1.to_y: "background";
+               rel2.to_y: "background";
+               rel1.relative: 0 0;
+               rel2.relative: 1 0;
+               align: 0.5 1;
+            }
+         }
+         part { name: "background";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_PENDING_HEIGHT_INC;
+               fixed: 0 1;
+               rel1.relative: 0.0 0.5;
+               rel2.relative: 1.0 0.5;
+               align: 0.5 0.5;
+               image.normal: "core_progress_bar.#";
+               color: 178 178 178 255;
+            }
+         }
+         part { name: "elm.progress.progressbar";
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "background";
+               rel2.to: "background";
+               image.normal: "core_progress_pending_bg_01";
+               color: 61 184 204 255;
+            }
+            description { state: "state_begin" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "state_end" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "core_progress_pending_bg_02";
+            }
+         }
+         part { name: "bottom_padding";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
+               fixed: 0 1;
+               rel1.to_y: "background";
+               rel2.to_y: "background";
+               rel1.relative: 0 1;
+               rel2.relative: 1 1;
+               align: 0.5 0;
+            }
+         }
+         part { name: "elm.text.bottom.left";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_y: "bottom_padding";
+               rel2.to_y: "bottom_padding";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 0.0 1.0;
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 0.0 0.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.text.status";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_y: "bottom_padding";
+               rel2.to_y: "bottom_padding";
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 1.0 1.0;
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 1.0 0.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+         part { name: "elm.text.bottom.right";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to_y: "bottom_padding";
+               rel2.to_y: "bottom_padding";
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 1.0 1.0;
+               text {
+                  min: 0 0;
+                  align: 0.5 0.5;
+                  font: "Tizen:style=Regular"; size: "32";
+                  text_class: "tizen";
+               }
+               align: 1.0 0.0;
+               color: 102 102 102 255;
+               visible: 0;
+            }
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               text.min: 1 1;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "text_top_right_show";
+            signal: "elm,state,top.right,visible";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.text.top.right";
+         }
+         program { name: "text_top_right_text_hide";
+            signal: "elm,state,top.right,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.top.right";
+         }
+         program { name: "text_bottom_left_show";
+            signal: "elm,state,bottom.left,visible";
+            source: "elm";
+            action: STATE_SET "show" 0.0;
+            target: "elm.text.bottom.left";
+         }
+         program { name: "text_bottom_left_text_hide";
+            signal: "elm,state,bottom.left,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.bottom.left";
+         }
+         program { name: "text_bottom_right_show";
+            signal: "elm,state,bottom.right,visible";
+            source: "elm";
+            script {
+               set_state(PART:"elm.text.status", "default", 0.0);
+               set_state(PART:"elm.text.bottom.right", "show", 0.0);
+            }
+         }
+         program { name: "text_status_show";
+            signal: "elm,state,status,visible";
+            source: "elm";
+            script {
+               set_state(PART:"elm.text.bottom.right", "default", 0.0);
+               set_state(PART:"elm.text.status", "show", 0.0);
+            }
+         }
+         program { name: "text_status_text_hide";
+            signal: "elm,state,status,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.status";
+         }
+         program { name: "slide_to_end";
+            in: 0.3 0.0;
+            script {
+               set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
+               set_int(state_end, 1);
+            }
+            after: "slide_to_begin";
+         }
+         program { name: "slide_to_begin";
+            signal: "elm,state,slide,begin";
+            in: 0.3 0.0;
+            script {
+               set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
+               set_int(state_end, 0);
+            }
+            after: "slide_to_end";
+         }
+         program { name: "start_pulse";
+            signal: "elm,state,pulse,start";
+            source: "elm";
+            after: "slide_to_end";
+         }
+         program { name: "stop_pulse";
+            signal: "elm,state,pulse,stop";
+            source: "elm";
+            action: ACTION_STOP;
+            target: "slide_to_begin";
+            target: "slide_to_end";
+            target: "start_pulse";
+            after: "init_pulse";
+         }
+         program { name: "init_pulse";
+            action: STATE_SET "default" 0.0;
+            target: "elm.progress.progressbar";
+         }
+         program { name: "progressbar_disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            script {
+               set_state(PART:"elm.progress.progressbar", "default", 0.0);
+            }
+         }
+         program { name: "progressbar_enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            script {
+               if (!get_int(state_end))
+                  set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
+               else
+                  set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
+            }
+         }
+      }
+   }
+
+   group { name: "elm/progressbar/horizontal/process_large";
+      data.item: "vector_ux" "process_large";
+      parts {
+         part { name: "access";
+            type: RECT;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "elm.swallow.bar";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: PROGRESSBAR_LARGE_SIZE_INC;
+               max: PROGRESSBAR_LARGE_SIZE_INC;
+               color: 61 184 204 102;
+            }
+         }
+         part { name: "tizen_vg_shape1";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               rel1.to: "clipper";
+               rel2.to: "clipper";
+            }
+         }
+
+         part { name: "tizen_vg_shape2";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "tizen_vg_shape2_clipper";
+            description { state: "default" 0.0;
+               rel1.to: "clipper";
+               rel2.to: "clipper";
+            }
+         }
+
+         part { name: "tizen_vg_shape2_clipper";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: 61 184 204 102;
+            }
+         }
+
+         part { name: "tizen_vg_shape3";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "tizen_vg_shape3_clipper";
+            description { state: "default" 0.0;
+               rel1.to: "clipper";
+               rel2.to: "clipper";
+            }
+         }
+         part { name: "tizen_vg_shape3_clipper";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: 61 184 204 255;
+            }
+         }
+      }
+      programs {
+         program { name: "start_pulse";
+            signal: "elm,state,pulse,start";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "clipper";
+         }
+         program { name: "stop_pulse";
+            signal: "elm,state,pulse,stop";
+            source: "elm";
+            action: ACTION_STOP;
+            target: "start_pulse";
+            after: "init_pulse";
+         }
+         program { name: "init_pulse";
+            action: STATE_SET "default" 0.0;
+            target: "clipper";
+         }
+      }
+   }
+
+   group { name: "elm/progressbar/horizontal/process_medium";
+      inherit: "elm/progressbar/horizontal/process_large";
+      data.item: "vector_ux" "process_medium";
+      parts {
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: PROGRESSBAR_MEDIUM_SIZE_INC;
+               max: PROGRESSBAR_MEDIUM_SIZE_INC;
+               color: 61 184 204 102;
+            }
+         }
+      }
+   }
+
+   group { name: "elm/progressbar/horizontal/process_small";
+      inherit: "elm/progressbar/horizontal/process_large";
+      data.item: "vector_ux" "process_small";
+      parts {
+         part { name: "clipper";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: PROGRESSBAR_SMALL_SIZE_INC;
+               max: PROGRESSBAR_SMALL_SIZE_INC;
+               color: 61 184 204 102;
+            }
+         }
+      }
+   }
diff --git a/mobile/widgets/radio.edc b/mobile/widgets/radio.edc
new file mode 100644
index 00000000..87fb0a6b
--- /dev/null
+++ b/mobile/widgets/radio.edc
@@ -0,0 +1,356 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+group { name: "elm/radio/base/default";
+   data.item: "vector_ux" "on";
+   script {
+      public radio_state;
+      public disabled;
+      public text;
+      public animate = 0;
+   }
+   parts {
+      part { name: "base";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: RADIO_SIZE;
+         }
+      }
+      //Outline
+      part { name: "tizen_vg_shape";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "tizen_vg_shape_clipper";
+         description { state: "default" 0.0;
+            min: CHECK_DEFAULT_SIZE;
+            rel1.relative: 0 0.5;
+            rel2.relative: 0 0.5;
+            align: 0 0.5;
+            fixed: 1 1;
+         }
+      }
+      part { name: "tizen_vg_shape_clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 61 184 204 255;
+         }
+         description { state: "on" 0.0;
+            color: 61 184 204 0;
+         }
+         description { state: "disabled" 0.0;
+            color: 61 184 204 77;
+         }
+      }
+      //Middle Circle
+      part { name: "tizen_vg_shape2";
+         type: SWALLOW;
+         clip_to: "tizen_vg_shape_clipper2";
+         description { state: "default" 0.0;
+            rel1.to: "tizen_vg_shape";
+            rel2.to: "tizen_vg_shape";
+         }
+      }
+      part { name: "tizen_vg_shape_clipper2";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 0;
+         }
+         description { state: "on" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "disabled" 0.0;
+            color: 255 255 255 77;
+         }
+      }
+      //Iconic Circle
+      part { name: "tizen_vg_shape3";
+         type: SWALLOW;
+         clip_to: "tizen_vg_shape_clipper3";
+         description { state: "default" 0.0;
+            rel1.to: "tizen_vg_shape";
+            rel2.to: "tizen_vg_shape";
+         }
+      }
+      part { name: "tizen_vg_shape_clipper3";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 61 184 204 0;
+         }
+         description { state: "on" 0.0;
+            color: 61 184 204 255;
+         }
+         description { state: "disabled" 0.0;
+            color: 61 184 204 77;
+         }
+      }
+      part { name: "padding_before_text";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            min: 0 0;
+            rel1 {
+               to: "tizen_vg_shape";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to: "tizen_vg_shape";
+               relative: 1.0 1.0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: CHECK_PAD_BEFORE_TEXT_INC;
+            fixed: 1 1;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 0 1;
+            rel1 {
+               relative: 1.0 0.5;
+               to_x: "padding_before_text";
+            }
+            rel2 {
+               relative: 1.0 0.5;
+            }
+            align: 0.0 0.5;
+            text {
+               style: "check_default";
+               min: 0 0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text.min: 1 1;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text {
+               style: "check_default_dim";
+               min: 0 1;
+            }
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text {
+               style: "check_default_press";
+               min: 0 1;
+            }
+         }
+      }
+      part { name: "event";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program { name: "click";
+         signal: "mouse,clicked,1";
+         source: "event";
+         script {
+            if (get_int(disabled) == 1) return;
+            emit("elm,action,radio,toggle", "");
+            run_program(PROGRAM:"touch_sound");
+         }
+      }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
+      program { name: "radio_on_activate";
+         signal: "elm,activate,radio,on";
+         source: "elm";
+         script {
+            set_int(animate, 1);
+         }
+      }
+      program { name: "radio_off_activate";
+         signal: "elm,activate,radio,off";
+         source: "elm";
+         script {
+            set_int(animate, 1);
+         }
+      }
+      program { name: "toggle_on_effect";
+         action: STATE_SET "on" 0.0;
+         target: "tizen_vg_shape_clipper";
+         target: "tizen_vg_shape_clipper3";
+         transition: DECELERATE 0.3;
+      }
+      program { name: "toggle_off_effect";
+         action: STATE_SET "default" 0.0;
+         target: "tizen_vg_shape_clipper";
+         target: "tizen_vg_shape_clipper3";
+         transition: DECELERATE 0.3;
+      }
+      program { name: "toggle_on_effect2";
+         action: STATE_SET "on" 0.0;
+         target: "tizen_vg_shape_clipper2";
+         transition: DECELERATE 0.15;
+      }
+      program { name: "toggle_off_effect2";
+         action: STATE_SET "default" 0.0;
+         target: "tizen_vg_shape_clipper2";
+         transition: DECELERATE 0.15;
+      }
+      program { name: "text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         script {
+            set_int(text, 1);
+            set_state(PART:"padding_before_text", "visible", 0.0);
+            if (get_int(disabled) == 1) {
+              set_state(PART:"elm.text", "disabled", 0.0);
+            }else {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+      program { name: "text_hide";
+         signal: "elm,state,text,hidden";
+         source: "elm";
+         script {
+            set_int(text, 0);
+            set_state(PART:"padding_before_text", "default", 0.0);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+      program { name: "radio_on";
+         signal: "elm,state,radio,on";
+         source: "elm";
+         script {
+            if (get_int(disabled) == 1) {
+               set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper3", "disabled", 0.0);
+            }else {
+               if (get_int(animate) == 0) {
+                 set_state(PART:"tizen_vg_shape_clipper", "on", 0.0);
+                 set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+                 set_state(PART:"tizen_vg_shape_clipper3", "on", 0.0);
+               } else {
+                 run_program(PROGRAM:"toggle_on_effect");
+                 run_program(PROGRAM:"toggle_on_effect2");
+               }
+            }
+            set_int(animate, 0);
+            set_int(radio_state, 1);
+         }
+      }
+      program { name: "radio_off";
+         signal: "elm,state,radio,off";
+         source: "elm";
+         script {
+            if (get_int(disabled) == 1) {
+               set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper3", "disabled", 0.0);
+            }else {
+              if (get_int(animate) == 0) {
+                 set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
+                 set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+                 set_state(PART:"tizen_vg_shape_clipper3", "default", 0.0);
+              } else {
+                 run_program(PROGRAM:"toggle_off_effect");
+                 run_program(PROGRAM:"toggle_off_effect2");
+              }
+            }
+            set_int(animate, 0);
+            set_int(radio_state, 0);
+         }
+      }
+      program { name: "pressed";
+         signal: "mouse,down,1";
+         source: "event";
+         script {
+            if (get_int(disabled) == 1) return;
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "pressed", 0.0);
+            }
+         }
+      }
+      program { name: "unpressed";
+         signal: "mouse,up,1";
+         source: "event";
+         script {
+            if (get_int(disabled) == 1) return;
+            if (get_int(radio_state) == 1) {
+               set_state(PART:"tizen_vg_shape_clipper", "on", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper3", "on", 0.0);
+            }else {
+               set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+               set_state(PART:"tizen_vg_shape_clipper3", "default", 0.0);
+            }
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            set_int(disabled, 1);
+            set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
+            set_state(PART:"tizen_vg_shape_clipper2", "disabled", 0.0);
+            set_state(PART:"tizen_vg_shape_clipper3", "disabled", 0.0);
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "disabled", 0.0);
+            }
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            set_int(disabled, 0);
+            if (get_int(radio_state) == 1) {
+                set_state(PART:"tizen_vg_shape_clipper", "on", 0.0);
+                set_state(PART:"tizen_vg_shape_clipper2", "on", 0.0);
+                set_state(PART:"tizen_vg_shape_clipper3", "on", 0.0);
+            } else {
+                set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
+                set_state(PART:"tizen_vg_shape_clipper2", "default", 0.0);
+                set_state(PART:"tizen_vg_shape_clipper3", "default", 0.0);
+            }
+            if (get_int(text) == 1) {
+              set_state(PART:"elm.text", "visible", 0.0);
+            }
+         }
+      }
+   }
+}
diff --git a/themes/widgets/scroller.edc b/mobile/widgets/scroller.edc
index 9e035096..4c8f5729 100644
--- a/themes/widgets/scroller.edc
+++ b/mobile/widgets/scroller.edc
@@ -87,37 +87,19 @@ group { name: "elm/scroller/base/default";
       set {
          name: "core_scroll_bar_v.#";
          image {
-            image: SMALL"images/Controls/core_scroll_bar_v.#.png" COMP;
+            image: SMALL"images/Navigation_elements/core_scroll_bar_v.#.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_scroll_bar_v.#.png" COMP;
-         }
-      }
-      set {
-         name: "core_scroll_bar_v_ef.#";
-         image {
-            image: SMALL"images/Controls/core_scroll_bar_v_ef.#.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_scroll_bar_v_ef.#.png" COMP;
+            image: MEDIUM"images/Navigation_elements/core_scroll_bar_v.#.png" COMP;
          }
       }
       set {
          name: "core_scroll_bar_h.#";
          image {
-            image: SMALL"images/Controls/core_scroll_bar_h.#.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_scroll_bar_h.#.png" COMP;
-         }
-      }
-      set {
-         name: "core_scroll_bar_h_ef.#";
-         image {
-            image: SMALL"images/Controls/core_scroll_bar_h_ef.#.png" COMP;
+            image: SMALL"images/Navigation_elements/core_scroll_bar_h.#.png" COMP;
          }
          image {
-            image: MEDIUM"images/Controls/core_scroll_bar_h_ef.#.png" COMP;
+            image: MEDIUM"images/Navigation_elements/core_scroll_bar_h.#.png" COMP;
          }
       }
    }
@@ -127,7 +109,7 @@ group { name: "elm/scroller/base/default";
          scale: 1;
          description { state: "default" 0.0;
             visible: 0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+            color: 2 61 132 255;
          }
       }
       part { name: "bg";
@@ -276,17 +258,7 @@ group { name: "elm/scroller/base/default";
                normal: "core_scroll_bar_v.#";
                middle: DEFAULT;
             }
-            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
-         }
-      }
-      part { name: "vbar_effect";
-         clip_to: "sb_vbar_clip";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.dragable.vbar";
-            rel2.to: "elm.dragable.vbar";
-            image.normal: "core_scroll_bar_v_ef.#";
+            color: 61 185 204 153;
          }
       }
       part { name: "sb_hbar_clip_master";
@@ -404,17 +376,7 @@ group { name: "elm/scroller/base/default";
                normal: "core_scroll_bar_h.#";
                middle: DEFAULT;
             }
-            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
-         }
-      }
-      part { name: "hbar_effect";
-         clip_to: "sb_hbar_clip";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.dragable.hbar";
-            rel2.to: "elm.dragable.hbar";
-            image.normal: "core_scroll_bar_h_ef.#";
+            color: 61 185 204 153;
          }
       }
       part { name: "disabler";
@@ -626,7 +588,117 @@ group { name: "elm/scroller/base/default";
       }
    }
 }
-
+group { name: "elm/scroller/base/list_effect";
+   inherit: "elm/scroller/base/default";
+   images {
+      set {
+         name: "core_contextual_popup_scroll_bar.#";
+         image {
+            image: SMALL"images/Assist_Views/core_contextual_popup_scroll_bar.#.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Assist_Views/core_contextual_popup_scroll_bar.#.png" COMP;
+         }
+      }
+   }
+   parts {
+      part { name: "sb_hbar_bottom_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_TB_PADDING_SIZE_INC;
+            max: 0 SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_TB_PADDING_SIZE_INC;
+            rel1.relative: 1.0 1.0;
+            rel2.relative: 1.0 1.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            fixed: 1 1;
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "sb_hbar_left_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_LR_PADDING_SIZE_INC 0;
+            max: SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_LR_PADDING_SIZE_INC 0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 0.0 1.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            fixed: 1 1;
+            align: 0.0 1.0;
+         }
+      }
+      part { name: "sb_hbar_right_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_LR_PADDING_SIZE_INC 0;
+            max: SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_LR_PADDING_SIZE_INC 0;
+            rel1.relative: 1.0 1.0;
+            rel2.relative: 1.0 1.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            fixed: 1 1;
+            align: 1.0 1.0;
+         }
+      }
+      part { name: "sb_hbar";
+         type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            visible: 0;
+            min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
+            align: 0.0 1.0;
+            rel1 {
+               relative: 1.0 0.0;
+               offset:   0 0;
+               to_x:     "sb_hbar_left_padding";
+               to_y:     "sb_hbar_bottom_padding";
+            }
+            rel2 {
+               relative: 0.0 0.0;
+               offset:   -1 -1;
+               to_x:     "sb_hbar_right_padding";
+               to_y:     "sb_hbar_bottom_padding";
+            }
+         }
+      }
+      part { name: "elm.dragable.hbar";
+         clip_to: "sb_hbar_clip";
+         mouse_events: 0;
+         scale: 1;
+         dragable {
+            x: 1 1 0;
+            y: 0 0 0;
+            confine: "sb_hbar";
+         }
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
+            max: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC;
+            rel1 {
+               relative: 0.5  0.0;
+               offset:   0    0;
+               to: "sb_hbar";
+            }
+            rel2 {
+               relative: 0.5  0.0;
+               offset:   0    0;
+               to: "sb_hbar";
+            }
+            image {
+               normal: "core_contextual_popup_scroll_bar.#";
+               middle: DEFAULT;
+            }
+            color: 61 185 204 179;
+         }
+      }
+   }
+}
 group { name: "elm/scroller/base/handler";
 
    data {
@@ -681,73 +753,55 @@ group { name: "elm/scroller/base/handler";
       set {
          name: "core_index_scroll_bar_v.#";
             image {
-               image: SMALL"images/Controls/core_index_scroll_bar_v.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_index_scroll_bar_v.#.png" COMP;
-            }
-      }
-      set {
-         name: "core_index_scroll_bar_v_ef.#";
-            image {
-               image: SMALL"images/Controls/core_index_scroll_bar_v_ef.#.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_bar_v.#.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_bar_v_ef.#.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_bar_v.#.png" COMP;
             }
       }
       set {
          name: "core_index_scroll_handler_v_01";
             image {
-               image: SMALL"images/Controls/core_index_scroll_handler_v_01.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_handler_v_01.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_handler_v_01.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_handler_v_01.png" COMP;
             }
       }
       set {
          name: "core_index_scroll_handler_v_02";
             image {
-               image: SMALL"images/Controls/core_index_scroll_handler_v_02.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_handler_v_02.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_handler_v_02.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_handler_v_02.png" COMP;
             }
       }
       set {
          name: "core_index_scroll_bar_h.#";
             image {
-               image: SMALL"images/Controls/core_index_scroll_bar_h.#.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_bar_h.#.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_bar_h.#.png" COMP;
-            }
-      }
-      set {
-         name: "core_index_scroll_bar_h_ef.#";
-            image {
-               image: SMALL"images/Controls/core_index_scroll_bar_h_ef.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_index_scroll_bar_h_ef.#.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_bar_h.#.png" COMP;
             }
       }
       set {
          name: "core_index_scroll_handler_h_01";
             image {
-               image: SMALL"images/Controls/core_index_scroll_handler_h_01.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_handler_h_01.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_handler_h_01.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_handler_h_01.png" COMP;
             }
       }
       set {
          name: "core_index_scroll_handler_h_02";
             image {
-               image: SMALL"images/Controls/core_index_scroll_handler_h_02.png" COMP;
+               image: SMALL"images/Navigation_elements/core_index_scroll_handler_h_02.png" COMP;
             }
             image {
-               image: MEDIUM"images/Controls/core_index_scroll_handler_h_02.png" COMP;
+               image: MEDIUM"images/Navigation_elements/core_index_scroll_handler_h_02.png" COMP;
             }
       }
    }
@@ -757,7 +811,7 @@ group { name: "elm/scroller/base/handler";
          scale: 1;
          description { state: "default" 0.0;
             visible: 0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+            color: 2 61 132 255;
          }
       }
       part { name: "bg";
@@ -795,8 +849,8 @@ group { name: "elm/scroller/base/handler";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 0;
-            max: 0 0;
+            min: 0 SCROLLER_HANDLER_SCROLLBAR_VBAR_HEADER_SIZE;
+            max: 0 SCROLLER_HANDLER_SCROLLBAR_VBAR_HEADER_SIZE;
             rel1.relative: 1.0 0.0;
             rel2.relative: 1.0 0.0;
             rel1.to: "elm.swallow.content";
@@ -809,8 +863,8 @@ group { name: "elm/scroller/base/handler";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 0;
-            max: 0 0;
+            min: 0 SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE;
+            max: 0 SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE;
             rel1.relative: 1.0 1.0;
             rel2.relative: 1.0 1.0;
             rel1.to: "elm.swallow.content";
@@ -916,19 +970,7 @@ group { name: "elm/scroller/base/handler";
             rel2.to: "elm.dragable.vbar";
             visible: 1;
             image.normal: "core_index_scroll_bar_v.#";
-            color: 2 61 132 0; /*(Changeable UI) color_class: "B0731L3";*/
-         }
-      }
-      part { name: "scrollbar_handler_effect";
-         clip_to: "sb_vbar_clip";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "scrollbar_handler_image";
-            rel2.to: "scrollbar_handler_image";
-            visible: 1;
-            image.normal: "core_index_scroll_bar_v_ef.#";
+            color: 61 185 204 179;
          }
       }
       part { name: "scrollbar_handler_image_middle";
@@ -944,7 +986,7 @@ group { name: "elm/scroller/base/handler";
             visible: 1;
             min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC;
             image.normal: "core_index_scroll_handler_v_01";
-            color: 244 244 244 127; /*(Changeable UI) color_class: "B0731L4";*/
+            color: 255 255 255 128;
          }
       }
       part { name: "scrollbar_handler_effect_middle";
@@ -958,15 +1000,15 @@ group { name: "elm/scroller/base/handler";
             visible: 1;
             min: SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC;
             image.normal: "core_index_scroll_handler_v_02";
-            color: 2 61 132 140; /*(Changeable UI) color_class: "B0731L5";*/
+            color: 61 185 204 140;
          }
       }
       part { name: "sb_hbar_bottom_padding";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE;
-            max: 0 SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE;
+            min: 0 SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE;
+            max: 0 SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE;
             rel1.relative: 1.0 1.0;
             rel2.relative: 1.0 1.0;
             rel1.to: "elm.swallow.content";
@@ -979,8 +1021,8 @@ group { name: "elm/scroller/base/handler";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 0;
-            max: 0 0;
+            min: SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 0;
+            max: SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 0;
             rel1.relative: 0.0 1.0;
             rel2.relative: 0.0 1.0;
             rel1.to: "elm.swallow.content";
@@ -993,8 +1035,8 @@ group { name: "elm/scroller/base/handler";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 0;
-            max: 0 0;
+            min: SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 0;
+            max: SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 0;
             rel1.relative: 1.0 1.0;
             rel2.relative: 1.0 1.0;
             rel1.to: "elm.swallow.content";
@@ -1087,19 +1129,7 @@ group { name: "elm/scroller/base/handler";
             rel2.to: "elm.dragable.hbar";
             visible: 1;
             image.normal: "core_index_scroll_bar_h.#";
-            color: 2 61 132 0; /*(Changeable UI) color_class: "B0731L3";*/
-         }
-      }
-      part { name: "h_scrollbar_handler_effect";
-         clip_to: "sb_hbar_clip";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "h_scrollbar_handler_image";
-            rel2.to: "h_scrollbar_handler_image";
-            visible: 1;
-            image.normal: "core_index_scroll_bar_h_ef.#";
+            color: 61 185 204 179;
          }
       }
       part { name: "scrollbar_handler_image_hor";
@@ -1115,7 +1145,7 @@ group { name: "elm/scroller/base/handler";
             visible: 1;
             min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC;
             image.normal: "core_index_scroll_handler_h_01";
-            color: 244 244 244 127; /*(Changeable UI) color_class: "B0731L4";*/
+            color: 255 255 255 128;
          }
       }
       part { name: "scrollbar_handler_effect_hor";
@@ -1129,7 +1159,7 @@ group { name: "elm/scroller/base/handler";
             visible: 1;
             min: SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC;
             image.normal: "core_index_scroll_handler_h_02";
-            color: 2 61 132 140; /*(Changeable UI) color_class: "B0731L5";*/
+            color: 61 185 204 140;
          }
       }
       part { name: "disabler";
@@ -1380,7 +1410,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.5 1.0;
             min: 0 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -1402,7 +1432,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.5 1.0;
             min: 0 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -1424,7 +1454,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.5 1.0;
             min: 0 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -1446,7 +1476,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.5 0.0;
             min: 0 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -1468,7 +1498,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.5 0.0;
             min: 0 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -1490,7 +1520,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.5 0.0;
             min: 0 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -1512,7 +1542,7 @@ group { name: "elm/scroller/base/effect";
             align: 1.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -1534,7 +1564,7 @@ group { name: "elm/scroller/base/effect";
             align: 1.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -1556,7 +1586,7 @@ group { name: "elm/scroller/base/effect";
             align: 1.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -1578,7 +1608,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -1600,7 +1630,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -1622,7 +1652,7 @@ group { name: "elm/scroller/base/effect";
             align: 0.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -2352,7 +2382,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.5 1.0;
             min: 0 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -2374,7 +2404,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.5 1.0;
             min: 0 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -2396,7 +2426,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.5 1.0;
             min: 0 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -2418,7 +2448,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.5 0.0;
             min: 0 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -2440,7 +2470,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.5 0.0;
             min: 0 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -2462,7 +2492,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.5 0.0;
             min: 0 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
             max: -1 SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 0 1;
          }
          description { state: "start" 0.0;
@@ -2484,7 +2514,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 1.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -2506,7 +2536,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 1.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -2528,7 +2558,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 1.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -2550,7 +2580,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -2572,7 +2602,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -2594,7 +2624,7 @@ group { name: "elm/scroller/base/handler/effect";
             align: 0.0 0.5;
             min: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE 0;
             max: SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE -1;
-            color: 2 61 132 76; /*(Changeable UI) color_class: "B018";*/
+            color: 2 61 132 76;
             fixed: 1 0;
          }
          description { state: "start" 0.0;
@@ -3481,8 +3511,7 @@ group { name: "elm/scroller/base/bg/default";
          description { state: "default" 0.0;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
-            color: 255 255 255 255;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       }
    }
@@ -3492,18 +3521,29 @@ group { name: "elm/scroller/base/bg/effect";
    inherit: "elm/scroller/base/effect";
    alias: "elm/genlist/base/bg/default";
 
-   data.item: "bg_color" "B0211";
-   data.item: "personalized_color" "B011";
+   data.item: "banded_bg" "on";
+
+   images {
+      set {
+         name: "core_theme_bg_01";
+         image {
+            image: SMALL"images/core_theme_bg_01.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/core_theme_bg_01.png" COMP;
+         }
+      }
+   }
 
    parts {
       part { name: "bg";
-         type: RECT;
+         type: IMAGE;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
-            color: 255 255 255 255;
-            color_class: "B0211";
+            image.normal: "core_theme_bg_01";
+            color: 61 185 204 255;
          }
       }
    }
@@ -3523,8 +3563,7 @@ group { name: "elm/scroller/base/bg/handler/effect";
          description { state: "default" 0.0;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
-            color: 255 255 255 255;
-            color_class: "B0211";
+            color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/
          }
       }
    }
@@ -3568,4 +3607,4 @@ group { name: "elm/gengrid/base/popup";
          }
       }
    }
-}
\ No newline at end of file
+}
diff --git a/mobile/widgets/slider.edc b/mobile/widgets/slider.edc
new file mode 100644
index 00000000..2608af26
--- /dev/null
+++ b/mobile/widgets/slider.edc
@@ -0,0 +1,2597 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+   group { name: "elm/slider/horizontal/indicator/default";
+      parts {
+         part { name: "access";
+            type: RECT;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "button_events";
+            type: RECT;
+            mouse_events: 1;
+            ignore_flags: ON_HOLD;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: 1.5*SLIDER_INDICATOR_SIZE_INC 1.5*SLIDER_SWALLOWBAR_HEIGHT_INC;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               color: 0 0 0 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.tizen_vg_shape1";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "button0";
+            description { state: "default" 0.0;
+               rel1.to: "button0";
+               rel2.to: "button0";
+            }
+         }
+         part { name: "button0";
+            type : RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: SLIDER_INDICATOR_NORMAL_SIZE_INC;
+               max: SLIDER_INDICATOR_NORMAL_SIZE_INC;
+               color: 255 255 255 255;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.tizen_vg_shape2";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "button0_press";
+            description { state: "default" 0.0;
+               rel1.to: "button0_press";
+               rel2.to: "button0_press";
+            }
+         }
+         part { name: "button0_press";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: SLIDER_INDICATOR_BUBBLE_SIZE_INC;
+               max: SLIDER_INDICATOR_BUBBLE_SIZE_INC;
+               color: 255 255 255 255;
+               visible: 0;
+               rel1.to: "button0";
+               rel2.to: "button0";
+               rel1.relative: 0.0 0.5;
+               rel2.relative: 1.0 0.5;
+               align: 0.5 0.5;
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               min: SLIDER_INDICATOR_BUBBLE_PRESSED_SIZE_INC;
+               max: SLIDER_INDICATOR_BUBBLE_PRESSED_SIZE_INC;
+               visible: 1;
+               align: 0.5 0.72;
+            }
+         }
+         part { name: "elm.indicator";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+               max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+               color: 7 7 7 255;
+               align: 0.5 0.0;
+               rel1.to: "button0_press";
+               rel2.to: "button0_press";
+               rel1.offset: 0 12;
+               text {
+                  min: 0 1;
+                  font: "Tizen:style=Light"; size: "36";
+                  text_class: "tizen";
+               }
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  min: 0 1;
+                  font: "Tizen:style=Light"; size: "36";
+                  text_class: "tizen";
+               }
+            }
+         }
+      }
+      programs {
+         program { name: "mouse_down";
+            signal: "mouse,down,*";
+            source: "button_events";
+            script {
+               run_program(PROGRAM:"pressed_effect1");
+               run_program(PROGRAM:"pressed_effect2");
+            }
+         }
+         program { name: "mouse_up";
+            signal: "mouse,up,*";
+            source: "button_events";
+            script {
+               run_program(PROGRAM:"release_effect1");
+               run_program(PROGRAM:"release_effect2");
+            }
+         }
+         program { name: "indicator_show";
+            signal: "elm,state,indicator,show";
+            source: "elm";
+            script {
+               run_program(PROGRAM:"pressed_effect1");
+               run_program(PROGRAM:"pressed_effect2");
+            }
+         }
+         program { name: "indicator_hide";
+            signal: "elm,state,indicator,hide";
+            source: "elm";
+            script {
+               run_program(PROGRAM:"release_effect1");
+               run_program(PROGRAM:"release_effect2");
+            }
+         }
+         program { name: "pressed_effect1";
+            action:  STATE_SET "pressed" 0.0;
+            transition: DECELERATE 0.3;
+            target: "button0_press";
+         }
+         program { name: "pressed_effect2";
+            action:  STATE_SET "default" 0.0;
+            transition: DECELERATE 0.21;
+            target: "elm.indicator";
+            after: "pressed_effect3";
+         }
+         program { name: "pressed_effect3";
+            action:  STATE_SET "pressed" 0.0;
+            transition: DECELERATE 0.09;
+            target: "elm.indicator";
+         }
+         program { name: "release_effect1";
+            action:  STATE_SET "default" 0.0;
+            transition: DECELERATE 0.3;
+            target: "button0_press";
+         }
+         program { name: "release_effect2";
+            action:  STATE_SET "default" 0.0;
+            transition: DECELERATE 0.09;
+            target: "elm.indicator";
+         }
+         program { name: "slider_disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action:  STATE_SET "disabled" 0.0;
+            target: "button0";
+            target: "button_events";
+         }
+         program { name: "slider_enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "button0";
+            target: "button_events";
+         }
+      }
+   }
+
+group { name: "elm/slider/horizontal/default";
+      data.item: "vector_ux" "default";
+      script {
+         public invert_on = 0;
+         public disabled = 0;
+         public popup_show = 1;
+         public show = 0;
+         public set_popup_show() {
+            set_int(popup_show, 0);
+         }
+         public set_popup_hide() {
+            set_int(popup_show, 0);
+         }
+         public set_invert_on() {
+            if (!get_int(disabled)) {
+              set_state(PART:"level", "inverted", 0.0);
+              set_state(PART:"level2", "inverted", 0.0);
+            }
+            else {
+              set_state(PART:"level", "inverted", 0.0);
+              set_state(PART:"level2", "disabled", 0.0);
+            }
+            set_int(invert_on, 1);
+         }
+         public set_invert_off() {
+            if (!get_int(disabled)) {
+              set_state(PART:"level", "default", 0.0);
+              set_state(PART:"level2", "default", 0.0);
+            }
+            else {
+              set_state(PART:"level", "disabled", 0.0);
+              set_state(PART:"level2", "default", 0.0);
+            }
+            set_int(invert_on, 0);
+         }
+         public thumb_down() {
+            if (!get_int(invert_on))
+              set_state(PART:"level", "pressed", 0.0);
+            else
+              set_state(PART:"level2", "pressed", 0.0);
+            set_state(PART:"handle_color", "pressed", 0.0);
+            if (get_int(popup_show) == 1)
+               emit("popup,show", "elm");
+            }
+         public thumb_up() {
+            if (!get_int(invert_on))
+              set_state(PART:"level", "default", 0.0);
+            else
+              set_state(PART:"level2", "inverted", 0.0);
+            set_state(PART:"handle_color", "default", 0.0);
+            if (get_int(popup_show) == 1)
+               emit("popup,hide", "elm");
+            }
+         public drag_state() {
+            new Float:dx, Float:dy;
+            get_drag(PART:"elm.dragable.slider", dx, dy);
+            if (dx > 0.5) {
+              if (!get_int(disabled)) {
+                set_state(PART:"level", "default", 0.0);
+                set_state(PART:"level2", "default", 0.0);
+              }
+              else {
+                set_state(PART:"level", "disabled", 0.0);
+                set_state(PART:"level2", "default", 0.0);
+              }
+              set_int(invert_on, 0);
+            }
+            else {
+              if (!get_int(disabled)) {
+                set_state(PART:"level", "inverted", 0.0);
+                set_state(PART:"level2", "inverted", 0.0);
+              }
+              else {
+                set_state(PART:"level", "inverted", 0.0);
+                set_state(PART:"level2", "disabled", 0.0);
+              }
+              set_int(invert_on, 1);
+            }
+         }
+      }
+         parts {
+            part { name: "access";
+               type: RECT;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  color: 0 0 0 0;
+               }
+            }
+            part {
+               name: "bg";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
+               }
+            }
+            part {
+               name: "bar_image_left_padding";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1.to: "bg";
+                  rel2 {
+                     relative: 0.0  1.0;
+                     to: "bg";
+                  }
+                  align: 0.0 0.5;
+               }
+            }
+            part { name: "elm.swallow.icon";
+               type: SWALLOW;
+               clip_to: "icon_clipper";
+               scale: 1;
+               description { state: "default" 0.0;
+                  visible: 0;
+                  align: 0.0 0.5;
+                  max: SLIDER_SWALLOWBAR_HEIGHT_INC SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  rel1 {
+                     relative: 1.0 0.0;
+                     to_x: "bar_image_left_padding";
+                     to_y: "bg";
+                  }
+                  rel2 {
+                     relative: 1.0 1.0;
+                     to_x: "bar_image_left_padding";
+                     to_y: "bg";
+                  }
+               }
+               description { state: "visible" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+            }
+            part {
+               name: "bar_icon_right_padding_1";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  align: 0.0 0.5;
+                  min: 0 0;
+                  max: 0 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "elm.swallow.icon";
+                  }
+                  rel2 {
+                     relative: 1.0  1.0;
+                     to: "elm.swallow.icon";
+                  }
+                  fixed: 1 1;
+               }
+               description { state: "visible";
+                  inherit: "default" 0.0;
+                  min: SLIDER_ICON_PADDING_SIZE_INC;
+                  max: SLIDER_ICON_PADDING_SIZE_INC;
+               }
+            }
+            part {
+               name: "bar_icon_right_padding_2";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  align: 0.0 0.5;
+                  min: 0 0;
+                  max: 0 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "bar_icon_right_padding_1";
+                  }
+                  rel2 {
+                     relative: 1.0  1.0;
+                     to: "bar_icon_right_padding_1";
+                  }
+                  fixed: 1 1;
+               }
+               description { state: "visible";
+                  inherit: "default" 0.0;
+                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+               }
+            }
+            part { name: "base";
+               type: "RECT";
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
+                  rel1 {
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
+                  }
+                  fixed: 0 1;
+                  color: 145 145 145 179;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 145 145 145 77;
+               }
+            }
+            part { name: "drag_base";
+               type: "SPACER";
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  rel1 {
+                     to_x: "bar_image_left_padding";
+                     to_y: "bg";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                      to_x: "bar_image_right_padding";
+                      to_y: "bg";
+                      relative: 0.0 1.0;
+                  }
+                  fixed: 1 1;
+               }
+               description { state: "visible" 0.0;
+                  inherit: "default" 0.0;
+                  rel1 {
+                     to_x: "bar_icon_right_padding_2";
+                     to_y: "bg";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                      to_x: "bar_image_right_padding";
+                      to_y: "bg";
+                      relative: 0.0 1.0;
+                  }
+               }
+            }
+            part { name: "level";
+               type: RECT;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  rel1 {
+                     to_x: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                     to_x: "elm.dragable.slider";
+                     relative: 0.5 1.0;
+                  }
+                  fixed: 1 1;
+                  min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
+                  color: 61 184 204 255;
+               }
+               description { state: "pressed" 0.0;
+                 inherit: "default" 0.0;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 61 184 204 77;
+               }
+            }
+            part { name: "level2";
+               type: RECT;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  visible: 0;
+                  rel1.to: "level";
+                  rel1.relative: 1 0;
+                  rel2.to: "base";
+                  color: 61 184 204 255;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+               description { state: "pressed" 0.0;
+                 inherit: "inverted" 0.0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "inverted" 0.0;
+                  color: 61 184 204 77;
+               }
+            }
+            part {
+               name: "bar_image_right_padding";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "bg";
+                  }
+                  rel2 {
+                     relative: 1.0  1.0;
+                     to: "bg";
+                  }
+                  align: 1.0 0.5;
+               }
+            }
+            part { name: "icon_clipper";
+               scale: 1;
+               type: RECT;
+               description { state: "default" 0.0;
+                  color: 61 184 204 255;
+               }
+               description { state: "disabled" 0.0;
+                  color: 61 184 204 76;
+               }
+            }
+            part { name: "elm.swallow.bar";
+               type: SWALLOW;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0  SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  fixed: 0 1;
+                  rel1 {
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
+                  }
+               }
+            }
+            part { name:"center_point";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: SLIDER_CENTER_POINT_SIZE_INC;
+                  max: SLIDER_CENTER_POINT_SIZE_INC;
+                  visible: 0;
+                  rel1.to: "base";
+                  rel2.to: "base";
+                  fixed: 0 1;
+                  color: 61 184 204 255;
+               }
+               description { state: "visible" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+                  color: 61 184 204 77;
+               }
+            }
+            part { name: "elm.track.slider";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_POPUP_HEIGHT_INC;
+                  max: -1 SLIDER_POPUP_HEIGHT_INC;
+                  align: 0.5 1.0;
+                  fixed: 0 1;
+                  rel1.to: "elm.dragable.slider";
+                  rel1.offset: 0 8;
+                  rel2 {
+                     relative: 1.0 0.0;
+                     to: "elm.dragable.slider";
+                     offset: 0 8;
+                  }
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape1";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "base";
+               description { state: "default" 0.0;
+                  rel1.to: "base";
+                  rel2.to: "base";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape2";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "level";
+               description { state: "default" 0.0;
+                  rel1.to: "level";
+                  rel2.to: "level";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape3";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "level2";
+               description { state: "default" 0.0;
+                  rel1.to: "level2";
+                  rel2.to: "level2";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape4";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "hider";
+               description { state: "default" 0.0;
+                  rel1.to: "level";
+                  rel2.to: "level";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape5";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "center_point";
+               description { state: "default" 0.0;
+                  rel1.to: "center_point";
+                  rel2.to: "center_point";
+               }
+            }
+            part { name: "elm.dragable.slider";
+               type: GROUP;
+               source: "elm/slider/horizontal/indicator/default";
+               mouse_events: 1;
+               ignore_flags: ON_HOLD;
+               scale: 1;
+               clip_to : "handle_color";
+               dragable {
+                  x: 1 1 0;
+                  y: 0 0 0;
+                  confine: "drag_base";
+               }
+               description { state: "default" 0.0;
+                  min: SLIDER_INDICATOR_SIZE_INC SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  fixed: 1 1;
+                  align: 0.5 0.5;
+                  rel1.to: "drag_base";
+                  rel1.relative: 0.5 0.5;
+                  rel2.to: "drag_base";
+                  rel2.relative: 0.5 0.5;
+                  color: 0 0 0 0;
+               }
+            }
+            part { name:"handle_color";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  rel1.offset: 0 -1000;
+                  rel2.offset: -1 1000;
+                  color: 61 184 204 255;
+               }
+               description { state: "pressed" 0.0;
+                 inherit: "default" 0.0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 163 198 204 255;
+               }
+            }
+            part { name: "hider";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  visible: 0;
+                  color: 0 0 0 0;
+               }
+            }
+            part { name: "disabler";
+               type: RECT;
+               mouse_events: 1;
+               repeat_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  visible: 0;
+                  color: 0 0 0 0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+            }
+         }
+      programs {
+         program { name: "invert_on";
+            signal: "elm,state,inverted,on";
+            source: "elm";
+            script {
+               set_invert_on();
+            }
+         }
+         program { name: "invert_off";
+            signal: "elm,state,inverted,off";
+            source: "elm";
+            script {
+               set_invert_off();
+            }
+         }
+         program { name: "val_show";
+            signal: "mouse,down,*";
+            source: "elm.dragable.slider";
+            script {
+               thumb_down();
+            }
+         }
+         program { name: "val_hide";
+            signal: "mouse,up,*";
+            source: "elm.dragable.slider";
+            script {
+               thumb_up();
+            }
+         }
+         program { name: "popup_show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            script {
+               set_popup_show();
+            }
+         }
+         program { name: "popup_hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            script {
+               set_popup_hide();
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.swallow.icon";
+            target: "bar_icon_right_padding_1";
+            target: "bar_icon_right_padding_2";
+            target: "drag_base";
+         }
+         program { name: "center_point_enable";
+            signal: "slider,center,point,show";
+            source: "elm";
+            script {
+               set_state(PART:"center_point", "visible", 0.0);
+               set_int(show, 1);
+            }
+         }
+         program { name: "center_point_disable";
+            signal: "slider,center,point,hide";
+            source: "elm";
+            script {
+               set_state(PART:"center_point", "default", 0.0);
+               set_int(show, 0);
+            }
+         }
+         program { name: "slider_disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            script {
+               if (get_int(show))
+                  set_state(PART:"center_point", "disabled", 0.0);
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"icon_clipper", "disabled", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"handle_color", "disabled", 0.0);
+               if (!get_int(invert_on)) {
+                 set_state(PART:"level", "disabled", 0.0);
+                 set_state(PART:"level2", "default", 0.0);
+               } else {
+                 set_state(PART:"level", "inverted", 0.0);
+                 set_state(PART:"level2", "disabled", 0.0);
+               }
+               set_int(disabled, 1);
+            }
+         }
+         program { name: "slider_enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            script {
+               if (get_int(show))
+                  set_state(PART:"center_point", "visible", 0.0);
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"icon_clipper", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"handle_color", "default", 0.0);
+               if (!get_int(invert_on)) {
+                 set_state(PART:"level", "default", 0.0);
+                 set_state(PART:"level2", "default", 0.0);
+               } else {
+                 set_state(PART:"level", "inverted", 0.0);
+                 set_state(PART:"level2", "inverted", 0.0);
+               }
+               set_int(disabled, 0);
+            }
+         }
+      }
+   }
+
+group { name: "elm/slider/horizontal/center_point";
+      inherit: "elm/slider/horizontal/default";
+      data.item: "vector_ux" "center_point";
+         parts {
+            part { name: "level";
+               type: RECT;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  rel1 {
+                     to_x: "center_point";
+                     to_y: "base";
+                     relative: 0.5 0.0;
+                  }
+                  rel2 {
+                     to_x: "elm.dragable.slider";
+                     to_y: "base";
+                     relative: 0.5 1.0;
+                  }
+                  color: 61 184 204 255;
+               }
+               description { state: "pressed" 0.0;
+                 inherit: "default" 0.0;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 61 184 204 77;
+               }
+            }
+            part { name: "level2";
+               type: RECT;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  visible: 0;
+                  rel1 {
+                     to_x: "elm.dragable.slider";
+                     to_y: "base";
+                     relative: 0.5 0.0;
+                  }
+                  rel2 {
+                     to_x: "center_point";
+                     to_y: "base";
+                     relative: 0.5 1.0;
+                  }
+                  color: 61 184 204 255;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+               description { state: "pressed" 0.0;
+                 inherit: "inverted" 0.0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "inverted" 0.0;
+                  color: 61 184 204 77;
+               }
+            }
+            part { name:"center_point";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: SLIDER_CENTER_POINT_SIZE_INC;
+                  max: SLIDER_CENTER_POINT_SIZE_INC;
+                  rel1.to: "base";
+                  rel2.to: "base";
+                  fixed: 0 1;
+                  visible: 1;
+                  color: 61 184 204 255;
+               }
+               description { state: "visible" 0.0;
+                  inherit: "default";
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+                  color: 61 184 204 77;
+               }
+            }
+         }
+         programs {
+            program { name: "center_point_calc";
+               signal: "drag";
+               source: "elm.dragable.slider";
+               script {
+                  drag_state();
+               }
+            }
+            program { name: "center_point_calc1";
+               signal: "drag,start";
+               source: "elm.dragable.slider";
+               script {
+                  drag_state();
+               }
+            }
+            program { name: "center_point_calc2";
+               signal: "drag,set";
+               source: "elm.dragable.slider";
+               script {
+                  drag_state();
+               }
+            }
+            program { name: "center_point_calc3";
+               signal: "mouse,up,*";
+               source: "elm.swallow.bar";
+               script {
+                  drag_state();
+               }
+            }
+            program { name: "center_point_calc4";
+               signal: "mouse,move";
+               source: "elm.swallow.bar";
+               script {
+                  drag_state();
+               }
+            }
+            program { name: "slider_disable";
+               signal: "elm,state,disabled";
+               source: "elm";
+               script {
+                  set_state(PART:"center_point", "disabled", 0.0);
+                  set_state(PART:"disabler", "disabled", 0.0);
+                  set_state(PART:"icon_clipper", "disabled", 0.0);
+                  set_state(PART:"base", "disabled", 0.0);
+                  set_state(PART:"handle_color", "disabled", 0.0);
+                  if (!get_int(invert_on)) {
+                    set_state(PART:"level", "disabled", 0.0);
+                    set_state(PART:"level2", "default", 0.0);
+                  } else {
+                    set_state(PART:"level", "inverted", 0.0);
+                    set_state(PART:"level2", "disabled", 0.0);
+                  }
+                  set_int(disabled, 1);
+               }
+            }
+            program { name: "slider_enable";
+               signal: "elm,state,enabled";
+               source: "elm";
+               script {
+                  set_state(PART:"center_point", "visible", 0.0);
+                  set_state(PART:"disabler", "default", 0.0);
+                  set_state(PART:"icon_clipper", "default", 0.0);
+                  set_state(PART:"base", "default", 0.0);
+                  set_state(PART:"handle_color", "default", 0.0);
+                  if (!get_int(invert_on)) {
+                    set_state(PART:"level", "default", 0.0);
+                    set_state(PART:"level2", "default", 0.0);
+                  } else {
+                    set_state(PART:"level", "inverted", 0.0);
+                    set_state(PART:"level2", "inverted", 0.0);
+                  }
+                  set_int(disabled, 0);
+               }
+            }
+         }
+   }
+
+group { name: "elm/slider/horizontal/warning";
+      data.item: "vector_ux" "default";
+      script {
+         public invert_on = 0;
+         public warning = 0;
+         public disabled = 0;
+         public popup_show = 1;
+         public show = 0;
+         public set_popup_show() {
+            set_int(popup_show, 0);
+         }
+         public set_popup_hide() {
+            set_int(popup_show, 0);
+         }
+         public set_invert_on() {
+            if (!get_int(disabled)) {
+              set_state(PART:"level", "inverted", 0.0);
+              set_state(PART:"level2", "inverted", 0.0);
+            }
+            else {
+              set_state(PART:"level", "inverted", 0.0);
+              set_state(PART:"level2", "disabled", 0.0);
+            }
+            if (!get_int(warning)){
+              set_state(PART:"level_warning_clip", "inverted", 0.0);
+            }
+            else {
+              set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
+            }
+            set_state(PART:"center_point", "inverted", 0.0);
+            set_state(PART:"level_rest_clip", "inverted", 0.0);
+            set_int(invert_on, 1);
+         }
+         public set_invert_off() {
+            if (!get_int(disabled)) {
+              set_state(PART:"level", "default", 0.0);
+              set_state(PART:"level2", "default", 0.0);
+            }
+            else {
+              set_state(PART:"level", "disabled", 0.0);
+              set_state(PART:"level2", "default", 0.0);
+            }
+            if (!get_int(warning)){
+              set_state(PART:"level_warning_clip", "default", 0.0);
+            }
+            else {
+              set_state(PART:"level_warning_clip", "warning", 0.0);
+            }
+            set_state(PART:"center_point", "default", 0.0);
+            set_state(PART:"level_rest_clip", "default", 0.0);
+            set_int(invert_on, 0);
+         }
+         public thumb_down() {
+            if (!get_int(warning))
+              set_state(PART:"handle_color", "pressed", 0.0);
+            else
+              set_state(PART:"handle_color", "pressed_warning", 0.0);
+            if (get_int(popup_show) == 1)
+               emit("popup,show", "elm");
+         }
+         public thumb_up() {
+            if (!get_int(warning))
+              set_state(PART:"handle_color", "default", 0.0);
+            else
+              set_state(PART:"handle_color", "warning", 0.0);
+            if (get_int(popup_show) == 1)
+               emit("popup,hide", "elm");
+         }
+         public drag_state_warning() {
+            new Float:dx, Float:dy;
+            get_drag(PART:"elm.dragable.slider", dx, dy);
+            if (!get_int(invert_on)) {
+               if (dx > SLIDER_WARNING_LEVEL) {
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "warning", 0.0);
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled_warning", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "warning", 0.0);
+                 set_int(warning, 1);
+               }
+               else {
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "default", 0.0);
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "default", 0.0);
+                 set_int(warning, 0);
+               }
+            }
+            else {
+               if (dx < (1.0 - SLIDER_WARNING_LEVEL)) {
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "warning", 0.0);
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled_warning", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
+                 set_int(warning, 1);
+               }
+               else {
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "default", 0.0);
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "inverted", 0.0);
+                 set_int(warning, 0);
+               }
+            }
+         }
+      }
+         parts {
+            part { name: "access";
+               type: RECT;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  color: 0 0 0 0;
+               }
+            }
+            part {
+               name: "bg";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
+               }
+            }
+            part {
+               name: "bar_image_left_padding";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1.to: "bg";
+                  rel2 {
+                     relative: 0.0  1.0;
+                     to: "bg";
+                  }
+                  align: 0.0 0.5;
+               }
+            }
+            part { name: "elm.swallow.icon";
+               type: SWALLOW;
+               clip_to: "icon_clipper";
+               scale: 1;
+               description { state: "default" 0.0;
+                  visible: 0;
+                  align: 0.0 0.5;
+                  max: SLIDER_SWALLOWBAR_HEIGHT_INC SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  rel1 {
+                     relative: 1.0 0.0;
+                     to_x: "bar_image_left_padding";
+                     to_y: "bg";
+                  }
+                  rel2 {
+                     relative: 1.0 1.0;
+                     to_x: "bar_image_left_padding";
+                     to_y: "bg";
+                  }
+               }
+               description { state: "visible" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+            }
+            part {
+               name: "bar_icon_right_padding_1";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  align: 0.0 0.5;
+                  min: 0 0;
+                  max: 0 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "elm.swallow.icon";
+                  }
+                  rel2 {
+                     relative: 1.0  1.0;
+                     to: "elm.swallow.icon";
+                  }
+                  fixed: 1 1;
+               }
+               description { state: "visible";
+                  inherit: "default" 0.0;
+                  min: SLIDER_ICON_PADDING_SIZE_INC;
+                  max: SLIDER_ICON_PADDING_SIZE_INC;
+               }
+            }
+            part {
+               name: "bar_icon_right_padding_2";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  align: 0.0 0.5;
+                  min: 0 0;
+                  max: 0 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "bar_icon_right_padding_1";
+                  }
+                  rel2 {
+                     relative: 1.0  1.0;
+                     to: "bar_icon_right_padding_1";
+                  }
+                  fixed: 1 1;
+               }
+               description { state: "visible";
+                  inherit: "default" 0.0;
+                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+               }
+            }
+            part { name: "base";
+               type: "RECT";
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
+                  rel1 {
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
+                  }
+                  fixed: 0 1;
+                  color: 145 145 145 179;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 145 145 145 77;
+               }
+            }
+            part { name: "drag_base";
+               type: "SPACER";
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  rel1 {
+                     to_x: "bar_image_left_padding";
+                     to_y: "bg";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                      to_x: "bar_image_right_padding";
+                      to_y: "bg";
+                      relative: 0.0 1.0;
+                  }
+                  fixed: 1 1;
+               }
+               description { state: "visible" 0.0;
+                  inherit: "default" 0.0;
+                  rel1 {
+                     to_x: "bar_icon_right_padding_2";
+                     to_y: "bg";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                      to_x: "bar_image_right_padding";
+                      to_y: "bg";
+                      relative: 0.0 1.0;
+                  }
+               }
+            }
+            part { name: "level";
+               type: RECT;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  rel1 {
+                     to_x: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                     to_x: "elm.dragable.slider";
+                     relative: 0.5 1.0;
+                  }
+                  fixed: 1 1;
+                  min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
+                  color: 255 25 25 255;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 216 162 162 255;
+               }
+            }
+            part { name: "level2";
+               type: RECT;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  visible: 0;
+                  rel1.to: "level";
+                  rel1.relative: 1 0;
+                  rel2.to: "base";
+                  color: 255 25 25 255;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "inverted" 0.0;
+                  color: 216 162 162 255;
+               }
+            }
+            part { name: "level_rest_clip";
+               type: RECT;
+               description { state: "default" 0.0;
+                  fixed: 1 1;
+                  color: 201 132 132 255;
+                  rel1.to_x: "center_point";
+                  rel1.to_y: "base";
+                  rel1.relative: 0.5 0.0;
+                  rel2.to: "base";
+               }
+               description { state: "inverted" 0.0;
+                 inherit: "default" 0.0;
+                 rel1.to: "base";
+                 rel1.relative: 0.0 0.0;
+                 rel2.to_x: "center_point";
+                 rel2.to_y: "base";
+                 rel2.relative: 0.5 1.0;
+               }
+            }
+            part { name: "level_warning_clip";
+               type: RECT;
+               scale: 1;
+               clip_to: "disabled_clipper";
+               description { state: "default" 0.0;
+                  rel1.to: "level";
+                  rel2.to: "level";
+               }
+               description { state: "warning" 0.0;
+                  inherit: "default";
+                  rel1.to: "level";
+                  rel2.to_x: "level_rest_clip";
+                  rel2.to_y: "level";
+                  rel2.relative: 0.0 1.0;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default";
+                  rel1.to: "level2";
+                  rel2.to: "level2";
+               }
+               description { state: "inverted_warning" 0.0;
+                 inherit: "inverted" 0.0;
+                 rel1.to_x: "level_rest_clip";
+                 rel1.to_y: "level2";
+                 rel1.relative: 1.0 0.0;
+                 rel2.to: "level2";
+               }
+            }
+            part { name: "disabled_clipper";
+              type: RECT;
+              scale: 1;
+               description { state: "default" 0.0;
+                  rel1.to: "level_warning_clip";
+                  rel2.to: "level_warning_clip";
+                  color: 61 184 204 255;
+               }
+               description { state: "disabled";
+                  inherit: "default" 0.0;
+                  color: 163 198 204 255;
+               }
+            }
+            part {
+               name: "bar_image_right_padding";
+               type: SPACER;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "bg";
+                  }
+                  rel2 {
+                     relative: 1.0  1.0;
+                     to: "bg";
+                  }
+                  align: 1.0 0.5;
+               }
+            }
+            part { name: "icon_clipper";
+               scale: 1;
+               type: RECT;
+               description { state: "default" 0.0;
+                  color: 61 184 204 255;
+               }
+               description { state: "disabled" 0.0;
+                  color: 61 184 204 76;
+               }
+            }
+            part { name: "elm.swallow.bar";
+               type: SWALLOW;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0  SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  fixed: 0 1;
+                  rel1 {
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
+                  }
+                  rel2 {
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
+                  }
+               }
+            }
+            part { name:"center_point";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 0;
+                  max: 0 0;
+                  align: SLIDER_WARNING_LEVEL 0.5;
+                  rel1.to: "base";
+                  rel2.to: "base";
+                  fixed: 0 1;
+                  color: 0 0 0 0;
+               }
+               description { state: "inverted" 0.0;
+                  inherit: "default" 0.0;
+                  align: (1.0 - SLIDER_WARNING_LEVEL) 0.5;
+               }
+            }
+            part { name: "elm.track.slider";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_POPUP_HEIGHT_INC;
+                  max: -1 SLIDER_POPUP_HEIGHT_INC;
+                  align: 0.5 1.0;
+                  fixed: 0 1;
+                  rel1.to: "elm.dragable.slider";
+                  rel1.offset: 0 8;
+                  rel2 {
+                     relative: 1.0 0.0;
+                     to: "elm.dragable.slider";
+                     offset: 0 8;
+                  }
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape1";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "base";
+               description { state: "default" 0.0;
+                  rel1.to: "base";
+                  rel2.to: "base";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape4";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "level_rest_clip";
+               description { state: "default" 0.0;
+                  rel1.to: "level_rest_clip";
+                  rel2.to: "level_rest_clip";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape2";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "level";
+               description { state: "default" 0.0;
+                  rel1.to: "level";
+                  rel2.to: "level";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape3";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "level2";
+               description { state: "default" 0.0;
+                  rel1.to: "level2";
+                  rel2.to: "level2";
+               }
+            }
+            part { name: "elm.swallow.tizen_vg_shape5";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               clip_to: "level_warning_clip";
+               description { state: "default" 0.0;
+                  rel1.to: "level_warning_clip";
+                  rel2.to: "level_warning_clip";
+               }
+            }
+            part { name: "elm.dragable.slider";
+               type: GROUP;
+               source: "elm/slider/horizontal/indicator/default";
+               mouse_events: 1;
+               ignore_flags: ON_HOLD;
+               scale: 1;
+               clip_to : "handle_color";
+               dragable {
+                  x: 1 1 0;
+                  y: 0 0 0;
+                  confine: "drag_base";
+               }
+               description { state: "default" 0.0;
+                  min: SLIDER_INDICATOR_SIZE_INC SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  fixed: 1 1;
+                  align: 0.5 0.5;
+                  rel1.to: "drag_base";
+                  rel1.relative: 0.5 0.5;
+                  rel2.to: "drag_base";
+                  rel2.relative: 0.5 0.5;
+                  color: 0 0 0 0;
+               }
+            }
+            part { name:"handle_color";
+               type: RECT;
+               scale: 1;
+               description { state: "default" 0.0;
+                  rel1.offset: 0 -1000;
+                  rel2.offset: -1 1000;
+                  color: 61 184 204 255;
+               }
+               description { state: "warning" 0.0;
+                  inherit: "default" 0.0;
+                  color: 255 25 25 255;
+               }
+               description { state: "pressed" 0.0;
+                  inherit: "default";
+               }
+               description { state: "pressed_warning" 0.0;
+                  inherit: "warning";
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  color: 163 198 204 255;
+               }
+               description { state: "disabled_warning" 0.0;
+                  inherit: "default" 0.0;
+                  color: 216 162 162 255;
+               }
+            }
+            part { name: "disabler";
+               type: RECT;
+               mouse_events: 1;
+               repeat_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  visible: 0;
+                  color: 0 0 0 0;
+               }
+               description { state: "disabled" 0.0;
+                  inherit: "default" 0.0;
+                  visible: 1;
+               }
+            }
+         }
+      programs {
+         program { name: "invert_on";
+            signal: "elm,state,inverted,on";
+            source: "elm";
+            script {
+               set_invert_on();
+            }
+         }
+         program { name: "invert_off";
+            signal: "elm,state,inverted,off";
+            source: "elm";
+            script {
+               set_invert_off();
+            }
+         }
+         program { name: "val_show";
+            signal: "mouse,down,*";
+            source: "elm.dragable.slider";
+            script {
+               thumb_down();
+            }
+         }
+         program { name: "val_hide";
+            signal: "mouse,up,*";
+            source: "elm.dragable.slider";
+            script {
+               thumb_up();
+            }
+         }
+         program { name: "popup_show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            script {
+               set_popup_show();
+            }
+         }
+         program { name: "popup_hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            script {
+               set_popup_hide();
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.swallow.icon";
+            target: "bar_icon_right_padding_1";
+            target: "bar_icon_right_padding_2";
+            target: "drag_base";
+         }
+         program { name: "center_point_enable";
+            signal: "slider,center,point,show";
+            source: "elm";
+            script {
+               set_state(PART:"center_point", "visible", 0.0);
+               set_int(show, 1);
+            }
+         }
+         program { name: "center_point_disable";
+            signal: "slider,center,point,hide";
+            source: "elm";
+            script {
+               set_state(PART:"center_point", "default", 0.0);
+               set_int(show, 0);
+            }
+         }
+         program { name: "slider_disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            script {
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"icon_clipper", "disabled", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"disabled_clipper", "disabled", 0.0);
+               if (!get_int(warning))
+                 set_state(PART:"handle_color", "disabled", 0.0);
+               else
+                 set_state(PART:"handle_color", "disabled_warning", 0.0);
+               if (!get_int(invert_on)) {
+                 set_state(PART:"level", "disabled", 0.0);
+                 set_state(PART:"level2", "default", 0.0);
+               } else {
+                 set_state(PART:"level", "inverted", 0.0);
+                 set_state(PART:"level2", "disabled", 0.0);
+               }
+               set_int(disabled, 1);
+            }
+         }
+         program { name: "slider_enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            script {
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"icon_clipper", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"disabled_clipper", "default", 0.0);
+               if (!get_int(warning))
+                 set_state(PART:"handle_color", "default", 0.0);
+               else
+                 set_state(PART:"handle_color", "warning", 0.0);
+               if (!get_int(invert_on)) {
+                 set_state(PART:"level", "default", 0.0);
+                 set_state(PART:"level2", "default", 0.0);
+               } else {
+                 set_state(PART:"level", "inverted", 0.0);
+                 set_state(PART:"level2", "inverted", 0.0);
+               }
+               set_int(disabled, 0);
+            }
+         }
+         program { name: "center_point_calc";
+            signal: "drag";
+            source: "elm.dragable.slider";
+            script {
+               drag_state_warning();
+            }
+         }
+         program { name: "center_point_calc1";
+            signal: "drag,start";
+            source: "elm.dragable.slider";
+            script {
+               drag_state_warning();
+            }
+         }
+         program { name: "center_point_calc2";
+            signal: "drag,set";
+            source: "elm.dragable.slider";
+            script {
+               drag_state_warning();
+            }
+         }
+         program { name: "center_point_calc3";
+            signal: "mouse,up,*";
+            source: "elm.swallow.bar";
+            script {
+               drag_state_warning();
+            }
+         }
+         program { name: "center_point_calc4";
+            signal: "mouse,move";
+            source: "elm.swallow.bar";
+            script {
+               drag_state_warning();
+            }
+         }
+      }
+   }
+
+group { name: "elm/slider/vertical/default";
+  data.item: "vector_ux" "default";
+  script {
+     public invert_on = 0;
+     public disabled = 0;
+     public show = 0;
+     public popup_show = 1;
+     public set_popup_show() {
+        set_int(popup_show, 0);
+     }
+     public set_popup_hide() {
+        set_int(popup_show, 0);
+     }
+     public set_invert_on() {
+        if (!get_int(disabled)) {
+          set_state(PART:"level", "inverted", 0.0);
+          set_state(PART:"level2", "inverted", 0.0);
+        }
+        else {
+          set_state(PART:"level", "disabled", 0.0);
+          set_state(PART:"level2", "inverted", 0.0);
+        }
+        set_int(invert_on, 1);
+     }
+     public set_invert_off() {
+        if (!get_int(disabled)) {
+          set_state(PART:"level", "default", 0.0);
+          set_state(PART:"level2", "default", 0.0);
+        }
+        else {
+          set_state(PART:"level", "default", 0.0);
+          set_state(PART:"level2", "disabled", 0.0);
+        }
+        set_int(invert_on, 0);
+     }
+     public thumb_down() {
+        if (!get_int(invert_on))
+          set_state(PART:"level2", "pressed", 0.0);
+        else
+          set_state(PART:"level", "pressed", 0.0);
+         set_state(PART:"handle_color", "pressed", 0.0);
+        if (get_int(popup_show) == 1)
+           emit("popup,show", "elm");
+        }
+     public thumb_up() {
+        if (!get_int(invert_on))
+          set_state(PART:"level2", "default", 0.0);
+        else
+         set_state(PART:"level", "inverted", 0.0);
+        set_state(PART:"handle_color", "default", 0.0);
+        if (get_int(popup_show) == 1)
+           emit("popup,hide", "elm");
+        }
+     public drag_state() {
+        new Float:dx, Float:dy;
+        get_drag(PART:"elm.dragable.slider", dx, dy);
+        if (dy < 0.5) {
+          if (!get_int(disabled)) {
+            set_state(PART:"level", "pressed", 0.0);
+            set_state(PART:"level2", "default", 0.0);
+          }
+          else {
+            set_state(PART:"level", "disabled", 0.0);
+            set_state(PART:"level2", "default", 0.0);
+          }
+          set_int(invert_on, 0);
+        }
+        else {
+          if (!get_int(disabled)) {
+            set_state(PART:"level", "inverted", 0.0);
+            set_state(PART:"level2", "pressed", 0.0);
+          }
+          else {
+            set_state(PART:"level", "inverted", 0.0);
+            set_state(PART:"level2", "disabled", 0.0);
+          }
+          set_int(invert_on, 1);
+        }
+     }
+  }
+  parts {
+     part { name: "access";
+        type: RECT;
+           description { state: "default" 0.0;
+           fixed: 1 1;
+           color: 0 0 0 0;
+           }
+      }
+        part {
+           name: "bg";
+           type: SPACER;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: SLIDER_SWALLOWBAR_WIDTH_INC 0;
+              max: SLIDER_SWALLOWBAR_WIDTH_INC -1;
+           }
+        }
+        part {
+           name: "bar_image_top_padding";
+           type: SPACER;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: SLIDER_TOP_PADDING_SIZE_INC;
+              max: SLIDER_TOP_PADDING_SIZE_INC;
+              fixed: 1 1;
+              rel1 {
+                 relative: 0.0  0.0;
+                 to: "bg";
+              }
+              rel2 {
+                 relative: 1.0  0.0;
+                 to: "bg";
+              }
+              align: 0.5 0.0;
+           }
+        }
+        part { name: "base";
+           type: "RECT";
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              min: SLIDER_VERTICAL_BASE_HEIGHT_INC 0;
+              max: SLIDER_VERTICAL_BASE_HEIGHT_INC -1;
+              fixed: 1 1;
+              rel1 {
+                 to: "bar_image_top_padding";
+                 relative: 0.0 1.0;
+              }
+              rel2 {
+                 to: "bar_image_bottom_padding";
+                 relative: 1.0 0.0;
+              }
+              fixed: 1 1;
+              color: 145 145 145 179;
+           }
+           description { state: "disabled" 0.0;
+              inherit: "default" 0.0;
+              color: 145 145 145 77;
+           }
+        }
+        part { name: "drag_base";
+           type: "SPACER";
+           scale: 1;
+           description { state: "default" 0.0;
+              min: SLIDER_SWALLOWBAR_HEIGHT_INC 0;
+              rel1 {
+                 to: "bar_image_top_padding";
+                 relative: 0.0 1.0;
+              }
+              rel2 {
+                 to: "bar_image_bottom_padding";
+                 relative: 1.0 0.0;
+              }
+              fixed: 1 1;
+           }
+           description { state: "visible" 0.0;
+              inherit: "default" 0.0;
+              rel1 {
+                 to: "bar_image_top_padding";
+                 relative: 0.0 1.0;
+              }
+              rel2 {
+                 to: "bar_image_bottom_padding";
+                 relative: 1.0 0.0;
+              }
+           }
+        }
+        part { name: "level";
+           type: RECT;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              visible: 0;
+              rel1 {
+                 to_y: "elm.dragable.slider";
+                 to_x: "base";
+                 relative: 0.0 0.5;
+              }
+              rel2 {
+                 to_y: "bar_image_bottom_padding";
+                 to_x: "base";
+                 relative: 1.0 0.0;
+              }
+              fixed: 1 1;
+              min: SLIDER_BASE_HEIGHT_INC 0;
+              max: SLIDER_BASE_HEIGHT_INC -1;
+              color: 61 184 204 255;
+           }
+           description { state: "inverted" 0.0;
+              inherit: "default" 0.0;
+              visible: 1;
+           }
+           description { state: "pressed" 0.0;
+             inherit: "inverted" 0.0;
+           }
+           description { state: "disabled" 0.0;
+              inherit: "inverted" 0.0;
+              color: 61 184 204 77;
+           }
+        }
+        part { name: "level2";
+           type: RECT;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              fixed: 1 1;
+              rel1 {
+                 to: "base";
+                 relative: 0.5 0.0;
+              }
+              rel2 {
+                 to_y: "elm.dragable.slider";
+                 to_x: "bar_image_top_padding";
+                 relative: 0.5 0.5;
+              }
+              fixed: 1 1;
+              min: SLIDER_BASE_HEIGHT_INC 0;
+              max: SLIDER_BASE_HEIGHT_INC -1;
+              color: 61 184 204 255;
+           }
+           description { state: "pressed" 0.0;
+              inherit: "default" 0.0;
+           }
+           description { state: "inverted" 0.0;
+              inherit: "default" 0.0;
+              visible: 0;
+           }
+           description { state: "disabled" 0.0;
+              inherit: "default" 0.0;
+              color: 61 184 204 77;
+           }
+        }
+        part {
+           name: "bar_image_bottom_padding";
+           type: SPACER;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: SLIDER_BOTTOM_PADDING_SIZE_INC;
+              max: SLIDER_BOTTOM_PADDING_SIZE_INC;
+              fixed: 1 1;
+              rel1 {
+                 relative: 0.0  1.0;
+                 to: "bg";
+              }
+              rel2 {
+                 relative: 1.0  1.0;
+                 to: "bg";
+              }
+              align: 0.5 1.0;
+           }
+        }
+        part { name: "elm.swallow.bar";
+           type: SWALLOW;
+           scale: 1;
+           description { state: "default" 0.0;
+              min: SLIDER_SWALLOWBAR_HEIGHT_INC 0;
+              max: SLIDER_SWALLOWBAR_HEIGHT_INC -1;
+              fixed: 1 0;
+              rel1 {
+                 to: "bar_image_top_padding";
+                 relative: 0.0 1.0;
+              }
+              rel2 {
+                 to: "bar_image_bottom_padding";
+                 relative: 1.0 0.0;
+              }
+           }
+        }
+        part { name:"center_point";
+           type: RECT;
+           scale: 1;
+           description { state: "default" 0.0;
+              min: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
+              max: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
+              visible: 0;
+              rel1.to: "base";
+              rel2.to: "base";
+              fixed: 1 0;
+              color: 61 184 204 255;
+           }
+           description { state: "visible" 0.0;
+              inherit: "default" 0.0;
+              visible: 1;
+           }
+           description { state: "disabled" 0.0;
+              inherit: "default" 0.0;
+              visible: 1;
+              color: 61 184 204 77;
+           }
+        }
+        part { name: "elm.track.slider";
+           type: SWALLOW;
+           mouse_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              min: 0 SLIDER_POPUP_HEIGHT_INC;
+              max: -1 SLIDER_POPUP_HEIGHT_INC;
+              align: 0.5 1.0;
+              fixed: 0 1;
+              rel1.to: "elm.dragable.slider";
+              rel1.offset: 0 8;
+              rel2 {
+                 relative: 1.0 0.0;
+                 to: "elm.dragable.slider";
+                 offset: 0 8;
+              }
+           }
+        }
+         part { name: "elm.swallow.tizen_vg_shape1";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "base";
+            description { state: "default" 0.0;
+               rel1.to: "base";
+               rel2.to: "base";
+            }
+         }
+         part { name: "elm.swallow.tizen_vg_shape2";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "level";
+            description { state: "default" 0.0;
+               rel1.to: "level";
+               rel2.to: "level";
+            }
+         }
+         part { name: "elm.swallow.tizen_vg_shape3";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "level2";
+            description { state: "default" 0.0;
+               rel1.to: "level2";
+               rel2.to: "level2";
+            }
+         }
+         part { name: "elm.swallow.tizen_vg_shape4";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "hider";
+            description { state: "default" 0.0;
+               rel1.to: "level";
+               rel2.to: "level";
+            }
+         }
+         part { name: "elm.swallow.tizen_vg_shape5";
+            type: SWALLOW;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "center_point";
+            description { state: "default" 0.0;
+               rel1.to: "center_point";
+               rel2.to: "center_point";
+            }
+         }
+        part { name: "elm.dragable.slider";
+           type: GROUP;
+           source: "elm/slider/horizontal/indicator/default";
+           mouse_events: 1;
+           ignore_flags: ON_HOLD;
+           scale: 1;
+           clip_to : "handle_color";
+           dragable {
+              x: 0 0 0;
+              y: 1 1 0;
+              confine: "drag_base";
+           }
+           description { state: "default" 0.0;
+              min: SLIDER_LEFT_VERTICAL_INDICATOR_SIZE_INC SLIDER_VERTICAL_INDICATOR_SIZE_INC;
+              fixed: 1 1;
+              align: 0.5 0.5;
+              rel1.to: "drag_base";
+              rel1.relative: 0.5 0.5;
+              rel2.to: "drag_base";
+              rel2.relative: 0.5 0.5;
+              color: 0 0 0 0;
+           }
+        }
+         part { name:"handle_color";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.offset: 0 -1000;
+               rel2.offset: -1 1000;
+               color: 61 184 204 255;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 163 198 204 255;
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+        part { name: "hider";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               color: 0 0 0 0;
+            }
+        }
+        part { name: "disabler";
+           type: RECT;
+           mouse_events: 1;
+           repeat_events: 0;
+           scale: 1;
+           description { state: "default" 0.0;
+              visible: 0;
+              color: 0 0 0 0;
+           }
+           description { state: "disabled" 0.0;
+              inherit: "default" 0.0;
+              visible: 1;
+           }
+        }
+     }
+     programs {
+        program { name: "invert_on";
+           signal: "elm,state,inverted,on";
+           source: "elm";
+           script {
+              set_invert_on();
+           }
+        }
+        program { name: "invert_off";
+           signal: "elm,state,inverted,off";
+           source: "elm";
+           script {
+              set_invert_off();
+           }
+        }
+        program { name: "val_show";
+           signal: "mouse,down,*";
+           source: "elm.dragable.slider";
+           script {
+              thumb_down();
+           }
+        }
+        program { name: "val_hide";
+           signal: "mouse,up,*";
+           source: "elm.dragable.slider";
+           script {
+              thumb_up();
+           }
+        }
+        program { name: "popup_show";
+           signal: "elm,state,val,show";
+           source: "elm";
+           script {
+              set_popup_show();
+           }
+        }
+        program { name: "popup_hide";
+           signal: "elm,state,val,hide";
+           source: "elm";
+           script {
+              set_popup_hide();
+           }
+        }
+        program { name: "icon_show";
+           signal: "elm,state,icon,visible";
+           source: "elm";
+           action:  STATE_SET "visible" 0.0;
+           target: "drag_base";
+        }
+        program { name: "center_point_enable";
+           signal: "slider,center,point,show";
+           source: "elm";
+           action:  STATE_SET "visible" 0.0;
+           target: "center_point";
+        }
+        program { name: "center_point_disable";
+           signal: "slider,center,point,hide";
+           source: "elm";
+           action:  STATE_SET "default" 0.0;
+           target: "center_point";
+        }
+         program { name: "slider_disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            script {
+               if (get_int(show))
+                  set_state(PART:"center_point", "disabled", 0.0);
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"handle_color", "disabled", 0.0);
+               if (!get_int(invert_on)) {
+                 set_state(PART:"level2", "disabled", 0.0);
+                 set_state(PART:"level", "default", 0.0);
+               } else {
+                 set_state(PART:"level2", "inverted", 0.0);
+                 set_state(PART:"level", "disabled", 0.0);
+               }
+               set_int(disabled, 1);
+            }
+         }
+         program { name: "slider_enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            script {
+               if (get_int(show))
+                  set_state(PART:"center_point", "visible", 0.0);
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"handle_color", "default", 0.0);
+               if (!get_int(invert_on)) {
+                 set_state(PART:"level2", "default", 0.0);
+                 set_state(PART:"level", "default", 0.0);
+               } else {
+                 set_state(PART:"level2", "inverted", 0.0);
+                 set_state(PART:"level", "inverted", 0.0);
+               }
+               set_int(disabled, 0);
+            }
+         }
+      }
+   }
+   group { name: "elm/slider/horizontal/popup/default";
+      alias: "elm/slider/vertical/popup/default";
+      images {
+         set {
+            name: "core_slider_popup_bg";
+            image {
+               image: SMALL"images/Old/core_slider_popup_bg.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/Old/core_slider_popup_bg.png" COMP;
+            }
+         }
+         set {
+            name: "core_slider_popup_bg_stroke";
+            image {
+               image: SMALL"images/Old/core_slider_popup_bg_stroke.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/Old/core_slider_popup_bg_stroke.png" COMP;
+            }
+         }
+         set {
+            name: "core_slider_popup_bg_ef";
+            image {
+               image: SMALL"images/Old/core_slider_popup_bg_ef.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/Old/core_slider_popup_bg_ef.png" COMP;
+            }
+         }
+      }
+      parts {
+         part { name: "bg";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_POPUP_HEIGHT_INC;
+            }
+         }
+         part { name: "bg.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_POPUP_HEIGHT_INC;
+               image.normal: "core_slider_popup_bg";
+               color: 255 255 255 255; /*(Changeable UI) color_class: "W0631";*/
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "bg.effect.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_POPUP_HEIGHT_INC;
+               image.normal: "core_slider_popup_bg_ef";
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "bg.stroke";
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_POPUP_HEIGHT_INC;
+               image.normal: "core_slider_popup_bg_stroke";
+               color: 2 61 132 255; /*(Changeable UI) color_class: "W0632";*/
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part {
+            name: "indicator.top.pad";
+            type: SPACER;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min: 0 SLIDER_INDICATOR_PADDING_TOP;
+               max: -1 SLIDER_INDICATOR_PADDING_TOP;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0  0.0;
+                  to: "bg.image";
+               }
+               rel2 {
+                  relative: 1.0  0.0;
+                  to: "bg.image";
+               }
+               align: 0.5 0.0;
+            }
+         }
+         part {
+            name: "indicator.bottom.pad";
+            type: SPACER;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               min: 0 SLIDER_INDICATOR_PADDING_BOTTOM;
+               max: -1 SLIDER_INDICATOR_PADDING_BOTTOM;
+               fixed: 0 1;
+               rel1 {
+                  relative: 0.0  1.0;
+                  to: "bg.image";
+               }
+               rel2 {
+                  relative: 1.0  1.0;
+                  to: "bg.image";
+               }
+               align: 0.5 1.0;
+            }
+         }
+         part { name: "elm.indicator";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+               max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+               color: 0 0 0 255; /*(Changeable UI) color_class: "T116";*/
+               rel1 {
+                  to: "indicator.top.pad";
+                  relative: 0.0 1.0;
+               }
+               rel2 {
+                  to: "indicator.bottom.pad";
+                  relative: 1.0 0.0;
+               }
+               text {
+                  min: 1 1;
+                  font: "Bold"; size: "33"; /*(Changeable UI) text_class: "T116";*/
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "popup,val,show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.indicator";
+            target: "bg.image";
+            target: "bg.effect.image";
+            target: "bg.stroke";
+         }
+         program { name: "popup,val,hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.indicator";
+            target: "bg.image";
+            target: "bg.effect.image";
+            target: "bg.stroke";
+         }
+         program { name: "popup,show";
+            signal: "popup,show";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.indicator";
+            target: "bg.image";
+            target: "bg.effect.image";
+            target: "bg.stroke";
+         }
+         program { name: "popup,hide";
+            signal: "popup,hide";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.indicator";
+            target: "bg.image";
+            target: "bg.effect.image";
+            target: "bg.stroke";
+            after: "popup,hide,done";
+         }
+         program { name: "popup,hide,done";
+            action: SIGNAL_EMIT "popup,hide,done" "elm";
+         }
+      }
+   }
+   group { name: "elm/slider/vertical/center_point";
+      inherit: "elm/slider/vertical/default";
+      data.item: "vector_ux" "center_point";
+      parts {
+         part { name: "level2";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  to_y: "center_point";
+                  to_x: "base";
+                  relative: 0.0 0.5;
+               }
+               rel2 {
+                  to_y: "elm.dragable.slider";
+                  to_x: "base";
+                  relative: 1.0 0.5;
+               }
+               color: 61 184 204 255;
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "inverted" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 61 184 204 77;
+            }
+         }
+         part { name: "level";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               visible: 0;
+               rel1 {
+                  to_y: "elm.dragable.slider";
+                  to_x: "base";
+                  relative: 0.0 0.5;
+               }
+               rel2 {
+                  to_y: "center_point";
+                  to_x: "base";
+                  relative: 1.0 0.5;
+               }
+               color: 61 184 204 255;
+            }
+            description { state: "inverted" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+            description { state: "pressed" 0.0;
+               inherit: "inverted" 0.0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "inverted" 0.0;
+               color: 61 184 204 77;
+            }
+         }
+         part { name:"center_point";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
+               max: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
+               rel1.to: "base";
+               rel2.to: "base";
+               fixed: 1 0;
+               visible: 1;
+               color: 61 184 204 255;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 61 184 204 77;
+            }
+         }
+      }
+     programs {
+        program { name: "center_point_calc";
+           signal: "drag";
+           source: "elm.dragable.slider";
+           script {
+              drag_state();
+           }
+         }
+         program { name: "center_point_calc1";
+            signal: "drag,start";
+             source: "elm.dragable.slider";
+             script {
+                drag_state();
+             }
+          }
+          program { name: "center_point_calc2";
+             signal: "drag,set";
+              source: "elm.dragable.slider";
+              script {
+                  drag_state();
+              }
+          }
+          program { name: "center_point_calc3";
+             signal: "mouse,up,*";
+             source: "elm.swallow.bar";
+              script {
+                 drag_state();
+              }
+          }
+          program { name: "center_point_calc4";
+             signal: "mouse,move";
+              source: "elm.swallow.bar";
+              script {
+                 drag_state();
+              }
+          }
+          program { name: "slider_disable";
+             signal: "elm,state,disabled";
+             source: "elm";
+             script {
+                set_state(PART:"center_point", "disabled", 0.0);
+                set_state(PART:"disabler", "disabled", 0.0);
+                set_state(PART:"base", "disabled", 0.0);
+                set_state(PART:"handle_color", "disabled", 0.0);
+                if (!get_int(invert_on)) {
+                  set_state(PART:"level2", "disabled", 0.0);
+                  set_state(PART:"level", "default", 0.0);
+                } else {
+                  set_state(PART:"level2", "inverted", 0.0);
+                  set_state(PART:"level", "disabled", 0.0);
+                }
+                set_int(disabled, 1);
+             }
+          }
+          program { name: "slider_enable";
+             signal: "elm,state,enabled";
+             source: "elm";
+             script {
+                set_state(PART:"center_point", "visible", 0.0);
+                set_state(PART:"disabler", "default", 0.0);
+                set_state(PART:"base", "default", 0.0);
+                set_state(PART:"handle_color", "default", 0.0);
+                if (!get_int(invert_on)) {
+                  set_state(PART:"level2", "default", 0.0);
+                  set_state(PART:"level", "default", 0.0);
+                } else {
+                  set_state(PART:"level2", "inverted", 0.0);
+                  set_state(PART:"level", "inverted", 0.0);
+                }
+                set_int(disabled, 0);
+             }
+          }
+       }
+   }
+
diff --git a/themes/widgets/spinner.edc b/mobile/widgets/spinner.edc
index b54cd6d1..a575a312 100644
--- a/themes/widgets/spinner.edc
+++ b/mobile/widgets/spinner.edc
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this
+ *      list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 group { name: "elm/spinner/base/default";
    alias: "elm/spinner/base/horizontal";
@@ -132,14 +157,12 @@ group { name: "elm/spinner/base/default";
 }
 
 group { name: "elm/spinner/base/vertical";
-   alias: "elm/spinner/base/vertical_date_picker";
-   alias: "elm/spinner/base/datetime";
    parts {
       part { name: "bg";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: SPINNER_VERTICAL_BG_WIDTH_INC SPINNER_VERTICAL_BG_HEIGHT_INC;
+            min: SPINNER_VERTICAL_BG_SIZE_INC;
          }
       }
       part { name: "access";
@@ -256,3 +279,17 @@ group { name: "elm/spinner/base/vertical";
       }
    }
 }
+
+group { name: "elm/spinner/base/vertical_date_picker";
+   inherit: "elm/spinner/base/vertical";
+   parts {
+      part { name: "bg";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SPINNER_VERTICAL_DATE_PICKER_BG_SIZE_INC;
+         }
+      }
+   }
+}
+
diff --git a/themes/widgets/toolbar.edc b/mobile/widgets/toolbar.edc
index ac92a34f..f5bae89a 100644
--- a/themes/widgets/toolbar.edc
+++ b/mobile/widgets/toolbar.edc
@@ -10,58 +10,47 @@
 
 styles{
    style { name: "tabbar_icon_text_style_T111";
-      base: "font=Tizen:style=regular font_size=21 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F499 linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=14 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T111 color_class=T111 linegap=0";
+      base: "font=Tizen:style=Condensed font_size=30 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F499 linegap=0";
       TAG
    }
    style { name: "tabbar_icon_text_style_T111P";
-      base: "font=Tizen:style=regular font_size=21 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=14 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T111P color_class=T111P linegap=0";
+      base: "font=Tizen:style=Condensed font_size=30 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
       TAG
    }
    style { name: "tabbar_icon_text_style_T111S";
-      base: "font=Tizen:style=regular font_size=21 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=14 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T111S color_class=T111S linegap=0";
+      base: "font=Tizen:style=Condensed font_size=30 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
       TAG
    }
    style { name: "tabbar_icon_text_style_T111D";
-      base: "font=Tizen:style=regular font_size=21 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F44C linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=14 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T111D color_class=T111D linegap=0";
+      base: "font=Tizen:style=Condensed font_size=30 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F44C linegap=0";
       TAG
    }
    style { name: "tabbar_text_style_T1117";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T1117 color_class=T1117 linegap=0";
+      base: "font=Tizen:style=Condensed font_size=38 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFFFF linegap=0";
       TAG
    }
    style { name: "tabbar_text_style_T1117P";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T1117P color_class=T1117P linegap=0";
+      base: "font=Tizen:style=Condensed font_size=38 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFFFF linegap=0";
       TAG
    }
    style { name: "tabbar_text_style_T1117S";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T1117S color_class=T1117S linegap=0";
+      base: "font=Tizen:style=Condensed font_size=38 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFFFF linegap=0";
       TAG
    }
    style { name: "tabbar_text_style_T1117D";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F499 linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T1117D color_class=T1117D linegap=0";
+      base: "font=Tizen:style=Condensed font_size=38 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFF5B linegap=0";
       TAG
    }
    style { name: "tabbar_navi_text_style_T042";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F4FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T042 color_class=T042 linegap=0";
+      base: "font=Tizen:style=regular font_size=32 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFFB8 linegap=0";
       TAG
    }
    style { name: "tabbar_navi_text_style_T042P";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#070707FF linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T042P color_class=T042P linegap=0";
+      base: "font=Tizen:style=regular font_size=32 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFFFF linegap=0";
       TAG
    }
    style { name: "tabbar_navi_text_style_T042D";
-      base: "font=Tizen:style=regular font_size=27 align=center wrap=word ellipsis=1 text_class=tizen color=#F4F4F44C linegap=0";
-      // (Changeable UI) base: "font=Tizen:style=regular font_size=18 align=center color=#FFFFFF wrap=word ellipsis=1 text_class=T042D color_class=T042D linegap=0";
+      base: "font=Tizen:style=regular font_size=32 align=center wrap=word ellipsis=1 text_class=tizen color=#FFFFFFA3 linegap=0";
       TAG
    }
 }
@@ -82,7 +71,7 @@ group { name: "elm/toolbar/base/default";
             rel1.to: "base";
             rel2.to: "base";
             rel2.offset: -1 -1;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+            color: 61 185 204 255;
          }
       }
      part { name: "clipper";
@@ -161,6 +150,34 @@ group { name: "elm/toolbar/item/tabbar";
             min: TABBAR_LANDSCAPE_SCROLLABLE_ITEMS_SIZE_INC;
          }
       }
+      part { name: "badge_top_right_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: TABBAR_BADGE_TOP_RIGHT_PADDING_SIZE_INC;
+            align: 1.0 0.0;
+            fixed: 1 1;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      part { name: "elm.swallow.badge";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: BADGE_LAYOUT_SIZE_MIN_INC;
+            align: 1.0 0.0;
+            fixed: 1 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "badge_top_right_padding";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               to: "badge_top_right_padding";
+            }
+         }
+      }
       part { name: "padding_center";
          type: SPACER;
          scale: 1;
@@ -195,7 +212,7 @@ group { name: "elm/toolbar/item/tabbar";
             fixed: 0 1;
             min: TABBAR_SELECTED_LINE_SIZE_INC;
             visible: 0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B0514S";*/
+            color: 244 244 244 255;
             align: 0.5 0.0;
          }
          description { state: "selected" 0.0;
@@ -209,12 +226,12 @@ group { name: "elm/toolbar/item/tabbar";
          mouse_events: 0;
          description { state: "default" 0.0;
             visible: 0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B0514";*/
+            color: 61 185 204 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 2 48 104 255; /*(Changeable UI) color_class: "B0514P";*/
+            color: 43 129 143 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -455,19 +472,19 @@ group { name: "elm/toolbar/item/tabbar";
       part { name: "elm.icon.clipper";
          type: RECT;
          description { state: "default" 0.0;
-            color: 244 244 244 153; /*(Changeable UI) color_class: "B052L6";*/
+            color: 244 244 244 153;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B052L6S";*/
+            color: 244 244 244 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B052L6P";*/
+            color: 244 244 244 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 244 244 244 76; /*(Changeable UI) color_class: "B052L6D";*/
+            color: 244 244 244 76;
          }
       }
       part { name: "elm.text.clipper";
@@ -597,9 +614,14 @@ group { name: "elm/toolbar/item/tabbar";
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "elm");
+               if (get_int(item_state) != ITEM_STATE_DISABLED)
+                  run_program(PROGRAM:"touch_sound");
             }
          }
       }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program { name: "mouse,in";
          signal:  "mouse,in";
          source:  "event";
@@ -784,7 +806,7 @@ group { name: "elm/toolbar/item/tabbar";
             else
               {
                 if (get_int(landscape))
-                  set_state(PART:"bg", "scrollable_land", 0.0);
+                  set_state(PART:"bg", "4items_land", 0.0);
                 else
                   set_state(PART:"bg", "scrollable", 0.0);
               }
@@ -986,7 +1008,7 @@ group { name: "elm/toolbar/base/tabbar_with_title";
             rel1.to: "base";
             rel2.to: "base";
             rel2.offset: -1 -1;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+            color: 61 185 204 255;
          }
       }
      part { name: "clipper";
@@ -1076,7 +1098,7 @@ group { name: "elm/toolbar/item/tabbar_with_title";
             fixed: 0 1;
             min: TABBAR_SELECTED_LINE_SIZE_INC;
             visible: 0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B0514S";*/
+            color: 244 244 244 255;
             align: 0.5 0.0;
          }
          description { state: "selected" 0.0;
@@ -1090,17 +1112,22 @@ group { name: "elm/toolbar/item/tabbar_with_title";
          mouse_events: 0;
          description { state: "default" 0.0;
             visible: 0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B0514";*/
+            color: 61 185 204 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 2 48 104 255; /*(Changeable UI) color_class: "B0514P";*/
+            color: 43 129 143 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            color: 138 255 255 255;
+         }
       }
       part { name: "padding_left_top";
          type: SPACER;
@@ -1114,11 +1141,11 @@ group { name: "elm/toolbar/item/tabbar_with_title";
          }
          description { state: "text" 0.0;
             inherit: "default" 0.0;
-            min: TABBAR_TEXT_LEFT_TOP_PADDING_SIZE_INC;
+            min: TABBAR_TITLE_TEXT_LEFT_TOP_PADDING_SIZE_INC;
          }
          description { state: "icon_text" 0.0;
             inherit: "default" 0.0;
-            min: TABBAR_ICON_TEXT_LAND_LEFT_TOP_PADDING_SIZE_INC;
+            min: TABBAR_TITLE_ICON_TEXT_LAND_LEFT_TOP_PADDING_SIZE_INC;
          }
       }
       part { name: "padding_right_bottom";
@@ -1167,17 +1194,17 @@ group { name: "elm/toolbar/item/tabbar_with_title";
             fixed: 1 0;
             align: 1.0 0.5;
             rel1 {
-               to_x: "elm.text";
+               to: "selected_line";
                relative: 0.0 0.0;
             }
             rel2 {
-               to_x: "elm.text";
+               to: "selected_line";
                relative: 0.0 1.0;
             }
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: TABBAR_ICON_TEXT_PAD_INC;
+            min: TABBAR_TITLE_ICON_TEXT_PAD_INC;
          }
       }
 
@@ -1187,21 +1214,21 @@ group { name: "elm/toolbar/item/tabbar_with_title";
          clip_to: "elm.icon.clipper";
          description { state: "default" 0.0;
             visible: 0;
-            min: TABBAR_ICON_SIZE_INC;
+            min: TABBAR_TITLE_ICON_SIZE_INC;
             aspect: 1.0 1.0;
             aspect_preference: HORIZONTAL;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 1.0 0.5;
+            align: 1.0 1.0;
             fixed: 1 1;
             rel1 {
-               to_x: "padding_icon_text";
+               to: "padding_icon_text";
                relative: 0.0 0.0;
             }
             rel2 {
-               to_x: "padding_icon_text";
+               to: "padding_icon_text";
                relative: 0.0 1.0;
             }
          }
@@ -1293,19 +1320,19 @@ group { name: "elm/toolbar/item/tabbar_with_title";
       part { name: "elm.icon.clipper";
          type: RECT;
          description { state: "default" 0.0;
-            color: 244 244 244 153; /*(Changeable UI) color_class: "B052L6";*/
+            color: 244 244 244 153;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B052L6S";*/
+            color: 244 244 244 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B052L6P";*/
+            color: 244 244 244 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 244 244 244 76; /*(Changeable UI) color_class: "B052L6D";*/
+            color: 244 244 244 76;
          }
       }
       part { name: "elm.text.clipper";
@@ -1425,9 +1452,14 @@ group { name: "elm/toolbar/item/tabbar_with_title";
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "elm");
+               if (get_int(item_state) != ITEM_STATE_DISABLED)
+                  run_program(PROGRAM:"touch_sound");
             }
          }
       }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program { name: "mouse,in";
          signal:  "mouse,in";
          source:  "event";
@@ -1708,7 +1740,7 @@ group { name: "elm/toolbar/base/navigationbar";
          scale: 1;
          description { state: "default" 0.0;
             min: 0 TOOLBAR_NAVI_HEIGHT_INC;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "B011";*/
+            color: 61 185 204 255;
          }
       }
       part { name: "left_padding";
@@ -1725,7 +1757,7 @@ group { name: "elm/toolbar/base/navigationbar";
                 to: "base";
             }
             align: 0.0 0.0;
-            color: 2 48 104 255; /*(Changeable UI) color_class: "B012L1";*/
+            color: 61 185 204 255;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -1744,7 +1776,7 @@ group { name: "elm/toolbar/base/navigationbar";
                 relative: 1.0 0.0;
                 to: "base";
             }
-            color: 244 244 244 25; /*(Changeable UI) color_class: "B012L4";*/
+            color: 244 244 244 25;
          }
       }
       part { name: "elm.swallow.content";
@@ -1775,10 +1807,10 @@ group { name: "elm/toolbar/item/navigationbar";
       set {
          name: "core_navigation_bar_bg";
          image {
-            image: SMALL"images/Navigation_elements/core_navigation_bar_bg.png" COMP;
+            image: SMALL"images/Old/core_navigation_bar_bg.png" COMP;
          }
          image {
-            image: MEDIUM"images/Navigation_elements/core_navigation_bar_bg.png" COMP;
+            image: MEDIUM"images/Old/core_navigation_bar_bg.png" COMP;
          }
       }
       set {
@@ -1812,7 +1844,7 @@ group { name: "elm/toolbar/item/navigationbar";
          description { state: "default" 0.0;
             min: TOOLBAR_NAVI_DIVIDER_INC 0;
             fixed: 1 0;
-            color: 2 48 104 255; /*(Changeable UI) color_class: "B012L1";*/
+            color: 61 185 204 38;
             rel1 {
                 relative: 1.0 0.0;
                 to: "bg";
@@ -1836,7 +1868,7 @@ group { name: "elm/toolbar/item/navigationbar";
          description { state: "default" 0.0;
             min: TOOLBAR_NAVI_DIVIDER_INC 0;
             fixed: 1 0;
-            color: 244 244 244 255; /*(Changeable UI) color_class: "B012L3";*/
+            color: 244 244 244 255;
             rel1.to: "divider_bg";
             rel2.to: "divider_bg";
             visible: 1;
@@ -1852,7 +1884,7 @@ group { name: "elm/toolbar/item/navigationbar";
          scale: 1;
          mouse_events: 0;
          description { state: "default" 0.0;
-            color: 2 48 104 255; /*(Changeable UI) color_class: "B012L1";*/
+            color: 61 185 204 255;
             rel2 {
                 relative: 0.0 1.0;
                 to: "divider_bg";
@@ -1875,7 +1907,6 @@ group { name: "elm/toolbar/item/navigationbar";
                min: 1 1;
                max: 1 1;
                align: 0.0 0.5;
-               ellipsis: -1;
             }
          }
          description { state: "pressed" 0.0;
@@ -1926,12 +1957,12 @@ group { name: "elm/toolbar/item/navigationbar";
                 to: "bg";
             }
             align: 1.0 1.0;
-            color: 2 48 104 255; /*(Changeable UI) color_class: "B012L1";*/
+            color: 61 185 204 255;
             image.normal: "core_navigation_bar_bg";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
+            visible: 0;
          }
       }
       part { name: "event";
@@ -1983,7 +2014,7 @@ group { name: "elm/toolbar/item/navigationbar";
                 && get_int(mouse_down) == 1)
               {
                 set_int(mouse_down, 0);
-                set_state(PART:"elm.text", "visible", 0.0);
+                set_state(PART:"elm.text", "selected", 0.0);
               }
          }
       }
@@ -1993,9 +2024,15 @@ group { name: "elm/toolbar/item/navigationbar";
          script {
             if (get_int(multi_down) == 0) {
                emit("elm,action,click", "elm");
+               set_state(PART:"elm.text", "selected", 0.0);
+               if (get_int(item_state) != ITEM_STATE_DISABLED)
+                  run_program(PROGRAM:"touch_sound");
             }
          }
       }
+      program { name: "touch_sound";
+         action: RUN_PLUGIN "touch_sound";
+      }
       program { name: "mouse,in";
          signal:  "mouse,in";
          source:  "event";
@@ -2049,10 +2086,12 @@ group { name: "elm/toolbar/item/navigationbar";
       program { name: "divider_visible_1";
          signal: "elm,order,first,item";
          source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "divider";
-         target: "divider_bg";
-         target: "right_padding";
+         script {
+            set_state(PART:"divider", "default", 0.0);
+            set_state(PART:"divider_bg", "default", 0.0);
+            set_state(PART:"right_padding", "default", 0.0);
+            set_state(PART:"elm.text", "default", 0.0);
+         }
       }
       program { name: "divider_visible_2";
          signal: "elm,order,default,item";
@@ -2061,15 +2100,18 @@ group { name: "elm/toolbar/item/navigationbar";
             set_state(PART:"divider", "default", 0.0);
             set_state(PART:"divider_bg", "default", 0.0);
             set_state(PART:"right_padding", "default", 0.0);
+            set_state(PART:"elm.text", "default", 0.0);
          }
       }
       program { name: "divider_hidden";
          signal: "elm,order,last,item";
          source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "divider";
-         target: "divider_bg";
-         target: "right_padding";
+         script {
+               set_state(PART:"divider", "hidden", 0.0);
+               set_state(PART:"divider_bg", "hidden", 0.0);
+               set_state(PART:"right_padding", "hidden", 0.0);
+               set_state(PART:"elm.text", "selected", 0.0);
+         }
       }
       program { name: "highlight_on";
          signal: "elm,highlight,on";
@@ -2099,6 +2141,10 @@ group { name: "elm/toolbar/item/navigationbar";
 }
 
 group { name: "elm/toolbar/more/default";
+   alias:"elm/toolbar/more/tabbar";
+   alias:"elm/toolbar/more/tabbar/item_with_title";
+   alias:"elm/toolbar/more/tabbar_with_title";
+   alias:"elm/toolbar/more/navigationbar";
    parts {
       part { name: "elm.swallow.content";
          type: SWALLOW;
diff --git a/themes/widgets/win.edc b/mobile/widgets/win.edc
index 343de6c6..343de6c6 100644
--- a/themes/widgets/win.edc
+++ b/mobile/widgets/win.edc
diff --git a/mobile/widgets_default/a11y_highlight.edc b/mobile/widgets_default/a11y_highlight.edc
new file mode 100644
index 00000000..f192bba2
--- /dev/null
+++ b/mobile/widgets_default/a11y_highlight.edc
@@ -0,0 +1,33 @@
+group { name: "elm/accessibility_highlight/top/default";
+   images.image: "a11y_highlight.png" COMP;
+   parts {
+      part { name: "base"; type: RECT;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "clip"; type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            rel1.relative: -1 -1;
+            rel2.relative: 2 2;
+         }
+      }
+      part { name: "glow"; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            image.normal: "a11y_highlight.png";
+            image.border: 12 12 12 12;
+            image.middle: 0;
+            fill.smooth: 0;
+            rel1.to: "base";
+            rel1.offset: -7 -7;
+            rel2.to: "base";
+            rel2.offset: 5 5;
+         }
+      }
+   }
+}
diff --git a/themes/widgets_default/actionslider.edc b/mobile/widgets_default/actionslider.edc
index b5e47856..12c87a90 100644
--- a/themes/widgets_default/actionslider.edc
+++ b/mobile/widgets_default/actionslider.edc
@@ -55,7 +55,6 @@ group { name: "elm/actionslider/base/default";
                size: ACTIONSLIDER_TEXT_SIZE;
                align: 0.1 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
       }
@@ -73,7 +72,6 @@ group { name: "elm/actionslider/base/default";
                size: ACTIONSLIDER_TEXT_SIZE;
                align: 0.5 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
       }
@@ -108,7 +106,6 @@ group { name: "elm/actionslider/base/default";
                size: ACTIONSLIDER_TEXT_SIZE;
                min: 1 1;
                text_class: "slp_bold";
-               ellipsis: -1;
             }
          }
       }
@@ -316,7 +313,6 @@ group { name: "elm/actionslider/base/bar";
                size: ACTIONSLIDER_TEXT_SIZE;
                align: 0.1 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
       }
@@ -334,7 +330,6 @@ group { name: "elm/actionslider/base/bar";
                size: ACTIONSLIDER_TEXT_SIZE;
                align: 0.5 0.5;
                min: 1 1;
-               ellipsis: -1;
             }
          }
       }
@@ -369,7 +364,6 @@ group { name: "elm/actionslider/base/bar";
                size: ACTIONSLIDER_TEXT_SIZE;
                min: 1 1;
                text_class: "slp_bold";
-               ellipsis: -1;
             }
          }
       }
diff --git a/themes/widgets_default/border.edc b/mobile/widgets_default/border.edc
index a21aa9b3..a21aa9b3 100644
--- a/themes/widgets_default/border.edc
+++ b/mobile/widgets_default/border.edc
diff --git a/themes/widgets_default/bubble.edc b/mobile/widgets_default/bubble.edc
index 5d470509..42a36ce5 100644
--- a/themes/widgets_default/bubble.edc
+++ b/mobile/widgets_default/bubble.edc
@@ -133,7 +133,6 @@ group { name: "elm/bubble/top_left/default";
                min: 1 1;
                max: 1 1;
                align: 1.0 0.0;
-               ellipsis: -1;
             }
          }
       }
@@ -360,7 +359,6 @@ group { name: "elm/bubble/top_right/default";
                min: 1 1;
                max: 1 1;
                align: 1.0 0.0;
-               ellipsis: -1;
             }
          }
       }
@@ -586,7 +584,6 @@ group { name: "elm/bubble/bottom_left/default";
                min: 1 1;
                max: 1 1;
                align: 1.0 1.0;
-               ellipsis: -1;
             }
          }
       }
@@ -812,7 +809,6 @@ group { name: "elm/bubble/bottom_right/default";
                min: 1 1;
                max: 1 1;
                align: 1.0 1.0;
-               ellipsis: -1;
             }
          }
       }
diff --git a/mobile/widgets_default/button.edc b/mobile/widgets_default/button.edc
new file mode 100644
index 00000000..b3b42d1b
--- /dev/null
+++ b/mobile/widgets_default/button.edc
@@ -0,0 +1,522 @@
+group { name: "elm/button/base/anchor";
+   images {
+      image: "whitetheme/btn_style_nor.png" COMP;
+      image: "whitetheme/btn_style_sel.png" COMP;
+   }
+   parts {
+      part { name: "button_image";
+         mouse_events: 1;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
+            visible: 0;
+            image {
+               normal: "whitetheme/btn_style_nor.png";
+               border: BUTTON_ANCHOR_BG_BORDER;
+               middle: SOLID;
+            }
+         }
+         description { state: "clicked" 0.0;
+            visible: 1;
+            min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
+            color_class: "W012P";
+            image {
+               normal: "whitetheme/btn_style_nor.png";
+               border: BUTTON_ANCHOR_BG_BORDER;
+               border_scale: 1;
+            }
+         }
+         description { state: "visible" 0.0;
+            visible: 1;
+            min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
+            color_class: "W012";
+            image {
+               normal: "whitetheme/btn_style_nor.png";
+               border: BUTTON_ANCHOR_BG_BORDER;
+               border_scale: 1;
+            }
+         }
+         description { state: "disabled" 0.0;
+            inherit:  "default" 0.0;
+            image {
+               normal: "whitetheme/btn_style_nor.png";
+               border: BUTTON_ANCHOR_BG_BORDER;
+            }
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            visible: 0;
+            align: 0.0 0.5;
+            rel2.relative: 0.0 1.0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            fixed: 1 0;
+            visible: 1;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+         }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
+            fixed: 0 0;
+            visible: 1;
+            align: 0.5 0.5;
+            aspect: 1.0 1.0;
+            rel2.relative: 1.0 1.0;
+            aspect_preference: VERTICAL;
+         }
+      }
+      part { name: "elm.padding.text.left";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description {  state: "default" 0.0;
+            align: 0 0.5;
+            fixed: 1 0;
+            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE 0;
+            rel1 {
+               to: "elm.swallow.content";
+               relative: 1 0;
+            }
+            rel2 {
+               to: "elm.swallow.content";
+               relative: 1 1;
+            }
+         }
+      }
+      part { name: "elm.padding.text.right";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description {  state: "default" 0.0;
+            align: 1 0.5;
+            rel1.relative: 1 0;
+            fixed: 1 0;
+            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE 10;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXT;
+         mouse_events:  0;
+         scale: 1;
+         effect: SHADOW BOTTOM;
+         description { state: "default" 0.0;
+            rel1 {
+               to_x: "elm.padding.text.left";
+               relative: 1 0;
+            }
+            rel2 {
+               to : "elm.padding.text.right";
+               relative: 0 1;
+            }
+            color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
+            color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
+            text {
+               font: "SLP:style=Regular";
+               size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
+               min: 0 0;
+               text_class: "slp";
+            }
+         }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+         }
+         description { state: "disabled_visible" 0.0;
+            inherit: "default" 0.0;
+            color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
+            visible: 1;
+            text.min: 1 1;
+         }
+      }
+      part { name: "over";
+         type: RECT;
+         mouse_events: 1;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            color: BUTTON_ANCHOR_COLOR_TRANSPARENT;
+         }
+      }
+      part { name: "disabler";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: BUTTON_ANCHOR_COLOR_TRANSPARENT;
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      // used to force sizing of icon to follow label sizing nearby
+      part { name: "sizer.content"; type: TEXT;
+         mouse_events:  0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            text {
+               font: "SLP:style=Medium";
+               size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
+               min: 0 0;
+               text_class: "button";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            text {
+               min: 1 1;
+               text: "M";
+            }
+         }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
+            rel1.to: "elm.swallow.content";
+            rel2.to: "elm.swallow.content";
+            text {
+               min: 1 1;
+               text: "M";
+            }
+         }
+      }
+      // end sizer
+   }
+   programs {
+      program { name: "button_mouse_in";
+         signal: "mouse,in";
+         source: "over";
+         action: STATE_SET "visible" 0.0;
+         target: "button_image";
+         target: "elm.text";
+      }
+      program { name: "button_mouse_out";
+         signal: "mouse,out";
+         source: "over";
+         action: STATE_SET "default" 0.0;
+         target: "button_image";
+         target: "elm.text";
+      }
+      program { name: "button_unclick";
+         signal: "mouse,up,1";
+         source: "over";
+         action: STATE_SET "visible" 0.0;
+         target: "button_image";
+         target: "elm.text";
+      }
+      program { name: "button_click2";
+         signal: "mouse,down,1";
+         source: "over";
+         action: STATE_SET "clicked" 0.0;
+         target: "button_image";
+         target: "elm.text";
+      }
+      program { name: "button_unclick2";
+         signal: "mouse,up,1";
+         source: "over";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.5;
+         target: "button_image";
+         target: "elm.text";
+      }
+      program { name: "button_unclick3";
+         signal: "mouse,up,1";
+         source: "over";
+         action: SIGNAL_EMIT "elm,action,click" "";
+      }
+      program { name: "text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.swallow.content", st, 30, vl);
+            if (!strcmp(st, "icononly")) {
+               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"sizer.content", "visible", 0.0);
+            }
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible")))
+              set_state(PART:"elm.text", "disabled_visible", 0.0);
+            else
+              set_state(PART:"elm.text", "visible", 0.0);
+         }
+      }
+      program { name: "text_hide";
+         signal: "elm,state,text,hidden";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.swallow.content", st, 30, vl);
+            if (!strcmp(st, "visible")) {
+               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"sizer.content", "icononly", 0.0);
+            }
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "default") || (!strcmp(st, "visible")))
+              set_state(PART:"elm.text", "default", 0.0);
+            else
+              set_state(PART:"elm.text", "disabled", 0.0);
+         }
+      }
+      program { name: "icon_show";
+         signal: "elm,state,icon,visible";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "visible")) {
+               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"sizer.content", "visible", 0.0);
+            }
+            else {
+               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"sizer.content", "icononly", 0.0);
+            }
+         }
+      }
+      program { name: "icon_hide";
+         signal: "elm,state,icon,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.swallow.content";
+         target: "sizer.content";
+      }
+      program { name: "disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            set_state(PART:"button_image", "disabled", 0.0);
+            set_state(PART:"over", "disabled", 0.0);
+            set_state(PART:"disabler", "disabled", 0.0);
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible"))
+              set_state(PART:"elm.text", "disabled_visible", 0.0);
+            else
+              set_state(PART:"elm.text", "disabled", 0.0);
+         }
+      }
+      program { name: "enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            set_state(PART:"button_image", "visible", 0.0);
+            set_state(PART:"over", "visible", 0.0);
+            set_state(PART:"disabler", "visible", 0.0);
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible"))
+              set_state(PART:"elm.text", "visible", 0.0);
+            else
+              set_state(PART:"elm.text", "default", 0.0);
+         }
+      }
+   }
+}
+
+group { name: "elm/button/base/dropdown";
+      script {
+         public mouse_down = 0;
+         public multi_down = 0;
+      }
+      images {
+         image: "core_dropdown_label_icon_arrow.png" COMP;
+      }
+      parts {
+         part { name: "base";
+            scale: 1;
+            type: SPACER;
+            description { state: "default" 0.0;
+               min: BUTTON_MIN_WIDTH BUTTON_DROPDOWN_MIN_HEIGHT;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_left_top";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.to: "base";
+               rel2 {
+                 relative: 0.0 0.0;
+                 to: "base";
+               }
+               min: BUTTON_DROPDOWN_PADDING_LEFT_RIGHT 0;
+               fixed: 1 1;
+            }
+         }
+         part { name: "padding_right_bottom";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1 {
+                 relative: 1.0 1.0;
+                 to:"base";
+               }
+               rel2.to:"base";
+               min: BUTTON_DROPDOWN_PADDING_LEFT_RIGHT 0;
+               fixed: 1 1;
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "padding_after_text";
+               }
+               text {
+                  style: "button_dropdown";
+               }
+            }
+            description { state: "invisible" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "arrow_icon";
+            scale: 1;
+            description { state: "default" 0.0;
+              min: BUTTON_DROPDOWN_ICON_SIZE;
+              max: BUTTON_DROPDOWN_ICON_SIZE;
+              image.normal: "core_dropdown_label_icon_arrow.png";
+              color_class: "B0734";
+              rel2 {
+                 to_x: "padding_right_bottom";
+                 to_y: "underline_bottom";
+                 relative: 0.0 0.0;
+              }
+              align: 1.0 1.0;
+            }
+         }
+         part { name: "underline_bottom";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min:  0 BUTTON_DROPDOWN_UNDERLINE_HEIGHT;
+               color_class:"B0733L2";
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_left_top";
+                  to_y: "base";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "base";
+               }
+               align: 1.0 1.0 ;
+               fixed: 1 1;
+            }
+         }
+         part { name: "padding_after_text";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+              min: BUTTON_DROPDOWN_PADDING_TEXT_WIDTH 0;
+              rel1 {
+                 relative: 0.0 0.0;
+                 to: "arrow_icon";
+              }
+              rel2 {
+                 relative: 0.0 1.0;
+                 to: "arrow_icon";
+              }
+              align: 0.0 0.0;
+              fixed: 1 1;
+            }
+         }
+         part { name: "event";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+              rel1.to: "base";
+              rel2.to: "base";
+              color: 0 0 0 0;
+            }
+         }
+      }
+      programs {
+         program { name: "touch_snd";
+            signal: "mouse,clicked,1";
+            source: "event";
+            script {
+               new st[31];
+               new Float:vl;
+               if (get_int(multi_down) == 0) {
+                  get_state(PART:"base", st, 30, vl);
+                  if (strcmp(st, "disabled")) {
+                     run_program(PROGRAM:"touch_sound");
+                     emit("elm,action,click", "");
+                  }
+               }
+            }
+         }
+         program { name: "touch_sound";
+            action: RUN_PLUGIN "touch_sound";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: elm.text;
+         }
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            action: STATE_SET "invisible" 0.0;
+            target: elm.text;
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "base";
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "base";
+         }
+         program { name: "multi_down";
+            signal: "elm,action,multi,down";
+            source: "elm";
+            script {
+               set_int(multi_down, 1);
+            }
+         }
+         program { name: "multi_up";
+            signal: "elm,action,multi,up";
+            source: "elm";
+            script {
+               set_int(multi_down, 0);
+            }
+         }
+      }
+   }
+
diff --git a/themes/widgets_default/check.edc b/mobile/widgets_default/check.edc
index 5b4bca06..db0eab23 100644
--- a/themes/widgets_default/check.edc
+++ b/mobile/widgets_default/check.edc
@@ -362,7 +362,6 @@ group { name: "elm/check/base/toggle";
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
-            text.ellipsis: -1;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -373,7 +372,6 @@ group { name: "elm/check/base/toggle";
             color: CHECK_TOGGLE_TEXT_DISABLE_COLOR_INC;
             visible: 1;
             text.min: 1 1;
-            text.ellipsis: -1;
          }
       }
       part { name: "disabler";
@@ -571,4 +569,4 @@ group { name: "elm/check/base/toggle";
          }
       }
    }
-}
+}
\ No newline at end of file
diff --git a/themes/widgets_default/clock.edc b/mobile/widgets_default/clock.edc
index 7a83b7aa..7a83b7aa 100644
--- a/themes/widgets_default/clock.edc
+++ b/mobile/widgets_default/clock.edc
diff --git a/themes/widgets_default/colorselector.edc b/mobile/widgets_default/colorselector.edc
index 87d9cd7d..87d9cd7d 100644
--- a/themes/widgets_default/colorselector.edc
+++ b/mobile/widgets_default/colorselector.edc
diff --git a/themes/widgets_default/default_macro.edc b/mobile/widgets_default/default_macro.edc
index af14e652..af14e652 100644
--- a/themes/widgets_default/default_macro.edc
+++ b/mobile/widgets_default/default_macro.edc
diff --git a/themes/widgets_default/entry.edc b/mobile/widgets_default/entry.edc
index 526a01dc..526a01dc 100644
--- a/themes/widgets_default/entry.edc
+++ b/mobile/widgets_default/entry.edc
diff --git a/themes/widgets_default/ews.edc b/mobile/widgets_default/ews.edc
index b00e3770..b00e3770 100644
--- a/themes/widgets_default/ews.edc
+++ b/mobile/widgets_default/ews.edc
diff --git a/themes/widgets_default/fileselector.edc b/mobile/widgets_default/fileselector.edc
index c530e75e..c530e75e 100644
--- a/themes/widgets_default/fileselector.edc
+++ b/mobile/widgets_default/fileselector.edc
diff --git a/themes/widgets_default/flipselector.edc b/mobile/widgets_default/flipselector.edc
index c7389045..2a90cc8e 100644
--- a/themes/widgets_default/flipselector.edc
+++ b/mobile/widgets_default/flipselector.edc
@@ -244,7 +244,6 @@ group { name: "elm/flipselector/base/default";
                size: FLIP_SELECTOR_TEXT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
-               ellipsis: -1;
             }
          }
       }
@@ -339,7 +338,6 @@ group { name: "elm/flipselector/base/default";
                size: FLIP_SELECTOR_TEXT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
-               ellipsis: -1;
             }
          }
          description { state: "shrink" 0.0;
@@ -434,7 +432,6 @@ group { name: "elm/flipselector/base/default";
                size: FLIP_SELECTOR_TEXT_SIZE_INC;
                min: 1 1;
                align: 0.5 0.5;
-               ellipsis: -1;
             }
          }
          description { state: "shrink" 0.0;
diff --git a/themes/widgets_default/focus_highlight.edc b/mobile/widgets_default/focus_highlight.edc
index 9cbdb278..9cbdb278 100644
--- a/themes/widgets_default/focus_highlight.edc
+++ b/mobile/widgets_default/focus_highlight.edc
diff --git a/themes/widgets_default/frame.edc b/mobile/widgets_default/frame.edc
index 9e78c159..9e78c159 100644
--- a/themes/widgets_default/frame.edc
+++ b/mobile/widgets_default/frame.edc
diff --git a/themes/widgets_default/gengrid.edc b/mobile/widgets_default/gengrid.edc
index d64479f5..928df803 100644
--- a/themes/widgets_default/gengrid.edc
+++ b/mobile/widgets_default/gengrid.edc
@@ -924,7 +924,6 @@ group { name: "elm/gengrid/item/up/default";
                align: 0.5 0.0;
                size: "24";
                text_class: "T127";
-               ellipsis: -1;
             }
          }
          description { state: "selected" 0.0;
@@ -1043,7 +1042,6 @@ group { name: "elm/gengrid/item/group_index/default";
                min: 1 1;
                font: "Tizen:style=Bold";
                size: GENGRID_GROUP_INDEX_TEXT_SIZE;
-               ellipsis: -1;
                //text_class: "T027L1";
             }
          } GENLIST_DESCRIPTION_LISTITEM_OTHERS )
diff --git a/themes/widgets_default/genlist.edc b/mobile/widgets_default/genlist.edc
index a394caa9..a394caa9 100644
--- a/themes/widgets_default/genlist.edc
+++ b/mobile/widgets_default/genlist.edc
diff --git a/themes/widgets_default/genlist_macro.edc b/mobile/widgets_default/genlist_macro.edc
index fec4e630..a5ed3df1 100644
--- a/themes/widgets_default/genlist_macro.edc
+++ b/mobile/widgets_default/genlist_macro.edc
@@ -388,14 +388,14 @@
 #define LIST_PART_BG \
    PART(RECT, "bg", \
       description { state: "default" 0.0; \
-         color_class: "B0211"; \
+         color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/ \
       } \
       description { state: "pressed" 0.0; \
          inherit: "default" 0.0; \
-         color_class: "B0211P"; \
+         color: 2 61 132 76; /*(Changeable UI) color_class: "B0211P";*/ \
       } \
       description { state: "disabled" 0.0; \
-         color_class: "B0211"; \
+         color: 255 255 255 255; /*(Changeable UI) color_class: "B0211";*/ \
       } \
       description { state: "reorder" 0.0; \
          color: 0 0 0 0; \
@@ -486,6 +486,18 @@
       TARGET \
    }
 
+#define LIST_PROGRAM_SOUND \
+   program { name: "play_sound"; \
+      signal: "elm,state,clicked"; \
+      source: "elm"; \
+      script { \
+         run_program(PROGRAM:"touch_sound"); \
+      } \
+   } \
+   program { name: "touch_sound"; \
+      action: RUN_PLUGIN "touch_sound"; \
+   }
+
 #define LIST_PROGRAMS( TARGET ) \
    programs { \
       LIST_PROGRAM_DEFAULT( TARGET \
@@ -500,6 +512,7 @@
       LIST_PROGRAM_REORDER( TARGET \
          target: "bg"; \
       ) \
+      LIST_PROGRAM_SOUND \
    }
 
 #define PARAM_TEXT(STYLE) \
diff --git a/themes/widgets_default/hover.edc b/mobile/widgets_default/hover.edc
index 2d26db11..5cc87b9a 100644
--- a/themes/widgets_default/hover.edc
+++ b/mobile/widgets_default/hover.edc
@@ -261,7 +261,7 @@ group { name: "elm/hover/base/popout";
             color: 0 0 0 0;
          }
          description { state: "visible" 0.0;
-            inherit: "default" 0.0;
+            inherit: "default" 1.0;
             color: HOVER_DEFAULT_DIM_COLOR;
          }
       }
@@ -768,7 +768,7 @@ group { name: "elm/hover/base/menu";
             color: HOVER_COLOR_TRANSPARENT;
          }
          description { state: "visible" 0.0;
-            inherit: "default" 0.0;
+            inherit: "default" 1.0;
             color: HOVER_DEFAULT_DIM_COLOR;
          }
       }
@@ -1225,359 +1225,6 @@ group { name: "elm/hover/base/submenu";
    }
 }
 
-group { name: "elm/hover/base/hoversel_vertical/default";
-   alias: "elm/hover/base/hoversel_vertical/entry";
-   images {
-      image: "whitetheme/hoversel_bg.png" COMP;
-      image: "whitetheme/hoversel_bg_shadow.png" COMP;
-   }
-   parts {
-      part { name: "elm.swallow.offset";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 0.0;
-         }
-      }
-      part { name: "elm.swallow.size";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               to: "elm.swallow.offset";
-               relative: 1.0 1.0;
-            }
-            rel2 {
-               to: "elm.swallow.offset";
-               relative: 1.0 1.0;
-            }
-         }
-      }      
-      part { name: "elm.padding.bg-top.left-top";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1 1;
-            fixed: 1 1;
-            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT 
-               HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
-            rel1.to: "elm.swallow.slot.top";
-            rel2 {
-               to: "elm.swallow.slot.top";
-               relative: 0 0;
-            }
-         }
-      }
-      
-      part { name: "elm.padding.bg-top.right-bottom";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 0;
-            fixed: 1 1;
-            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT 
-               HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
-            rel1 {
-               to_x: "elm.swallow.slot.top";
-               to_y: "elm.swallow.slot.bottom";
-               relative: 1 0;
-            }
-            rel2 {
-               to_x: "elm.swallow.slot.top";
-               to_y: "elm.swallow.slot.bottom";
-            }
-         }
-      }
-      
-      part { name: "elm.padding.bg-bottom.left-top";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1 1;
-            fixed: 1 1;
-            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT 
-               HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
-            rel1 {
-               to_x: "elm.swallow.slot.bottom";
-               to_y: "elm.swallow.slot.top";
-            }
-            rel2 {
-               to_x: "elm.swallow.slot.bottom";
-               to_y: "elm.swallow.slot.top";
-               relative: 0 1;
-            }
-         }
-      }
-      
-      part { name: "elm.padding.bg-bottom.right-bottom";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 0;
-            fixed: 1 1;
-            min: HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT 
-               HOVER_HOVERSEL_VERTICAL_PADDING_SIZE_DEFAULT;
-            rel1 {
-               to: "elm.swallow.slot.bottom";
-               relative: 1 1;
-            }
-            rel2.to: "elm.swallow.slot.bottom";
-         }
-      }
-      
-      part { name: "button_image";
-         mouse_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "elm.padding.bg-top.left-top";
-               relative: 0 0;
-            }
-            rel2 {
-               to: "elm.padding.bg-top.right-bottom";
-               relative: 1 1;
-            }
-            image {
-               normal: "whitetheme/hoversel_bg.png";
-               border: HOVER_MENU_IMG_BG_BORDER;
-               border_scale: 1;
-               middle: SOLID;
-            }
-         }
-         description { state: "bottom" 0.0;
-            rel1 {
-               to: "elm.padding.bg-bottom.left-top";
-               relative: 0 0;
-            }
-            rel2 {
-               to: "elm.padding.bg-bottom.right-bottom";
-               relative: 1 1;
-            }
-            image {
-               normal: "whitetheme/hoversel_bg.png";
-               border: HOVER_MENU_IMG_BG_BORDER;
-               border_scale: 1;
-               middle: SOLID;
-            }
-         }
-      }
-      part { name: "base";
-         type: RECT;
-         mouse_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            color: HOVER_COLOR_TRANSPARENT;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: HOVER_DEFAULT_DIM_COLOR;
-         }
-      }
-
-      part { name: "topclip";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel2 {
-               to_y: "edge_top";
-               relative: 1.0 0.0;
-            }
-         }
-      }
-      part { name: "elm.swallow.slot.top";
-         type: SWALLOW;
-         clip_to: "topclip";
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 1;
-            align: 0.5 0.0;
-            rel1 {
-               to: "elm.swallow.slot.middle";
-               relative: 0.0 0.0;
-               offset: 0 -1;
-            }
-            rel2 {
-               to: "elm.swallow.slot.middle";
-               relative: 1.0 0.0;
-               offset: -1 -1;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 1.0;
-         }
-      }
-      part { name: "bottomclip";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1 {
-               to_y: "edge_bottom";
-               relative: 0.0 1.0;
-            }
-         }
-      }
-      part { name: "elm.swallow.slot.bottom";
-         type: SWALLOW;
-         clip_to: "bottomclip";
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.5 1.0;
-            rel1 {
-               to: "elm.swallow.slot.middle";
-               relative: 0.0 1.0;
-            }
-            rel2 {
-               to: "elm.swallow.slot.middle";
-               relative: 1.0 1.0;
-               offset: -1 0;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 0.0;
-         }
-      }
-
-      part { name: "over1";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "button_image";
-            rel2.to: "button_image";
-            image {
-               normal: "whitetheme/hoversel_bg_shadow.png";
-               border: HOVER_MENU_IMG_BG_BORDER;
-               border_scale: 1;
-            }
-         }
-      }
-      part { name: "edge_top";
-         mouse_events:  0;
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
-            color: HOVER_COLOR_TRANSPARENT;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "edge_bottom";
-         mouse_events:  0;
-         scale: 1;
-         type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
-            color: HOVER_COLOR_TRANSPARENT;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "elm.swallow.slot.middle";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
-         }
-      }
-   }
-   programs {
-      program { name: "end";
-         signal: "mouse,up,1";
-         source: "base";
-         action: SIGNAL_EMIT "elm,action,dismiss" "";
-      }
-
-      program { name: "show";
-         signal: "elm,action,show";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "base";
-      }
-      program { name: "hide";
-         signal: "elm,action,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-      }
-      program { name: "topshow";
-         signal: "elm,action,slot,top,show";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "edge_top";
-         after: "topshow2";
-      }
-      program { name: "topshow2";
-         action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "elm.swallow.slot.top";
-      }
-      program { name: "topshow3";
-         signal: "elm,action,slot,top,show";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "button_image";
-      }
-      program { name: "tophide";
-         signal: "elm,action,slot,top,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
-         target: "elm.swallow.slot.top";
-         after: "tophide2";
-      }
-      program { name: "tophide2";
-         action: STATE_SET "default" 0.0;
-         target: "edge_top";
-      }
-      program { name: "bottomshow";
-         signal: "elm,action,slot,bottom,show";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "edge_bottom";
-         after: "bottomshow2";
-      }
-      program { name: "bottomshow2";
-         action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "elm.swallow.slot.bottom";
-      }
-      program { name: "bottomshow3";
-         signal: "elm,action,slot,bottom,show";
-         source: "elm";
-         action: STATE_SET "bottom" 0.0;
-         target: "button_image";
-      }
-      program { name: "bottomhide";
-         signal: "elm,action,slot,bottom,hide";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
-         target: "elm.swallow.slot.bottom";
-         after: "bottomhide2";
-      }
-      program { name: "bottomhide2";
-         action: STATE_SET "default" 0.0;
-         target: "edge_bottom";
-      }
-   }
-}
 group { name: "elm/hover/base/hoversel_horizontal/default";
    alias: "elm/hover/base/hoversel_horizontal/entry";
    images {
@@ -1686,7 +1333,7 @@ group { name: "elm/hover/base/hoversel_horizontal/default";
             color: 0 0 0 0;
          }
          description { state: "visible" 0.0;
-            inherit: "default" 0.0;
+            inherit: "default" 1.0;
             color: HOVER_DEFAULT_DIM_COLOR;
          }
       }
diff --git a/themes/widgets_default/icon.edc b/mobile/widgets_default/icon.edc
index fed70195..fed70195 100644
--- a/themes/widgets_default/icon.edc
+++ b/mobile/widgets_default/icon.edc
diff --git a/themes/widgets_default/index.edc b/mobile/widgets_default/index.edc
index c682b9b1..e438fcbc 100644
--- a/themes/widgets_default/index.edc
+++ b/mobile/widgets_default/index.edc
@@ -320,7 +320,6 @@ group { name: "elm/index/base/horizontal/default";
                font: "SLP:style=Bold";
                size: INDEX_POPUP_TEXT_SIZE_INC;
                min: 1 1;
-               ellipsis: -1;
             }
          }
          description { state: "active" 0.0;
@@ -665,7 +664,6 @@ group { name: "elm/index/item/horizontal/default";
                min: 1 1;
                align: 0.5 0.5;
                text_class: "slp_medium";
-               ellipsis: -1;
             }
          }
          description { state: "active" 0.0;
diff --git a/themes/widgets_default/layout.edc b/mobile/widgets_default/layout.edc
index 15219ebd..15219ebd 100644
--- a/themes/widgets_default/layout.edc
+++ b/mobile/widgets_default/layout.edc
diff --git a/themes/widgets_default/list.edc b/mobile/widgets_default/list.edc
index ef063e7a..ef063e7a 100644
--- a/themes/widgets_default/list.edc
+++ b/mobile/widgets_default/list.edc
diff --git a/themes/widgets_default/map.edc b/mobile/widgets_default/map.edc
index b79e6ed7..b79e6ed7 100644
--- a/themes/widgets_default/map.edc
+++ b/mobile/widgets_default/map.edc
diff --git a/themes/widgets_default/menu.edc b/mobile/widgets_default/menu.edc
index 18a00ccc..7e07f8c4 100644
--- a/themes/widgets_default/menu.edc
+++ b/mobile/widgets_default/menu.edc
@@ -105,14 +105,12 @@ group { name: "elm/menu/item/default";
                min:      1 1;
                align:    0.5 0.5;
                text_class: "menu_item";
-               ellipsis: -1;
             }
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
-            text.ellipsis: -1;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
@@ -420,14 +418,12 @@ group { name: "elm/menu/item_with_submenu/default";
                min:      1 1;
                align:    0.5 0.5;
                text_class: "menu_item";
-               ellipsis: -1;
             }
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
-            text.ellipsis: -1;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
diff --git a/themes/widgets_default/multisense_haptic.edc b/mobile/widgets_default/multisense_haptic.edc
index 93cfab04..93cfab04 100644
--- a/themes/widgets_default/multisense_haptic.edc
+++ b/mobile/widgets_default/multisense_haptic.edc
diff --git a/themes/widgets_default/multisense_sound.edc b/mobile/widgets_default/multisense_sound.edc
index fa00a8e8..fa00a8e8 100644
--- a/themes/widgets_default/multisense_sound.edc
+++ b/mobile/widgets_default/multisense_sound.edc
diff --git a/themes/widgets_default/multisense_ui.edc b/mobile/widgets_default/multisense_ui.edc
index 6d9907af..6d9907af 100644
--- a/themes/widgets_default/multisense_ui.edc
+++ b/mobile/widgets_default/multisense_ui.edc
diff --git a/themes/widgets_default/naviframe.edc b/mobile/widgets_default/naviframe.edc
index 6c65fdb1..6c65fdb1 100644
--- a/themes/widgets_default/naviframe.edc
+++ b/mobile/widgets_default/naviframe.edc
diff --git a/themes/widgets_default/notify.edc b/mobile/widgets_default/notify.edc
index 58bfe6db..58bfe6db 100644
--- a/themes/widgets_default/notify.edc
+++ b/mobile/widgets_default/notify.edc
diff --git a/themes/widgets_default/panel.edc b/mobile/widgets_default/panel.edc
index e7379bca..e7379bca 100644
--- a/themes/widgets_default/panel.edc
+++ b/mobile/widgets_default/panel.edc
diff --git a/themes/widgets_default/panes.edc b/mobile/widgets_default/panes.edc
index cc6cd55d..cc6cd55d 100644
--- a/themes/widgets_default/panes.edc
+++ b/mobile/widgets_default/panes.edc
diff --git a/themes/widgets_default/photo.edc b/mobile/widgets_default/photo.edc
index 0e207397..0e207397 100644
--- a/themes/widgets_default/photo.edc
+++ b/mobile/widgets_default/photo.edc
diff --git a/themes/widgets_default/photocam.edc b/mobile/widgets_default/photocam.edc
index f53dea88..f53dea88 100644
--- a/themes/widgets_default/photocam.edc
+++ b/mobile/widgets_default/photocam.edc
diff --git a/themes/widgets_default/player.edc b/mobile/widgets_default/player.edc
index abe46b2f..abe46b2f 100644
--- a/themes/widgets_default/player.edc
+++ b/mobile/widgets_default/player.edc
diff --git a/themes/widgets_default/pointer.edc b/mobile/widgets_default/pointer.edc
index 22185643..22185643 100644
--- a/themes/widgets_default/pointer.edc
+++ b/mobile/widgets_default/pointer.edc
diff --git a/themes/widgets_default/progressbar.edc b/mobile/widgets_default/progressbar.edc
index b8a4186e..22586fca 100644
--- a/themes/widgets_default/progressbar.edc
+++ b/mobile/widgets_default/progressbar.edc
@@ -85,7 +85,6 @@ group { name: "elm/progressbar/vertical/default";
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
-            text.ellipsis: -1;
          }
       }
       part { name: "background";
@@ -226,7 +225,6 @@ group { name: "elm/progressbar/vertical/default";
             fixed: 1 1;
             visible: 1;
             text.min: 1 1;
-            text.ellipsis: -1;
          }
       }
    }
diff --git a/themes/widgets_default/segmentedcontrol.edc b/mobile/widgets_default/segmentedcontrol.edc
index 0d242fbc..7dd50677 100644
--- a/themes/widgets_default/segmentedcontrol.edc
+++ b/mobile/widgets_default/segmentedcontrol.edc
@@ -412,7 +412,6 @@ group { name: "elm/segment_control/item/default";
                size: SEGMENT_CONTROL_BADGE_TEXT_FONT_SIZE_INC;
                min: 1 1;
                max: 1 0;
-               ellipsis: -1;
             }
          }
          description { state: "normal" 0.0;
diff --git a/themes/widgets_default/separator.edc b/mobile/widgets_default/separator.edc
index fc0f54ff..fc0f54ff 100644
--- a/themes/widgets_default/separator.edc
+++ b/mobile/widgets_default/separator.edc
diff --git a/mobile/widgets_default/slider.edc b/mobile/widgets_default/slider.edc
new file mode 100644
index 00000000..6b356c56
--- /dev/null
+++ b/mobile/widgets_default/slider.edc
@@ -0,0 +1,593 @@
+/* FIXME: Decide whether "elm/slider/horizontal/indicator/default" is deleted or not.
+ *        "elm/slider/horizontal/indicator/default" is from redwood and only used for
+ *        "elm/slider/vertical/default". */
+/*
+   group { name: "elm/slider/horizontal/indicator/default";
+           alias: "elm/slider/horizontal/indicator/disabled";
+           alias: "elm/slider/vertical/indicator/default";
+           alias: "elm/slider/vertical/indicator/disabled";
+           alias: "elm/slider/horizontal/indicator/tap_to_drag";
+      images {
+         image: "00_slider_handle.png" COMP;
+         image: "00_slider_handle_dim.png" COMP;
+         image: "00_slider_handle_press.png" COMP;
+      }
+      parts {
+         part { name: "button_events";
+            type: RECT;
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: 2*SLIDER_INDICATOR_WIDTH_INC 1.5*SLIDER_INDICATOR_HEIGHT_INC;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+               color: 0 0 0 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "button0";
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+               max: SLIDER_INDICATOR_MAX_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+               rel1 {
+                  to: "elm.indicator";
+                  offset: -2 -2;
+               }
+               rel2 {
+                  to: "elm.indicator";
+                  offset: 2 2;
+               }
+               image {
+                  normal: "00_slider_handle.png";
+                  border: 3 3 3 3;
+                  border_scale: 1;
+               }
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_slider_handle_press.png";
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image {
+                  normal: "00_slider_handle_dim.png";
+               }
+            }
+         }
+         part { name: "elm.indicator";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 1;
+               color: SLIDER_INDICATOR_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: SLIDER_INDICATOR_TEXT_SIZE_INC;
+                  min: 1 1;
+                  align: 0.5 0.5;
+                  text_class: "slp";
+               }
+            }
+            description { state: "hide" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+             }
+         }
+      }
+      programs {
+         program { name: "set_val_show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.indicator";
+         }
+         program { name: "set_val_hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            action:  STATE_SET "hide" 0.0;
+            target: "elm.indicator";
+         }
+         program { name: "slider_disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action:  STATE_SET "disabled" 0.0;
+            target: "button0";
+            target: "button_events";
+         }
+         program { name: "slider_enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "button0";
+            target: "button_events";
+         }
+         program { name: "mouse_down";
+            signal: "mouse,down,*";
+            source: "button_events";
+            action:  STATE_SET "pressed" 0.0;
+            target: "button0";
+         }
+         program { name: "mouse_up";
+            signal: "mouse,up,*";
+            source: "button_events";
+            action:  STATE_SET "default" 0.0;
+            target: "button0";
+         }
+      }
+   }
+
+group { name: "elm/slider/vertical/default";
+   alias: "elm/slider/vertical/disabled";
+   images {
+      image: "whitetheme/slider_v_bg.png" COMP;
+      image: "whitetheme/slider_v_guage.png" COMP;
+   }
+   parts {
+      part { name: "base";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SLIDER_BASE_HEIGHT_INC SLIDER_BASE_MIN_WIDTH_INC;
+            max: SLIDER_BASE_HEIGHT_INC SLIDER_BASE_WIDTH_LIMIT_INC;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image {
+               normal: "whitetheme/slider_v_bg.png";
+               border: SLIDER_VERTICAL_BG_BORDER;
+               border_scale: 1;
+            }
+         }
+      }
+      part { name: "elm.padding.level.left-top";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+           min: SLIDER_VERTICAL_LEVEL_PADDING_LEFT_TOP;
+           fixed: 1 1;
+           rel1 {
+              to: "base";
+              relative: 0 0;
+           }
+           rel2 {
+              to: "base";
+              relative: 0 0;
+           }
+           align: 0 0;
+         }
+      }
+      part { name: "elm.padding.level.right-bottom";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SLIDER_VERTICAL_LEVEL_PADDING_RIGHT_BOTTOM;
+            fixed: 1 1;
+            align: 1 1;
+            rel1 {
+              to: "base";
+              relative: 1 1;
+            }
+            rel2.to: "base";
+         }
+      }
+      part { name: "level";
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1 {
+               to: "elm.padding.level.left-top";
+               relative: 1 1;
+            }
+            rel2 {
+               to_x: "elm.padding.level.right-bottom";
+               to_y: "elm.dragable.slider";
+               relative: 0.0 0.5;
+            }
+            image {
+               normal: "whitetheme/slider_v_guage.png";
+               border: SLIDER_VERTICAL_GUAGE_BORDER;
+               border_scale: 1;
+            }
+         }
+         description { state: "inverted" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "level2";
+         mouse_events: 0;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            visible: 0;
+            rel1 {
+               to_x: "elm.padding.level.left-top";
+               to_y: "elm.dragable.slider";
+               relative: 1 0.5;
+            }
+            rel2 {
+               to: "elm.padding.level.right-bottom";
+               relative: 0 0;
+            }
+            image {
+               normal: "whitetheme/slider_v_guage.png";
+               border: SLIDER_VERTICAL_GUAGE_BORDER;
+               border_scale: 1;
+            }
+            align: 0.5 0.5;
+         }
+         description { state: "inverted" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "bg";
+         type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            rel1.to: "elm.swallow.bar";
+            rel2.to: "elm.swallow.bar";
+         }
+      }
+      
+      part { name: "elm.swallow.bar";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: SLIDER_SWALLOW_BAR_HEIGHT_INC SLIDER_BASE_MIN_WIDTH_INC;
+            max: SLIDER_SWALLOW_BAR_HEIGHT_INC SLIDER_BASE_WIDTH_LIMIT_INC;
+            rel1 {
+               to_y: "bar_top_padding";
+               relative: 0.0 1.0;
+            }
+            rel2 {
+               to_y: "bar_bottom_padding";
+               relative: 1.0 0.0;
+            }
+         }
+      }
+      part { name: "bar_top_padding";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            min: 0 SLIDER_VERTICAL_PADDING_SIZE_DEFAULT;
+            fixed: 1 1;
+            rel1 {
+               relative: 0.5 1.0;
+               to_y: "elm.text";
+            }
+            rel2 {
+               relative: 0.5 1.0;
+               to_y: "elm.text";
+            }
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bar_bottom_padding";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            min: 0 SLIDER_VERTICAL_PADDING_SIZE_DEFAULT;
+            fixed: 1 1;
+            rel1 {
+               relative: 0.5  0.0;
+               to_y: "elm.units";
+            }
+            rel2 {
+               relative: 0.5  0.0;
+               to_y: "elm.units";
+            }
+            align: 0.5 1.0;
+         }
+      }
+      part { name: "elm.text";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to_y: "elm.swallow.icon";
+            }
+            rel2.to_y: "elm.swallow.icon";
+            align: 0.5 0.0;
+            color: SLIDER_UNITS_TEXT_COLOR_INC;
+            text {
+               font: "SLP:style=Medium";
+               size: SLIDER_UNITS_TEXT_SIZE_INC;
+               min: 0 0;
+               align: 0.5 0.5;
+               text_class: "slp_medium";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text.min: 1 1;
+         }
+      }
+      part { name: "elm.swallow.icon";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 0.0;
+            rel1.to_x: "elm.swallow.bar";
+            rel2 {
+               relative: 1.0 0.0;
+               to_x: "elm.swallow.bar";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: SLIDER_INDICATOR_HEIGHT_INC SLIDER_INDICATOR_HEIGHT_INC;
+            visible: 1;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+         }
+      }
+      part { name: "elm.swallow.end";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to_x: "elm.swallow.bar";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to_x: "elm.swallow.bar";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+            visible: 1;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+         }
+      }
+      part { name: "elm.units";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 1.0;
+            color: SLIDER_UNITS_TEXT_COLOR_INC;
+            rel1.to_y: "elm.swallow.end";
+            rel2 {
+               relative: 1.0 0.0;
+               to_y: "elm.swallow.end";
+            }
+            text {
+               font: "SLP:style=Bold";
+               size: SLIDER_UNITS_TEXT_SIZE_INC;
+               min: 0 0;
+               align: 0.5 0.0;
+               text_class: "slp_bold";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            fixed: 1 1;
+            visible: 1;
+            text.min: 1 1;
+         }
+      }
+      part { name: "limits";
+         type: GROUP;
+         source: "elm/slider/hidden/limit";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 1 0;
+            min: SOURCE;
+            fixed: 1 1;
+            rel1 {
+               to_x: "elm.swallow.end";
+               relative: 0.0 0.0;
+               offset: 0 8;
+            }
+            rel2 {
+               to_x: "elm.swallow.end";
+               relative: 0.0 1.0;
+               offset: 0 -9;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel1.offset: -5 0;
+            rel2.offset: -5 -1;
+         }
+      }
+      part { name: "elm.dragable.slider";
+         type: GROUP;
+         source: "elm/slider/vertical/indicator/default";
+         scale: 1;
+         dragable {
+            x: 0 0 0;
+            y: 1 1 0;
+            confine: "bg";
+         }
+         description { state: "default" 0.0;
+            min: SLIDER_INDICATOR_HEIGHT_INC SLIDER_INDICATOR_WIDTH_INC;
+            fixed: 1 1;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "disabler";
+         type: RECT;
+         repeat_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 0 0 0 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "clipper";
+         type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "disabled" 0.0;
+            color: 255 255 255 102;
+         }
+      }
+   }
+   programs {
+      program { name: "text_show";
+         signal: "elm,state,text,visible";
+         source: "elm";
+         action:  STATE_SET "visible" 0.0;
+         target: "elm.text";
+      }
+      program { name: "text_hide";
+         signal: "elm,state,text,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.text";
+      }
+      program { name: "icon_show";
+         signal: "elm,state,icon,visible";
+         source: "elm";
+         action:  STATE_SET "visible" 0.0;
+         target: "elm.swallow.icon";
+      }
+      program { name: "icon_hide";
+         signal: "elm,state,icon,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.swallow.icon";
+      }
+      program { name: "end_show";
+         signal: "elm,state,end,visible";
+         source: "elm";
+         action:  STATE_SET "visible" 0.0;
+         target: "elm.swallow.end";
+      }
+      program { name: "end_hide";
+         signal: "elm,state,end,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.swallow.end";
+      }
+      program { name: "units_show";
+         signal: "elm,state,units,visible";
+         source: "elm";
+         action:  STATE_SET "visible" 0.0;
+         target: "elm.units";
+         target: "limits";
+         after: "limits,children,visible";
+      }
+      program { name: "limits,children,visible";
+         action: SIGNAL_EMIT "limits:limits,visible" "elm";
+      }
+      program { name: "units_hide";
+         signal: "elm,state,units,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.units";
+         target: "limits";
+         after: "limits,children,hide";
+      }
+      program { name: "limits,children,hide";
+         action: SIGNAL_EMIT "limits:limits,hide" "elm";
+      }
+      program { name: "invert_on";
+         signal: "elm,state,inverted,on";
+         source: "elm";
+         action:  STATE_SET "inverted" 0.0;
+         target: "level";
+         target: "level2";
+      }
+      program { name: "invert_off";
+         signal: "elm,state,inverted,off";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "level";
+         target: "level2";
+      }
+      program { name: "slider_disable";
+         signal: "elm,state,disabled";
+         source: "elm";
+         action:  STATE_SET "disabled" 0.0;
+         target: "disabler";
+         target: "clipper";
+      }
+      program { name: "slider_enable";
+         signal: "elm,state,enabled";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "disabler";
+         target: "clipper";
+      }
+   }
+}
+*/
+
+group { name: "elm/slider/hidden/limit";
+   parts {
+      part { name: "elm.units.min";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 1.0 0.5;
+            color: 0 0 0 255;
+            text {
+               font: "SLP:style=Medium";
+               size: SLIDER_HIDDEN_FONT_SIZE;
+               min: 1 1;
+               align: 0.0 0.5;
+            }
+         }
+      }
+      part { name: "elm.units.max";
+         type: TEXT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 1.0 0.5;
+            color: 0 0 0 255;
+            text {
+               font: "SLP:style=Medium";
+               size: SLIDER_HIDDEN_FONT_SIZE;
+               min: 1 1;
+               align: 0.0 0.5;
+            }
+         }
+      }
+   }
+}
diff --git a/themes/widgets_default/spinner.edc b/mobile/widgets_default/spinner.edc
index 80b48fe6..80b48fe6 100644
--- a/themes/widgets_default/spinner.edc
+++ b/mobile/widgets_default/spinner.edc
diff --git a/themes/widgets_default/thumb.edc b/mobile/widgets_default/thumb.edc
index 431fa1bf..431fa1bf 100644
--- a/themes/widgets_default/thumb.edc
+++ b/mobile/widgets_default/thumb.edc
diff --git a/themes/widgets_default/toolbar.edc b/mobile/widgets_default/toolbar.edc
index 9eacb5af..9eacb5af 100644
--- a/themes/widgets_default/toolbar.edc
+++ b/mobile/widgets_default/toolbar.edc
diff --git a/themes/widgets_default/tooltip.edc b/mobile/widgets_default/tooltip.edc
index c8d56857..fc823575 100644
--- a/themes/widgets_default/tooltip.edc
+++ b/mobile/widgets_default/tooltip.edc
@@ -17,7 +17,6 @@ group { name: "elm/label/base/tooltip";
             text {
                style: "tooltip_style";
                min: 1 1;
-               ellipsis: -1;
             }
          }
       }
diff --git a/themes/widgets_default/win.edc b/mobile/widgets_default/win.edc
index 5122a15c..5122a15c 100644
--- a/themes/widgets_default/win.edc
+++ b/mobile/widgets_default/win.edc
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_00.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_00.png
deleted file mode 100755
index 36ed2071..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_00.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_01.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_01.png
deleted file mode 100755
index 5c34a617..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_01.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_02.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_02.png
deleted file mode 100755
index 29e23ae8..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_02.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_03.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_03.png
deleted file mode 100755
index 2acc106e..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_03.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_04.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_04.png
deleted file mode 100755
index 090b989b..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_04.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_05.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_05.png
deleted file mode 100755
index 09ac57ea..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_05.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_06.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_06.png
deleted file mode 100755
index 1ffdd7b3..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_06.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_07.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_07.png
deleted file mode 100755
index db98da16..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_07.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_08.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_08.png
deleted file mode 100755
index d45130cc..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_08.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_09.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_09.png
deleted file mode 100755
index d247227c..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_09.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_10.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_10.png
deleted file mode 100755
index b578a9c1..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_10.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_11.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_11.png
deleted file mode 100755
index e3b9d5bc..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_11.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_12.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_12.png
deleted file mode 100755
index 80e80dce..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_12.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_13.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_13.png
deleted file mode 100755
index 1bce0c96..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_13.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_14.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_14.png
deleted file mode 100755
index 8a3eb7bf..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_14.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_15.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_15.png
deleted file mode 100755
index 509be7f6..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_15.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_16.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_16.png
deleted file mode 100755
index 3a31be0a..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_16.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_17.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_17.png
deleted file mode 100755
index b94cb415..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_17.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_18.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_18.png
deleted file mode 100755
index 45b70855..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_18.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_19.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_19.png
deleted file mode 100755
index f5c94f21..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_19.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_20.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_20.png
deleted file mode 100755
index b993d430..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_20.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_21.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_21.png
deleted file mode 100755
index 88612b24..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_21.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_22.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_22.png
deleted file mode 100755
index fcb4946f..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_22.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_23.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_23.png
deleted file mode 100755
index 78fa32a4..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_23.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_24.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_24.png
deleted file mode 100755
index 3abfe675..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_24.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_25.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_25.png
deleted file mode 100755
index a2489716..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_25.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_26.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_26.png
deleted file mode 100755
index 46b244f8..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_26.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_27.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_27.png
deleted file mode 100755
index 215a3897..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_27.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_28.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_28.png
deleted file mode 100755
index c598d274..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_28.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_29.png b/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_29.png
deleted file mode 100755
index 02266dcc..00000000
--- a/themes/MIDDLE/images/Activity_indicator/large/core_activity_Indicator_large_29.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png
deleted file mode 100755
index 104bcf32..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png
deleted file mode 100755
index 7853e63e..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png
deleted file mode 100755
index ab046742..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png
deleted file mode 100755
index 0b547aa9..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png
deleted file mode 100755
index 61b14879..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png
deleted file mode 100755
index 73f89f11..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png
deleted file mode 100755
index 8c0284b8..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png
deleted file mode 100755
index 7bcbdece..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png
deleted file mode 100755
index 5756d57a..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png
deleted file mode 100755
index 7988b1b0..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png
deleted file mode 100755
index 1459685e..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png
deleted file mode 100755
index 66fc1248..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png
deleted file mode 100755
index 3cb81e73..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png
deleted file mode 100755
index 9b7fd49c..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png
deleted file mode 100755
index e55e53de..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png
deleted file mode 100755
index a7a3b7c1..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png
deleted file mode 100755
index f6de10fb..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png
deleted file mode 100755
index 0bff8649..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png
deleted file mode 100755
index 9e16c827..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png
deleted file mode 100755
index 9d19c882..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png
deleted file mode 100755
index 759e192d..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png
deleted file mode 100755
index 522bdc55..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png
deleted file mode 100755
index 5d44f9ee..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png
deleted file mode 100755
index cedc8c8c..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png
deleted file mode 100755
index fdcf8552..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png
deleted file mode 100755
index cba3e51d..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png
deleted file mode 100755
index e7054417..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png
deleted file mode 100755
index fb50a260..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png
deleted file mode 100755
index 29772219..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png b/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png
deleted file mode 100755
index 24a00cb5..00000000
--- a/themes/MIDDLE/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_00.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_00.png
deleted file mode 100755
index 7ea575ef..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_00.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_01.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_01.png
deleted file mode 100755
index a5b63d30..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_01.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_02.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_02.png
deleted file mode 100755
index 3712f78b..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_02.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_03.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_03.png
deleted file mode 100755
index 5f69bda8..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_03.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_04.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_04.png
deleted file mode 100755
index d60e8cd0..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_04.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_05.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_05.png
deleted file mode 100755
index 86815cbc..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_05.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_06.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_06.png
deleted file mode 100755
index 853527c3..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_06.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_07.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_07.png
deleted file mode 100755
index 2805cc0b..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_07.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_08.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_08.png
deleted file mode 100755
index 37415fa3..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_08.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_09.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_09.png
deleted file mode 100755
index fde593ef..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_09.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_10.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_10.png
deleted file mode 100755
index 6d1d7fa5..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_10.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_11.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_11.png
deleted file mode 100755
index e74574a4..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_11.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_12.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_12.png
deleted file mode 100755
index e194d765..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_12.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_13.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_13.png
deleted file mode 100755
index 72c0ffcb..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_13.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_14.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_14.png
deleted file mode 100755
index 9363e342..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_14.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_15.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_15.png
deleted file mode 100755
index 838c5856..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_15.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_16.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_16.png
deleted file mode 100755
index 5263fa7e..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_16.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_17.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_17.png
deleted file mode 100755
index 254a0857..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_17.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_18.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_18.png
deleted file mode 100755
index 950bedad..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_18.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_19.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_19.png
deleted file mode 100755
index 53e11903..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_19.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_20.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_20.png
deleted file mode 100755
index ed7c8712..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_20.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_21.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_21.png
deleted file mode 100755
index 6f236072..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_21.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_22.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_22.png
deleted file mode 100755
index 359674c9..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_22.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_23.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_23.png
deleted file mode 100755
index 1f026e8f..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_23.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_24.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_24.png
deleted file mode 100755
index 955ec833..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_24.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_25.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_25.png
deleted file mode 100755
index 6e6db92a..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_25.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_26.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_26.png
deleted file mode 100755
index 663d4820..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_26.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_27.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_27.png
deleted file mode 100755
index b1c4cd4e..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_27.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_28.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_28.png
deleted file mode 100755
index c4c47e9c..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_28.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_29.png b/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_29.png
deleted file mode 100755
index d39d807b..00000000
--- a/themes/MIDDLE/images/Activity_indicator/small/core_activity_Indicator_small_29.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Content_views/core_dropdown_label_bg_stroke.#.png b/themes/MIDDLE/images/Content_views/core_dropdown_label_bg_stroke.#.png
deleted file mode 100755
index 36f4c34a..00000000
--- a/themes/MIDDLE/images/Content_views/core_dropdown_label_bg_stroke.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Content_views/core_folder_icon_folder.png b/themes/MIDDLE/images/Content_views/core_folder_icon_folder.png
deleted file mode 100755
index e230b0e0..00000000
--- a/themes/MIDDLE/images/Content_views/core_folder_icon_folder.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Content_views/core_folder_icon_minus.png b/themes/MIDDLE/images/Content_views/core_folder_icon_minus.png
deleted file mode 100755
index 0cb1cc6b..00000000
--- a/themes/MIDDLE/images/Content_views/core_folder_icon_minus.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Content_views/core_folder_icon_plus.png b/themes/MIDDLE/images/Content_views/core_folder_icon_plus.png
deleted file mode 100755
index 144f3edd..00000000
--- a/themes/MIDDLE/images/Content_views/core_folder_icon_plus.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Content_views/core_pattern_empty_bg.png b/themes/MIDDLE/images/Content_views/core_pattern_empty_bg.png
deleted file mode 100644
index 1a871343..00000000
--- a/themes/MIDDLE/images/Content_views/core_pattern_empty_bg.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Content_views/core_pattern_empty_bg_h.png b/themes/MIDDLE/images/Content_views/core_pattern_empty_bg_h.png
deleted file mode 100644
index eeab3028..00000000
--- a/themes/MIDDLE/images/Content_views/core_pattern_empty_bg_h.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_activity_Indicator_large.png b/themes/MIDDLE/images/Controls/core_activity_Indicator_large.png
deleted file mode 100755
index bff05abc..00000000
--- a/themes/MIDDLE/images/Controls/core_activity_Indicator_large.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_activity_Indicator_medium.png b/themes/MIDDLE/images/Controls/core_activity_Indicator_medium.png
deleted file mode 100755
index edaf0fe0..00000000
--- a/themes/MIDDLE/images/Controls/core_activity_Indicator_medium.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_activity_Indicator_small.png b/themes/MIDDLE/images/Controls/core_activity_Indicator_small.png
deleted file mode 100755
index a70c4054..00000000
--- a/themes/MIDDLE/images/Controls/core_activity_Indicator_small.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_button_bg.#.png b/themes/MIDDLE/images/Controls/core_button_bg.#.png
deleted file mode 100755
index fb8e2d48..00000000
--- a/themes/MIDDLE/images/Controls/core_button_bg.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_check_bg.png b/themes/MIDDLE/images/Controls/core_check_bg.png
deleted file mode 100755
index d2d3792d..00000000
--- a/themes/MIDDLE/images/Controls/core_check_bg.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_check_bg_stroke.png b/themes/MIDDLE/images/Controls/core_check_bg_stroke.png
deleted file mode 100755
index 4dee1e7f..00000000
--- a/themes/MIDDLE/images/Controls/core_check_bg_stroke.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_check_icon.png b/themes/MIDDLE/images/Controls/core_check_icon.png
deleted file mode 100755
index 037e7597..00000000
--- a/themes/MIDDLE/images/Controls/core_check_icon.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_brightness.png b/themes/MIDDLE/images/Controls/core_icon_brightness.png
deleted file mode 100755
index 03ee94b7..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_brightness.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_container.png b/themes/MIDDLE/images/Controls/core_icon_container.png
deleted file mode 100755
index 3a356d28..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_container.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_expand_close.png b/themes/MIDDLE/images/Controls/core_icon_expand_close.png
deleted file mode 100755
index 5144bfd3..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_expand_close.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_expand_open.png b/themes/MIDDLE/images/Controls/core_icon_expand_open.png
deleted file mode 100755
index fad7ece9..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_expand_open.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_favorite.png b/themes/MIDDLE/images/Controls/core_icon_favorite.png
deleted file mode 100755
index 9c766023..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_favorite.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_down.png b/themes/MIDDLE/images/Controls/core_icon_picker_arrow_down.png
deleted file mode 100755
index a9180e64..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_down.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_up.png b/themes/MIDDLE/images/Controls/core_icon_picker_arrow_up.png
deleted file mode 100755
index 8ad131e2..00000000
--- a/themes/MIDDLE/images/Controls/core_icon_picker_arrow_up.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_bar_h.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_bar_h.#.png
deleted file mode 100755
index 46dd4aa3..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_bar_h.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_bar_h_ef.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_bar_h_ef.#.png
deleted file mode 100755
index d27ce3f6..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_bar_h_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_bar_v.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_bar_v.#.png
deleted file mode 100755
index f49f7f5c..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_bar_v.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_bar_v_ef.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_bar_v_ef.#.png
deleted file mode 100755
index 3f9555cb..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_bar_v_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg.#.png
deleted file mode 100755
index 2c38e2a9..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg_ef.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg_ef.#.png
deleted file mode 100755
index 0e35ec87..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg_stroke.#.png b/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg_stroke.#.png
deleted file mode 100755
index 5b91618e..00000000
--- a/themes/MIDDLE/images/Controls/core_index_scroll_popup_bg_stroke.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_progress_bar.#.png b/themes/MIDDLE/images/Controls/core_progress_bar.#.png
deleted file mode 100755
index f6ae9466..00000000
--- a/themes/MIDDLE/images/Controls/core_progress_bar.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_progress_bar_v.#.png b/themes/MIDDLE/images/Controls/core_progress_bar_v.#.png
deleted file mode 100755
index 9b86e6d3..00000000
--- a/themes/MIDDLE/images/Controls/core_progress_bar_v.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_radio_bg.png b/themes/MIDDLE/images/Controls/core_radio_bg.png
deleted file mode 100755
index 15289180..00000000
--- a/themes/MIDDLE/images/Controls/core_radio_bg.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_radio_bg_stroke.png b/themes/MIDDLE/images/Controls/core_radio_bg_stroke.png
deleted file mode 100755
index f7200f94..00000000
--- a/themes/MIDDLE/images/Controls/core_radio_bg_stroke.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_radio_icon.png b/themes/MIDDLE/images/Controls/core_radio_icon.png
deleted file mode 100755
index 215391b0..00000000
--- a/themes/MIDDLE/images/Controls/core_radio_icon.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_scroll_bar_h.#.png b/themes/MIDDLE/images/Controls/core_scroll_bar_h.#.png
deleted file mode 100755
index ae7efb66..00000000
--- a/themes/MIDDLE/images/Controls/core_scroll_bar_h.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_scroll_bar_h_ef.#.png b/themes/MIDDLE/images/Controls/core_scroll_bar_h_ef.#.png
deleted file mode 100755
index c6614b1c..00000000
--- a/themes/MIDDLE/images/Controls/core_scroll_bar_h_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_scroll_bar_v.#.png b/themes/MIDDLE/images/Controls/core_scroll_bar_v.#.png
deleted file mode 100755
index b93567f2..00000000
--- a/themes/MIDDLE/images/Controls/core_scroll_bar_v.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_scroll_bar_v_ef.#.png b/themes/MIDDLE/images/Controls/core_scroll_bar_v_ef.#.png
deleted file mode 100755
index 64378ffc..00000000
--- a/themes/MIDDLE/images/Controls/core_scroll_bar_v_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_slider_center_point_bg.png b/themes/MIDDLE/images/Controls/core_slider_center_point_bg.png
deleted file mode 100755
index b6571459..00000000
--- a/themes/MIDDLE/images/Controls/core_slider_center_point_bg.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_slider_center_point_bg_v.png b/themes/MIDDLE/images/Controls/core_slider_center_point_bg_v.png
deleted file mode 100755
index 0183dc8d..00000000
--- a/themes/MIDDLE/images/Controls/core_slider_center_point_bg_v.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_slider_handle_normal.png b/themes/MIDDLE/images/Controls/core_slider_handle_normal.png
deleted file mode 100755
index 6623b515..00000000
--- a/themes/MIDDLE/images/Controls/core_slider_handle_normal.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_slider_handle_press.png b/themes/MIDDLE/images/Controls/core_slider_handle_press.png
deleted file mode 100755
index e131d60e..00000000
--- a/themes/MIDDLE/images/Controls/core_slider_handle_press.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_toggle_bg.png b/themes/MIDDLE/images/Controls/core_toggle_bg.png
deleted file mode 100755
index 563d1267..00000000
--- a/themes/MIDDLE/images/Controls/core_toggle_bg.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_toggle_icon_off.png b/themes/MIDDLE/images/Controls/core_toggle_icon_off.png
deleted file mode 100755
index 37fe4e6b..00000000
--- a/themes/MIDDLE/images/Controls/core_toggle_icon_off.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Controls/core_toggle_icon_on.png b/themes/MIDDLE/images/Controls/core_toggle_icon_on.png
deleted file mode 100755
index 6f56f9ac..00000000
--- a/themes/MIDDLE/images/Controls/core_toggle_icon_on.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_Magnifier.#.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_Magnifier.#.png
deleted file mode 100644
index 1706aa97..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_Magnifier.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_Magnifier_mask.#.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_Magnifier_mask.#.png
deleted file mode 100644
index 450175f4..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_Magnifier_mask.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_center_circle.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_center_circle.png
deleted file mode 100755
index cd9d8df9..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_center_circle.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_center_line.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_center_line.png
deleted file mode 100755
index 314ece66..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_center_line.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_bottom.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_bottom.png
deleted file mode 100644
index 048c247f..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_bottom.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_top.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_top.png
deleted file mode 100644
index 0cd7cad2..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_circle_top.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_line_bottom.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_line_bottom.png
deleted file mode 100644
index bc1b3442..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_line_bottom.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_line_top.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_line_top.png
deleted file mode 100644
index 3153d0bd..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_handler_line_top.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg.#.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg.#.png
deleted file mode 100644
index 17feee1b..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_ef.#.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_ef.#.png
deleted file mode 100644
index a44eea3b..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_line.#.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_line.#.png
deleted file mode 100644
index 226b7441..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_bg_line.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_clipboard.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_clipboard.png
deleted file mode 100755
index e3554fc2..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_clipboard.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_copy.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_copy.png
deleted file mode 100755
index d3ab99cf..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_copy.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_cut.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_cut.png
deleted file mode 100755
index 0fc85eaa..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_cut.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_paste.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_paste.png
deleted file mode 100755
index 5b20dbc2..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_paste.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select.png
deleted file mode 100755
index b483da8e..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select_all.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select_all.png
deleted file mode 100755
index 05e87960..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_icon_select_all.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom.png
deleted file mode 100644
index 197dca25..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png
deleted file mode 100644
index 654a596b..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png
deleted file mode 100644
index 261c0a30..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up.png
deleted file mode 100644
index f25155f6..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up_line.png b/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up_line.png
deleted file mode 100644
index 2a54dcb8..00000000
--- a/themes/MIDDLE/images/Copy_Paste/copy&paste_popup_tail_up_line.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Navigation_elements/core_icon_badge_container.#.png b/themes/MIDDLE/images/Navigation_elements/core_icon_badge_container.#.png
deleted file mode 100755
index e7102347..00000000
--- a/themes/MIDDLE/images/Navigation_elements/core_icon_badge_container.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Navigation_elements/core_icon_badge_container_outer.#.png b/themes/MIDDLE/images/Navigation_elements/core_icon_badge_container_outer.#.png
deleted file mode 100755
index 5fd01437..00000000
--- a/themes/MIDDLE/images/Navigation_elements/core_icon_badge_container_outer.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Navigation_elements/core_page_indicator_off.png b/themes/MIDDLE/images/Navigation_elements/core_page_indicator_off.png
deleted file mode 100755
index 7b8fabd7..00000000
--- a/themes/MIDDLE/images/Navigation_elements/core_page_indicator_off.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Navigation_elements/core_page_indicator_off_ef.png b/themes/MIDDLE/images/Navigation_elements/core_page_indicator_off_ef.png
deleted file mode 100755
index e3d999fa..00000000
--- a/themes/MIDDLE/images/Navigation_elements/core_page_indicator_off_ef.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Navigation_elements/core_page_indicator_on.png b/themes/MIDDLE/images/Navigation_elements/core_page_indicator_on.png
deleted file mode 100755
index eb256e1e..00000000
--- a/themes/MIDDLE/images/Navigation_elements/core_page_indicator_on.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Navigation_elements/core_title_button_focus.png b/themes/MIDDLE/images/Navigation_elements/core_title_button_focus.png
deleted file mode 100755
index cdbcea07..00000000
--- a/themes/MIDDLE/images/Navigation_elements/core_title_button_focus.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Popups/core_popup_noti_bg.#.png b/themes/MIDDLE/images/Popups/core_popup_noti_bg.#.png
deleted file mode 100755
index 74e6dda9..00000000
--- a/themes/MIDDLE/images/Popups/core_popup_noti_bg.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Popups/core_popup_noti_bg_ef.#.png b/themes/MIDDLE/images/Popups/core_popup_noti_bg_ef.#.png
deleted file mode 100755
index 0df0511e..00000000
--- a/themes/MIDDLE/images/Popups/core_popup_noti_bg_ef.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Popups/core_popup_noti_bg_stroke.#.png b/themes/MIDDLE/images/Popups/core_popup_noti_bg_stroke.#.png
deleted file mode 100755
index 78efbcf4..00000000
--- a/themes/MIDDLE/images/Popups/core_popup_noti_bg_stroke.#.png
+++ /dev/null
diff --git a/themes/MIDDLE/images/Popups/core_popup_top.#.png b/themes/MIDDLE/images/Popups/core_popup_top.#.png
deleted file mode 100755
index 003ec207..00000000
--- a/themes/MIDDLE/images/Popups/core_popup_top.#.png
+++ /dev/null
diff --git a/themes/Makefile.am b/themes/Makefile.am
deleted file mode 100644
index ce16fca6..00000000
--- a/themes/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-prefix ?= /usr
-INSTALL=install -c
-THEME_DIR=$(DESTDIR)/$(prefix)/share/elementary/themes
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS =
-SRC=efl-theme-tizen-mobile
-DEFAULT_SRC=default-mobile
-
-all:
-	edje_cc $(EDJE_FLAGS) $(EDJE_FLAGS_$(V)) \
-		-id ./SMALL/images/ \
-		-id ./SMALL/images/Activity_indicator/ \
-		-id ./SMALL/images/Activity_indicator/large \
-		-id ./SMALL/images/Activity_indicator/medium \
-		-id ./SMALL/images/Activity_indicator/small \
-		-id ./SMALL/images/Content_views \
-		-id ./SMALL/images/Controls \
-		-id ./SMALL/images/Copy_Paste \
-		-id ./SMALL/images/Emoticon \
-		-id ./SMALL/images/Navigation_elements \
-		-id ./SMALL/images/Popups \
-		-id ./SMALL/images/Indicator \
-		-sd ./SMALL/sounds -fd ../objects \
-		-id ./MIDDLE/images/ \
-		-id ./MIDDLE/images/Activity_indicator/ \
-		-id ./MIDDLE/images/Activity_indicator/large \
-		-id ./MIDDLE/images/Activity_indicator/medium \
-		-id ./MIDDLE/images/Activity_indicator/small \
-		-id ./MIDDLE/images/Content_views \
-		-id ./MIDDLE/images/Controls \
-		-id ./MIDDLE/images/Copy_Paste \
-		-id ./MIDDLE/images/Emoticon \
-		-id ./MIDDLE/images/Navigation_elements \
-		-id ./MIDDLE/images/Popups \
-		-sd ./MIDDLE/sounds -fd ../objects \
-		$(SRC).edc $(SRC).edj;
-	edje_cc $(EDJE_FLAGS_$(V)) \
-		-id default/images -sd default/sounds -fd ../objects \
-		-id ./SMALL/images/\
-		-id ./SMALL/images/Activity_indicator/\
-		-id ./SMALL/images/Activity_indicator/large\
-		-id ./SMALL/images/Activity_indicator/medium\
-		-id ./SMALL/images/Activity_indicator/small\
-		-id ./SMALL/images/Content_views\
-		-id ./SMALL/images/Controls\
-		-id ./SMALL/images/Copy_Paste\
-		-id ./SMALL/images/Emoticon\
-		-id ./SMALL/images/Navigation_elements\
-		-id ./SMALL/images/Popups\
-		$(DEFAULT_SRC).edc $(DEFAULT_SRC).edj;
-
-
-clean:
-	rm -rf $(SRC).edj;
-	rm -rf $(DEFAULT_SRC).edj;
-
-install:
-	mkdir -p $(THEME_DIR)
-	$(INSTALL) $(SRC).edj $(THEME_DIR);
-	$(INSTALL) $(DEFAULT_SRC).edj $(THEME_DIR);
-
-uninstall:
-	rm -rf $(THEME_DIR)/
-
-distclean: clean
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_00.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_00.png
deleted file mode 100644
index 05cb5479..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_00.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_01.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_01.png
deleted file mode 100644
index 53cff683..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_01.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_02.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_02.png
deleted file mode 100644
index 525f882c..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_02.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_03.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_03.png
deleted file mode 100644
index 580012e3..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_03.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_04.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_04.png
deleted file mode 100644
index b40035f8..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_04.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_05.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_05.png
deleted file mode 100644
index 0cbddc67..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_05.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_06.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_06.png
deleted file mode 100644
index 2db5b519..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_06.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_07.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_07.png
deleted file mode 100644
index bd4bab17..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_07.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_08.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_08.png
deleted file mode 100644
index 67cace68..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_08.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_09.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_09.png
deleted file mode 100644
index 3d041c02..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_09.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_10.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_10.png
deleted file mode 100644
index 4628958b..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_10.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_11.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_11.png
deleted file mode 100644
index de400e3a..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_11.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_12.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_12.png
deleted file mode 100644
index 2097cb57..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_12.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_13.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_13.png
deleted file mode 100644
index ded89099..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_13.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_14.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_14.png
deleted file mode 100644
index 61d9be0f..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_14.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_15.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_15.png
deleted file mode 100644
index ef6bebbc..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_15.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_16.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_16.png
deleted file mode 100644
index ec370e6e..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_16.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_17.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_17.png
deleted file mode 100644
index 1e298482..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_17.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_18.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_18.png
deleted file mode 100644
index c8fcd13b..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_18.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_19.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_19.png
deleted file mode 100644
index 892bebe1..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_19.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_20.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_20.png
deleted file mode 100644
index a46231f8..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_20.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_21.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_21.png
deleted file mode 100644
index 67424cd9..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_21.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_22.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_22.png
deleted file mode 100644
index 1551b12f..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_22.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_23.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_23.png
deleted file mode 100644
index 1ae3057c..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_23.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_24.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_24.png
deleted file mode 100644
index 7a2049bb..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_24.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_25.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_25.png
deleted file mode 100644
index 8f650015..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_25.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_26.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_26.png
deleted file mode 100644
index 105f5e09..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_26.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_27.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_27.png
deleted file mode 100644
index 10f45b29..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_27.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_28.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_28.png
deleted file mode 100644
index 70777106..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_28.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_29.png b/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_29.png
deleted file mode 100644
index a882859d..00000000
--- a/themes/SMALL/images/Activity_indicator/large/core_activity_Indicator_large_29.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png
deleted file mode 100644
index 37b7a90d..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_00.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png
deleted file mode 100644
index c14c54b0..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_01.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png
deleted file mode 100644
index 693f8f29..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_02.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png
deleted file mode 100644
index 0270a404..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_03.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png
deleted file mode 100644
index 6fc55873..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_04.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png
deleted file mode 100644
index ee5d96b1..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_05.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png
deleted file mode 100644
index 46e39641..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_06.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png
deleted file mode 100644
index 93ebf9ed..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_07.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png
deleted file mode 100644
index 8e4c6881..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_08.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png
deleted file mode 100644
index 007218f5..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_09.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png
deleted file mode 100644
index 75cb0f86..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_10.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png
deleted file mode 100644
index 5df320a1..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_11.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png
deleted file mode 100644
index c28de6ba..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_12.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png
deleted file mode 100644
index 2fd2e51d..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_13.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png
deleted file mode 100644
index 9e07a5d0..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_14.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png
deleted file mode 100644
index 5fccce57..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_15.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png
deleted file mode 100644
index 5bdbcddf..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_16.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png
deleted file mode 100644
index 88becef3..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_17.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png
deleted file mode 100644
index ef23ee03..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_18.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png
deleted file mode 100644
index e8a6dba9..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_19.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png
deleted file mode 100644
index 79e50b15..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_20.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png
deleted file mode 100644
index 2f9f472b..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_21.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png
deleted file mode 100644
index 9f77e60e..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_22.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png
deleted file mode 100644
index bea093d3..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_23.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png
deleted file mode 100644
index dcad32d7..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_24.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png
deleted file mode 100644
index 46cdca2d..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_25.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png
deleted file mode 100644
index 62071df0..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_26.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png
deleted file mode 100644
index 55b2cabd..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_27.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png
deleted file mode 100644
index 85868f57..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_28.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png b/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png
deleted file mode 100644
index 6e358a15..00000000
--- a/themes/SMALL/images/Activity_indicator/medium/core_activity_Indicator_medium_29.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_00.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_00.png
deleted file mode 100644
index d62fae76..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_00.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_01.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_01.png
deleted file mode 100644
index 63cb531d..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_01.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_02.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_02.png
deleted file mode 100644
index de3e25b6..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_02.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_03.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_03.png
deleted file mode 100644
index ee57d118..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_03.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_04.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_04.png
deleted file mode 100644
index 66564622..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_04.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_05.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_05.png
deleted file mode 100644
index 7be533ce..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_05.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_06.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_06.png
deleted file mode 100644
index ee5c6826..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_06.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_07.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_07.png
deleted file mode 100644
index 3294b3a2..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_07.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_08.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_08.png
deleted file mode 100644
index fa8a2c13..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_08.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_09.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_09.png
deleted file mode 100644
index 430be0a8..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_09.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_10.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_10.png
deleted file mode 100644
index 25e11219..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_10.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_11.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_11.png
deleted file mode 100644
index 0da56d08..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_11.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_12.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_12.png
deleted file mode 100644
index 3c7c428f..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_12.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_13.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_13.png
deleted file mode 100644
index 62d07671..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_13.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_14.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_14.png
deleted file mode 100644
index ba7da289..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_14.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_15.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_15.png
deleted file mode 100644
index 02da45a0..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_15.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_16.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_16.png
deleted file mode 100644
index cf9ff136..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_16.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_17.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_17.png
deleted file mode 100644
index 86db1e18..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_17.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_18.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_18.png
deleted file mode 100644
index 7d33fb2e..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_18.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_19.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_19.png
deleted file mode 100644
index fa016c05..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_19.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_20.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_20.png
deleted file mode 100644
index a62ad25c..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_20.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_21.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_21.png
deleted file mode 100644
index 78fa3aa0..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_21.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_22.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_22.png
deleted file mode 100644
index 2bb086bd..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_22.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_23.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_23.png
deleted file mode 100644
index 37aa26f5..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_23.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_24.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_24.png
deleted file mode 100644
index d3f6f4d2..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_24.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_25.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_25.png
deleted file mode 100644
index 85a2b817..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_25.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_26.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_26.png
deleted file mode 100644
index ac459c9e..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_26.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_27.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_27.png
deleted file mode 100644
index 4271b3c9..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_27.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_28.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_28.png
deleted file mode 100644
index d0359778..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_28.png
+++ /dev/null
diff --git a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_29.png b/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_29.png
deleted file mode 100644
index db892f87..00000000
--- a/themes/SMALL/images/Activity_indicator/small/core_activity_Indicator_small_29.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_button_icon_clear.png b/themes/SMALL/images/Content_views/core_button_icon_clear.png
deleted file mode 100644
index 89702e88..00000000
--- a/themes/SMALL/images/Content_views/core_button_icon_clear.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_dropdown_label_bg.#.png b/themes/SMALL/images/Content_views/core_dropdown_label_bg.#.png
deleted file mode 100644
index 8d669ee4..00000000
--- a/themes/SMALL/images/Content_views/core_dropdown_label_bg.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_dropdown_label_bg_stroke.#.png b/themes/SMALL/images/Content_views/core_dropdown_label_bg_stroke.#.png
deleted file mode 100644
index 557c707d..00000000
--- a/themes/SMALL/images/Content_views/core_dropdown_label_bg_stroke.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_dropdown_label_icon_arrow.png b/themes/SMALL/images/Content_views/core_dropdown_label_icon_arrow.png
deleted file mode 100644
index fb111b05..00000000
--- a/themes/SMALL/images/Content_views/core_dropdown_label_icon_arrow.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_focus.#.png b/themes/SMALL/images/Content_views/core_focus.#.png
deleted file mode 100644
index 16a3b7df..00000000
--- a/themes/SMALL/images/Content_views/core_focus.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_folder_icon_folder.png b/themes/SMALL/images/Content_views/core_folder_icon_folder.png
deleted file mode 100644
index dc379fa3..00000000
--- a/themes/SMALL/images/Content_views/core_folder_icon_folder.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_folder_icon_minus.png b/themes/SMALL/images/Content_views/core_folder_icon_minus.png
deleted file mode 100644
index a94a9f15..00000000
--- a/themes/SMALL/images/Content_views/core_folder_icon_minus.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_folder_icon_plus.png b/themes/SMALL/images/Content_views/core_folder_icon_plus.png
deleted file mode 100644
index 9dc8402c..00000000
--- a/themes/SMALL/images/Content_views/core_folder_icon_plus.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_group_list_bg_ef.#.png b/themes/SMALL/images/Content_views/core_group_list_bg_ef.#.png
deleted file mode 100644
index d7424efd..00000000
--- a/themes/SMALL/images/Content_views/core_group_list_bg_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_pattern_empty_bg.png b/themes/SMALL/images/Content_views/core_pattern_empty_bg.png
deleted file mode 100755
index fff3c00e..00000000
--- a/themes/SMALL/images/Content_views/core_pattern_empty_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_pattern_empty_bg_h.png b/themes/SMALL/images/Content_views/core_pattern_empty_bg_h.png
deleted file mode 100644
index c67291d8..00000000
--- a/themes/SMALL/images/Content_views/core_pattern_empty_bg_h.png
+++ /dev/null
diff --git a/themes/SMALL/images/Content_views/core_title_icon_option.png b/themes/SMALL/images/Content_views/core_title_icon_option.png
deleted file mode 100755
index 762a7d4a..00000000
--- a/themes/SMALL/images/Content_views/core_title_icon_option.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_button_add.png b/themes/SMALL/images/Controls/core_button_add.png
deleted file mode 100644
index b0911482..00000000
--- a/themes/SMALL/images/Controls/core_button_add.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_button_bg.#.png b/themes/SMALL/images/Controls/core_button_bg.#.png
deleted file mode 100644
index eba1fe58..00000000
--- a/themes/SMALL/images/Controls/core_button_bg.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_button_delete.png b/themes/SMALL/images/Controls/core_button_delete.png
deleted file mode 100644
index b93030b3..00000000
--- a/themes/SMALL/images/Controls/core_button_delete.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_button_reorder.png b/themes/SMALL/images/Controls/core_button_reorder.png
deleted file mode 100755
index 21a06ec9..00000000
--- a/themes/SMALL/images/Controls/core_button_reorder.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_check_bg.png b/themes/SMALL/images/Controls/core_check_bg.png
deleted file mode 100644
index 8a295283..00000000
--- a/themes/SMALL/images/Controls/core_check_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_check_bg_stroke.png b/themes/SMALL/images/Controls/core_check_bg_stroke.png
deleted file mode 100644
index 54f7e134..00000000
--- a/themes/SMALL/images/Controls/core_check_bg_stroke.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_check_icon.png b/themes/SMALL/images/Controls/core_check_icon.png
deleted file mode 100644
index 1ad477a1..00000000
--- a/themes/SMALL/images/Controls/core_check_icon.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_color_picker_color_shadow.png b/themes/SMALL/images/Controls/core_color_picker_color_shadow.png
deleted file mode 100644
index 1dcb359c..00000000
--- a/themes/SMALL/images/Controls/core_color_picker_color_shadow.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_color_picker_palette.png b/themes/SMALL/images/Controls/core_color_picker_palette.png
deleted file mode 100644
index be0bc79b..00000000
--- a/themes/SMALL/images/Controls/core_color_picker_palette.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_color_picker_palette_focused.png b/themes/SMALL/images/Controls/core_color_picker_palette_focused.png
deleted file mode 100644
index cd27c935..00000000
--- a/themes/SMALL/images/Controls/core_color_picker_palette_focused.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_color_picker_palette_selected.png b/themes/SMALL/images/Controls/core_color_picker_palette_selected.png
deleted file mode 100644
index 5245cf23..00000000
--- a/themes/SMALL/images/Controls/core_color_picker_palette_selected.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_color_picker_palette_selected_bg.png b/themes/SMALL/images/Controls/core_color_picker_palette_selected_bg.png
deleted file mode 100644
index d6b76d5b..00000000
--- a/themes/SMALL/images/Controls/core_color_picker_palette_selected_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_brightness.png b/themes/SMALL/images/Controls/core_icon_brightness.png
deleted file mode 100644
index 0ab208c7..00000000
--- a/themes/SMALL/images/Controls/core_icon_brightness.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_container.png b/themes/SMALL/images/Controls/core_icon_container.png
deleted file mode 100644
index 570a91e6..00000000
--- a/themes/SMALL/images/Controls/core_icon_container.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_expand_close.png b/themes/SMALL/images/Controls/core_icon_expand_close.png
deleted file mode 100644
index f386dd8e..00000000
--- a/themes/SMALL/images/Controls/core_icon_expand_close.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_expand_open.png b/themes/SMALL/images/Controls/core_icon_expand_open.png
deleted file mode 100644
index 2e608cfd..00000000
--- a/themes/SMALL/images/Controls/core_icon_expand_open.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_favorite.png b/themes/SMALL/images/Controls/core_icon_favorite.png
deleted file mode 100644
index 292bad2b..00000000
--- a/themes/SMALL/images/Controls/core_icon_favorite.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_picker_arrow_down.png b/themes/SMALL/images/Controls/core_icon_picker_arrow_down.png
deleted file mode 100644
index e16bb8bf..00000000
--- a/themes/SMALL/images/Controls/core_icon_picker_arrow_down.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_picker_arrow_left.png b/themes/SMALL/images/Controls/core_icon_picker_arrow_left.png
deleted file mode 100755
index 78f6081d..00000000
--- a/themes/SMALL/images/Controls/core_icon_picker_arrow_left.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_picker_arrow_right.png b/themes/SMALL/images/Controls/core_icon_picker_arrow_right.png
deleted file mode 100755
index 84a88329..00000000
--- a/themes/SMALL/images/Controls/core_icon_picker_arrow_right.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_icon_picker_arrow_up.png b/themes/SMALL/images/Controls/core_icon_picker_arrow_up.png
deleted file mode 100644
index 465c91d4..00000000
--- a/themes/SMALL/images/Controls/core_icon_picker_arrow_up.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_bar_h.#.png b/themes/SMALL/images/Controls/core_index_scroll_bar_h.#.png
deleted file mode 100755
index f607cc93..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_bar_h.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_bar_h_ef.#.png b/themes/SMALL/images/Controls/core_index_scroll_bar_h_ef.#.png
deleted file mode 100755
index b1555dcd..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_bar_h_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_bar_v.#.png b/themes/SMALL/images/Controls/core_index_scroll_bar_v.#.png
deleted file mode 100755
index ebf2b358..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_bar_v.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_bar_v_ef.#.png b/themes/SMALL/images/Controls/core_index_scroll_bar_v_ef.#.png
deleted file mode 100755
index 51cb22ba..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_bar_v_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_handler_h_01.png b/themes/SMALL/images/Controls/core_index_scroll_handler_h_01.png
deleted file mode 100644
index 2e85775c..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_handler_h_01.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_handler_h_02.png b/themes/SMALL/images/Controls/core_index_scroll_handler_h_02.png
deleted file mode 100644
index 23db633d..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_handler_h_02.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_handler_v_01.png b/themes/SMALL/images/Controls/core_index_scroll_handler_v_01.png
deleted file mode 100644
index 165ae07b..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_handler_v_01.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_handler_v_02.png b/themes/SMALL/images/Controls/core_index_scroll_handler_v_02.png
deleted file mode 100644
index b844d4bd..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_handler_v_02.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_popup_bg.#.png b/themes/SMALL/images/Controls/core_index_scroll_popup_bg.#.png
deleted file mode 100644
index b264f4a8..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_popup_bg.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_popup_bg_ef.#.png b/themes/SMALL/images/Controls/core_index_scroll_popup_bg_ef.#.png
deleted file mode 100644
index 7cbda50a..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_popup_bg_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_index_scroll_popup_bg_stroke.#.png b/themes/SMALL/images/Controls/core_index_scroll_popup_bg_stroke.#.png
deleted file mode 100755
index 6caf5e79..00000000
--- a/themes/SMALL/images/Controls/core_index_scroll_popup_bg_stroke.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_list_button_bg.#.png b/themes/SMALL/images/Controls/core_list_button_bg.#.png
deleted file mode 100644
index ea6c926b..00000000
--- a/themes/SMALL/images/Controls/core_list_button_bg.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_progress_bar.#.png b/themes/SMALL/images/Controls/core_progress_bar.#.png
deleted file mode 100644
index 233f0dae..00000000
--- a/themes/SMALL/images/Controls/core_progress_bar.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_progress_bar_v.#.png b/themes/SMALL/images/Controls/core_progress_bar_v.#.png
deleted file mode 100755
index e03c8ce9..00000000
--- a/themes/SMALL/images/Controls/core_progress_bar_v.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_progress_pending_bg_01.png b/themes/SMALL/images/Controls/core_progress_pending_bg_01.png
deleted file mode 100755
index 1342d403..00000000
--- a/themes/SMALL/images/Controls/core_progress_pending_bg_01.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_progress_pending_bg_02.png b/themes/SMALL/images/Controls/core_progress_pending_bg_02.png
deleted file mode 100755
index f9936928..00000000
--- a/themes/SMALL/images/Controls/core_progress_pending_bg_02.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_radio_bg.png b/themes/SMALL/images/Controls/core_radio_bg.png
deleted file mode 100644
index 98623eec..00000000
--- a/themes/SMALL/images/Controls/core_radio_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_radio_bg_stroke.png b/themes/SMALL/images/Controls/core_radio_bg_stroke.png
deleted file mode 100644
index d6db6ae6..00000000
--- a/themes/SMALL/images/Controls/core_radio_bg_stroke.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_radio_icon.png b/themes/SMALL/images/Controls/core_radio_icon.png
deleted file mode 100644
index ee0f0d37..00000000
--- a/themes/SMALL/images/Controls/core_radio_icon.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_scroll_bar_h.#.png b/themes/SMALL/images/Controls/core_scroll_bar_h.#.png
deleted file mode 100644
index 6f7000ea..00000000
--- a/themes/SMALL/images/Controls/core_scroll_bar_h.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_scroll_bar_h_ef.#.png b/themes/SMALL/images/Controls/core_scroll_bar_h_ef.#.png
deleted file mode 100644
index b2682722..00000000
--- a/themes/SMALL/images/Controls/core_scroll_bar_h_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_scroll_bar_h_tab.#.png b/themes/SMALL/images/Controls/core_scroll_bar_h_tab.#.png
deleted file mode 100644
index 7d259173..00000000
--- a/themes/SMALL/images/Controls/core_scroll_bar_h_tab.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_scroll_bar_v.#.png b/themes/SMALL/images/Controls/core_scroll_bar_v.#.png
deleted file mode 100644
index 3ce40934..00000000
--- a/themes/SMALL/images/Controls/core_scroll_bar_v.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_scroll_bar_v_ef.#.png b/themes/SMALL/images/Controls/core_scroll_bar_v_ef.#.png
deleted file mode 100644
index 54e4bd30..00000000
--- a/themes/SMALL/images/Controls/core_scroll_bar_v_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_center_point_bg.png b/themes/SMALL/images/Controls/core_slider_center_point_bg.png
deleted file mode 100644
index 6405989e..00000000
--- a/themes/SMALL/images/Controls/core_slider_center_point_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_center_point_bg_v.png b/themes/SMALL/images/Controls/core_slider_center_point_bg_v.png
deleted file mode 100755
index fcfa8ddc..00000000
--- a/themes/SMALL/images/Controls/core_slider_center_point_bg_v.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_handle_normal.png b/themes/SMALL/images/Controls/core_slider_handle_normal.png
deleted file mode 100644
index ec63c337..00000000
--- a/themes/SMALL/images/Controls/core_slider_handle_normal.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_handle_press.png b/themes/SMALL/images/Controls/core_slider_handle_press.png
deleted file mode 100644
index 2c34d83e..00000000
--- a/themes/SMALL/images/Controls/core_slider_handle_press.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_popup_bg.png b/themes/SMALL/images/Controls/core_slider_popup_bg.png
deleted file mode 100644
index 444a23ee..00000000
--- a/themes/SMALL/images/Controls/core_slider_popup_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_popup_bg_ef.png b/themes/SMALL/images/Controls/core_slider_popup_bg_ef.png
deleted file mode 100644
index 4505abcc..00000000
--- a/themes/SMALL/images/Controls/core_slider_popup_bg_ef.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_slider_popup_bg_stroke.png b/themes/SMALL/images/Controls/core_slider_popup_bg_stroke.png
deleted file mode 100644
index e6b27fe8..00000000
--- a/themes/SMALL/images/Controls/core_slider_popup_bg_stroke.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_toggle_bg.png b/themes/SMALL/images/Controls/core_toggle_bg.png
deleted file mode 100644
index 5716656c..00000000
--- a/themes/SMALL/images/Controls/core_toggle_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_toggle_icon_off.png b/themes/SMALL/images/Controls/core_toggle_icon_off.png
deleted file mode 100644
index 68011e0f..00000000
--- a/themes/SMALL/images/Controls/core_toggle_icon_off.png
+++ /dev/null
diff --git a/themes/SMALL/images/Controls/core_toggle_icon_on.png b/themes/SMALL/images/Controls/core_toggle_icon_on.png
deleted file mode 100644
index 0e11effa..00000000
--- a/themes/SMALL/images/Controls/core_toggle_icon_on.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_Magnifier.#.png b/themes/SMALL/images/Copy_Paste/copy&paste_Magnifier.#.png
deleted file mode 100644
index 1706aa97..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_Magnifier.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_Magnifier_mask.#.png b/themes/SMALL/images/Copy_Paste/copy&paste_Magnifier_mask.#.png
deleted file mode 100644
index 450175f4..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_Magnifier_mask.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_handler_center_circle.png b/themes/SMALL/images/Copy_Paste/copy&paste_handler_center_circle.png
deleted file mode 100644
index e794a3e1..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_handler_center_circle.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_handler_center_line.png b/themes/SMALL/images/Copy_Paste/copy&paste_handler_center_line.png
deleted file mode 100644
index 569e3f22..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_handler_center_line.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_handler_circle_bottom.png b/themes/SMALL/images/Copy_Paste/copy&paste_handler_circle_bottom.png
deleted file mode 100644
index 048c247f..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_handler_circle_bottom.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_handler_circle_top.png b/themes/SMALL/images/Copy_Paste/copy&paste_handler_circle_top.png
deleted file mode 100644
index 0cd7cad2..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_handler_circle_top.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_handler_line_bottom.png b/themes/SMALL/images/Copy_Paste/copy&paste_handler_line_bottom.png
deleted file mode 100644
index bc1b3442..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_handler_line_bottom.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_handler_line_top.png b/themes/SMALL/images/Copy_Paste/copy&paste_handler_line_top.png
deleted file mode 100644
index 3153d0bd..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_handler_line_top.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg.#.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg.#.png
deleted file mode 100644
index 55447cd4..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg_ef.#.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg_ef.#.png
deleted file mode 100644
index b89651c9..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg_line.#.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg_line.#.png
deleted file mode 100644
index 0b5c2b1b..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_bg_line.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_clipboard.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_clipboard.png
deleted file mode 100644
index f0b6c4e3..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_clipboard.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_copy.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_copy.png
deleted file mode 100644
index 4583c8d7..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_copy.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_cut.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_cut.png
deleted file mode 100644
index 6dd00443..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_cut.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_paste.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_paste.png
deleted file mode 100644
index 48e7f502..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_paste.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_select.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_select.png
deleted file mode 100755
index c61bb355..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_select.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_select_all.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_select_all.png
deleted file mode 100755
index e4b23466..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_icon_select_all.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom.png
deleted file mode 100644
index 197dca25..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png
deleted file mode 100644
index 654a596b..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_ef.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png
deleted file mode 100644
index 261c0a30..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_bottom_line.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_up.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_up.png
deleted file mode 100644
index f25155f6..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_up.png
+++ /dev/null
diff --git a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_up_line.png b/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_up_line.png
deleted file mode 100644
index 2a54dcb8..00000000
--- a/themes/SMALL/images/Copy_Paste/copy&paste_popup_tail_up_line.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-angry-shout.png b/themes/SMALL/images/Emoticon/emo-angry-shout.png
deleted file mode 100644
index 9995fe8a..00000000
--- a/themes/SMALL/images/Emoticon/emo-angry-shout.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-angry.png b/themes/SMALL/images/Emoticon/emo-angry.png
deleted file mode 100644
index 8ad74e19..00000000
--- a/themes/SMALL/images/Emoticon/emo-angry.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-guilty.png b/themes/SMALL/images/Emoticon/emo-guilty.png
deleted file mode 100644
index d2894414..00000000
--- a/themes/SMALL/images/Emoticon/emo-guilty.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-haha.png b/themes/SMALL/images/Emoticon/emo-haha.png
deleted file mode 100644
index a4c61b7c..00000000
--- a/themes/SMALL/images/Emoticon/emo-haha.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-half-smile.png b/themes/SMALL/images/Emoticon/emo-half-smile.png
deleted file mode 100644
index d1d07cc3..00000000
--- a/themes/SMALL/images/Emoticon/emo-half-smile.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-happy.png b/themes/SMALL/images/Emoticon/emo-happy.png
deleted file mode 100644
index 8cdfd564..00000000
--- a/themes/SMALL/images/Emoticon/emo-happy.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-kiss.png b/themes/SMALL/images/Emoticon/emo-kiss.png
deleted file mode 100644
index 0f148a87..00000000
--- a/themes/SMALL/images/Emoticon/emo-kiss.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-little-bit-sorry.png b/themes/SMALL/images/Emoticon/emo-little-bit-sorry.png
deleted file mode 100644
index e053f281..00000000
--- a/themes/SMALL/images/Emoticon/emo-little-bit-sorry.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-love.png b/themes/SMALL/images/Emoticon/emo-love.png
deleted file mode 100644
index 78892a09..00000000
--- a/themes/SMALL/images/Emoticon/emo-love.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-minimal-smile.png b/themes/SMALL/images/Emoticon/emo-minimal-smile.png
deleted file mode 100644
index aff28da5..00000000
--- a/themes/SMALL/images/Emoticon/emo-minimal-smile.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-omg.png b/themes/SMALL/images/Emoticon/emo-omg.png
deleted file mode 100644
index 94faeefc..00000000
--- a/themes/SMALL/images/Emoticon/emo-omg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-smile.png b/themes/SMALL/images/Emoticon/emo-smile.png
deleted file mode 100644
index 7a011d37..00000000
--- a/themes/SMALL/images/Emoticon/emo-smile.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-sorry.png b/themes/SMALL/images/Emoticon/emo-sorry.png
deleted file mode 100644
index bbfbe4e8..00000000
--- a/themes/SMALL/images/Emoticon/emo-sorry.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-surprised.png b/themes/SMALL/images/Emoticon/emo-surprised.png
deleted file mode 100644
index 87a9d987..00000000
--- a/themes/SMALL/images/Emoticon/emo-surprised.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-tongue-dangling.png b/themes/SMALL/images/Emoticon/emo-tongue-dangling.png
deleted file mode 100644
index 3a7f0ac4..00000000
--- a/themes/SMALL/images/Emoticon/emo-tongue-dangling.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-very-sorry.png b/themes/SMALL/images/Emoticon/emo-very-sorry.png
deleted file mode 100644
index a9daeb73..00000000
--- a/themes/SMALL/images/Emoticon/emo-very-sorry.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-wink.png b/themes/SMALL/images/Emoticon/emo-wink.png
deleted file mode 100644
index 2f22878a..00000000
--- a/themes/SMALL/images/Emoticon/emo-wink.png
+++ /dev/null
diff --git a/themes/SMALL/images/Emoticon/emo-worried.png b/themes/SMALL/images/Emoticon/emo-worried.png
deleted file mode 100644
index 9bb78c86..00000000
--- a/themes/SMALL/images/Emoticon/emo-worried.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_icon_badge_container.#.png b/themes/SMALL/images/Navigation_elements/core_icon_badge_container.#.png
deleted file mode 100644
index 4f533f48..00000000
--- a/themes/SMALL/images/Navigation_elements/core_icon_badge_container.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_icon_badge_container_outer.#.png b/themes/SMALL/images/Navigation_elements/core_icon_badge_container_outer.#.png
deleted file mode 100644
index 748fa8e9..00000000
--- a/themes/SMALL/images/Navigation_elements/core_icon_badge_container_outer.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_icon_drawer.png b/themes/SMALL/images/Navigation_elements/core_icon_drawer.png
deleted file mode 100644
index a10ff936..00000000
--- a/themes/SMALL/images/Navigation_elements/core_icon_drawer.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_navigation_bar_bg.png b/themes/SMALL/images/Navigation_elements/core_navigation_bar_bg.png
deleted file mode 100644
index d609b33e..00000000
--- a/themes/SMALL/images/Navigation_elements/core_navigation_bar_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_navigation_bar_icon_arrow.png b/themes/SMALL/images/Navigation_elements/core_navigation_bar_icon_arrow.png
deleted file mode 100644
index 4ca4418f..00000000
--- a/themes/SMALL/images/Navigation_elements/core_navigation_bar_icon_arrow.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_page_indicator_off.png b/themes/SMALL/images/Navigation_elements/core_page_indicator_off.png
deleted file mode 100644
index 3ab25a79..00000000
--- a/themes/SMALL/images/Navigation_elements/core_page_indicator_off.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_page_indicator_off_ef.png b/themes/SMALL/images/Navigation_elements/core_page_indicator_off_ef.png
deleted file mode 100644
index 21709ed2..00000000
--- a/themes/SMALL/images/Navigation_elements/core_page_indicator_off_ef.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_page_indicator_on.png b/themes/SMALL/images/Navigation_elements/core_page_indicator_on.png
deleted file mode 100644
index 815ddc58..00000000
--- a/themes/SMALL/images/Navigation_elements/core_page_indicator_on.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_title_button_bg.png b/themes/SMALL/images/Navigation_elements/core_title_button_bg.png
deleted file mode 100755
index 6cfbcb83..00000000
--- a/themes/SMALL/images/Navigation_elements/core_title_button_bg.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_title_button_focus.png b/themes/SMALL/images/Navigation_elements/core_title_button_focus.png
deleted file mode 100644
index f02c34c9..00000000
--- a/themes/SMALL/images/Navigation_elements/core_title_button_focus.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_title_icon_cancel.png b/themes/SMALL/images/Navigation_elements/core_title_icon_cancel.png
deleted file mode 100644
index fe94c3ea..00000000
--- a/themes/SMALL/images/Navigation_elements/core_title_icon_cancel.png
+++ /dev/null
diff --git a/themes/SMALL/images/Navigation_elements/core_title_icon_done.png b/themes/SMALL/images/Navigation_elements/core_title_icon_done.png
deleted file mode 100755
index 988dae84..00000000
--- a/themes/SMALL/images/Navigation_elements/core_title_icon_done.png
+++ /dev/null
diff --git a/themes/SMALL/images/Popups/core_popup_noti_bg.#.png b/themes/SMALL/images/Popups/core_popup_noti_bg.#.png
deleted file mode 100644
index 6362748f..00000000
--- a/themes/SMALL/images/Popups/core_popup_noti_bg.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Popups/core_popup_noti_bg_ef.#.png b/themes/SMALL/images/Popups/core_popup_noti_bg_ef.#.png
deleted file mode 100755
index 85636f8f..00000000
--- a/themes/SMALL/images/Popups/core_popup_noti_bg_ef.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Popups/core_popup_noti_bg_stroke.#.png b/themes/SMALL/images/Popups/core_popup_noti_bg_stroke.#.png
deleted file mode 100755
index 0afeb12f..00000000
--- a/themes/SMALL/images/Popups/core_popup_noti_bg_stroke.#.png
+++ /dev/null
diff --git a/themes/SMALL/images/Popups/core_popup_top.#.png b/themes/SMALL/images/Popups/core_popup_top.#.png
deleted file mode 100644
index 83827823..00000000
--- a/themes/SMALL/images/Popups/core_popup_top.#.png
+++ /dev/null
diff --git a/themes/inc.edc b/themes/inc.edc
deleted file mode 100644
index 6ad610e1..00000000
--- a/themes/inc.edc
+++ /dev/null
@@ -1,947 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-//****************************************************************************//
-// This file defines the width, height (not color!) for each widgets
-//
-// ************* Naming Rule ************ //
-// {WIDGET}_{GROUP}_{PART}_{STATE}_{TYPE}
-//   WIDGET: NAVIFRAME, LIST, DATETIME, POPUP, etc.
-//   GROUP:  INDEX
-//   PART:   TEXT, ICON, BG, PADDING, DIVIDER, ICON, etc.
-//   STATE:  LEFT, RIGHT, TOP, BOTTOM, MIN, MAX,
-//   TYPE:   HEIGHT, WIDTH, SIZE
-// e.g. LIST_PADDING_LEFT_HEIGHT
-//****************************************************************************//
-#define BASE_SCALE_INC 1.8
-#define SMALL "SMALL/"
-#define MEDIUM "MIDDLE/"
-#define DEFAULT_IMAGE "SMALL/"
-//****************************************************************************//
-// Colorselector
-//****************************************************************************//
-#define COLORSELECTOR_PALETTE_COLORPLANE_HEIGHT_INC 158
-#define COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC 480
-#define COLORSELECTOR_PORTRAIT_HOR_PAD_COLORPLANE_INC "5"
-#define COLORSELECTOR_PORTRAIT_VER_PAD_COLORPLANE_INC "6"
-#define COLORSELECTOR_PALETTE_COLORBG_MIN_COLORPLANE_INC 60 60
-#define COLORPLANE_MIN_HEIGHT_INC 80
-#define COLORSELECTOR_TOPBOTTOM_PAD_COLORPLANE_INC 16
-//****************************************************************************//
-// Naviframe
-//****************************************************************************//
-#define NAVIFRAME_TITLE_HEIGHT_INC 72
-#define NAVIFRAME_SUBTITLE_HEIGHT_INC 28
-#define NAVIFRAME_TITLE_TOP_PADDING_HEIGHT_INC 3
-#define NAVIFRAME_SUBTITLE_BOTTOM_PADDING_HEIGHT_INC 3
-#define NAVIFRAME_TABBAR_HEIGHT_INC 72
-#define NAVIFRAME_NAVIGATIONBAR_HEIGHT_INC 51
-#define NAVIFRAME_NAVIGATIONBAR_TOP_DIVIDER_HEIGHT_INC 1
-#define NAVIFRAME_TABBAR2_HEIGHT_INC 104
-#define NAVIFRAME_TABBAR_TOP_DIVIDER_HEIGHT_INC 1
-#define NAVIFRAME_TITLE_LEFT_PADDING_WIDTH_INC 15
-#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 46 46
-#define NAVIFRAME_BADGE_ICON_LEFT_PADDING_WIDTH_INC 15
-#define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_WIDTH_INC 15
-#define NAVIFRAME_BADGE_HEIGHT_INC 32
-#define NAVIFRAME_BADGE2_PADDING_WIDTH_INC (NAVIFRAME_BADGE_ICON_LEFT_PADDING_WIDTH_INC + NAVIFRAME_BADGE_TEXT_LEFT_PADDING_WIDTH_INC + NAVIFRAME_BADGE_TEXT_LEFT_PADDING_WIDTH_INC)
-#define NAVIFRAME_DRAWERS_WIDTH_INC 55
-#define NAVIFRAME_TOOLBAR_HEIGHT_INC 108
-#define NAVIFRAME_TOOLBAR_COLOR_INC 245 245 245 255
-
-#define BUTTON_NAVIFRAME_TITLE_BUTTON_SIZE_INC 46 46
-#define BUTTON_NAVIFRAME_TITLE_BUTTON_BG_SIZE_INC 46 46
-#define BUTTON_NAVIFRAME_TITLE_BUTTON_IMAGE_SIZE_INC 46 46
-#define BUTTON_NAVIFRAME_DRAWERS_WIDTH_INC 55
-#define BUTTON_NAVIFRAME_DRAWERS_IMAGE_SIZE_INC 55 72
-
-#define NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 36
-#define NAVIFRAME_SUBTITLE_VISIBLE_TEXT_FONT_SIZE_INC 30
-#define NAVIFRAME_VISIBLE_TEXT_FONT_SIZE_INC 21
-
-#define NAVIFRAME_TITLE_TEXT_SHADOW_COLOR_INC "#080808BF"
-#define NAVIFRAME_SUBTITLE_VISIBLE_TEXT_SHADOW_COLOR_INC "#080808BF"
-#define NAVIFRAME_SUBTITLE_TEXT_SHADOW_COLOR_INC "#080808BF"
-
-//****************************************************************************//
-// Label
-//****************************************************************************//
-#define LABEL_FONT_SIZE_INC 24
-
-//****************************************************************************//
-// Layout
-//****************************************************************************//
-#define LAYOUT_INDICATOR_HEIGHT_INC 36
-
-#define SEARCHBAR_CANCEL_BUTTON_W_INC 46
-#define SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 15
-#define SEARCHBAR_H_INC 96
-#define SEARCHBAR_HEIGHT_INC 96
-#define SEARCHBAR_BASE_HEIGHT_INC 96
-#define SEARCHBAR_WIDTH_INC 480
-#define SEARCHBAR_TOP_PADDING_INC 0
-#define SEARCHBAR_BOTTOM_PADDING_INC 0
-#define SEARCHBAR_LEFT_PADDING_INC 0
-#define SEARCHBAR_RIGHT_PADDING_INC 0
-
-//****************************************************************************//
-// Ctxpopup
-//****************************************************************************//
-#define CTXPOPUP_MOVE_PAD 40
-#define CTXPOPUP_OUTLINE_SIZE 1
-#define CTXPOPUP_WIDTH 480
-#define CTXPOPUP_TEXT_MAX 438
-#define CTXPOPUP_ITEM_TEXT_SIZE 30
-#define CTXPOPUP_ITEM_TEXT_MAX_SIZE (CTXPOPUP_ITEM_TEXT_SIZE*2)
-#define CTXPOPUP_ITEM_HEIGHT_MIN 96
-#define CTXPOPUP_ITEM_HEIGHT_MAX 104
-#define CTXPOPUP_ITEM_TEXT_LR_PADDING 21
-#define CTXPOPUP_ITEM_TEXT_TB_PADDING 29
-#define CTXPOPUP_ITEM_TEXT_HEIGHT_MIN 38
-#define CTXPOPUP_DROPDOWN_WIDTH 450
-#define CTXPOPUP_DROPDOWN_TEXT_MAX 418
-#define CTXPOPUP_DROPDOWN_ITEM_TEXT_SIZE 27
-#define CTXPOPUP_DROPDOWN_ITEM_TEXT_MAX_SIZE (CTXPOPUP_DROPDOWN_ITEM_TEXT_SIZE*2)
-#define CTXPOPUP_DROPDOWN_ITEM_HEIGHT_MIN 72
-#define CTXPOPUP_DROPDOWN_ITEM_HEIGHT_MAX 92
-#define CTXPOPUP_DROPDOWN_ITEM_TEXT_LR_PADDING 15
-#define CTXPOPUP_DROPDOWN_CONTENT_LR_PADDING 1
-#define CTXPOPUP_DROPDOWN_CONTENT_TB_PADDING 1
-#define CTXPOPUP_DROPDOWN_SEPARATOR_HEIGHT 1
-#define CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC 62
-#define CTXPOPUP_ITEM_TEXT_HORIZONTAL_PADDING_INC 10
-#define CTXPOPUP_CONTENT_PADDING_HEIGHT 1
-#define CTXPOPUP_ITEM_ICON_HORIZONTAL_WIDTH_INC 82
-#define CTXPOPUP_ITEM_BOTTOM_PADDING_INC 17
-#define CTXPOPUP_ITEM_TOP_PADDING_INC 17
-#define CTXPOPUP_ITEM_HEIGHT_INC 102
-#define CTXPOPUP_CONTENT_PADDING 1
-#define CTXPOPUP_ITEM_HORIZONTAL_WIDTH_MIN_INC 106
-#define CTXPOPUP_ITEM_HORIZONTAL_WIDTH_MAX_INC 136
-#define CTXPOPUP_ITEM_HORIZONTAL_TEXT_HEIGHT_MIN 32
-#define CTXPOPUP_SEPARATOR_MIN_SIZE_INC 1 CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC
-#define CTXPOPUP_SEPARATOR_MAX_SIZE_INC 1 -1
-#define CTXPOPUP_ICON_WIDTH_INC 30
-#define CTXPOPUP_ICON_HEIGHT_INC 30
-#define CTXPOPUP_ITEM_ICON_BOTTOM_PADDING_INC 6
-#define CTXPOPUP_TEXT_SIZE_INC 17
-#define CTXPOPUP_ITEM_TEXT_TOP_PADDING_INC 15
-#define CTXPOPUP_ITEM_TEXT_BOTTOM_PADDING_INC 15
-
-//****************************************************************************//
-// Copypaste
-//****************************************************************************//
-#define CTXPOPUP_SHADOW_TOP_PADDING 1
-#define CTXPOPUP_SHADOW_BOTTOM_PADDING 3
-#define CTXPOPUP_SHADOW_LEFT_PADDING 1
-#define CTXPOPUP_SHADOW_RIGHT_PADDING 1
-#define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
-#define CTXPOPUP_ITEM_TEXT_LR_PADDING_INC 20
-#define CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC 112
-#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18
-#define CTXPOPUP_CONTENT_TOP_PADDING 3
-#define CTXPOPUP_CONTENT_BOTTOM_PADDING 5
-#define CTXPOPUP_CONTENT_LEFT_PADDING 3
-#define CTXPOPUP_CONTENT_RIGHT_PADDING 3
-#define CTXPOPUP_ARROW_PADDING 0
-#define CTXPOPUP_ARROW_SIZE_INC 20 20
-#define CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC 106
-#define CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MAX_INC 136
-#define CTXPOPUP_COPYPASTE_TEXT_SIZE_INC 24
-#define CTXPOPUP_COPYPASTE_TEXT_MAX_SIZE_INC (CTXPOPUP_COPYPASTE_TEXT_SIZE_INC * 2)
-#define CTXPOPUP_COPYPASTE_WIDTH_MAX_INC 800
-#define CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC 62
-#define CTXPOPUP_COPYPASTE_ICON_WIDTH_INC 30
-#define CTXPOPUP_COPYPASTE_ICON_HEIGHT_INC 30
-#define CTXPOPUP_COPYPASTE_ITEM_TEXT_TOP_PADDING_INC 15
-#define CTXPOPUP_COPYPASTE_ITEM_ICON_BOTTOM_PADDING_INC 6
-#define CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 10
-#define CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC 15
-#define CTXPOPUP_COPYPASTE_SEPARATOR_MIN_SIZE_INC 1 CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC
-#define CTXPOPUP_COPYPASTE_SEPARATOR_MAX_SIZE_INC 1 -1
-
-//****************************************************************************//
-// Tabbar
-//****************************************************************************//
-#define TABBAR_TWO_ITEMS_SIZE_INC 240 50;
-#define TABBAR_THREE_ITEMS_SIZE_INC 160 50;
-#define TABBAR_FOUR_ITEMS_SIZE_INC 120 50;
-#define TABBAR_SCROLLABLE_ITEMS_SIZE_INC 135 50;
-#define TABBAR_LANDSCAPE_TWO_ITEMS_SIZE_INC 400 50;
-#define TABBAR_LANDSCAPE_THREE_ITEMS_SIZE_INC  267 50;
-#define TABBAR_LANDSCAPE_FOUR_ITEMS_SIZE_INC 200 50;
-#define TABBAR_LANDSCAPE_SCROLLABLE_ITEMS_SIZE_INC 175 50;
-#define TABBAR_SELECTED_LINE_SIZE_INC 0 3
-#define TABBAR_TEXT_CENTER_PADDING_SIZE_INC 0 1
-#define TABBAR_TEXT_LEFT_TOP_PADDING_SIZE_INC 8 18
-#define TABBAR_TEXT_RIGHT_BOTTOM_PADDING_SIZE_INC 8 18
-#define TABBAR_ICON_TEXT_LEFT_TOP_PADDING_SIZE_INC 8 14
-#define TABBAR_ICON_TEXT_RIGHT_BOTTOM_PADDING_SIZE_INC 8 14
-#define TABBAR_ICON_TEXT_LAND_LEFT_TOP_PADDING_SIZE_INC 8 20
-#define TABBAR_ICON_TEXT_LAND_RIGHT_BOTTOM_PADDING_SIZE_INC 8 14
-#define TABBAR_ICON_SIZE_INC 46 46
-#define TABBAR_ICON_TEXT_PAD_INC 15 0
-#define TABBAR_ICON_RECT_SIZE_INC 61 46
-#define TABBAR_TEXT_TEXT_SIZE_INC 0 37
-#define TABBAR_ICON_TEXT_TEXT_SIZE_INC 0 31
-#define TABBAR_ICON_TEXT_LAND_TEXT_SIZE_INC 0 39
-//Navigation style
-#define TOOLBAR_NAVI_HEIGHT_INC 51
-#define TOOLBAR_NAVI_PADDING_INC 15
-#define TOOLBAR_NAVI_DIVIDER_INC 42
-
-//****************************************************************************//
-// Genlist
-//****************************************************************************//
-// Group index
-#define LIST_INDEX_PADDING_LEFT_SIZE        15
-#define LIST_INDEX_PADDING_RIGHT_SIZE       15
-#define LIST_INDEX_PADDING_TOP_SIZE         7
-#define LIST_INDEX_PADDING_BOTTOM_SIZE      8
-
-#define LIST_INDEX_HEIGHT                   36
-
-#define LIST_INDEX_TEXT_MAIN_SIZE           27
-#define LIST_INDEX_TEXT_SUB_SIZE            27
-#define LIST_INDEX_TEXT_SUB_WIDTH_MAX       160
-#define LIST_INDEX_TEXT_PADDING_SIZE        15
-#define LIST_INDEX_BOTTOMLINE_HEIGHT        1
-
-// Normal style
-#define LIST_ITEM_HEIGHT                    96
-#define LIST_PADDING_TOP_SIZE               29   // FIXME: please check font height
-#define LIST_PADDING_BOTTOM_SIZE            29   // FIXME: please check font height
-#define LIST_2LINE_PADDING_TOP_SIZE         13   // FIXME: please check font height
-#define LIST_2LINE_PADDING_BOTTOM_SIZE      13   // FIXME: please check font height
-#define LIST_PADDING_CENTER_LEFT_SIZE       15
-#define LIST_PADDING_CENTER_RIGHT_SIZE      15
-#define LIST_PADDING_TEXT_SIZE              22
-#define LIST_PADDING_DEFAULT_SIZE           15
-
-#define LIST_TEXT_MAIN_HEIGHT               38
-#define LIST_TEXT_SUB_HEIGHT                32
-
-#define LIST_TEXT_MAIN_SIZE                 30
-#define LIST_TEXT_SUB_SIZE                  24
-#define LIST_TEXT_SUB_WIDTH_MAX             130
-
-// Multiline style
-#define LIST_WRAP_PADDING_LEFT_SIZE         15
-#define LIST_WRAP_PADDING_RIGHT_SIZE        15
-#define LIST_WRAP_PADDING_TOP_SIZE          14
-#define LIST_WRAP_PADDING_BOTTOM_SIZE       14
-#define LIST_MULTILINE_ICON_SIZE            60 60
-#define LIST_MULTILINE_ICON_SIZE1           40 40
-
-// Editfield style
-#define LIST_ENTRY_PADDING_LEFT_SIZE          0
-#define LIST_ENTRY_PADDING_RIGHT_SIZE         0
-#define LIST_ENTRY_PADDING_TOP_SIZE           0
-#define LIST_ENTRY_PADDING_BOTTOM_SIZE        0
-
-#define LIST_ENTRY_PADDING_ICON_RIGHT_SIZE    15
-#define LIST_ENTRY_PADDING_MAIN_TEXT_TOP_SIZE 12
-
-#define LIST_ENTRY_ENTRY_HEIGHT               96
-#define LIST_ENTRY_TEXT_SUB_WIDTH_MAX         160
-#define LIST_ENTRY_ICON_SIZE                  46 46
-
-// Bar style
-#define LIST_BAR_PADDING_TOP_SIZE             14
-#define LIST_BAR_PADDING_BOTTOM_SIZE          14
-#define LIST_SLIDER_PADDING_CENTER_SIZE       10
-#define LIST_PROGRESSBAR_HEIGHT               20
-#define LIST_PROGRESSBAR_PADDING_CENTER_SIZE  10
-
-// List A
-#define LIST_A_LEFTICON_RIGHT_PADDING_WIDTH   10
-#define LIST_A_LEFTICON_SIZE               32 32
-#define LIST_A_RIGHTICON_LEFT_PADDING_WIDTH   10
-#define LIST_A_RIGHTICON_SIZE              32 32
-#define LIST_B_TYPE1_ICON_SIZE             96 96
-#define LIST_B_TYPE2_LEFT_PADDING_WIDTH       15
-#define LIST_B_TYPE2_ICON_SIZE             74 74
-#define LIST_B_TYPE3_LEFT_PADDING_WIDTH       14
-#define LIST_B_TYPE3_ICON_SIZE             46 46
-#define LIST_B_TYPE4_LEFT_PADDING_WIDTH       15
-#define LIST_B_TYPE4_RIGHT_PADDING_WIDTH       5
-#define LIST_B_TYPE4_ICON_SIZE             40 40
-#define LIST_C_TYPE1_RIGHT_PADDING_WIDTH      15
-#define LIST_C_TYPE1_ICON_SIZE             46 46
-#define LIST_C_TYPE2_RIGHT_PADDING_WIDTH      15
-#define LIST_C_TYPE2_ICON_SIZE             40 40
-#define LIST_C_TYPE3_RIGHT_PADDING_WIDTH      15
-#define LIST_C_TYPE3_ICON_SIZE             60 60
-#define LIST_C_TYPE4_TOGGLE_DIVIDER_SIZE    1 40
-#define LIST_C_TYPE4_LEFT_PADDING_WIDTH       15
-#define LIST_C_TYPE4_RIGHT_PADDING_WIDTH      15
-#define LIST_C_TYPE4_ICON_SIZE             60 60
-#define LIST_GROUP_HEIGHT                     10
-#define LIST_DESC_PADDING_TOP_SIZE            10
-#define LIST_DESC_PADDING_BOTTOM_SIZE         32
-#define LIST_DESC_PADDING_LEFT_RIGHT_SIZE     15
-#define LIST_DESC_TEXT_PART_SIZE              32
-#define LIST_DESC_TEXT_SIZE                   24
-#define LIST_SELECT_ALL_PADDING_LEFT_SIZE     15
-#define LIST_SELECT_ALL_PADDING_RIGHT_SIZE    15
-#define LIST_SELECT_ALL_PADDING_BOTTOM_SIZE    1
-#define LIST_SELECT_ALL_ICON_SIZE          40 40
-#define LIST_SELECT_ALL_PADDING_CENTER_SIZE   15
-#define LIST_SELECT_ALL_HEIGHT                84
-
-//Expand style
-#define GENLIST_TREESIZE_DEFAULT            22
-
-//No use to Combination
-#define LIST_TOP_PADDING_SIZE               29
-#define LIST_BOTTOM_PADDING_SIZE            29
-#define LIST_LEFT_PADDING_SIZE              15
-#define LIST_RIGHT_PADDING_SIZE             15
-#define LIST_TEXT_LEFT_PADDING_SIZE         10
-#define LIST_TEXT_RIGHT_PADDING_SIZE        10
-#define LIST_DEFAULT_PADDING_SIZE           20
-#define LIST_BOTTOMLINE_HEIGHT               2
-
-
-//****************************************************************************//
-// SCROLLER
-//****************************************************************************//
-#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC 8 22
-#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC 8 99999
-#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC 22 8
-#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 8
-#define SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT 20
-#define SCROLLER_TABBAR_SCROLLBAR_HBAR_MIN_SIZE_INC 22 SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT
-#define SCROLLER_TABBAR_SCROLLBAR_HBAR_MAX_SIZE_INC 99999 SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT
-#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_PADDING_SIZE 4
-#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_PADDING_SIZE 4
-#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC 25 47
-#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIN_SIZE_INC 47 25
-#define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 21 21
-#define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 21 21
-#define SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE 4
-#define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 45
-#define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MIN_SIZE 30
-#define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MOVE_CORRECTION_VALUE 15
-#define SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MAX_SIZE 30
-#define SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MIN_SIZE 20
-#define SCROLLER_EFFECT_SHADOW_SECOND_LAYER_MOVE_CORRECTION_VALUE 10
-#define SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MAX_SIZE 15
-#define SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MIN_SIZE 10
-#define SCROLLER_EFFECT_SHADOW_THIRD_LAYER_MOVE_CORRECTION_VALUE 5
-
-//****************************************************************************//
-// Entry
-//****************************************************************************//
-// Normal Entry
-#define ENTRY_TEXT_SIZE_INC 24
-#define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FAFAFA"
-#define ENTRY_PREEDIT_TEXT_COLOR_INC "#000000"
-#define ENTRY_PREEDIT_UNDERLINE_COLOR_INC "#FAFAFA"
-#define ENTRY_PREEDIT_SUB1_COLOR_INC "#2EA8E1"
-#define ENTRY_PREEDIT_SUB2_COLOR_INC "#9962C3"
-#define ENTRY_PREEDIT_SUB3_COLOR_INC "#76DE37"
-#define ENTRY_PREEDIT_SUB4_COLOR_INC "#999999"
-#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC 34
-#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC 34
-#define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 2
-#define ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC 51
-#define ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC 51
-#define ENTRY_CURSOR_SIZE_INC 2 0
-#define MAGNIFIER_WIDTH_FIXED_INC 218
-#define MAGNIFIER_HEIGHT_MIN 78
-#define MAGNIFIER_HEIGHT_MAX 108
-#define MAGNIFIER_ARROW_HEIGHT_INC 10
-#define MAGNIFIER_LEFT_OFFSET_INC 11 11
-#define MAGNIFIER_RIGHT_OFFSET_INC 11 22
-#define ENTRY_EMOTICON_SIZE 52 52
-
-// Editfield
-#define ENTRY_EDITFIELD_TEXT_SIZE_INC 24
-#define ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC 51 0
-#define ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC 0 2
-#define ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_INC 0 19
-#define ENTRY_EDITFIELD_TOP_PADDING_HEIGHT 0 24
-#define ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT 0 24
-#define ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT 15 0
-#define ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT 15 0
-#define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 30
-#define ENTRY_EDITFIELD_LEFT_RIGHT_PADDING 5 0
-#define ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN 5
-#define ENTRY_EDITFIELD_TOP_PADDING_HEIGHT_MULTILINE 0 10
-#define ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT_MULTILINE 0 16
-#define ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_MULTILINE 0 10
-// Clear Button
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 36 36
-#define BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC 36 36
-
-// Editfield Layout
-#define EDITFIELD_BASE_HEIGHT_INC 96
-#define EDITFIELD_TOP_LEFT_PADDING_MIN_INC 20 29
-#define EDITFIELD_MULTILINE_TOP_LEFT_PADDING_MIN_INC 15 10
-#define EDITFIELD_BOTTOM_RIGHT_PADDING_MIN_INC 20 29
-#define EDITFIELD_MULTILINE_BOTTOM_RIGHT_PADDING_MIN_INC 15 16
-#define EDITFIELD_BUTTON_FIELD_MIN_INC 38 38
-#define EDITFIELD_FOCUSED_BOTTOM_RIGHT_PADDING_MIN_INC 15+36+15 29
-#define EDITFIELD_ENTRY_FIELD_MIN_INC 0 38
-#define EDITFIELD_LINE_BOTTOM_PADDING_MIN_INC 0 19
-#define EDITFIELD_LINE_RECT_MIN_INC 0 2
-#define EDITFIELD_ENTRY_SWALLOW_ALIGN 0.5 0.5
-#define EDITFIELD_BASE_HEIGHT_MULTILINE_INC 64
-#define EDITFIELD_LINE_BOTTOM_PADDING_MIN_MULTILINE_INC 0 10
-
-#define BUTTON_OPTION_MIN_MAX_INC 46 46
-#define BUTTON_OPTION_IMAGE_MIN_MAX_INC 46 46
-
-//Slider
-#define SLIDER_BASE_HEIGHT_INC  6
-#define SLIDER_INDICATOR_SIZE_INC 42
-#define SLIDER_SWALLOWBAR_HEIGHT_INC  42
-#define SLIDER_LEFT_RIGHT_PADDING_SIZE_INC 21 0
-#define SLIDER_ICON_PADDING_SIZE_INC 5 0
-#define SLIDER_CENTER_POINT_SIZE_INC 10 24
-
-//Slider vertical
-#define SLIDER_VERTICAL_BASE_HEIGHT_INC  6
-#define SLIDER_SWALLOWBAR_WIDTH_INC  42
-#define SLIDER_VERTICAL_CENTER_POINT_SIZE_INC 24 10
-#define SLIDER_VERTICAL_ICON_PADDING_SIZE_INC 42 5
-#define SLIDER_TOP_BOTTOM_PADDING_SIZE_INC 42 21
-
-#define SLIDER_POPUP_WIDTH_INC 80
-#define SLIDER_POPUP_HEIGHT_INC 92
-#define SLIDER_INDICATOR_PADDING_TOP 20
-#define SLIDER_INDICATOR_PADDING_BOTTOM 32
-#define SLIDER_INDICATOR_TEXT_SIZE_HEIGHT 20
-#define SLIDER_INDICATOR_TEXT_SIZE_WIDTH 20
-
-//Progressbar
-#define PROGRESSBAR_BG_DEFAULT_HEIGHT_INC 42
-#define PROGRESSBAR_BG_ONE_TEXT_HEIGHT_INC 48
-#define PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC 76
-#define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 6
-#define PROGRESSBAR_PADDING_HEIGHT_INC 7
-#define PROCESS_LARGE_IMAGE_HEIGHT_INC 66
-#define PROCESS_LARGE_IMAGE_WIDTH_INC 66
-#define PROCESS_MEDIUM_IMAGE_HEIGHT_INC 36
-#define PROCESS_MEDIUM_IMAGE_WIDTH_INC 36
-#define PROCESS_SMALL_IMAGE_HEIGHT_INC 28
-#define PROCESS_SMALL_IMAGE_WIDTH_INC 28
-
-//Check and Radio
-#define CHECK_GEN_SIZE 60 60
-#define CHECK_SIZE  26 26
-#define CHECK_ICON_SIZE 30 30
-#define CHECK_BG_SIZE 40 40
-#define CHECK_BG_STROKE_SIZE 40 40
-#define RADIO_SIZE 30 30
-#define RADIO_BG_SIZE 40 40
-#define RADIO_BG_STROKE_SIZE 40 40
-#define CHECK_TEXT_FONT_SIZE_INC 22
-#define CHECK_PAD_BEFORE_TEXT_INC 15 0
-// No Content
-#define NO_CONTENT_WIDTH_INC 480
-#define NO_CONTENT_WIDTH_LANDSCAPE_INC 800
-#define NO_CONTENT_BG_HEIGHT_INC 280
-#define NO_CONTENT_BG_LANDSCAPE_HEIGHT_INC 150
-#define NO_CONTENT_MAX_HEIGHT_INC 378
-#define NO_CONTENT_LEFT_RIGHT_PADDING_WIDTH_INC 15
-#define NO_CONTENT_TITLE_TEXT_HEIGHT_INC 38
-#define NO_CONTENT_TEXT_PADDING_HEIGHT_INC 20
-#define NO_CONTENT_TITLE_TEXT_FONT_SIZE_INC 30
-#define NO_CONTENT_TEXT_FONT_SIZE_INC 24
-//Button
-#define BUTTON_BOTTOM_MIN_HEIGHT 74
-#define BUTTON_MIN_WIDTH 62
-#define BUTTON_MIN_HEIGHT 58
-#define BUTTON_MAX_WIDTH 450
-#define BUTTON_ICON_DEFAULT_WIDTH 30
-#define BUTTON_ICON_DEFAULT_HEIGHT 30
-#define BUTTON_PADDING_ICON_RIGHT 12
-#define BUTTON_BOTTOM_PADDING_LEFT_RIGHT 12
-#define BUTTON_PADDING_LEFT_RIGHT 12
-#define BUTTON_ICON_HEIGHT 46
-#define BUTTON_ICON_WIDTH 46
-#define BUTTON_CIRCLE_SIZE  74 74
-#define BUTTON_CIRCLE_ICON_SIZE 46 46
-#define BUTTON_CIRCLE_LABEL_SIZE 120 173
-#define BUTTON_CIRCLE_TOP_PADDING_HEIGHT 15
-#define BUTTON_CIRCLE_LEFT_RIGHT_PADDING_WIDTH 8
-#define BUTTON_CIRCLE_MIDDDLE_PADDING_HEIGHT 10
-#define BUTTON_CIRCLE_BOTTOM_PADDING_HEIGHT 10
-#define BUTTON_CIRCLE_TEXT_HEIGHT 64
-#define BUTTON_TEXT_SIZE  30
-#define BUTTON_BOTTOM_TEXT_SIZE  33
-#define BUTTON_DATE_TEXT_SIZE  30
-#define BUTTON_AMPM_TEXT_SIZE  54
-#define BUTTON_TEXT_CIRCLE_SIZE 24
-#define BUTTON_POPUP_TEXT_SIZE 33
-//Multibuttonentry
-#define MULTIBUTTONENTRY_BOX_HORIZONTAL_PAD_INC 15
-#define MULTIBUTTONENTRY_BOX_VERTICAL_PAD_INC 16
-#define MULTIBUTTONENTRY_WIDTH_PAD_INC 15
-#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 15
-#define MULTIBUTTONENTRY_BOTTOM_HEIGHT_PAD_INC 16
-#define MULTIBUTTONENTRY_GUIDE_HEIGHT_INC 56
-#define MULTIBUTTONENTRY_GUIDE_TEXT_SIZE_INC 30
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 30
-#define MULTIBUTTONENTRY_BUTTON_PAD_INC 20
-#define MULTIBUTTONENTRY_BUTTON_WIDTH_INC 70
-#define MULTIBUTTONENTRY_BUTTON_HEIGHT_INC 56
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 30
-#define MULTIBUTTONENTRY_LABEL_HEIGHT_INC 56 // same as button
-#define MULTIBUTTONENTRY_LABEL_PAD_INC 0
-
-//****************************************************************************//
-// Index
-//****************************************************************************//
-// FastScrol
-#define INDEX_ITEM_WIDTH_INC                        33
-#define INDEX_ITEM_HEIGHT_INC                       30
-#define INDEX_POPUP_TEXT_SIZE_INC                   54
-#define INDEX_DIVIDER_WIDTH_INC                     0
-#define INDEX_SCROLL_BG_LINE_WIDTH_INC              0
-#define INDEX_TEXT_LEFT_PADDING_SIZE_INC            0
-#define INDEX_TEXT_RIGHT_PADDING_SIZE_INC           0
-#define INDEX_PADDING_SIZE_INC                      5
-#define INDEX_ITEM_PADDING_SIZE_INC                 0
-#define INDEX_SCROLL_DRAG_PART_SIZE                 33 28
-#define INDEX_SCROLL_PADDING_COLOR                  34 34 34 255
-#define INDEX_SCROLL_POPUP_SIZE                     100 100
-#define INDEX_SCROLL_POPUP_ACTIVE_SIZE              100 100
-#define INDEX_SCROLL_TEXT1_DEFAULT_SIZE             100 64
-#define INDEX_SCROLL_TEXT1_ACTIVE_SIZE              100 64
-
-// Page Control
-#define INDEX_PAGECONTROL_IND_INC 32 26
-#define INDEX_PAGECONTROL_IND_MIN_INC 26 26
-
-//****************************************************************************//
-// Popup
-//****************************************************************************//
-#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 30
-#define POPUP_SUBTITLE_TEXT_FONT_SIZE_INC 21
-#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 30
-
-#define POPUP_OUTSIDE_PADDING "48"
-#define POPUP_TITLE_AREA_HEIGHT "72"
-#define POPUP_CONTENT_AREA_LANDSCAPE_WIDTH_INC "480"
-#define POPUP_SCROLLER_MAX_HEIGHT "432"
-
-
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 480 0
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 99999 752
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 480 0
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 480 432
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 0 72
-#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 438 108
-#define POPUP_BASE_DEFAULT_TEXT_SHADOW_COLOR_INC "#08080855"
-#define POPUP_SUBTITLE_TEXT_SHADOW_COLOR_INC "#08080855"
-#define POPUP_CONTENT_AREA_DEFAULT_MIN_INC 480 0
-#define POPUP_CONTENT_AREA_LANDSCAPE_MIN_INC 480 0
-
-#define POPUP_TITLE_LEFT_PADDING 15
-#define POPUP_TITLE_RIGHT_PADDING 15
-#define POPUP_TITLE_TOP_PADDING 3
-#define POPUP_TITLE_BOTTOM_PADDING 3
-#define POPUP_SUBTITLE_HEIGHT 28
-
-#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 27
-#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 15
-#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 15
-#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 27
-
-#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "108"
-#define POPUP_BUTTON1_DEFAULT_HEIGHT_INC 74
-#define POPUP_BUTTON1_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 21
-#define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 74
-#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 12 74
-#define POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 21
-#define POPUP_BUTTON3_DEFAULT_HEIGHT_INC 74
-#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 12 74
-#define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 21
-
-#define POPUP_TOAST_BG_MAX_WIDTH_INC 450
-#define POPUP_TOAST_BG_MAX_HEIGHT_INC 668
-#define POPUP_TOAST_BOTTOM_PAD_INC 0
-#define POPUP_TOAST_TITLE_TOP_BOTTOM_PAD_INC 16
-#define POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 28
-#define POPUP_TOAST_TEXT_MAX_WIDTH_INC 288
-#define POPUP_TOAST_TEXT_MIN_HEIGHT_INC 34
-#define POPUP_TOAST_TEXT_MAX_HEIGHT_INC 636
-#define POPUP_TOAST_CONTENT_HEIGHT_MIN_INC 66
-
-#define STYLE_TAGS \
-   tag:  "br" "\n";\
-   tag:  "ps" "ps";\
-   tag:  "tab" "\t";\
-   tag:  "b" "+ font_weight=Bold";
-
-#define STYLE_TAG_MATCH \
-   tag:  "match" "+ color=#0051B5FF";
-
-styles {
-   // ************* list main text ********** //
-   style { name: "list_text_main";
-      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=list_item ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023 text_class=T023 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_main_dim";
-      base: "color=#0707077F font=Tizen:style=Regular font_size=30 text_class=list_item ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff  color_class=T023D text_class=T023D ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_main_press";
-      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=list_item ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023P text_class=T023P ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   // ************* list sub text ********** //
-   style { name: "list_text_sub_01";
-      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      //base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color=#4C4C4CFF color_class=T024 text_class=T024 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_01_dim";
-      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024D text_class=T024D ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_01_press";
-      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024P text_class=T024P ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_02";
-      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L1 text_class=T024L1 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_02_dim";
-      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L1D text_class=T024L1D ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_02_press";
-      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L1P text_class=T024L1P ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_03";
-      base: "font=Tizen:style=Regular font_size=24  color=#023D84FF text_class=tizen ellipsis=1.0";
-      //base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L2 fotext_class=T024L2 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_03_dim";
-      base: "color=#023D847F font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L2D text_class=T024L2D ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_03_press";
-      base: "color=#023D84FF font=Tizen:style=Regular font_size=24 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024L2P text_class=T024L2P ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   // ************* list index text ********** //
-   style { name: "list_text_index_main";
-      base: "color=#023d84ff font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_MAIN_SIZE" color=#ffffff color_class=T027L1 text_class=T027L1 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_index_main_dim";
-      base: "color=#023d84ff font=Tizen:styleRegular font_size=27 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_MAIN_SIZE" color=#ffffff color_class=T027L1 text_class=T027L1 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_index_main_press";
-      base: "color=#023d84ff font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_MAIN_SIZE" color=#ffffff color_class=T027L1 text_class=T027L1 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_index_sub";
-      base: "color=#023D84FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_SUB_SIZE" color=#ffffff color_class=T027L2 text_class=T027L2 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_index_sub_dim";
-      base: "color=#023D847F font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_SUB_SIZE" color=#ffffff color_class=T027L2 text_class=T027L2 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_index_sub_press";
-      base: " color=#023D84FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=1.0";
-      //base: "font=Tizen:style=Regular font_size="LIST_INDEX_TEXT_SUB_SIZE" color=#ffffff color_class=T027L2 font=Tizen:style=Regular ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   // multiline text
-   style { name: "list_text_multiline_main";
-      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=list_item wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023 text_class=T023 wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_main_dim";
-      base: "color=#0707077F font=Tizen:style=Regular font_size=30 text_class=list_item wrap=mixed";
-      //base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023D text_class=T023D wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_main_press";
-      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=list_item wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023P text_class=T023P wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_sub";
-      base: "font=Tizen:style=Regular font_size=24 color=#4C4C4CFF text_class=tizen wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024 text_class=T024 wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_sub_dim";
-      base: "color=#4C4C4C7F font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024D text_class=T024D wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_sub_press";
-      base: "color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024P text_class=T024P wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_desc";
-      base: "color=#006FD1FF font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_DESC_TEXT_SIZE" color=#ffffff color_class=T129 text_class=T129 wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_select";
-      base: "color=#006FD1FF font=Tizen:style=Regular font_size=24 text_class=list_item ellipsis=1.0";
-       //(Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_DESC_TEXT_SIZE" color=#ffffff color=#006FD1FF color_class=T129 text_class=T129 ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   // ************* button text ********** //
-   style { name: "button_main";
-      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" align=center color=#ffffff color_class=T051L2 text_class=T051L2 ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_main_dim";
-      base: "align=center color=#ffffff7f font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" align=center color=#ffffff color_class=T051L2D text_class=T051L2D ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_main_press";
-      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" align=center color=#ffffff color_class=T051L2P text_class=T051L2P ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_date";
-      base: "color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_DATE_TEXT_SIZE" color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=0.0";
-      STYLE_TAGS
-   }
-   style { name: "button_date_dim";
-      base: "color=#ffffff7f font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_DATE_TEXT_SIZE" color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=0.0";
-      STYLE_TAGS
-   }
-   style { name: "button_date_press";
-      base: "color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_DATE_TEXT_SIZE" color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=0.0";
-      STYLE_TAGS
-   }
-   style { name: "button_ampm";
-      base: "color=#023D84FF font=Tizen:style=Light font_size=54 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_AMPM_TEXT_SIZE" color=#ffffff color_class=T1234 text_class=T1234 ellipsis=0.0";
-      STYLE_TAGS
-   }
-      style { name: "button_ampm_dim";
-      base: "color=#0707077F font=Tizen:style=Light font_size=54 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_AMPM_TEXT_SIZE" color=#ffffff color_class=T1234D text_class=T1234D ellipsis=0.0";
-      STYLE_TAGS
-   }
-      style { name: "button_ampm_press";
-      base: "color=#F4F4F4FF font=Tizen:style=Light font_size=54 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_AMPM_TEXT_SIZE" color=#ffffff color_class=T1234P text_class=T1234P ellipsis=0.0";
-      STYLE_TAGS
-   }
-   style { name: "button_bottom";
-      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_bottom_dim";
-      base: "align=center color=#ffffff7f font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_bottom_press";
-      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_popup";
-      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_popup_dim";
-      base: "align=center color=#ffffff80 font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_popup_press";
-      base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_trans";
-      base: "color=#070707FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=0.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff color_class=T1221 text_class=T1221 ellipsis=0.0";
-      STYLE_TAGS
-   }
-   style { name: "button_circle";
-      base: "align=center color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_CIRCLE_SIZE" align=center color=#ffffff color_class=T127 text_class=T127 wrap=mixed";
-      STYLE_TAGS
-   }
-   style { name: "button_contacts";
-      base: "color=#ffffffff align=center font=Tizen:style=Regular font_size=30 text_class=tizen  wrap=none ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2 text_class=T051L2  wrap=none ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_contacts_dim";
-      base: "color=#ffffff7f align=center font=Tizen:style=Regular font_size=30 text_class=tizen wrap=none  ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2D text_class=T051L2D wrap=none  ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "button_contacts_press";
-      base: "color=#ffffffff align=center font=Tizen:style=Regular font_size=30 text_class=tizen wrap=none  ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2P text_class=T051L2P wrap=none  ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "check_popup";
-      base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=label ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="CHECK_TEXT_FONT_SIZE_INC" color=#ffffff color_class=T023 text_class=T023 ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "check_popup_dim";
-      base: "color=#0707077F font=Tizen:style=Regular font_size=30 text_class=label ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="CHECK_TEXT_FONT_SIZE_INC" color=#ffffff color_class=T023D font=Tizen:style=Regular font_size=30 text_class=T023D ellipsis=1.0";
-      STYLE_TAGS
-   }
-  // ************* no Content text ********** //
-   style { name: "empty_state_1";
-      base: "align=center color=#000000FF font=Tizen:style=Regular font_size=30 text_class=tizen wrap=mixed ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Regular font_size="NO_CONTENT_TITLE_TEXT_FONT_SIZE_INC" align=center color=#ffffff color_class=T0222L1 text_class=T0222L1 wrap=mixed ellipsis=1.0";
-      STYLE_TAGS
-   }
-   style { name: "empty_state_2";
-      base: "align=center color=#000000FF font=Tizen:style=Light font_size=24 text_class=tizen wrap=mixed ellipsis=1.0";
-      // (Changeable UI) base: "font=Tizen:style=Light font_size="NO_CONTENT_TEXT_FONT_SIZE_INC" align=center color=#ffffff color_class=T0222L2 text_class=T0222L2 wrap=mixed ellipsis=1.0";
-      STYLE_TAGS
-   }
-}
-
-
-//****************************************************************************//
-// Gengrid
-//****************************************************************************//
-
-#define GRID_PADDING_LEFT_TOP_SIZE            1 1
-#define GRID_PADDING_RIGHT_BOTTOM_SIZE        1 1
-#define GRID_POPUP_PADDING_LEFT_TOP_SIZE      42 21
-#define GRID_POPUP_PADDING_RIGHT_BOTTOM_SIZE  42 11
-#define GRID_POPUP_ITEM_REAL_BG_SIZE          156 167
-#define GRID_POPUP_SWALLOW_ICON_SIZE          72 72
-#define GRID_POPUP_TEXT_SIZE                  124 60
-#define GENGRID_POPUP_CONTENT_TOP_PADDING     18
-#define GENGRID_POPUP_CONTENT_BOTTOM_PADDING  18
-
-//**************************DATETIME SPINNER****************//
-
-#define DATETIME_WIDGET_HEIGHT                     49 //FIXME : widget UX not provided
-#define DATETIME_WIDGET_PADDING_SIZE_INC           11 49 //FIXME : widget UX not provided
-
-
-#define DATETIME_LAYOUT_CONTENT_SIZE_INC 480 222
-#define TIME_LAYOUT_CONTENT_TIME_24HR_LEFT_RIGHT_PADDING_WIDTH_INC 85
-#define TIME_LAYOUT_CONTENT_TIME_24HR_CENTER_PADDING_WIDTH_INC 38
-#define TIME_LAYOUT_CONTENT_COLON_WIDTH_INC 24
-
-#define DATETIME_AMPM_BUTTON_SIZE_INC 105 110
-#define DATETIME_AMPM_BUTTON_PRESSED_AREA_SIZE_INC 105 68
-#define DATETIME_AMPM_BUTTON_TOP_BOTTOM_PADDING_HEIGHT_INC 21
-#define DATETIME_FIELD_BUTTON_LEFT_RIGHT_PADDING_WIDTH_INC 12
-
-#define TIME_LAYOUT_CONTENT_LEFT_PADDING_WIDTH_INC 45
-#define TIME_LAYOUT_CONTENT_RIGHT_PADDING_WIDTH_INC 26
-#define TIME_LAYOUT_CONTENT_FIELD_WIDTH_INC 105
-#define TIME_LAYOUT_CONTENT_CENTER_PADDING_WIDTH_INC 22
-
-#define DATE_LAYOUT_CONTENT_FIELD_WIDTH_INC 140
-#define DATE_LAYOUT_CONTENT_LEFT_PADDING_WIDTH_INC 24
-#define DATE_LAYOUT_CONTENT_RIGHT_PADDING_WIDTH_INC 24
-#define DATE_LAYOUT_CONTENT_CENTER_PADDING_WIDTH_INC 6
-
-#define SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC 42 60
-#define SPINNER_LEFT_RIGHT_BG_IMAGE_SIZE_INC 42 60
-#define SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC 60 42
-#define SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC 60 42
-#define SPINNER_TEXT_HEIGHT_INC 110
-#define SPINNER_TEXT_TOP_BOTTOM_PADDING_HEIGHT_INC 14
-#define SPINNER_UP_DOWN_BG_EVENT_AREA_HEIGHT_INC 56
-#define SPINNER_VERTICAL_BG_WIDTH_INC 105
-#define SPINNER_VERTICAL_BG_HEIGHT_INC 222
-
-#define ENTRY_TIME_LAYOUT_TEXT_SIZE_INC 60
-#define ENTRY_DATE_LAYOUT_TEXT_SIZE_INC 40
-
-//***************************DATETIME SPINNER*************************//
-
-
diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc
deleted file mode 100644
index 4377cf7a..00000000
--- a/themes/widgets/check.edc
+++ /dev/null
@@ -1,844 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-group { name: "elm/check/base/default";
-   images {
-      set {
-         name: "core_check_bg";
-            image {
-               image: SMALL"images/Controls/core_check_bg.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_check_bg.png" COMP;
-            }
-      }
-      set {
-         name: "core_check_bg_stroke";
-            image {
-               image: SMALL"images/Controls/core_check_bg_stroke.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_check_bg_stroke.png" COMP;
-            }
-      }
-      set {
-         name: "core_check_icon";
-            image {
-               image: SMALL"images/Controls/core_check_icon.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_check_icon.png" COMP;
-            }
-      }
-   }
-   script {
-      public check_state;
-      public check_disabled;
-      public check_visible;
-   }
-   parts {
-      part { name: "bg";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_BG_SIZE;
-            align: 0.0 0.5;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-            image.normal: "core_check_bg";
-            color: 0 0 0 102; /*(Changeable UI) color_class: "W013L1E1";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "W013L1";*/
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 0 0 0 51; /*(Changeable UI) color_class: "W013L1D";*/
-         }
-      }
-      part { name: "bg_stroke";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_BG_STROKE_SIZE;
-            align: 0.0 0.5;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-            image.normal: "core_check_bg_stroke";
-            color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2E1";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2";*/
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 191 191 191 76; /*(Changeable UI) color_class: "W013L2D";*/
-         }
-      }
-      part { name: "check";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_ICON_SIZE;
-            rel1.to: "bg";
-            rel1.relative: 0.125 0.125;
-            rel2.to: "bg";
-            rel2.relative: 0.875 0.875;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-            image.normal: "core_check_icon";
-            color_class:"W013L1i";
-            visible:0;
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class:"W013L1iD";
-         }
-      }
-      part { name: "event";
-         scale: 1;
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { name: "show";
-         signal: "show";
-         script {
-            set_int(check_visible, 1);
-         }
-      }
-      program { name: "hide";
-         signal: "hide";
-         script {
-            set_int(check_visible, 0);
-         }
-      }
-      program { name: "click";
-         signal: "mouse,clicked,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            emit("elm,action,check,toggle", "");
-         }
-      }
-      program { name: "unpressed";
-         signal: "mouse,up,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1) {
-              set_state(PART:"check", "on", 0.0);
-              set_state(PART:"bg", "on", 0.0);
-              set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            else {
-              set_state(PART:"check", "default", 0.0);
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"bg_stroke", "default", 0.0);
-            }
-         }
-      }
-      program { name: "unpressed2";
-         signal: "elm,state,mouse,up";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1) {
-              set_state(PART:"check", "on", 0.0);
-              set_state(PART:"bg", "on", 0.0);
-              set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            else {
-              set_state(PART:"check", "default", 0.0);
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"bg_stroke", "default", 0.0);
-            }
-         }
-      }
-
-      program { name: "check_on";
-         signal: "elm,state,check,on";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) {
-               set_state(PART:"bg", "disabled", 0.0);
-               set_state(PART:"bg_stroke", "disabled", 0.0);
-            }
-            else {
-               set_state(PART:"bg", "on", 0.0);
-               set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            set_state(PART:"check", "on", 0.0);
-            set_int(check_state, 1);
-         }
-      }
-      program { name: "check_off";
-         signal: "elm,state,check,off";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) {
-               set_state(PART:"bg", "disabled", 0.0);
-               set_state(PART:"bg_stroke", "disabled", 0.0);
-            }
-            else {
-               set_state(PART:"bg", "default", 0.0);
-               set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            set_state(PART:"check", "default", 0.0);
-            set_int(check_state, 0);
-         }
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 1);
-            set_state(PART:"bg", "disabled", 0.0);
-            set_state(PART:"bg_stroke", "disabled", 0.0);
-            set_state(PART:"check", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 0);
-            if (get_int(check_state) == 1) {
-              set_state(PART:"bg", "on", 0.0);
-              set_state(PART:"bg_stroke", "on", 0.0);
-              set_state(PART:"check", "on", 0.0);
-            }
-            else {
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"bg_stroke", "default", 0.0);
-              set_state(PART:"check", "default", 0.0);
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/check/base/list";
-   images {
-      image: "core_check_bg.png" COMP;
-      image: "core_check_bg_stroke.png" COMP;
-      image: "core_check_icon.png" COMP;
-   }
-   script {
-      public check_state;
-      public check_disabled;
-      public check_visible;
-   }
-   parts {
-      part { name: "bg";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_BG_SIZE;
-            align: 0.0 0.5;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-            image.normal: "core_check_bg.png";
-            color: 0 0 0 102; /*(Changeable UI) color_class: "W013L1E1";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            color: 2 61 132 255; /*(Changeable UI) color_class: "W013L1";*/
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 0 0 0 51; /*(Changeable UI) color_class: "W013L1D";*/
-         }
-      }
-      part { name: "bg_stroke";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_BG_STROKE_SIZE;
-            align: 0.0 0.5;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-            image.normal: "core_check_bg_stroke.png";
-            color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2E1";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            color: 191 191 191 153; /*(Changeable UI) color_class: "W013L2";*/
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 191 191 191 76; /*(Changeable UI) color_class: "W013L2D";*/
-         }
-      }
-      part { name: "check";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_ICON_SIZE;
-            rel1.to: "bg";
-            rel1.relative: 0.125 0.125;
-            rel2.to: "bg";
-            rel2.relative: 0.875 0.875;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-            image.normal: "core_check_icon.png";
-            color_class:"W013L1i";
-            visible:0;
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class:"W013L1iD";
-         }
-      }
-      part { name: "event";
-         scale: 1;
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { name: "show";
-         signal: "show";
-         script {
-            set_int(check_visible, 1);
-         }
-      }
-      program { name: "hide";
-         signal: "hide";
-         script {
-            set_int(check_visible, 0);
-         }
-      }
-      program { name: "unpressed";
-         signal: "mouse,up,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1) {
-              set_state(PART:"check", "on", 0.0);
-              set_state(PART:"bg", "on", 0.0);
-              set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            else {
-              set_state(PART:"check", "default", 0.0);
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"bg_stroke", "default", 0.0);
-            }
-         }
-      }
-      program { name: "unpressed2";
-         signal: "elm,state,mouse,up";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1) {
-              set_state(PART:"check", "on", 0.0);
-              set_state(PART:"bg", "on", 0.0);
-              set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            else {
-              set_state(PART:"check", "default", 0.0);
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"bg_stroke", "default", 0.0);
-            }
-         }
-      }
-
-      program { name: "check_on";
-         signal: "elm,state,check,on";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) {
-               set_state(PART:"bg", "disabled", 0.0);
-               set_state(PART:"bg_stroke", "disabled", 0.0);
-            }
-            else {
-               set_state(PART:"bg", "on", 0.0);
-               set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            set_state(PART:"check", "on", 0.0);
-            set_int(check_state, 1);
-         }
-      }
-      program { name: "check_off";
-         signal: "elm,state,check,off";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) {
-               set_state(PART:"bg", "disabled", 0.0);
-               set_state(PART:"bg_stroke", "disabled", 0.0);
-            }
-            else {
-               set_state(PART:"bg", "default", 0.0);
-               set_state(PART:"bg_stroke", "on", 0.0);
-            }
-            set_state(PART:"check", "default", 0.0);
-            set_int(check_state, 0);
-         }
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 1);
-            set_state(PART:"bg", "disabled", 0.0);
-            set_state(PART:"bg_stroke", "disabled", 0.0);
-            set_state(PART:"check", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 0);
-            if (get_int(check_state) == 1) {
-              set_state(PART:"bg", "on", 0.0);
-              set_state(PART:"bg_stroke", "on", 0.0);
-              set_state(PART:"check", "on", 0.0);
-            }
-            else {
-              set_state(PART:"bg", "default", 0.0);
-              set_state(PART:"bg_stroke", "default", 0.0);
-              set_state(PART:"check", "default", 0.0);
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/check/base/favorite";
-   images {
-      set {
-         name: "core_icon_favorite";
-         image {
-            image: SMALL"images/Controls/core_icon_favorite.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_icon_favorite.png" COMP;
-         }
-      }
-   }
-   script {
-      public check_state;
-      public check_disabled;
-      public check_visible;
-   }
-   parts {
-      part { name: "bg";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_BG_SIZE ;
-            max: CHECK_BG_SIZE ;
-            image.normal: "core_icon_favorite";
-            color: 7 7 7 76; /*(Changeable UI) color_class: "W016L1iE1";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            color: 255 178 0 255; /*(Changeable UI) color_class: "W016L1i";*/
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 7 7 7 38; /*(Changeable UI) color_class: "W016L1iD";*/
-         }
-      }
-      part { name: "event";
-         scale: 1;
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { name: "show";
-         signal: "show";
-         script {
-            set_int(check_visible, 1);
-         }
-      }
-      program { name: "hide";
-         signal: "hide";
-         script {
-            set_int(check_visible, 0);
-         }
-      }
-      program { name: "click";
-         signal: "mouse,clicked,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            emit("elm,action,check,toggle", "");
-         }
-      }
-      program { name: "unpressed";
-         signal: "mouse,up,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1)
-              set_state(PART:"bg", "on", 0.0);
-            else
-              set_state(PART:"bg", "default", 0.0);
-         }
-      }
-      program { name: "unpressed2";
-         signal: "elm,state,mouse,up";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1)
-              set_state(PART:"bg", "on", 0.0);
-            else
-              set_state(PART:"bg", "default", 0.0);
-         }
-      }
-      program { name: "check_on";
-         signal: "elm,state,check,on";
-         source: "elm";
-         script {
-            set_state(PART:"bg", "on", 0.0);
-            set_int(check_state, 1);
-         }
-      }
-      program { name: "check_off";
-         signal: "elm,state,check,off";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1)
-               set_state(PART:"bg", "disabled", 0.0);
-            else
-               set_state(PART:"bg", "default", 0.0);
-            set_int(check_state, 0);
-         }
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 1);
-            if (get_int(check_state) == 1)
-              set_state(PART:"bg", "on", 0.0);
-            else
-              set_state(PART:"bg", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 0);
-            if (get_int(check_state) == 1)
-              set_state(PART:"bg", "on", 0.0);
-            else
-              set_state(PART:"bg", "default", 0.0);
-         }
-      }
-   }
-}
-
-group { name: "elm/check/base/on&off";
-   images {
-      set {
-         name: "core_toggle_bg";
-         image {
-            image: SMALL"images/Controls/core_toggle_bg.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_toggle_bg.png" COMP;
-         }
-      }
-      set {
-         name: "core_toggle_icon_off";
-         image {
-            image: SMALL"images/Controls/core_toggle_icon_off.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_toggle_icon_off.png" COMP;
-         }
-      }
-      set {
-         name: "core_toggle_icon_on";
-         image {
-            image: SMALL"images/Controls/core_toggle_icon_on.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_toggle_icon_on.png" COMP;
-         }
-      }
-   }
-   script {
-      public check_state;
-      public check_disabled;
-      public check_visible;
-   }
-   parts {
-      part { name: "bg";
-         type: SPACER;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_GEN_SIZE;
-            max: CHECK_GEN_SIZE;
-         }
-      }
-      part { name: "bg_image";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "core_toggle_bg";
-            color: 7 7 7 76; /*(Changeable UI) color_class: "W015L1E1";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            color: 52 158 91 255; /*(Changeable UI) color_class: "W015L1";*/
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 7 7 7 38; /*(Changeable UI) color_class: "W015L1D";*/
-         }
-      }
-      part { name: "button";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CHECK_SIZE ;
-            max: CHECK_SIZE ;
-            rel1.to: "bg_image";
-            rel2.to: "bg_image";
-            image.normal: "core_toggle_icon_off";
-            color: 244 244 244 255; /*(Changeable UI) color_class: "W015L1i";*/
-         }
-         description { state: "on" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "core_toggle_icon_on";
-            color: 244 244 244 255; /*(Changeable UI) color_class: "W015L1i";*/
-         }
-      }
-      part { name: "event";
-         scale: 1;
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { name: "show";
-         signal: "show";
-         script {
-            set_int(check_visible, 1);
-         }
-      }
-      program { name: "hide";
-         signal: "hide";
-         script {
-            set_int(check_visible, 0);
-         }
-      }
-      program { name: "click";
-         signal: "mouse,clicked,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            emit("elm,action,check,toggle", "");
-         }
-      }
-      program { name: "unpressed";
-         signal: "mouse,up,1";
-         source: "event";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1) {
-              set_state(PART:"bg_image", "on", 0.0);
-              set_state(PART:"button", "on", 0.0);
-            }
-            else {
-              set_state(PART:"bg_image", "default", 0.0);
-              set_state(PART:"button", "default", 0.0);
-            }
-         }
-      }
-      program { name: "unpressed2";
-         signal: "elm,state,mouse,up";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1) return;
-            if (get_int(check_state) == 1) {
-              set_state(PART:"bg_image", "on", 0.0);
-              set_state(PART:"button", "on", 0.0)
-            }
-            else {
-              set_state(PART:"bg_image", "default", 0.0);
-              set_state(PART:"button", "default", 0.0);
-            }
-         }
-      }
-      program { name: "check_on";
-         signal: "elm,state,check,on";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1)
-               set_state(PART:"bg_image", "disabled", 0.0);
-            else
-               set_state(PART:"bg_image", "on", 0.0);
-            set_state(PART:"button", "on", 0.0)
-            set_int(check_state, 1);
-         }
-      }
-      program { name: "check_off";
-         signal: "elm,state,check,off";
-         source: "elm";
-         script {
-            if (get_int(check_disabled) == 1)
-               set_state(PART:"bg_image", "disabled", 0.0);
-            else
-               set_state(PART:"bg_image", "default", 0.0);
-            set_state(PART:"button", "default", 0.0);
-            set_int(check_state, 0);
-         }
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 1);
-            set_state(PART:"bg_image", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(check_disabled, 0);
-            if (get_int(check_state) == 1)
-              set_state(PART:"bg_image", "on", 0.0);
-            else
-              set_state(PART:"bg_image", "default", 0.0);
-         }
-      }
-   }
-}
-
-group { name: "elm/check/base/popup";
-   inherit: "elm/check/base/default";
-   parts {
-      part { name: "padding_before_text";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.5;
-            min: 0 0;
-            rel1 {
-               to_x: "bg";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to_x: "bg";
-               relative: 1.0 1.0;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            min: CHECK_PAD_BEFORE_TEXT_INC;
-            max: CHECK_PAD_BEFORE_TEXT_INC;
-            fixed: 1 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            fixed: 0 1;
-            rel1 {
-               relative: 1.0 0.5;
-               to_x: "padding_before_text";
-            }
-            rel2 {
-               relative: 1.0 0.5;
-            }
-            align: 0.0 0.5;
-            text {
-               style: "check_popup";
-               min: 0 0;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            text.min: 1 1;
-            text.ellipsis: -1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "disabled_visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            text {
-               style: "check_popup_dim";
-               min: 1 1;
-               ellipsis: -1;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "text_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "padding_before_text";
-         target: "elm.text";
-      }
-      program { name: "text_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "padding_before_text";
-         target: "elm.text";
-      }
-   }
- }
diff --git a/themes/widgets/conform.edc b/themes/widgets/conform.edc
deleted file mode 100644
index f4bb27d1..00000000
--- a/themes/widgets/conform.edc
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// FIXME: scroller UX is not defined yet
-// Ho Sang, do it!
-
-group { name: "elm/conformant/base/default";
-   script {
-      public indicator_effect = 0;     //Indicator need effect
-      public indicator_visible = 0;     //Indicator visible check
-      public indicator_opacity = 0;     //0=opaque, 1=transparent
-      public indicator_overlap = 0;     //check indicator overlap/nooverlap
-      public clipboard_disable  = 0;     //check clipboard enable/disable
-      public keypad_disable = 0;  //check virtualkeypad enable/disable
-      public landscape = 0; //Landscape mode status
-      public portrait_overlap = 0; //save portrait_overlap mode
-      public portrait_opacity = 0; //save portrait_opacity
-   }
-   parts {
-      part { name: "elm.swallow.bg";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-         }
-      }
-      part { name: "indicator_base";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
-            rel2.relative: 1.0 0.0;
-            visible: 0;
-         }
-         description { state: "hide" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-         }
-      }
-      part { name: "indicator_overlap_base";
-         type: RECT;
-         description { state: "default" 0.0; //nooverlap
-            rel1 { relative: 0.0 0.0; to: "indicator_base"; }
-            rel2 { relative: 1.0 1.0; to: "indicator_base"; }
-            visible: 0;
-         }
-         description { state: "overlap" 0.0; //content start (0,0)
-            inherit: "default" 0.0;
-            rel2 { relative: 1.0 0.0; to: "indicator_base"; }
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0; //sip: enable
-            align: 0.5 0.5;
-            rel1.relative: 0.0 1.0;
-            rel1.to: "indicator_overlap_base";
-            rel2.relative: 1.0 0.0;
-            rel2.to: "sip_area";
-         }
-         description { state: "disable_sip" 0.0; //sip: disable
-            inherit: "default" 0.0;
-            rel2.relative: 1.0 1.0;
-            rel2.to: "elm.swallow.bg";
-         }
-      }
-      part { name: "elm.swallow.ug";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.5 0.5;
-            rel1.relative: 0.0 1.0;
-            rel1.to: "indicator_overlap_base";
-            rel2.relative: 1.0 0.0;
-            rel2.to: "sip_area";
-         }
-         description { state: "disable_sip" 0.0; //sip: disable
-            inherit: "default" 0.0;
-            rel2.relative: 1.0 1.0;
-            rel2.to: "elm.swallow.bg";
-         }
-      }
-     part { name: "elm.swallow.dim";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-         }
-      }
-      part { name: "indicator_event";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            rel1 { relative: 0.0 0.0; to: "elm.swallow.content"; }
-            rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
-            color: 0 0 0 0;
-            visible: 1;
-         }
-      }
-      part { name: "indicator_clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1 { relative: 0.0 0.0; to: "indicator_base"; }
-            rel2 { relative: 1.0 1.0; to: "indicator_base"; }
-            visible: 1;
-         }
-         description { state: "hide" 0.0;
-            inherit: "default" 0.0;
-            rel1 { relative: 0.0 -1.0; to: "indicator_base"; }
-            rel2 { relative: 1.0  0.0; to: "indicator_base"; }
-         }
-      }
-      part { name: "indicator_bg";
-         type: RECT;
-         clip_to: "indicator_clipper";
-         description { state: "default" 0.0;
-            rel1 { relative: 0.0 0.0; to: "indicator_clipper"; }
-            rel2 { relative: 1.0 1.0; to: "indicator_clipper"; }
-            color: 7 7 7 255; /*(Changeable UI) color_class: "B031";*/
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.swallow.indicator_bg";
-         type: SWALLOW;
-         clip_to: "indicator_clipper";
-         description { state: "default" 0.0;
-            rel1 { relative: 0.0 0.0; to: "indicator_clipper"; }
-            rel2 { relative: 1.0 1.0; to: "indicator_clipper"; }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.swallow.indicator";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "indicator_clipper";
-         description { state: "default" 0.0;
-            rel1 { relative: 0.0 0.0; to: "indicator_clipper"; }
-            rel2 { relative: 1.0 1.0; to: "indicator_clipper"; }
-         }
-      }
-      part { name: "sip_area";
-         type: RECT;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            min: 0 0;
-            rel1.relative: 0.0 0.0;
-            rel1.to_y: "elm.swallow.virtualkeypad";
-            rel2.relative: 1.0 1.0;
-            rel2.to_y: "elm.swallow.virtualkeypad";
-            visible: 0;
-         }
-         description { state: "clipboard_on" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_y: "elm.swallow.clipboard";
-            rel2.to_y: "elm.swallow.clipboard";
-         }
-      }
-      part { name: "clipboard_bg";
-          type: RECT;
-          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.clipboard";
-            rel2.to: "elm.swallow.clipboard";
-            color_class: "B0211";
-          }
-      }
-      part { name: "elm.swallow.clipboard";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.0 1.0;
-            rel1.relative: 0.0 1.0;
-         }
-      }
-      part { name: "virtualkeypad_bg";
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "elm.swallow.virtualkeypad";
-            rel2.to: "elm.swallow.virtualkeypad";
-            color_class: "B0211";
-          }
-      }
-      part { name: "elm.swallow.virtualkeypad";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.0 1.0;
-            rel1.relative: 0.0 1.0;
-         }
-      }
-   }
-   programs {
-      program {
-          name: "show_indicator"; //show indicator using effect
-          signal: "elm,state,indicator,show";
-          source: "elm";
-          script {
-             set_int(indicator_visible, 1);
-             set_state(PART:"indicator_base", "default", 0.0);
-             //it is possible app call show after opacity call
-             /////Portrait
-             if (get_int(landscape) == 0) {
-               if (get_int(indicator_opacity) == 0)
-                 run_program(PROGRAM:"opaque_state");
-               if (get_int(indicator_opacity) == 1)
-                 run_program(PROGRAM:"transparent_state");
-             }
-             /////Landscape
-             else
-               run_program(PROGRAM:"transparent_state");
-          }
-      }
-      program {
-          name: "hide_indicator";
-          signal: "elm,state,indicator,hide";
-          source: "elm";
-          script {
-             set_int(indicator_visible, 0);
-             set_state(PART:"indicator_base", "hide", 0.0);
-          }
-      }
-      program {
-          name: "show_indicator_transition"; //show indicator using effect
-          action: STATE_SET "default" 0.0;
-          target: "indicator_clipper";
-          transition: DECELERATE 0.2;
-      }
-      program {
-          name: "hide_indicator_transition"; //show indicator using effect
-          action: STATE_SET "hide" 0.0;
-          target: "indicator_clipper";
-          transition: DECELERATE 0.2;
-      }
-      program {
-          name: "show_indicator_effect"; //show indicator using effect
-          signal: "indicator,show,effect";
-          source: "elm";
-          script {
-             if (get_int(indicator_visible) == 1)
-               run_program(PROGRAM:"show_indicator_transition");
-          }
-      }
-      program {
-          name: "hide_indicator_effect"; //show indicator using effect
-          signal: "indicator,hide,effect";
-          source: "elm";
-          script {
-             if (get_int(indicator_visible) == 1)
-               run_program(PROGRAM:"hide_indicator_transition");
-          }
-      }
-      program {
-          name: "opaque_state";
-          script {
-             set_state(PART:"elm.swallow.indicator_bg", "default", 0.0);
-             set_state(PART:"indicator_clipper", "default", 0.0);
-             if (get_int(indicator_overlap) == 0)
-               {
-                 set_state(PART:"indicator_overlap_base", "default", 0.0);
-                 set_state(PART:"indicator_bg", "default", 0.0);
-               }
-             else
-               {
-                 set_state(PART:"indicator_overlap_base", "overlap", 0.0);
-                 set_state(PART:"indicator_bg", "hidden", 0.0);
-               }
-          }
-      }
-      program {
-          name: "transparent_state";
-          script {
-             set_state(PART:"indicator_bg", "default", 0.0);
-             set_state(PART:"elm.swallow.indicator_bg", "hidden", 0.0);
-             set_state(PART:"indicator_clipper", "hide", 0.0);
-             set_state(PART:"indicator_overlap_base", "overlap", 0.0);
-          }
-      }
-
-      program {
-          name: "opaque_indicator";
-          signal: "elm,state,indicator,opaque";
-          source: "elm";
-          script {
-            set_int(indicator_opacity, 0);
-            if ((get_int(indicator_visible) == 1) && (get_int(landscape) == 0))
-              run_program(PROGRAM:"opaque_state");
-          }
-      }
-      program {
-          name: "transparent_indicator";
-          signal: "elm,state,indicator,transparent";
-          source: "elm";
-          script {
-             set_int(indicator_opacity, 1);
-             if (get_int(indicator_visible) == 1)
-               run_program(PROGRAM:"transparent_state");
-          }
-      }
-      program {
-         name: "overlap_indicator";
-         signal: "elm,state,indicator,overlap";
-         source: "elm";
-         script {
-            set_int(indicator_overlap, 1);
-            set_state(PART:"indicator_overlap_base", "overlap", 0.0);
-            set_state(PART:"indicator_bg", "hidden", 0.0);
-        }
-      }
-      program {
-         name: "nooverlap_indicator";
-         signal: "elm,state,indicator,nooverlap";
-         source: "elm";
-         script {
-            //Only portrait state get nooverlap mode
-            set_int(indicator_overlap, 0);
-            if (get_int(indicator_visible) == 1)
-              if (get_int(indicator_opacity) == 0) { //only opaque can be nooverlap
-                if (get_int(landscape) == 0) { //landscape should be overlap
-                  set_state(PART:"indicator_overlap_base", "default", 0.0);
-                  set_state(PART:"indicator_bg", "default", 0.0);
-                }
-              }
-         }
-      }
-      program { name: "enable_clipboard";
-         signal: "elm,state,clipboard,enable";
-         source: "";
-         script {
-            set_int(clipboard_disable, 0);
-            //set content state
-            set_state(PART:"elm.swallow.content", "default", 0.0);
-         }
-      }
-      program { name: "disable_clipboard";
-         signal: "elm,state,clipboard,disable";
-         source: "";
-         script {
-            set_int(clipboard_disable, 1);
-            set_state(PART:"sip_area", "default", 0.0);
-            if (get_int(keypad_disable) == 1)
-              set_state(PART:"elm.swallow.content", "disable_sip", 0.0);
-            else
-              set_state(PART:"elm.swallow.content", "default", 0.0);
-         }
-      }
-      program { name: "enable_virtualkeypad";
-         signal: "elm,state,virtualkeypad,enable";
-         source: "";
-         script {
-            set_int(keypad_disable, 0);
-            set_state(PART:"elm.swallow.content", "default", 0.0);
-         }
-      }
-      program { name: "disable_virtualkeypad";
-         signal: "elm,state,virtualkeypad,disable";
-         source: "";
-         script {
-            set_int(keypad_disable, 1);
-            if (get_int(clipboard_disable) == 1)
-              {
-                 set_state(PART:"sip_area", "clipboard_on", 0.0);
-                 set_state(PART:"elm.swallow.content", "disable_sip", 0.0);
-              }
-            else
-              set_state(PART:"elm.swallow.content", "default", 0.0);
-         }
-      }
-      program {
-          name: "change_to_landscape";
-          script {
-             if (get_int(landscape) == 0) {
-               set_int(landscape, 1);
-               if (get_int(indicator_visible) == 1)
-                 run_program(PROGRAM:"transparent_state");
-             }
-          }
-       }
-       program {
-          name: "change_to_portrait";
-          script {
-             if (get_int(landscape) == 1) {  //content start (0, indicator height)
-                set_int(landscape, 0);
-                if (get_int(indicator_visible) == 1) {
-                  if (get_int(indicator_opacity) == 1)
-                    run_program(PROGRAM:"transparent_state");
-                  else
-                    run_program(PROGRAM:"opaque_state");
-                }
-             }
-          }
-       }
-       program { name: "landscape_mode";
-          source: "elm";
-          signal: "elm,state,orient,90";
-          after: "change_to_landscape";
-       }
-       program { name: "landscape_mode2";
-          source: "elm";
-          signal: "elm,state,orient,270";
-          after: "change_to_landscape";
-       }
-       program { name: "portrait_mode";
-          source: "elm";
-          signal: "elm,state,orient,0";
-          after: "change_to_portrait";
-       }
-       program { name: "portrait_mode2";
-          source: "elm";
-          signal: "elm,state,orient,180";
-          after: "change_to_portrait";
-      }
-      program {
-          name: "clipboard_on";
-          signal: "elm,state,clipboard,on";
-          source: "elm";
-          action: STATE_SET "clipboard_on" 0.0;
-          target: "sip_area";
-      }
-      program {
-          name: "clipboard_off";
-          signal: "elm,state,clipboard,off";
-          source: "elm";
-          action: STATE_SET "default" 0.0;
-          target: "sip_area";
-      }
-      program { name: "indicator_event_down";
-          signal: "mouse,down,1";
-          source: "indicator_event";
-          action: SIGNAL_EMIT "elm,action,press" "";
-      }
-   }
-}
-
-group { name: "elm/conformant/base/without_resize";
-   script {
-      public indicator_visible = 0;     //Indicator visible check
-      public indicator_opacity = 0;     //0=opaque, 1=transparent
-   }
-   parts {
-      part { name: "elm.swallow.bg";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-         }
-      }
-      part { name: "elm.swallow.indicator_area";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
-            rel2.relative: 1.0 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.5 0.5;
-            rel1.relative: 0.0 1.0;
-            rel1.to: "elm.swallow.indicator_area";
-         }
-      }
-      part { name: "indicator_bg";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
-            rel2.relative: 1.0 0.0;
-            visible: 1;
-            color: 7 7 7 255; /*(Changeable UI) color_class: "B031";*/
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-            min: 0 0;
-         }
-      }
-      part { name: "elm.swallow.indicator_bg";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
-            rel2.relative: 1.0 0.0;
-            visible: 1;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.swallow.indicator";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
-            rel2.relative: 1.0 0.0;
-            visible: 1;
-         }
-          description { state: "hide" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-            min: 0 0;
-         }
-      }
-   }
-   programs {
-      program {
-          name: "show_indicator";
-          signal: "elm,state,indicator,show";
-          source: "elm";
-          script {
-             set_int(indicator_visible, 1);
-             set_state(PART:"elm.swallow.indicator", "default", 0.0);
-             if (get_int(indicator_opacity) == 0)
-               {
-                 set_state(PART:"indicator_bg", "default", 0.0);
-                 set_state(PART:"elm.swallow.indicator_bg", "default", 0.0);
-               }
-          }
-      }
-      program {
-          name: "hide_indicator";
-          signal: "elm,state,indicator,hide";
-          source: "elm";
-          script {
-             set_int(indicator_visible, 0);
-             set_state(PART:"elm.swallow.indicator", "hide", 0.0);
-             set_state(PART:"indicator_bg", "hidden", 0.0);
-             set_state(PART:"elm.swallow.indicator_bg", "hidden", 0.0);
-          }
-      }
-      program {
-          name: "opaque_indicator";
-          signal: "elm,state,indicator,opaque";
-          source: "elm";
-          script {
-             set_int(indicator_opacity, 0);
-             if (get_int(indicator_visible) == 1)
-               {
-                 set_state(PART:"indicator_bg", "default", 0.0);
-                 set_state(PART:"elm.swallow.indicator_bg", "default", 0.0);
-               }
-          }
-      }
-   }
-}
-
-group { name: "elm/conformant/base/indicator_overlap";
-   inherit: "elm/conformant/base/default";
-   parts {
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.to: "indicator_base";
-         }
-      }
-      part { name: "indicator_bg";
-         type: RECT;
-         clip_to: "indicator_clipper";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-}
diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
deleted file mode 100644
index b43b0b59..00000000
--- a/themes/widgets/entry.edc
+++ /dev/null
@@ -1,6398 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define ENTRY_BLOCK_HANDLE_SOURCE7 "elm/entry/selection/block_handle_left"
-#define ENTRY_BLOCK_HANDLE_SOURCE8 "elm/entry/selection/block_handle_right"
-#define ENTRY_CURSOR_HANDLE_SOURCE9 "elm/entry/cursor_handle/default"
-#define ENTRY_BLOCK_HANDLE_SOURCE10 "elm/entry/selection/block_handle_edge_left"
-#define ENTRY_BLOCK_HANDLE_SOURCE11 "elm/entry/selection/block_handle_edge_right"
-
-#define ENTRY_EDITFIELD_FOCUS_DATA \
-   data.item: "focus_highlight" "on";
-
-#define ENTRY_TOP_BOTTOM_PADDING( SIZE1, SIZE2 ) \
-   part { name: "top_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: SIZE1; \
-         max: SIZE1; \
-         align: 0.5 0.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 0.0; \
-      } \
-   } \
-   part { name: "bottom_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: SIZE2; \
-         max: SIZE2; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 1.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   }
-
-#define ENTRY_TOP_BOTTOM_REL \
-   rel1 { \
-      to_y: "top_padding"; \
-      relative: 0.0 1.0; \
-   } \
-   rel2 { \
-      to_y: "bottom_padding"; \
-      relative: 1.0 0.0; \
-   }
-
-#define ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL \
-   rel1 { \
-      to_x: "left_padding"; \
-      to_y: "top_padding"; \
-      relative: 1.0 1.0; \
-   } \
-   rel2 { \
-      to_x: "right_padding"; \
-      to_y: "bottom_padding"; \
-      relative: 0.0 0.0; \
-   }
-
-#define ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC \
-   script { \
-      public scroll_enabled; \
-   }
-
-#define ENTRY_EDITFIELD_SWALLOW_PARTS \
-   part { name: "clear_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1 { \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            relative: 0.0 1.0; \
-         } \
-      } \
-      description { state: "visible" 0.0; \
-         inherit: "default" 0.0; \
-         min: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC; \
-         max: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC; \
-      } \
-   } \
-   part { name: "elm.swallow.clear"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 1; \
-         rel1 { \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            relative: 0.0 1.0; \
-         } \
-         visible: 0; \
-      } \
-      description { state: "visible" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS \
-   ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT_MULTILINE, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT_MULTILINE) \
-   part { name: "focus_underline_bottom_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_MULTILINE; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 1.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   } \
-   part { name: "left_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         fixed: 1 0; \
-         align: 0.0 0.5; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 0.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "right_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1.relative: 1.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "focus_underline"; \
-      type: RECT; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1 { \
-            relative: 1.0 0.0; \
-            to_x: "left_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         rel2 { \
-            relative: 0.0 0.0; \
-            to_x: "right_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-         visible: 1; \
-      } \
-      description { state: "focused" 0.0; \
-         inherit: "default" 0.0; \
-         color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/ \
-      } \
-      description { state: "disabled" 0.0; \
-         inherit: "default" 0.0; \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 0; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_FOCUS_PARTS \
-   ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT) \
-   part { name: "focus_underline_bottom_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_INC; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1.relative: 0.0 1.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-   } \
-   part { name: "left_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT; \
-         fixed: 1 0; \
-         align: 0.0 0.5; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 0.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "right_padding"; \
-      type: SPACER; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         max: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT; \
-         align: 1.0 0.5; \
-         fixed: 1 0; \
-         rel1.relative: 1.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         min: 0 0; \
-         max: 0 0; \
-      } \
-   } \
-   part { name: "focus_underline"; \
-      type: RECT; \
-      scale: 1; \
-      mouse_events: 0; \
-      description { state: "default" 0.0; \
-         min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC; \
-         align: 0.5 1.0; \
-         fixed: 0 1; \
-         rel1 { \
-            relative: 1.0 0.0; \
-            to_x: "left_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         rel2 { \
-            relative: 0.0 0.0; \
-            to_x: "right_padding"; \
-            to_y: "focus_underline_bottom_padding"; \
-         } \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-         visible: 1; \
-      } \
-      description { state: "focused" 0.0; \
-         inherit: "default" 0.0; \
-         color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/ \
-      } \
-      description { state: "disabled" 0.0; \
-         inherit: "default" 0.0; \
-         color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/ \
-      } \
-      description { state: "hidden" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 0; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART \
-   part { name: "event_rect"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-         visible: 1; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM \
-   program { name: "event_rect_touch_snd"; \
-      signal: "mouse,clicked,1"; \
-      source: "event_rect"; \
-   }
-
-#define ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PART \
-   part { name: "scroller_event_rect"; \
-      type: SWALLOW; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         rel1.relative: 0.0 0.0; \
-         rel2.relative: 1.0 1.0; \
-         visible: 1; \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PROGRAM \
-   program { name: "scroller_event_rect_touch_snd"; \
-      signal: "mouse,clicked,1"; \
-      source: "scroller_event_rect"; \
-	}
-
-#define ENTRY_EDITFIELD_SWALLOW_PROGRAMS \
-   program { name: "scroll_enabled"; \
-      signal: "elm,state,scroll,enabled"; \
-      source: "*"; \
-      script { \
-         set_int(scroll_enabled, 1); \
-         set_state(PART:"focus_underline", "hidden", 0.0); \
-         set_state(PART:"top_padding", "hidden", 0.0); \
-         set_state(PART:"bottom_padding", "hidden", 0.0); \
-         set_state(PART:"left_padding", "hidden", 0.0); \
-         set_state(PART:"right_padding", "hidden", 0.0); \
-      } \
-   } \
-   program { name: "scroll_disabled"; \
-      signal: "elm,state,scroll,disabled"; \
-      source: "*"; \
-      script { \
-         set_int(scroll_enabled, 0); \
-         set_state(PART:"focus_underline", "default", 0.0); \
-         set_state(PART:"top_padding", "default", 0.0); \
-         set_state(PART:"bottom_padding", "default", 0.0); \
-         set_state(PART:"left_padding", "default", 0.0); \
-         set_state(PART:"right_padding", "default", 0.0); \
-      } \
-   } \
-   program { name: "clear_show"; \
-      signal: "elm,state,clear,visible"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.clear", "visible", 0.0); \
-            set_state(PART:"clear_padding", "visible", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "clear_hide"; \
-      signal: "elm,state,clear,hidden"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.clear", "default", 0.0); \
-            set_state(PART:"clear_padding", "default", 0.0); \
-         } \
-      } \
-   }
-
-#define ENTRY_EDITFIELD_FOCUS_PROGRAMS \
-   program { name: "action_focus"; \
-      signal: "elm,state,focus,on"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "focused", 0.0); \
-         } \
-         set_state(PART:"elm.text", "focused", 0.0); \
-      } \
-   } \
-   program { name: "action_unfocus"; \
-      signal: "elm,state,focus,off"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "default", 0.0); \
-         } \
-         set_state(PART:"elm.text", "default", 0.0); \
-      } \
-   } \
-   program { name: "enable_focus_bg"; \
-      signal: "elm,state,enabled"; \
-      source: "elm"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "default", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "disable_focus_bg"; \
-      signal: "elm,state,disabled"; \
-      source: "elm"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"focus_underline", "disabled", 0.0); \
-         } \
-      } \
-   }
-
-group { name: "elm/entry/emoticon/angry/default"; images.image:
-   "emo-angry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-angry.png"; } } } }
-group { name: "elm/entry/emoticon/angry-shout/default"; images.image:
-   "emo-angry-shout.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-angry-shout.png"; } } } }
-group { name: "elm/entry/emoticon/guilty/default"; images.image:
-   "emo-guilty.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-guilty.png"; } } } }
-group { name: "elm/entry/emoticon/haha/default"; images.image:
-   "emo-haha.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-haha.png"; } } } }
-group { name: "elm/entry/emoticon/half-smile/default"; images.image:
-   "emo-half-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-half-smile.png"; } } } }
-group { name: "elm/entry/emoticon/happy/default"; images.image:
-   "emo-happy.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-happy.png"; } } } }
-group { name: "elm/entry/emoticon/kiss/default"; images.image:
-   "emo-kiss.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-kiss.png"; } } } }
-group { name: "elm/entry/emoticon/little-bit-sorry/default"; images.image:
-   "emo-little-bit-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-little-bit-sorry.png"; } } } }
-group { name: "elm/entry/emoticon/love/default"; images.image:
-   "emo-love.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-love.png"; } } } }
-group { name: "elm/entry/emoticon/minimal-smile/default"; images.image:
-   "emo-minimal-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-minimal-smile.png"; } } } }
-group { name: "elm/entry/emoticon/omg/default"; images.image:
-   "emo-omg.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-omg.png"; } } } }
-group { name: "elm/entry/emoticon/smile/default"; images.image:
-   "emo-smile.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-smile.png"; } } } }
-group { name: "elm/entry/emoticon/sorry/default"; images.image:
-   "emo-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-sorry.png"; } } } }
-group { name: "elm/entry/emoticon/surprised/default"; images.image:
-   "emo-surprised.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-surprised.png"; } } } }
-group { name: "elm/entry/emoticon/tongue-dangling/default"; images.image:
-   "emo-tongue-dangling.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-tongue-dangling.png"; } } } }
-group { name: "elm/entry/emoticon/very-sorry/default"; images.image:
-   "emo-very-sorry.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-very-sorry.png"; } } } }
-group { name: "elm/entry/emoticon/wink/default"; images.image:
-   "emo-wink.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-wink.png"; } } } }
-group { name: "elm/entry/emoticon/worried/default"; images.image:
-   "emo-worried.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: ENTRY_EMOTICON_SIZE; image.normal:
-            "emo-worried.png"; } } } }
-
-
-group { name: "elm/entry/base/default";
-   alias: "elm/entry/base-mixedwrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data.item: "focus_highlight" "on";
-   styles {
-      style { name: "entry_textblock_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1013 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=T1013";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1012 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" wrap=mixed text_class=T1012";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base/vcenter_align";
-   alias: "elm/entry/base-mixedwrap/vcenter_align";
-   inherit: "elm/entry/base/default";
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/entry/base-charwrap/default";
-   alias: "elm/entry/base/char_wrap";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "entry_textblock_char_wrap_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_textblock_char_wrap_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1013";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1012 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1012";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_char_wrap_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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_char_wrap_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-	 program { name: "focus";
-        signal: "load";
-	    source: "";
-	    action: FOCUS_SET;
-	    target: "elm.text";
-	 }
-	 program { name: "disable";
-	    signal: "elm,state,disabled";
-	    source: "elm";
-	    action: STATE_SET "disabled" 0.0;
-	    target: "elm.text";
-	 }
-	 program { name: "enable";
-	    signal: "elm,state,enabled";
-	    source: "elm";
-	    action: STATE_SET "default" 0.0;
-	    target: "elm.text";
-	 }
-     program { name: "gdisable";
-        signal: "elm,guide,disabled";
-        source: "elm";
-        action: STATE_SET "hidden" 0.0;
-        target: "elm.guide";
-     }
-     program { name: "genable";
-        signal: "elm,guide,enabled";
-        source: "elm";
-        action: STATE_SET "default" 0.0;
-        target: "elm.guide";
-     }
-  }
-}
-
-group { name: "elm/entry/base-charwrap/vcenter_align";
-   alias: "elm/entry/base/vcenter_align";
-   inherit: "elm/entry/base-charwrap/default";
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_char_wrap_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_char_wrap_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-}
-
-
-group { name: "elm/entry/base-nowrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "entry_textblock_style";
-               min: 1 1;
-               align: 0.0 0.0;
-               ellipsis: -1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-               min: 1 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base-nowrap/vcenter_align";
-   inherit: "elm/entry/base-nowrap/default";
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "entry_textblock_style";
-               min: 1 1;
-               align: 0.0 0.5;
-               ellipsis: -1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-               min: 1 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/entry/base/editfield";
-   alias: "elm/entry/base-mixedwrap/editfield";
-   alias: "elm/entry/base/editfield/default";
-   alias: "elm/entry/base/editfield/lighting";
-   alias: "elm/entry/base/editfield/multiline";
-   alias: "elm/entry/base/editfield/multiline/default";
-   alias: "elm/entry/base/editfield/multiline/lighting";
-   alias: "elm/entry/base/editfield/searchbar/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_textblock_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1015 wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1015";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1013";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff  color_class=T1014 wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1014";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1011 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
-   parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_textblock_guide_style";
-               min: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-            style: "editfield_textblock_style";
-               min: 0 1;
-               max: 0 1;
-            }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_focused_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_disabled_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-      }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit/editfield";
-   alias: "elm/entry/base-noedit-mixedwrap/editfield";
-   alias: "elm/entry/base-noedit/editfield/default";
-   alias: "elm/entry/base-noedit/editfield/lighting";
-   alias: "elm/entry/base-noedit/editfield/multiline";
-   alias: "elm/entry/base-noedit/editfield/multiline/default";
-   alias: "elm/entry/base-noedit/editfield/multiline/lighting";
-   inherit: "elm/entry/base/editfield";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base/editfield/fixed_size";
-   alias: "elm/entry/base-mixedwrap/editfield/fixed_size";
-   alias: "elm/entry/base/editfield/multiline/fixed_size";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_textblock_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1015 wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1015";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1013";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1014 wrap=mixed left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1014";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1011 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
-   parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_textblock_fixed_size_guide_style";
-               min: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-            style: "editfield_textblock_fixed_size_style";
-               min: 0 1;
-            }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_fixed_size_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_fixed_size_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit/editfield/fixed_size";
-   alias: "elm/entry/base-noedit-mixedwrap/editfield/fixed_size";
-   alias: "elm/entry/base-noedit/editfield/multiline/fixed_size";
-   inherit: "elm/entry/base/editfield/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-charwrap/editfield";
-   alias: "elm/entry/base/editfield/char_wrap";
-   alias: "elm/entry/base/editfield/default/char_wrap";
-   alias: "elm/entry/base/editfield/lighting/char_wrap";
-   alias: "elm/entry/base/editfield/multiline/char_wrap";
-   alias: "elm/entry/base/editfield/multiline/default/char_wrap";
-   alias: "elm/entry/base/editfield/multiline/lighting/char_wrap";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_textblock_char_wrap_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1015 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1015";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_char_wrap_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1013";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_char_wrap_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDTIFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1014 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1014";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_char_wrap_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1011 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
-   parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_textblock_char_wrap_guide_style";
-               min: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "editfield_textblock_char_wrap_style";
-               min: 0 1;
-            }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_char_wrap_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_char_wrap_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/editfield";
-   alias: "elm/entry/base-noedit/editfield/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/default/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/lighting/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/multiline/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/multiline/default/char_wrap";
-   alias: "elm/entry/base-noedit/editfield/multiline/lighting/char_wrap";
-   inherit: "elm/entry/base-charwrap/editfield";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-charwrap/editfield/fixed_size";
-   alias: "elm/entry/base/editfield/char_wrap/fixed_size";
-   alias: "elm/entry/base/editfield/multiline/char_wrap/fixed_size";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_textblock_char_wrap_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1015 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1015";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_char_wrap_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1013";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_char_wrap_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDTIFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1014 wrap=char left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" text_class=T1014";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_textblock_char_wrap_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1011 left_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" right_margin="ENTRY_EDITFIELD_LEFT_RIGHT_MARGIN" ellipsis=1.0 text_class=T1011";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
-   parts {
-      ENTRY_EDITFIELD_FOCUS_MULTILINE_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_textblock_char_wrap_fixed_size_guide_style";
-               min: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         //source6: "X"; // anchor over
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "editfield_textblock_char_wrap_fixed_size_style";
-               min: 0 1;
-            }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_char_wrap_fixed_size_focused_style";
-               min: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_textblock_char_wrap_fixed_size_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/editfield/fixed_size";
-   alias: "elm/entry/base-noedit/editfield/char_wrap/fixed_size";
-   alias: "elm/entry/base-noedit/editfield/multiline/char_wrap/fixed_size";
-   inherit: "elm/entry/base-charwrap/editfield/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/editfield";
-   alias: "elm/entry/base-single/editfield/default";
-   alias: "elm/entry/base-single/editfield/lighting";
-   alias: "elm/entry/base-single/editfield/singleline";
-   alias: "elm/entry/base-single/editfield/singleline/default";
-   alias: "elm/entry/base-single/editfield/singleline/lighting";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1015 wrap=none left_margin=1 right_margin=3 text_class=T1015";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_single_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=none left_margin=1 right_margin=3 text_class=T1013";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1014 wrap=none left_margin=1 right_margin=3 text_class=T1014";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1011 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
-   parts {
-      ENTRY_EDITFIELD_FOCUS_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_single_textblock_guide_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         repeat_events:1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: ; // selection over
-         //source3: ; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_style";
-               min: 1 1;
-               max: 0 1;
-               ellipsis: -1;
-            }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_disabled_style";
-            }
-         }
-      }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield";
-   alias: "elm/entry/base-single-noedit/editfield/default";
-   alias: "elm/entry/base-single-noedit/editfield/lighting";
-   alias: "elm/entry/base-single-noedit/editfield/singleline";
-   alias: "elm/entry/base-single-noedit/editfield/singleline/default";
-   alias: "elm/entry/base-single-noedit/editfield/singleline/lighting";
-   inherit: "elm/entry/base-single/editfield";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/editfield/fixed_size";
-   alias: "elm/entry/base-single/editfield/singleline/fixed_size";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "editfield_single_textblock_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1015 wrap=none left_margin=1 right_margin=3 text_class=T1015";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_single_textblock_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=none left_margin=1 right_margin=3 text_class=T1013";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_single_textblock_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1014 wrap=none left_margin=1 right_margin=3 text_class=T1014";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_single_textblock_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1011 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   ENTRY_EDITFIELD_FOCUS_DATA
-   parts {
-      ENTRY_EDITFIELD_FOCUS_PARTS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PART
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_single_textblock_fixed_size_guide_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: ; // selection over
-         //source3: ; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_fixed_size_style";
-               min: 1 1;
-               max: 0 1;
-               ellipsis: -1;
-            }
-            ENTRY_EDITFIELD_TEXTBLOCK_DEFAULT_REL
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_fixed_size_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_single_textblock_fixed_size_disabled_style";
-            }
-         }
-      }
-      ENTRY_EDITFIELD_SWALLOW_PARTS
-   }
-   ENTRY_EDITFIELD_SWALLOW_SCRIPT_PUBLIC
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-      ENTRY_EDITFIELD_SWALLOW_PROGRAMS
-      ENTRY_EDITFIELD_FOCUS_PROGRAMS
-      ENTRY_EDITFIELD_EVENT_RECT_SWALLOW_PROGRAM
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield/fixed_size";
-   alias: "elm/entry/base-single-noedit/editfield/singleline/fixed_size";
-   inherit: "elm/entry/base-single/editfield/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/editfield/searchbar/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   styles {
-      style { name: "editfield_searchbar_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1065 wrap=none left_margin=1 right_margin=3 text_class=T1065";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_searchbar_single_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1064 wrap=none left_margin=1 right_margin=3 text_class=T1064";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_searchbar_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1066 wrap=none left_margin=1 right_margin=3 text_class=T1066";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_searchbar_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1061 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1061 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-      style { name: "editfield_searchbar_single_textblock_disabled_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1062 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1062 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   script {
-      public guide_hidden;
-      public disabled;
-   }
-   parts {
-      ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_searchbar_single_textblock_guide_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_disabled_guide_style";
-            }
-         }
-         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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            ENTRY_TOP_BOTTOM_REL
-            text {
-               style: "editfield_searchbar_single_textblock_style";
-               min: 1 1;
-               max: 0 1;
-               ellipsis: -1;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(disabled, 1);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            }
-            set_state(PART:"elm.text", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(disabled, 0);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         script {
-            set_int(guide_hidden, 1);
-            set_state(PART:"elm.guide", "hidden", 0.0);
-         }
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         script {
-            set_int(guide_hidden, 0);
-            if (get_int(disabled)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            } else {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield/searchbar/default";
-   inherit: "elm/entry/base-single/editfield/searchbar/default";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/editfield/searchbar/fixed_size";
-   alias: "elm/entry/base-single/editfield/popup";
-   alias: "elm/entry/base-single/editfield/password/popup";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   styles {
-      style { name: "editfield_searchbar_single_textblock_fixed_size_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1065 wrap=none left_margin=1 right_margin=3 text_class=T1065";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF color_class=T1064 wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1064 wrap=none left_margin=1 right_margin=3 text_class=T1064";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1066 wrap=none left_margin=1 right_margin=3 text_class=T1066";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1061 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1061 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-      style { name: "editfield_searchbar_single_textblock_fixed_size_disabled_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707074C wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC" color=#FFFFFF color_class=T1062 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1062 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   script {
-      public guide_hidden;
-      public disabled;
-   }
-   parts {
-      ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "editfield_searchbar_single_textblock_fixed_size_guide_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_fixed_size_disabled_guide_style";
-            }
-         }
-         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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            ENTRY_TOP_BOTTOM_REL
-            text {
-               style: "editfield_searchbar_single_textblock_fixed_size_style";
-               min: 1 1;
-               max: 0 1;
-               ellipsis: -1;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_fixed_size_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "editfield_searchbar_single_textblock_fixed_size_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(disabled, 1);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            }
-            set_state(PART:"elm.text", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(disabled, 0);
-            if (!get_int(guide_hidden)) {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         script {
-            set_int(guide_hidden, 1);
-            set_state(PART:"elm.guide", "hidden", 0.0);
-         }
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         script {
-            set_int(guide_hidden, 0);
-            if (get_int(disabled)) {
-               set_state(PART:"elm.guide", "disabled", 0.0);
-            } else {
-               set_state(PART:"elm.guide", "default", 0.0);
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/editfield/searchbar/fixed_size";
-   alias: "elm/entry/base-single-noedit/editfield/popup";
-   alias: "elm/entry/base-single-noedit/editfield/password/popup";
-   inherit: "elm/entry/base-single/editfield/searchbar/fixed_size";
-   parts {
-      part { name: "elm.text";
-         entry_mode: PLAIN;
-         source4: "";
-      }
-   }
-   programs {
-      program { name: "touch_snd";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/default";
-   alias: "elm/entry/base-single/vcenter_align";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "entry_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=none left_margin=1 right_margin=3 text_class=T1011";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_textblock_focused_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=none left_margin=1 right_margin=3 text_class=T1011";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=none left_margin=1 right_margin=3 text_class=T1013";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1012 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1012 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_single_textblock_guide_style";
-               min: 0 1;
-               max: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "entry_single_textblock_style";
-               min: 1 1;
-               max: 0 0;
-               align: 0.0 0.5;
-               ellipsis: -1;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/spinner/default";
-   alias: "elm/entry/base-single/spinner/horizontal";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "entry_single_spinner_textblock_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1232 wrap=none align=center left_margin=1 right_margin=3 text_class=T1233";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_spinner_textblock_focused_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1232 wrap=none align=center left_margin=1 right_margin=3 text_class=T1233";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_spinner_textblock_disabled_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1232 wrap=none align=center left_margin=1 right_margin=3 text_class=T1233";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_spinner_textblock_guide_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1232 wrap=none align=center left_margin=1 right_margin=3 font=Tizen:style=Light font_size=60 text_class=T1233 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_single_spinner_textblock_guide_style";
-               min: 0 1;
-               max: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_style";
-               min: 1 1;
-               max: 0 0;
-               align: 0.0 0.5;
-               ellipsis: -1;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/spinner/vertical";
-   alias: "elm/entry/base-single/spinner/vertical_date_picker";
-   alias: "elm/entry/base-single/spinner/datetime";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   styles {
-      style { name: "entry_single_spinner_textblock_date_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         //base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1233 wrap=none align=center left_margin=1 right_margin=3 text_class=T1233";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_spinner_textblock_date_focused_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1233 wrap=none align=center left_margin=1 right_margin=3 text_class=T1233";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_spinner_textblock_date_disabled_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1233 wrap=none align=center left_margin=1 right_margin=3 text_class=T1233";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link " "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "entry_single_spinner_textblock_date_guide_style";
-         base: "font=Tizen:style=Light font_size=60 color=#070707FF wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1233 wrap=none align=center left_margin=1 right_margin=3 font=Tizen:style=Light font_size=60 text_class=T1233 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_single_spinner_textblock_date_guide_style";
-               min: 0 1;
-               max: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         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;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_date_style";
-               min: 1 1;
-               max: 0 0;
-               align: 0.0 0.5;
-               ellipsis: -1;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_date_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_spinner_textblock_date_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single/multibuttonentry";
-
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-
-   styles {
-      style { name: "multibuttonentry_single_textblock_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1011 wrap=none left_margin=1 right_margin=3 text_class=T1011";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "multibuttonentry_single_textblock_disabled_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#070707FF wrap=none left_margin=1 right_margin=3 text_class=entry";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1013 wrap=none left_margin=1 right_margin=3 text_class=T1013";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#00000080 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC;
-         tag:  "preedit_sub1" "+ backing=on backing_color="ENTRY_PREEDIT_SUB1_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub2" "+ backing=on backing_color="ENTRY_PREEDIT_SUB2_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub3" "+ backing=on backing_color="ENTRY_PREEDIT_SUB3_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-         tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
-      }
-      style { name: "multibuttonentry_single_textblock_guide_style";
-         base: "font=Tizen:style=Regular font_size=30 color=#0707077F wrap=none left_margin=1 right_margin=3 text_class=entry ellipsis=1.0";
-         //(Changeable UI) base: "font=Tizen:style=Regular font_size="ENTRY_TEXT_SIZE_INC" color=#ffffff color_class=T1012 wrap=none left_margin=1 right_margin=3 font=Tizen:style=Regular font_size=30 text_class=T1012 ellipsis=1.0";
-         tag:  "br" "";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font_style=Oblique";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font_weight=Bold";
-      }
-   }
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "multibuttonentry_single_textblock_guide_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "multibuttonentry_single_textblock_style";
-               min: 1 1;
-               max: 0 1;
-               ellipsis: -1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "multibuttonentry_single_textblock_disabled_style";
-            }
-         }
-      }
-   }
-   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";
-      }
-   }
-}
-
-group { name: "elm/entry/base-single-noedit/default";
-   alias: "elm/entry/base-single-noedit/vcenter_align";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_single_textblock_guide_style";
-               min: 0 1;
-               max: 0 1;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            text {
-               style: "entry_single_textblock_style";
-               min: 1 1;
-               max: 0 1;
-               ellipsis: -1;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base-noedit/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "gdisable";
-         signal: "elm,guide,disabled";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.guide";
-      }
-      program { name: "genable";
-         signal: "elm,guide,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.guide";
-      }
-   }
-}
-
-group { name: "elm/entry/base-noedit/vcenter_align";
-   inherit: "elm/entry/base-noedit/default";
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_char_wrap_guide_style";
-               min: 0 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_char_wrap_style";
-               min: 0 1;
-            align: 0.0 0.0;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "action_focus";
-         signal: "elm,action,focus";
-         source: "elm";
-         action: STATE_SET "focused" 0.0;
-         target: "elm.text";
-      }
-      program { name: "action_unfocus";
-         signal: "elm,action,unfocus";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-      program { name: "focus";
-        signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-     program { name: "gdisable";
-        signal: "elm,guide,disabled";
-        source: "elm";
-        action: STATE_SET "hidden" 0.0;
-        target: "elm.guide";
-     }
-     program { name: "genable";
-        signal: "elm,guide,enabled";
-        source: "elm";
-        action: STATE_SET "default" 0.0;
-        target: "elm.guide";
-     }
-   }
-}
-
-group { name: "elm/entry/base-noedit-charwrap/vcenter_align";
-   inherit: "elm/entry/base-noedit-charwrap/default";
-   parts {
-      part { name: "elm.guide";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            text {
-               style: "entry_textblock_char_wrap_guide_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PLAIN;
-//         select_mode: BLOCK_HANDLE;
-         select_mode: EXPLICIT;
-         cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         //source2: "X"; // selection over
-         //source3: "X"; // cursor under
-         source5: "elm/entry/anchor/default"; // anchor under
-//         source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//         source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//         source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//         source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//         source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            text {
-               style: "entry_textblock_char_wrap_style";
-               min: 0 1;
-               align: 0.0 0.5;
-            }
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_focused_style";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_char_wrap_disabled_style";
-            }
-         }
-      }
-   }
-}
-
-   group { name: "elm/entry/base-noedit-mixedwrap/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PLAIN;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 1;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               text {
-                  style: "entry_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_disabled_style";
-               }
-            }
-         }
-      }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "elm.text";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "focus";
-            signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "gdisable";
-            signal: "elm,guide,disabled";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "elm.guide";
-         }
-         program { name: "genable";
-            signal: "elm,guide,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.guide";
-         }
-      }
-   }
-
-   group { name: "elm/entry/base-noedit-mixedwrap/vcenter_align";
-      inherit: "elm/entry/base-noedit-mixedwrap/default";
-      parts {
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PLAIN;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 1;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               text {
-                  style: "entry_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_disabled_style";
-               }
-            }
-         }
-      }
-   }
-
-   group { name: "elm/entry/base-nowrap-noedit/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-	 part { name: "elm.text";
-	    type: TEXTBLOCK;
-	    mouse_events: 1;
-	    scale: 1;
-	    entry_mode: PLAIN;
-//	    select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-	    cursor_mode: BEFORE;
-	    multiline: 1;
-	    source: "elm/entry/selection/default"; // selection under
-	    //source2: "X"; // selection over
-	    //source3: "X"; // cursor under
-	    source5: "elm/entry/anchor/default"; // anchor under
-//	    source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//	    source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//	    source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//	    source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//	    source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-	    description { state: "default" 0.0;
-	       text {
-               style: "entry_textblock_style";
-               min: 1 1;
-               align: 0.0 0.0;
-               ellipsis: -1;
-	       }
-	    }
-	    description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-	       text {
-		  style: "entry_textblock_focused_style";
-	       }
-	    }
-	    description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-	       text {
-		  style: "entry_textblock_disabled_style";
-	       }
-	    }
-	 }
-      }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "elm.text";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-	 program { name: "focus";
-            signal: "load";
-	    source: "";
-	    action: FOCUS_SET;
-	    target: "elm.text";
-	 }
-	 program { name: "disable";
-	    signal: "elm,state,disabled";
-	    source: "elm";
-	    action: STATE_SET "disabled" 0.0;
-	    target: "elm.text";
-	 }
-	 program { name: "enable";
-	    signal: "elm,state,enabled";
-	    source: "elm";
-	    action: STATE_SET "default" 0.0;
-	    target: "elm.text";
-	 }
-         program { name: "gdisable";
-            signal: "elm,guide,disabled";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "elm.guide";
-         }
-         program { name: "genable";
-            signal: "elm,guide,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.guide";
-         }
-      }
-   }
-
-   group { name: "elm/entry/base-nowrap-noedit/vcenter_align";
-      inherit: "elm/entry/base-nowrap-noedit/default";
-      parts {
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "entry_textblock_guide_style";
-                  min: 0 1;
-                  align: 0.0 0.0;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PLAIN;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 1;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               text {
-                  style: "entry_textblock_style";
-                  min: 1 1;
-                  align: 0.0 0.0;
-                  ellipsis: -1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_textblock_disabled_style";
-               }
-            }
-         }
-      }
-   }
-
-  group { name: "elm/entry/base-password/default";
-      alias: "elm/entry/base-password/vcenter_align";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "entry_single_textblock_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//	    select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-	    //source2: "X"; // selection over
-	    //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//	    source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//	    source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//	    source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//	    source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//	    source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               text {
-                  style: "entry_single_textblock_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-                  ellipsis: -1;
-	           }
-	        }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_single_textblock_focused_style";
-	           }
-	        }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-	           text {
-                  style: "entry_single_textblock_disabled_style";
-	           }
-	        }
-	     }
-      }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,action,focus";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "elm.text";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,unfocus";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "focus";
-            signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "gdisable";
-            signal: "elm,guide,disabled";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "elm.guide";
-         }
-         program { name: "genable";
-            signal: "elm,guide,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.guide";
-         }
-      }
-   }
-
-   group { name: "elm/entry/base-password/editfield";
-      inherit: "elm/entry/base-password/default";
-      alias: "elm/entry/base-password/editfield/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "editfield_single_textblock_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            repeat_events:1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               ENTRY_TOP_BOTTOM_REL
-               text {
-                  style: "editfield_single_textblock_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-                  ellipsis: -1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_disabled_style";
-               }
-            }
-         }
-      }
-   }
-
-   group { name: "elm/entry/base-password/editfield/popup";
-      inherit: "elm/entry/base-password/default";
-      alias: "elm/entry/base-password/editfield/password/popup";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               ENTRY_TOP_BOTTOM_REL
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-                  ellipsis: -1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_searchbar_single_textblock_fixed_size_disabled_style";
-               }
-            }
-         }
-      }
-   }
-
-   group { name: "elm/entry/base-password/editfield/fixed_size";
-      inherit: "elm/entry/base-password/default";
-      data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         ENTRY_TOP_BOTTOM_PADDING(ENTRY_EDITFIELD_TOP_PADDING_HEIGHT, ENTRY_EDITFIELD_BOTTOM_PADDING_HEIGHT)
-         part { name: "elm.guide";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2.to: "elm.text";
-               text {
-                  style: "editfield_single_textblock_fixed_size_guide_style";
-                  min: 0 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PASSWORD;
-//            select_mode: BLOCK_HANDLE;
-            select_mode: EXPLICIT;
-            cursor_mode: BEFORE;
-            multiline: 0;
-            source: "elm/entry/selection/default"; // selection under
-            //source2: "X"; // selection over
-            //source3: "X"; // cursor under
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-//            source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler
-//            source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler
-//            source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler
-//            source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection
-//            source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection
-            description { state: "default" 0.0;
-               ENTRY_TOP_BOTTOM_REL
-               text {
-                  style: "editfield_single_textblock_fixed_size_style";
-                  repch: "•";
-                  min: 1 1;
-                  max: 0 1;
-                  ellipsis: -1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_fixed_size_focused_style";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "editfield_single_textblock_fixed_size_disabled_style";
-               }
-            }
-         }
-      }
-   }
-
-	group { name: "elm/entry/cursor/default";
-		parts {
-			part { name: "clip2";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					rel1.to: "clip";
-					rel2.to: "clip";
-				visible: 0;
-				}
-				description { state: "focused" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part { name: "clip";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				clip_to: "clip2";
-				description { state: "default" 0.0;
-					rel1.offset: -10 0;
-					rel2.offset: 9 9;
-				}
-				description { state: "hidden" 0.0;
-					inherit: "default" 0.0;
-					visible: 0;
-				}
-			}
-			part { name: "base";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				clip_to: "clip";
-				description { state: "default" 0.0;
-					min: ENTRY_CURSOR_SIZE_INC;
-					align: 0.5 1.0;
-					color: 0 0 0 0;
-				}
-			}
-			part { name: "glow";
-				type: RECT;
-				mouse_events: 0;
-				scale: 1;
-				clip_to: "clip2";
-				description { state: "default" 0.0;
-					min: ENTRY_CURSOR_SIZE_INC;
-					fixed: 1 0;
-					align: 0.5 0.5;
-					rel1 {
-						relative: 0.0  0.0;
-						offset: 0 -2;
-					}
-					rel2 {
-						relative: 0.0  1.0;
-						offset: 0 -2;
-					}
-					color: 2 61 132 255; /*(Changeable UI) color_class: "F052";*/
-					visible: 1;
-				}
-				description { state: "hidden" 0.0;
-					inherit: "default" 0.0;
-					visible: 0;
-				}
-			}
-		}
-		programs {
-			program { name: "show";
-				action: STATE_SET "hidden" 0.0;
-				in: 0.6 0.0;
-				target: "glow";
-				after: "show4";
-			}
-			program { name: "show4";
-				action: STATE_SET "default" 0.0;
-				in: 0.6 0.0;
-				target: "glow";
-				after: "show";
-			}
-			program { name: "focused";
-				signal: "elm,action,focus";
-				source: "elm";
-				action: STATE_SET "focused" 0.0;
-				target: "clip2";
-				after: "show4";
-			}
-			program { name: "unfocused";
-				signal: "elm,action,unfocus";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "clip2";
-				after: "stop_glow";
-			}
-			program { name: "stop_glow";
-			action: ACTION_STOP;
-				target: "show";
-				target: "show4";
-			}
-			program { name: "show_cursor";
-				signal: "elm,action,show,cursor";
-				source: "elm";
-				action: ACTION_STOP;
-				target: "show";
-				target: "show4";
-				after: "show_cursor1";
-			}
-			program { name: "show_cursor1";
-				action: STATE_SET "default" 0.0;
-				target: "glow";
-				after: "show";
-			}
-		}
-	}
-
-
-	group { name: "elm/entry/selection/default";
-		parts {
-			part { name: "bg";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description { state: "default" 0.0;
-					color_class: "F065";
-				}
-			}
-		}
-	}
-
-	group { name: "elm/entry/selection/block_handle_left";
-		data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-		data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC;
-		images {
-		  image: "copy&paste_handler_circle_bottom.png" COMP;
-		  image: "copy&paste_handler_line_bottom.png" COMP;
-		  image: "copy&paste_handler_circle_top.png" COMP;
-		  image: "copy&paste_handler_line_top.png" COMP;
-		}
-		parts {
-			part { name: "handle";
-				mouse_events: 1;
-				scale: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					fixed: 1 1;
-					align: 0.5 0;
-					min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					color_class: "F052L2";
-					image {
-						normal: "copy&paste_handler_circle_bottom.png";
-						border: 0 0 0 0;
-					}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_circle_top.png";
-					}
-				}
-				description { state: "bottom_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 0;
-				}
-				description { state: "top_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_circle_top.png";
-					}
-				}
-			}
-			part { name: "handler_line";
-				mouse_events: 1;
-				scale: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					fixed: 1 1;
-					align: 0.5 0;
-					min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					color_class: "F052L1";
-					image {
-						normal: "copy&paste_handler_line_bottom.png";
-						border: 0 0 0 0;
-					}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_line_top.png";
-					}
-				}
-				description { state: "bottom_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 0;
-				}
-				description { state: "top_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_line_top.png";
-					}
-				}
-			}
-		}
-		script {
-			public handler_ontop;
-			public handler_focused;
-			public handler_disabled;
-		}
-		programs {
-			program { name: "focused";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					set_int(handler_focused, 1);
-				}
-			}
-			program { name: "unfocused";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_int(handler_focused, 0);
-					set_state(PART:"handle", "default", 0.0);
-					set_state(PART:"handler_line", "default", 0.0);
-				}
-			}
-			program { name: "bottom_reversed";
-				signal: "elm,state,bottom,reversed";
-				source: "elm";
-				script {
-					new disabled;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						set_state(PART:"handle", "bottom_reversed", 0.0);
-						set_state(PART:"handler_line", "bottom_reversed", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-						set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "top_reversed";
-				signal: "elm,state,top,reversed";
-				source: "elm";
-				script {
-					new disabled;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						set_state(PART:"handle", "top_reversed", 0.0);
-						set_state(PART:"handler_line", "top_reversed", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-						set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "top";
-				signal: "elm,state,top";
-				source: "elm";
-				script {
-					new focused, disabled;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 1);
-					if ((focused == 1) && (disabled == 0))
-					{
-						set_state(PART:"handle", "top", 0.0);
-						set_state(PART:"handler_line", "top", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-						set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "bottom";
-				signal: "elm,state,bottom";
-				source: "elm";
-				script {
-					new focused, disabled;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 0);
-					if ((focused == 1) && (disabled == 0))
-					{
-						set_state(PART:"handle", "show", 0.0);
-						set_state(PART:"handler_line", "show", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-						set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "disabled";
-				signal: "app,selection,handler,disable";
-				source: "app";
-				script {
-					set_int(handler_disabled, 1);
-				}
-			}
-			program { name: "enabled";
-				signal: "app,selection,handler,enable";
-				source: "app";
-				script {
-					set_int(handler_disabled, 0);
-				}
-			}
-		}
-	}
-
-	group { name: "elm/entry/selection/block_handle_right";
-		data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-		data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WEIGHT_INC;
-		images {
-		  image: "copy&paste_handler_circle_bottom.png" COMP;
-		  image: "copy&paste_handler_line_bottom.png" COMP;
-		  image: "copy&paste_handler_circle_top.png" COMP;
-		  image: "copy&paste_handler_line_top.png" COMP;
-		}
-
-		parts {
-			part { name: "handle";
-				mouse_events: 1;
-				scale: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					fixed: 1 1;
-					align: 0.5 0;
-					min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					color_class: "F052L2";
-					image {
-						normal: "copy&paste_handler_circle_bottom.png";
-						border: 0 0 0 0;
-					}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_circle_top.png";
-					}
-				}
-				description { state: "bottom_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 0;
-				}
-				description { state: "top_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_circle_top.png";
-					}
-				}
-			}
-			part { name: "handler_line";
-				mouse_events: 1;
-				scale: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					fixed: 1 1;
-					align: 0.5 0;
-					min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
-					color_class: F052L1;
-					image {
-						normal: "copy&paste_handler_line_bottom.png";
-						border: 0 0 0 0;
-					}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_line_top.png";
-					}
-				}
-				description { state: "bottom_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 0;
-					}
-				description { state: "top_reversed" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1;
-					image {
-						normal: "copy&paste_handler_line_top.png";
-					}
-				}
-			}
-		}
-		script {
-			public handler_ontop;
-			public handler_focused;
-			public handler_disabled;
-		}
-		programs {
-			program { name: "focused";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					set_int(handler_focused, 1);
-				}
-			}
-			program { name: "unfocused";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_int(handler_focused, 0);
-					set_state(PART:"handle", "default", 0.0);
-					set_state(PART:"handler_line", "default", 0.0);
-				}
-			}
-			program { name: "top";
-				signal: "elm,state,top";
-				source: "elm";
-				script {
-					new focused, disabled;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 1);
-					if ((focused == 1) && (disabled == 0))
-						{
-							set_state(PART:"handle", "top", 0.0);
-							set_state(PART:"handler_line", "top", 0.0);
-						}
-					else
-						{
-							set_state(PART:"handle", "default", 0.0);
-							set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "bottom";
-				signal: "elm,state,bottom";
-				source: "elm";
-				script {
-					new focused, disabled;
-					focused = get_int(handler_focused);
-					disabled = get_int(handler_disabled);
-					set_int(handler_ontop, 0);
-					if ((focused == 1) && (disabled == 0))
-						{
-							set_state(PART:"handle", "show", 0.0);
-							set_state(PART:"handler_line", "show", 0.0);
-						}
-					else
-						{
-							set_state(PART:"handle", "default", 0.0);
-							set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "bottom_reversed";
-				signal: "elm,state,bottom,reversed";
-				source: "elm";
-				script {
-					new disabled;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						set_state(PART:"handle", "bottom_reversed", 0.0);
-						set_state(PART:"handler_line", "bottom_reversed", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-						set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "top_reversed";
-				signal: "elm,state,top,reversed";
-				source: "elm";
-				script {
-					new disabled;
-					disabled = get_int(handler_disabled);
-					if (disabled == 0)
-					{
-						set_state(PART:"handle", "top_reversed", 0.0);
-						set_state(PART:"handler_line", "top_reversed", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "default", 0.0);
-						set_state(PART:"handler_line", "default", 0.0);
-					}
-				}
-			}
-			program { name: "disabled";
-				signal: "app,selection,handler,disable";
-				source: "app";
-				script {
-					set_int(handler_disabled, 1);
-				}
-			}
-			program { name: "enabled";
-				signal: "app,selection,handler,enable";
-				source: "app";
-				script {
-					set_int(handler_disabled, 0);
-				}
-			}
-		}
-	}
-
-   group { name: "elm/entry/cursor_handle/default";
-      images {
-         set {
-            name: "copy&paste_handler_center_circle";
-            image {
-               image: SMALL"images/Copy_Paste/copy&paste_handler_center_circle.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Copy_Paste/copy&paste_handler_center_circle.png" COMP;
-            }
-         }
-         set {
-            name: "copy&paste_handler_center_line";
-            image {
-               image: SMALL"images/Copy_Paste/copy&paste_handler_center_line.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Copy_Paste/copy&paste_handler_center_line.png" COMP;
-            }
-         }
-      }
-		parts {
-			part { name: "sens";
-				type: RECT;
-				scale: 1;
-				mouse_events: 1;
-				description { state: "default" 0.0;
-					visible: 0;
-					color: 0 0 0 0;
-					rel1 { relative: -0.25 0.0; to: "handle";}
-					rel2 { relative: 1.25 1.0; to: "handle";}
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part { name: "handle";
-				scale: 1;
-				mouse_events: 1;
-				description { state: "default" 0.0;
-					min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
-					max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
-					align: 0 0;
-					visible: 0;
-					align: 0.5 0;
-					color_class: "F052L2";
-					image {
-						normal: "copy&paste_handler_center_circle";
-						border: 0 0 0 0;
-					}
-					image.middle: SOLID;
-					fill.smooth: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1.0;
-				}
-			}
-			part { name: "handler_line";
-				scale: 1;
-				mouse_events: 1;
-				description { state: "default" 0.0;
-					min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
-					max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC;
-					align: 0 0;
-					visible: 0;
-					align: 0.5 0;
-					color_class: "F052L1";
-					image {
-						normal: "copy&paste_handler_center_line";
-						border: 0 0 0 0;
-					}
-					image.middle: SOLID;
-					fill.smooth: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-				description { state: "top" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-					align: 0.5 1.0;
-				}
-			}
-		}
-		script {
-			public on_top;
-		}
-		programs {
-			program { name: "focused";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					new on_top_val = get_int(on_top);
-					if (on_top_val)
-					{
-						set_state(PART:"handle", "top", 0.0);
-						set_state(PART:"handler_line", "top", 0.0);
-					}
-					else
-					{
-						set_state(PART:"handle", "show", 0.0);
-						set_state(PART:"handler_line", "show", 0.0);
-					}
-					set_state(PART:"sens", "show", 0.0);
-				}
-			}
-			program { name: "unfocused";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_state(PART:"handle", "default", 0.0);
-					set_state(PART:"handler_line", "default", 0.0);
-					set_state(PART:"sens", "default", 0.0);
-				}
-			}
-			program { name: "show";
-				signal: "edje,cursor,handle,show";
-				source: "edje";
-				script {
-					set_int(on_top, 0);
-					set_state(PART:"handle", "show", 0.0);
-					set_state(PART:"handler_line", "show", 0.0);
-					set_state(PART:"sens", "show", 0.0);
-				}
-			}
-			program { name: "hide";
-				signal: "edje,cursor,handle,hide";
-				source: "edje";
-				script {
-					set_state(PART:"handle", "default", 0.0);
-					set_state(PART:"handler_line", "default", 0.0);
-					set_state(PART:"sens", "default", 0.0);
-				}
-			}
-			program { name: "top";
-				signal: "edje,cursor,handle,top";
-				source: "edje";
-				script {
-					set_int(on_top, 1);
-					set_state(PART:"handle", "top", 0.0);
-					set_state(PART:"handler_line", "top", 0.0);
-					set_state(PART:"sens", "show", 0.0);
-				}
-			}
-		}
-	}
-	group { name: "elm/entry/selection/block_handle_edge_left";
-		parts {
-			part { name: "align";
-				type: SPACER;
-				scale: 1;
-				description { state: "default" 0.0;
-					min: 0 0;
-					max: 0 0;
-					align: 0 0;
-				}
-			}
-			part { name: "bg";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description { state: "default" 0.0;
-					fixed: 1 0;
-					color_class: "F052L1";
-					min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
-					rel2 { relative: 0 1; to_x: "align"; }
-					align: 0 0;
-					visible: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-		}
-		programs {
-			program { name: "show";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "show", 0.0);
-				}
-			}
-			program { name: "hide";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "default", 0.0);
-				}
-			}
-		}
-	}
-
-	group { name: "elm/entry/selection/block_handle_edge_right";
-		parts {
-			part { name: "bg";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description { state: "default" 0.0;
-					color_class: "F052L1";
-					min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0;
-					max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1;
-					visible: 0;
-				}
-				description { state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-		}
-		programs {
-			program { name: "show";
-				signal: "edje,focus,in";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "show", 0.0);
-				}
-			}
-			program { name: "hide";
-				signal: "edje,focus,out";
-				source: "edje";
-				script {
-					set_state(PART:"bg", "default", 0.0);
-				}
-			}
-		}
-	}
-
-	group { name: "elm/entry/anchor/default";
-		parts {
-			part { name: "bg";
-				type: SPACER;
-				description { state: "default" 0.0;
-				}
-			}
-		}
-	}
-
-    group { name: "elm/entry/preedit/default";
-        parts {
-            part { name: "bg";
-                type: RECT;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                    color: 128 128 128 255;
-                }
-            }
-        }
-   }
-
-
-#define MAGNIFIER_SCALE 1.5
-
-	group { name: "elm/entry/magnifier/fixed-size";
-		data.item: "height" MAGNIFIER_HEIGHT_MIN;
-		data.item: "scale" MAGNIFIER_SCALE;
-		data.item: "arrow" MAGNIFIER_ARROW_HEIGHT_INC;
-		images {
-		  image: "copy&paste_Magnifier.#.png" COMP;
-		  image: "copy&paste_Magnifier_mask.#.png" COMP;
-		}
-		parts {
-			part { name: "bg_mask";
-				scale: 1;
-				description { state: "default" 0.0;
-					rel1.to: "bg";
-					rel2.to: "bg";
-					image.normal: "copy&paste_Magnifier_mask.#.png";
-					color: 245 245 245 255;
-				}
-				description { state: "custom_cc" 0.0;
-					inherit: "default" 0.0;
-					color_class: "mgf_custom_cc";
-				}
-			}
-			part { name: "bg";
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					min: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MIN;
-					max: MAGNIFIER_WIDTH_FIXED_INC MAGNIFIER_HEIGHT_MAX;
-					image.normal: "copy&paste_Magnifier.#.png";
-					align: 0.0 0.0;
-				}
-			}
-			part { name: "left_offset";
-				type: SPACER;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					min: MAGNIFIER_LEFT_OFFSET_INC;
-					max: MAGNIFIER_LEFT_OFFSET_INC;
-					rel1 {
-						to: "bg";
-						relative: 0.0 0.0;
-					}
-					align: 0.0 0.0;
-				}
-			}
-			part { name: "right_offset";
-				type: SPACER;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					min: MAGNIFIER_RIGHT_OFFSET_INC;
-					max: MAGNIFIER_RIGHT_OFFSET_INC;
-					rel1 {
-						to: "bg";
-						relative: 1.0 1.0;
-					}
-					rel2 {
-						to: "bg";
-						relative: 1.0 1.0;
-					}
-					align: 1.0 1.0;
-				}
-			}
-			part { name: "swallow";
-				type: SWALLOW;
-				mouse_events: 0;
-				scale: 1;
-				description { state: "default" 0.0;
-					fixed: 1 1;
-					align: 0.0 0.0;
-					rel1 {
-						to: "left_offset";
-						relative: 1.0 1.0;
-					}
-					rel2 {
-						to: "right_offset";
-						relative: 0.0 0.0;
-					}
-				}
-			}
-		}
-		script {
-			public message(Msg_Type:type, id, ...) {
-				if (type == MSG_INT_SET) {
-					new r, g, b, a;
-
-					r = getarg(2);
-					g = getarg(3);
-					b = getarg(4);
-					a = getarg(5);
-
-					set_state(PART:"bg_mask", "custom_cc", 0.0);
-					set_color_class("mgf_custom_cc", r, g, b, a);
-				}
-			}
-		}
-	}
-
-group { name: "elm/scroller/entry/default";
-      data {
-         item: "focus_highlight" "off";
-      }
-      script {
-         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
-         public timer0(val) {
-            new v;
-            v = get_int(sbvis_v);
-            if (v) {
-               v = get_int(sbalways_v);
-               if (!v) {
-                  emit("do-hide-vbar", "");
-                  set_int(sbvis_v, 0);
-               }
-            }
-            v = get_int(sbvis_h);
-            if (v) {
-               v = get_int(sbalways_h);
-               if (!v) {
-                  emit("do-hide-hbar", "");
-                  set_int(sbvis_h, 0);
-               }
-            }
-            set_int(sbvis_timer, 0);
-            return 0;
-         }
-      }
-      images {
-         image: "core_scroll_bar_v.#.png" COMP;
-         image: "core_scroll_bar_v_ef.#.png" COMP;
-         image: "core_scroll_bar_h.#.png" COMP;
-         image: "core_scroll_bar_h_ef.#.png" COMP;
-      }
-      parts {
-         part { name: "bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "focus_underline_bottom_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "focus_underline";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PART
-         part { name: "clipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-         }
-         part { name: "icon_padding";
-            type: SPACER;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0 1.0;
-               }
-            }
-         }
-         part { name: "elm.swallow.icon";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "clear_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_x: "elm.swallow.clear";
-                  relative: 0.0 0.0;
-               }
-            }
-         }
-         part { name: "elm.swallow.clear";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  relative: 0.0 1.0;
-               }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.swallow.end";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 1.0 1.0;
-               }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "left_content_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               max: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  to_x: "icon_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "icon_padding";
-                  to_y: "bg";
-                  relative: 1.0 1.0;
-               }
-            }
-         }
-         part { name: "right_content_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               max: ENTRY_EDITFIELD_LEFT_RIGHT_PADDING;
-               align: 1.0 0.5;
-               fixed: 1 0;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "contentclipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "left_content_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "right_content_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  to_x: "clear_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "elm.swallow.content";
-            clip_to: "contentclipper";
-            scale: 1;
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "left_content_padding";
-                  to_y: "bg";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "right_content_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel2 {
-                  to_x: "clear_padding";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "scroller_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT;
-               align: 0.0 0.0;
-               fixed: 1 0;
-               rel1 {
-                  to_y:     "elm.swallow.content";
-                  to_x:     "clear_padding";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_y:     "sb_hbar";
-                  to_x:     "clear_padding";
-                  relative: 1.0 0.0;
-               }
-            }
-         }
-         part { name: "sb_vbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-                  to: "bg";
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  to: "scroller_padding";
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "sb_vbar_clip";
-            clip_to: "sb_vbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.0  0.0;
-                  to: "bg";
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  to: "scroller_padding";
-               }
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "sb_vbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
-               align: 1.0 0.0;
-               rel1 {
-                  to_y:     "elm.swallow.content";
-                  to_x:     "scroller_padding";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_y:     "sb_hbar";
-                  to_x:     "scroller_padding";
-                  relative: 1.0 0.0;
-               }
-            }
-         }
-         part { name: "elm.dragable.vbar";
-            scale: 1;
-            clip_to: "sb_vbar_clip";
-            mouse_events: 0;
-            dragable {
-               x: 0 0 0;
-               y: 1 1 0;
-               confine: "sb_vbar";
-            }
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MIN_SIZE_INC;
-               max: SCROLLER_DEFAULT_SCROLLBAR_VBAR_MAX_SIZE_INC;
-               rel1 {
-                  relative: 0.5  0.5;
-                  to: "sb_vbar";
-               }
-               rel2 {
-                  relative: 0.5  0.5;
-                  to: "sb_vbar";
-               }
-               image {
-                  normal: "core_scroll_bar_v.#.png";
-                  middle: DEFAULT;
-               }
-            color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
-            }
-         }
-         part { name: "vbar_effect";
-            clip_to: "sb_vbar_clip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.dragable.vbar";
-               rel2.to: "elm.dragable.vbar";
-               image.normal: "core_scroll_bar_v_ef.#.png";
-            }
-         }
-         part { name: "sb_hbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-            }
-            description { state: "hidden" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "sb_hbar_clip";
-            clip_to: "sb_hbar_clip_master";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-            }
-            description { state: "hidden" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "sb_hbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
-               align: 0.0 1.0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x:     "elm.swallow.content";
-                  to_y:     "elm.swallow.content";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x:     "sb_vbar";
-                  to_y:     "elm.swallow.content";
-               }
-            }
-         }
-         part { name: "elm.dragable.hbar";
-            scale: 1;
-            clip_to: "sb_hbar_clip";
-            mouse_events: 0;
-            dragable {
-               x: 1 1 0;
-               y: 0 0 0;
-               confine: "sb_hbar";
-            }
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MIN_SIZE_INC;
-               max: SCROLLER_DEFAULT_SCROLLBAR_HBAR_MAX_SIZE_INC;
-               rel1 {
-                  relative: 0.5  0.5;
-                  to: "sb_hbar";
-               }
-               rel2 {
-                  relative: 0.5  0.5;
-                  to: "sb_hbar";
-               }
-              image {
-                  normal: "core_scroll_bar_h.#.png";
-                  middle: DEFAULT;
-               }
-               color: 2 61 132 178; /*(Changeable UI) color_class: "B071";*/
-            }
-            part { name: "hbar_effect";
-               clip_to: "sb_hbar_clip";
-               mouse_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                  rel1.to: "elm.dragable.hbar";
-                  rel2.to: "elm.dragable.hbar";
-                  image.normal: "core_scroll_bar_h_ef.#.png";
-               }
-            }
-         }
-      }
-      programs {
-         program { name: "load";
-            signal: "load";
-            source: "";
-            script {
-               set_state(PART:"sb_hbar_clip", "hidden", 0.0);
-               set_state(PART:"sb_vbar_clip", "hidden", 0.0);
-               set_int(sbvis_h, 0);
-               set_int(sbvis_v, 0);
-               set_int(sbalways_v, 0);
-               set_int(sbalways_h, 0);
-               set_int(sbvis_timer, 0);
-               emit("reload", "elm");
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,action,show,icon";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.icon";
-            target: "icon_padding";
-         }
-         program { name: "icon_hide";
-            signal: "elm,action,hide,icon";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.icon";
-            target: "icon_padding";
-         }
-         program { name: "clear_show";
-            signal: "elm,state,clear,visible";
-            source: "*";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.clear";
-            target: "clear_padding";
-            target: "contentclipper";
-            target: "elm.swallow.content";
-         }
-         program { name: "clear_hide";
-            signal: "elm,state,clear,hidden";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.clear";
-            target: "clear_padding";
-            target: "contentclipper";
-            target: "elm.swallow.content";
-         }
-         program { name: "end_show";
-            signal: "elm,action,show,end";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.end";
-         }
-         program { name: "end_hide";
-            signal: "elm,action,hide,end";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.end";
-         }
-         program { name: "vbar_show";
-            signal: "elm,action,show,vbar";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "sb_vbar_clip_master";
-         }
-         program { name: "vbar_hide";
-            signal: "elm,action,hide,vbar";
-            source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "sb_vbar_clip_master";
-         }
-         program { name: "vbar_show_always";
-            signal: "elm,action,show_always,vbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_v);
-               if (!v) {
-                  set_int(sbalways_v, 1);
-                  v = get_int(sbvis_v);
-                  if (!v) {
-                     emit("do-show-vbar", "");
-                     set_int(sbvis_v, 1);
-                  }
-               }
-            }
-         }
-         program { name: "vbar_show_notalways";
-            signal: "elm,action,show_notalways,vbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_v);
-               if (v) {
-                  set_int(sbalways_v, 0);
-                  v = get_int(sbvis_v);
-                  if (!v) {
-                     emit("do-hide-vbar", "");
-                     set_int(sbvis_v, 0);
-                  }
-               }
-            }
-         }
-         program { name: "sb_vbar_show";
-            signal: "do-show-vbar";
-            source: "";
-            action:  STATE_SET "default" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_vbar_clip";
-         }
-         program { name: "sb_vbar_hide";
-            signal: "do-hide-vbar";
-            source: "";
-            action:  STATE_SET "hidden" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_vbar_clip";
-         }
-
-         program { name: "hbar_show";
-            signal: "elm,action,show,hbar";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "sb_hbar_clip_master";
-         }
-         program { name: "hbar_hide";
-            signal: "elm,action,hide,hbar";
-            source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "sb_hbar_clip_master";
-         }
-         program { name: "hbar_show_always";
-            signal: "elm,action,show_always,hbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_h);
-               if (!v) {
-                  set_int(sbalways_h, 1);
-                  v = get_int(sbvis_h);
-                  if (!v) {
-                     emit("do-show-hbar", "");
-                     set_int(sbvis_h, 1);
-                  }
-               }
-            }
-         }
-         program { name: "hbar_show_notalways";
-            signal: "elm,action,show_notalways,hbar";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbalways_h);
-               if (v) {
-                  set_int(sbalways_h, 0);
-                  v = get_int(sbvis_h);
-                  if (!v) {
-                     emit("do-hide-hbar", "");
-                     set_int(sbvis_h, 0);
-                  }
-               }
-            }
-         }
-         program { name: "sb_hbar_show";
-            signal: "do-show-hbar";
-            source: "";
-            action:  STATE_SET "default" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_hbar_clip";
-         }
-         program { name: "sb_hbar_hide";
-            signal: "do-hide-hbar";
-            source: "";
-            action:  STATE_SET "hidden" 0.0;
-            transition: LINEAR 0.5;
-            target: "sb_hbar_clip";
-         }
-
-         program { name: "scroll";
-            signal: "elm,action,scroll";
-            source: "elm";
-            script {
-               new v;
-               v = get_int(sbvis_v);
-               v |= get_int(sbalways_v);
-               if (!v) {
-                  emit("do-show-vbar", "");
-                  set_int(sbvis_v, 1);
-               }
-               v = get_int(sbvis_h);
-               v |= get_int(sbalways_h);
-               if (!v) {
-                  emit("do-show-hbar", "");
-                  set_int(sbvis_h, 1);
-               }
-               v = get_int(sbvis_timer);
-               if (v > 0) cancel_timer(v);
-               v = timer(1.0, "timer0", 0);
-               set_int(sbvis_timer, v);
-            }
-         }
-         ENTRY_EDITFIELD_SCROLLER_EVENT_RECT_SWALLOW_PROGRAM
-      }
-   }
-
-group { name: "elm/scroller/entry/editfield";
-      inherit: "elm/scroller/entry/default";
-      alias: "elm/scroller/entry/editfield/fixed_size";
-      alias: "elm/scroller/entry/editfield/searchbar/default";
-      alias: "elm/scroller/entry/editfield/searchbar/fixed_size";
-      data {
-         item: "focus_highlight" "on";
-      }
-      parts {
-         part { name: "left_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT;
-               max: ENTRY_EDITFIELD_LEFT_PADDING_HEIGHT;
-               fixed: 1 0;
-               align: 0.0 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.0 1.0;
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-            }
-         }
-         part { name: "right_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT;
-               max: ENTRY_EDITFIELD_RIGHT_PADDING_HEIGHT;
-               align: 1.0 1.0;
-               fixed: 1 0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 1.0 1.0;
-            }
-            description { state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-            }
-         }
-         part { name: "bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "left_padding";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "right_padding";
-                  relative: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "focus_underline_bottom_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_BOTTOM_PADDING_SIZE_INC;
-               align: 0.5 1.0;
-               fixed: 0 1;
-               rel1 {
-                  to: "bg";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "bg";
-                  relative: 1.0 1.0;
-               }
-            }
-         }
-         part { name: "focus_underline";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               min: ENTRY_EDITFIELD_FOCUS_UNDERLINE_SIZE_INC;
-               align: 0.5 1.0;
-               fixed: 0 1;
-               rel1 {
-                  to: "focus_underline_bottom_padding";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "focus_underline_bottom_padding";
-                  relative: 1.0 0.0;
-               }
-               color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "F057";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 7 7 7 51; /*(Changeable UI) color_class: "F059";*/
-            }
-         }
-         part { name: "clear_padding";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.end";
-                  to_y: "bg";
-                  relative: 0.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC 0;
-               max: ENTRY_EDITFIELD_CLEAR_BUTTON_PADDING_MIN_MAX_INC 0;
-            }
-         }
-      }
-      programs {
-         program { name: "action_focus";
-            signal: "elm,state,focus,on";
-            source: "*";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_underline";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,state,focus,off";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "focus_underline";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "focus_underline";
-         }
-         program { name: "enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_underline";
-         }
-      }
-}
-
-////////////////////////////   COPY&PASTE UI  ///////////////////////////////////
-#define IMAGE_GROUP(GROUP_NAME, IMAGE_NAME) \
-   group { name: GROUP_NAME; \
-      images.image: IMAGE_NAME COMP; \
-      parts { \
-         part { name: "image"; \
-            description { \
-               state: "default" 0.0; \
-               visible: 1; \
-               image.normal: IMAGE_NAME; \
-               aspect: 1 1; \
-               aspect_preference: BOTH; \
-            } \
-         } \
-      } \
-   }
-///////////////////////////////////////////////////////////////////////////////
-
-IMAGE_GROUP("elm/copypaste/clipboard/default", "copy&paste_popup_icon_clipboard.png");
-IMAGE_GROUP("elm/copypaste/copy/default", "copy&paste_popup_icon_copy.png");
-IMAGE_GROUP("elm/copypaste/cut/default", "copy&paste_popup_icon_cut.png");
-IMAGE_GROUP("elm/copypaste/paste/default", "copy&paste_popup_icon_paste.png");
-IMAGE_GROUP("elm/copypaste/select/default", "copy&paste_popup_icon_select.png");
-IMAGE_GROUP("elm/copypaste/select_all/default", "copy&paste_popup_icon_select_all.png");
-
diff --git a/themes/widgets/progressbar.edc b/themes/widgets/progressbar.edc
deleted file mode 100644
index 54c4ffa1..00000000
--- a/themes/widgets/progressbar.edc
+++ /dev/null
@@ -1,2304 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-   group { name: "elm/progressbar/horizontal/default";
-      images {
-         set {
-            name: "core_progress_bar.#";
-            image {
-               image: SMALL"images/Controls/core_progress_bar.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_bar.#.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-            description { state: "show" 0.0;
-               min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               text {
-                  min: 0 0;
-                  align: 1.0 0.0;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               text.ellipsis: -1;
-               visible: 1;
-            }
-         }
-         part { name: "elm.left.top.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               visible: 1;
-            }
-         }
-         part { name: "swallowbar.top.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               rel1 {
-                  to: "elm.text";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.text";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.swallow.bar";
-            type: SWALLOW;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               rel1.to: "elm.background.progressbar";
-               rel2.to: "elm.background.progressbar";
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-               image.normal: "core_progress_bar.#";
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-            }
-         }
-         part { name: "swallowbar.bottom.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "elm.text.status";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.bottom.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L1";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "drag.background";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "background";
-                  to_y: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "background";
-                  to_y: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-            }
-         }
-         part { name: "elm.progress.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 1;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_y: "elm.swallow.bar";
-                  to_x: "elm.cur.progressbar";
-                  offset: -1 -1;
-               }
-               image.normal: "core_progress_bar.#";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-            }
-            description { state: "invert" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_y: "elm.swallow.bar";
-                  to_x: "elm.cur.progressbar";
-               }
-               rel2 {
-                  to_y: "elm.swallow.bar";
-                  to_x: "background";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "state_begin" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 0.1 1.0;
-               }
-            }
-            description { state: "state_end" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.9 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W062L2D";
-            }
-         }
-         part { name: "elm.cur.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            dragable {
-               confine: "drag.background";
-               x: 1 1 1;
-               y: 0 0 0;
-            }
-            description { state: "default" 0.0;
-               min: 0 28;
-               fixed: 1 1;
-               visible: 0;
-               rel1.to: "drag.background";
-               rel2.to: "drag.background";
-           }
-         }
-      }
-      programs {
-         program { name: "units_show";
-            signal: "elm,units,show";
-            source: "elm";
-            action: STATE_SET "show" 0.0;
-            target: "elm.text.status";
-            target: "elm.swallow.bar";
-            target: "elm.bottom.text";
-            target: "elm.left.top.text";
-            target: "elm.text";
-            target: "swallowbar.top.pad";
-            target: "elm.background.progressbar";
-         }
-         program { name: "units_hide";
-            signal: "elm,units,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.status";
-            target: "elm.swallow.bar";
-            target: "elm.bottom.text";
-            target: "elm.left.top.text";
-            target: "elm.text";
-            target: "swallowbar.top.pad";
-            target: "elm.background.progressbar";
-         }
-         program { name: "slide_to_end";
-            action: STATE_SET "state_end" 0.0;
-            transition: LINEAR 0.5;
-            target: "elm.progress.progressbar";
-            after: "slide_to_begin";
-         }
-         program { name: "slide_to_begin";
-            signal: "elm,state,slide,begin";
-            action: STATE_SET "state_begin" 0.0;
-            target: "elm.progress.progressbar";
-            transition: LINEAR 0.5;
-            after: "slide_to_end";
-         }
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-         }
-         program { name: "state_pulse";
-            signal: "elm,state,pulse";
-            source: "elm";
-            action: STATE_SET "state_begin" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "state_fraction";
-            signal: "elm,state,fraction";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "set_invert_on";
-            signal: "elm,state,inverted,on";
-            source: "elm";
-            action: STATE_SET "invert" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "set_invert_off";
-            signal: "elm,state,inverted,off";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "progressbar_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target: "elm.progress.progressbar";
-            target: "background";
-         }
-         program { name: "progressbar_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-            target: "background";
-         }
-      }
-   }
-   group { name: "elm/progressbar/horizontal/custom";
-      alias: "elm/progressbar/horizontal/list_progress";
-      images {
-         set {
-            name: "core_progress_bar.#";
-            image {
-               image: SMALL"images/Controls/core_progress_bar.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_bar.#.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_BG_DEFAULT_HEIGHT_INC;
-            }
-            description { state: "one_text" 0.0;
-               min: 0 PROGRESSBAR_BG_ONE_TEXT_HEIGHT_INC;
-            }
-            description { state: "two_text" 0.0;
-               min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.top.right.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               text {
-                  min: 0 0;
-                  align: 1.0 0.0;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               text.ellipsis: -1;
-               visible: 1;
-            }
-         }
-         part { name: "elm.top.left.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               visible: 1;
-            }
-         }
-         part { name: "swallowbar.top.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               rel1 {
-                  to: "elm.top.right.text";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.top.right.text";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.swallow.bar";
-            type: SWALLOW;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               rel1.to: "elm.background.progressbar";
-               rel2.to: "elm.background.progressbar";
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-               image.normal: "core_progress_bar.#";
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-            }
-         }
-         part { name: "swallowbar.bottom.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "elm.bottom.right.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.bottom.left.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L1";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "drag.background";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "background";
-                  to_y: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_x: "background";
-                  to_y: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-            }
-         }
-         part { name: "elm.progress.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 1;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to_y: "elm.swallow.bar";
-                  to_x: "elm.cur.progressbar";
-                  offset: -1 -1;
-               }
-               image.normal: "core_progress_bar.#";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-            }
-            description { state: "invert" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_y: "elm.swallow.bar";
-                  to_x: "elm.cur.progressbar";
-               }
-               rel2 {
-                  to_y: "elm.swallow.bar";
-                  to_x: "background";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "state_begin" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 0.1 1.0;
-               }
-            }
-            description { state: "state_end" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.9 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W062L2D";
-            }
-         }
-         part { name: "elm.cur.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            dragable {
-               confine: "drag.background";
-               x: 1 1 1;
-               y: 0 0 0;
-            }
-            description { state: "default" 0.0;
-               min: 0 28;
-               fixed: 1 1;
-               visible: 0;
-               rel1.to: "drag.background";
-               rel2.to: "drag.background";
-           }
-         }
-      }
-      script {
-         public top_text = 0;
-         public bottom_text = 0;
-      }
-      programs {
-         program { name: "bottom_text_show";
-            signal: "elm,bottom,text,show";
-            source: "elm";
-            script {
-               if (!get_int(top_text))
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "two_text", 0.0);
-               set_int(bottom_text, 1);
-               run_program(PROGRAM:"prog1");
-            }
-         }
-         program { name: "prog1";
-            action: STATE_SET "show" 0.0;
-            target: "elm.bottom.right.text";
-            target: "elm.swallow.bar";
-            target: "elm.bottom.left.text";
-         }
-         program { name: "bottom_text_hide";
-            signal: "elm,bottom,text,hide";
-            source: "elm";
-            script {
-               if (!get_int(top_text))
-                 set_state(PART:"elm.background.progressbar", "default", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               set_int(bottom_text, 0);
-               run_program(PROGRAM:"prog1");
-            }
-            after: "prog3";
-         }
-         program { name: "prog3";
-            action: STATE_SET "default" 0.0;
-            target: "elm.bottom.right.text";
-            target: "elm.bottom.left.text";
-            target: "elm.swallow.bar";
-         }
-         program { name: "top_text_show";
-            signal: "elm,top,text,show";
-            source: "elm";
-            script {
-               if (!get_int(bottom_text))
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "two_text", 0.0);
-               set_int(top_text, 1);
-               run_program(PROGRAM:"prog2");
-            }
-         }
-         program { name: "prog2";
-            action: STATE_SET "show" 0.0;
-            target: "elm.top.right.text";
-            target: "elm.top.left.text";
-            target: "elm.swallow.bar";
-            target: "swallowbar.top.pad";
-         }
-         program { name: "top_text_hide";
-            signal: "elm,top,text,hide";
-            source: "elm";
-            script {
-               if (!get_int(bottom_text))
-                 set_state(PART:"elm.background.progressbar", "default", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               set_int(top_text, 0);
-               run_program(PROGRAM:"prog1");
-            }
-            after: "prog4";
-         }
-         program { name: "prog4";
-            action: STATE_SET "default" 0.0;
-            target: "elm.top.right.text";
-            target: "elm.top.left.text";
-            target: "elm.swallow.bar";
-            target: "swallowbar.top.pad";
-         }
-         program { name: "slide_to_end";
-            action: STATE_SET "state_end" 0.0;
-            transition: LINEAR 0.5;
-            target: "elm.progress.progressbar";
-            after: "slide_to_begin";
-         }
-         program { name: "slide_to_begin";
-            signal: "elm,state,slide,begin";
-            action: STATE_SET "state_begin" 0.0;
-            target: "elm.progress.progressbar";
-            transition: LINEAR 0.5;
-            after: "slide_to_end";
-         }
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-         }
-         program { name: "state_pulse";
-            signal: "elm,state,pulse";
-            source: "elm";
-            action: STATE_SET "state_begin" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "state_fraction";
-            signal: "elm,state,fraction";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "set_invert_on";
-            signal: "elm,state,inverted,on";
-            source: "elm";
-            action: STATE_SET "invert" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "set_invert_off";
-            signal: "elm,state,inverted,off";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "progressbar_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target: "elm.progress.progressbar";
-            target: "background";
-         }
-         program { name: "progressbar_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-            target: "background";
-         }
-      }
-   }
-
-group { name: "elm/progressbar/horizontal/pending";
-      images {
-         set {
-            name: "core_progress_bar.#";
-            image {
-               image: SMALL"images/Controls/core_progress_bar.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_bar.#.png" COMP;
-            }
-         }
-         set {
-            name: "core_progress_pending_bg_01";
-            image {
-               image: SMALL"images/Controls/core_progress_pending_bg_01.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_pending_bg_01.png" COMP;
-            }
-         }
-         set {
-            name: "core_progress_pending_bg_02";
-            image {
-               image: SMALL"images/Controls/core_progress_pending_bg_02.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_pending_bg_02.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-            description { state: "show" 0.0;
-               min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               text {
-                  min: 0 0;
-                  align: 1.0 0.0;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               text.ellipsis: -1;
-               visible: 1;
-            }
-         }
-         part { name: "elm.left.top.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 1.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               visible: 1;
-            }
-         }
-         part { name: "swallowbar.top.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               rel1 {
-                  to: "elm.text";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.text";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.swallow.bar";
-            type: SWALLOW;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               rel1.to: "elm.background.progressbar";
-               rel2.to: "elm.background.progressbar";
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "swallowbar.bottom.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "elm.text.status";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.bottom.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L1";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-            image.normal: "core_progress_bar.#";
-            color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-            }
-         }
-         part { name: "elm.progress.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 1;
-               rel1 {
-                  to: "background";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "background";
-                  relative: 1.0 1.0;
-                  offset: -1 -1;
-               }
-               image.normal: "core_progress_pending_bg_01";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-            }
-            description { state: "state_begin" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "state_end" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "core_progress_pending_bg_02";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-            }
-            description { state: "state_begin_disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W062L5D";
-            }
-            description { state: "state_end_disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W062L5D";
-            }
-         }
-      }
-      script {
-         public state_end = 0;
-      }
-      programs {
-         program { name: "units_show";
-            signal: "elm,units,show";
-            source: "elm";
-            action: STATE_SET "show" 0.0;
-            target: "elm.text.status";
-            target: "elm.swallow.bar";
-            target: "elm.bottom.text";
-            target: "elm.text";
-            target: "elm.left.top.text";
-            target: "swallowbar.top.pad";
-            target: "elm.background.progressbar";
-         }
-         program { name: "units_hide";
-            signal: "elm,bottom,text,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.status";
-            target: "elm.swallow.bar";
-            target: "elm.bottom.text";
-            target: "elm.text";
-            target: "elm.left.top.text";
-            target: "swallowbar.top.pad";
-            target: "elm.background.progressbar";
-         }
-         program { name: "slide_to_end";
-            in: 0.3 0.0;
-            script {
-               set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
-               set_int(state_end, 1);
-            }
-            after: "slide_to_begin";
-         }
-         program { name: "slide_to_begin";
-            signal: "elm,state,slide,begin";
-            in: 0.3 0.0;
-            script {
-               set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
-               set_int(state_end, 0);
-            }
-            after: "slide_to_end";
-         }
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-            after: "slide_to_end";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-            after: "init_pulse";
-         }
-         program { name: "init_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "progressbar_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               set_state(PART:"background", "disabled", 0.0);
-               if (!get_int(state_end))
-                  set_state(PART:"elm.progress.progressbar", "state_begin_disabled", 0.0);
-               else
-                  set_state(PART:"elm.progress.progressbar", "state_end_disabled", 0.0);
-            }
-         }
-         program { name: "progressbar_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               set_state(PART:"background", "default", 0.0);
-               if (!get_int(state_end))
-                  set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
-               else
-                  set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
-            }
-         }
-      }
-   }
-
-   group { name: "elm/progressbar/horizontal/pending_custom";
-      images {
-         set {
-            name: "core_progress_bar.#";
-            image {
-               image: SMALL"images/Controls/core_progress_bar.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_bar.#.png" COMP;
-            }
-         }
-         set {
-            name: "core_progress_pending_bg_01";
-            image {
-               image: SMALL"images/Controls/core_progress_pending_bg_01.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_pending_bg_01.png" COMP;
-            }
-         }
-         set {
-            name: "core_progress_pending_bg_02";
-            image {
-               image: SMALL"images/Controls/core_progress_pending_bg_02.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_pending_bg_02.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_BG_DEFAULT_HEIGHT_INC;
-            }
-            description { state: "one_text" 0.0;
-               min: 0 PROGRESSBAR_BG_ONE_TEXT_HEIGHT_INC;
-            }
-            description { state: "two_text" 0.0;
-               min: 0 PROGRESSBAR_BG_TWO_TEXT_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.top.right.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 1.0 0.0;
-               }
-               text {
-                  min: 0 0;
-                  align: 1.0 0.0;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               text.ellipsis: -1;
-               visible: 1;
-            }
-         }
-         part { name: "elm.top.left.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.background.progressbar";
-                  relative: 0.0 0.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               text.min: 1 1;
-               visible: 1;
-            }
-         }
-         part { name: "swallowbar.top.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: 0 0;
-               rel1 {
-                  to: "elm.top.right.text";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.top.right.text";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
-            }
-         }
-         part { name: "elm.swallow.bar";
-            type: SWALLOW;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               max: -1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
-               rel1.to: "elm.background.progressbar";
-               rel2.to: "elm.background.progressbar";
-               fixed: 0 1;
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               rel1 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to_x: "elm.background.progressbar";
-                  to_y: "swallowbar.top.pad";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "swallowbar.bottom.pad";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-               align: 0.5 0.0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "elm.bottom.right.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 1.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L2";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 1.0 0.0;
-               color_class: "T057L2";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "elm.bottom.left.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "swallowbar.bottom.pad";
-                  relative: 0.0 1.0;
-               }
-               text {
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  font: "Tizen:style=Regular"; size: "21"; /*(Changeable UI) text_class: "T057L1";*/
-                  text_class: "tizen";
-                  ellipsis: -1;
-               }
-               align: 0.0 0.0;
-               color_class: "T057L1";
-            }
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "elm.swallow.bar";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "elm.swallow.bar";
-                  relative: 1.0 1.0;
-               }
-            image.normal: "core_progress_bar.#";
-            color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-            }
-         }
-         part { name: "elm.progress.progressbar";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               fixed: 1 1;
-               rel1 {
-                  to: "background";
-                  relative: 0.0 0.0;
-               }
-               rel2 {
-                  to: "background";
-                  relative: 1.0 1.0;
-                  offset: -1 -1;
-               }
-               image.normal: "core_progress_pending_bg_01";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-            }
-            description { state: "state_begin" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "state_end" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "core_progress_pending_bg_02";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-            }
-            description { state: "state_begin_disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W062L5D";
-            }
-            description { state: "state_end_disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W062L5D";
-            }
-         }
-      }
-      script {
-         public top_text = 0;
-         public bottom_text = 0;
-         public state_end = 0;
-      }
-      programs {
-         program { name: "bottom_text_show";
-            signal: "elm,bottom,text,show";
-            source: "elm";
-            script {
-               if (!get_int(top_text))
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "two_text", 0.0);
-               set_int(bottom_text, 1);
-               run_program(PROGRAM:"prog1");
-            }
-         }
-         program { name: "prog1";
-            action: STATE_SET "show" 0.0;
-            target: "elm.bottom.right.text";
-            target: "elm.swallow.bar";
-            target: "elm.bottom.left.text";
-         }
-         program { name: "bottom_text_hide";
-            signal: "elm,bottom,text,hide";
-            source: "elm";
-            script {
-               if (!get_int(top_text))
-                 set_state(PART:"elm.background.progressbar", "default", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               set_int(bottom_text, 0);
-               run_program(PROGRAM:"prog1");
-            }
-            after: "prog3";
-         }
-         program { name: "prog3";
-            action: STATE_SET "default" 0.0;
-            target: "elm.bottom.right.text";
-            target: "elm.bottom.left.text";
-            target: "elm.swallow.bar";
-         }
-         program { name: "top_text_show";
-            signal: "elm,top,text,show";
-            source: "elm";
-            script {
-               if (!get_int(bottom_text))
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "two_text", 0.0);
-               set_int(top_text, 1);
-               run_program(PROGRAM:"prog2");
-            }
-         }
-         program { name: "prog2";
-            action: STATE_SET "show" 0.0;
-            target: "elm.top.right.text";
-            target: "elm.top.left.text";
-            target: "elm.swallow.bar";
-            target: "swallowbar.top.pad";
-         }
-         program { name: "top_text_hide";
-            signal: "elm,top,text,hide";
-            source: "elm";
-            script {
-               if (!get_int(bottom_text))
-                 set_state(PART:"elm.background.progressbar", "default", 0.0);
-               else
-                 set_state(PART:"elm.background.progressbar", "one_text", 0.0);
-               set_int(top_text, 0);
-               run_program(PROGRAM:"prog1");
-            }
-            after: "prog4";
-         }
-         program { name: "prog4";
-            action: STATE_SET "default" 0.0;
-            target: "elm.top.right.text";
-            target: "elm.top.left.text";
-            target: "elm.swallow.bar";
-            target: "swallowbar.top.pad";
-         }
-         program { name: "slide_to_end";
-            in: 0.3 0.0;
-            script {
-               set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
-               set_int(state_end, 1);
-            }
-            after: "slide_to_begin";
-         }
-         program { name: "slide_to_begin";
-            signal: "elm,state,slide,begin";
-            in: 0.3 0.0;
-            script {
-               set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
-               set_int(state_end, 0);
-            }
-            after: "slide_to_end";
-         }
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-            after: "slide_to_end";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "slide_to_begin";
-            target: "slide_to_end";
-            target: "start_pulse";
-            after: "init_pulse";
-         }
-         program { name: "init_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "elm.progress.progressbar";
-         }
-         program { name: "progressbar_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               set_state(PART:"background", "disabled", 0.0);
-               if (!get_int(state_end))
-                  set_state(PART:"elm.progress.progressbar", "state_begin_disabled", 0.0);
-               else
-                  set_state(PART:"elm.progress.progressbar", "state_end_disabled", 0.0);
-            }
-         }
-         program { name: "progressbar_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               set_state(PART:"background", "default", 0.0);
-               if (!get_int(state_end))
-                  set_state(PART:"elm.progress.progressbar", "state_begin", 0.0);
-               else
-                  set_state(PART:"elm.progress.progressbar", "state_end", 0.0);
-            }
-         }
-      }
-   }
-
-#define PROGRESS_DESC(NUM , SIZE) \
-   description { state: "pulse" 0.0; \
-      inherit: "default" 0.0; \
-      image.normal: "core_activity_Indicator_"SIZE; \
-      map { \
-         on: 1; \
-         smooth: 0; \
-         rotation { \
-            z: NUM; \
-         } \
-      } \
-   }
-
-#define PROCESS_DESCS(WIDTH, HEIGHT, SIZE) \
-      description { \
-         state: "default" 0.0; \
-         min: WIDTH HEIGHT; \
-         max: WIDTH HEIGHT; \
-         aspect: 1.0 1.0; \
-         aspect_preference: BOTH; \
-         image.normal: "core_activity_Indicator_"SIZE; \
-      } \
-      PROGRESS_DESC(-360, SIZE)
-
-#define   PROGRESSING_DELAY    0.01
-
-#define PROCESS_IMAGES(SIZE) \
-   images { \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_00"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_00.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_00.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_01"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_01.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_01.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_02"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_02.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_02.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_03"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_03.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_03.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_04"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_04.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_04.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_05"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_05.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_05.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_06"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_06.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_06.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_07"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_07.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_07.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_08"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_08.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_08.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_09"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_09.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_09.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_10"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_10.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_10.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_11"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_11.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_11.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_12"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_12.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_12.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_13"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_13.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_13.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_14"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_14.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_14.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_15"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_15.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_15.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_16"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_16.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_16.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_17"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_17.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_17.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_18"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_18.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_18.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_19"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_19.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_19.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_20"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_20.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_20.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_21"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_21.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_21.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_22"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_22.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_22.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_23"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_23.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_23.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_24"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_24.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_24.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_25"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_25.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_25.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_26"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_26.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_26.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_27"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_27.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_27.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_28"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_28.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_28.png" COMP; \
-            } \
-      } \
-      set { \
-         name: "core_activity_Indicator_"SIZE"_29"; \
-            image { \
-               image: SMALL"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_29.png" COMP; \
-            } \
-            image { \
-               image: MEDIUM"images/Activity_indicator/"SIZE"/core_activity_Indicator_"SIZE"_29.png" COMP; \
-            } \
-      } \
-   }
-
-
-   group { name: "elm/progressbar/horizontal/process_large";
-      PROCESS_IMAGES(large)
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "elm.background.progressbar";
-            description { state: "default" 0.0;
-               min: PROCESS_LARGE_IMAGE_WIDTH_INC PROCESS_LARGE_IMAGE_HEIGHT_INC;
-               max: PROCESS_LARGE_IMAGE_WIDTH_INC PROCESS_LARGE_IMAGE_HEIGHT_INC;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               color: 2 61 132 178; /*(Changeable UI) color_class: "W157E1";*/
-               image.normal: "core_activity_Indicator_large_00";
-               image.tween: "core_activity_Indicator_large_01";
-               image.tween: "core_activity_Indicator_large_02";
-               image.tween: "core_activity_Indicator_large_03";
-               image.tween: "core_activity_Indicator_large_04";
-               image.tween: "core_activity_Indicator_large_05";
-               image.tween: "core_activity_Indicator_large_06";
-               image.tween: "core_activity_Indicator_large_07";
-               image.tween: "core_activity_Indicator_large_08";
-               image.tween: "core_activity_Indicator_large_09";
-               image.tween: "core_activity_Indicator_large_10";
-               image.tween: "core_activity_Indicator_large_11";
-               image.tween: "core_activity_Indicator_large_12";
-               image.tween: "core_activity_Indicator_large_13";
-               image.tween: "core_activity_Indicator_large_14";
-               image.tween: "core_activity_Indicator_large_15";
-               image.tween: "core_activity_Indicator_large_16";
-               image.tween: "core_activity_Indicator_large_17";
-               image.tween: "core_activity_Indicator_large_18";
-               image.tween: "core_activity_Indicator_large_19";
-               image.tween: "core_activity_Indicator_large_20";
-               image.tween: "core_activity_Indicator_large_21";
-               image.tween: "core_activity_Indicator_large_22";
-               image.tween: "core_activity_Indicator_large_23";
-               image.tween: "core_activity_Indicator_large_24";
-               image.tween: "core_activity_Indicator_large_25";
-               image.tween: "core_activity_Indicator_large_26";
-               image.tween: "core_activity_Indicator_large_27";
-               image.tween: "core_activity_Indicator_large_28";
-               image.tween: "core_activity_Indicator_large_29";
-            }
-         }
-      }
-      programs {
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-            transition: LINEAR 1.8;
-            after: "start_pulse";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "start_pulse";
-            after: "init_pulse";
-         }
-         program { name: "init_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-         }
-      }
-   }
-
-   group { name: "elm/progressbar/horizontal/process_medium";
-      PROCESS_IMAGES(medium)
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "elm.background.progressbar";
-            description { state: "default" 0.0;
-               min: PROCESS_MEDIUM_IMAGE_WIDTH_INC PROCESS_MEDIUM_IMAGE_HEIGHT_INC;
-               max: PROCESS_MEDIUM_IMAGE_WIDTH_INC PROCESS_MEDIUM_IMAGE_HEIGHT_INC;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               color: 2 61 132 178; /*(Changeable UI) color_class: "W157E1";*/
-               image.normal: "core_activity_Indicator_medium_00";
-               image.tween: "core_activity_Indicator_medium_01";
-               image.tween: "core_activity_Indicator_medium_02";
-               image.tween: "core_activity_Indicator_medium_03";
-               image.tween: "core_activity_Indicator_medium_04";
-               image.tween: "core_activity_Indicator_medium_05";
-               image.tween: "core_activity_Indicator_medium_06";
-               image.tween: "core_activity_Indicator_medium_07";
-               image.tween: "core_activity_Indicator_medium_08";
-               image.tween: "core_activity_Indicator_medium_09";
-               image.tween: "core_activity_Indicator_medium_10";
-               image.tween: "core_activity_Indicator_medium_11";
-               image.tween: "core_activity_Indicator_medium_12";
-               image.tween: "core_activity_Indicator_medium_13";
-               image.tween: "core_activity_Indicator_medium_14";
-               image.tween: "core_activity_Indicator_medium_15";
-               image.tween: "core_activity_Indicator_medium_16";
-               image.tween: "core_activity_Indicator_medium_17";
-               image.tween: "core_activity_Indicator_medium_18";
-               image.tween: "core_activity_Indicator_medium_19";
-               image.tween: "core_activity_Indicator_medium_20";
-               image.tween: "core_activity_Indicator_medium_21";
-               image.tween: "core_activity_Indicator_medium_22";
-               image.tween: "core_activity_Indicator_medium_23";
-               image.tween: "core_activity_Indicator_medium_24";
-               image.tween: "core_activity_Indicator_medium_25";
-               image.tween: "core_activity_Indicator_medium_26";
-               image.tween: "core_activity_Indicator_medium_27";
-               image.tween: "core_activity_Indicator_medium_28";
-               image.tween: "core_activity_Indicator_medium_29";
-            }
-         }
-      }
-      programs {
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-            transition: LINEAR 1.8;
-            after: "start_pulse";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "start_pulse";
-            after: "init_pulse";
-         }
-         program { name: "init_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-         }
-      }
-   }
-
-   group { name: "elm/progressbar/horizontal/process_small";
-      PROCESS_IMAGES(small)
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.background.progressbar";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "background";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "elm.background.progressbar";
-            description { state: "default" 0.0;
-               min: PROCESS_SMALL_IMAGE_WIDTH_INC PROCESS_SMALL_IMAGE_HEIGHT_INC;
-               max: PROCESS_SMALL_IMAGE_WIDTH_INC PROCESS_SMALL_IMAGE_HEIGHT_INC;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               color: 2 61 132 178; /*(Changeable UI) color_class: "W157E1";*/
-               image.normal: "core_activity_Indicator_small_00";
-               image.tween: "core_activity_Indicator_small_01";
-               image.tween: "core_activity_Indicator_small_02";
-               image.tween: "core_activity_Indicator_small_03";
-               image.tween: "core_activity_Indicator_small_04";
-               image.tween: "core_activity_Indicator_small_05";
-               image.tween: "core_activity_Indicator_small_06";
-               image.tween: "core_activity_Indicator_small_07";
-               image.tween: "core_activity_Indicator_small_08";
-               image.tween: "core_activity_Indicator_small_09";
-               image.tween: "core_activity_Indicator_small_10";
-               image.tween: "core_activity_Indicator_small_11";
-               image.tween: "core_activity_Indicator_small_12";
-               image.tween: "core_activity_Indicator_small_13";
-               image.tween: "core_activity_Indicator_small_14";
-               image.tween: "core_activity_Indicator_small_15";
-               image.tween: "core_activity_Indicator_small_16";
-               image.tween: "core_activity_Indicator_small_17";
-               image.tween: "core_activity_Indicator_small_18";
-               image.tween: "core_activity_Indicator_small_19";
-               image.tween: "core_activity_Indicator_small_20";
-               image.tween: "core_activity_Indicator_small_21";
-               image.tween: "core_activity_Indicator_small_22";
-               image.tween: "core_activity_Indicator_small_23";
-               image.tween: "core_activity_Indicator_small_24";
-               image.tween: "core_activity_Indicator_small_25";
-               image.tween: "core_activity_Indicator_small_26";
-               image.tween: "core_activity_Indicator_small_27";
-               image.tween: "core_activity_Indicator_small_28";
-               image.tween: "core_activity_Indicator_small_29";
-            }
-         }
-      }
-      programs {
-         program { name: "start_pulse";
-            signal: "elm,state,pulse,start";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-            transition: LINEAR 1.8;
-            after: "start_pulse";
-         }
-         program { name: "stop_pulse";
-            signal: "elm,state,pulse,stop";
-            source: "elm";
-            action: ACTION_STOP;
-            target: "start_pulse";
-            after: "init_pulse";
-         }
-         program { name: "init_pulse";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-         }
-      }
-   }
diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc
deleted file mode 100644
index be635958..00000000
--- a/themes/widgets/radio.edc
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-group { name: "elm/radio/base/default";
-      images {
-         set {
-            name: "core_radio_bg";
-            image {
-               image: SMALL"images/Controls/core_radio_bg.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_radio_bg.png" COMP;
-            }
-         }
-         set {
-            name: "core_radio_bg_stroke";
-            image {
-               image: SMALL"images/Controls/core_radio_bg_stroke.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_radio_bg_stroke.png" COMP;
-            }
-         }
-         set {
-            name: "core_radio_icon";
-            image {
-               image: SMALL"images/Controls/core_radio_icon.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_radio_icon.png" COMP;
-            }
-         }
-      }
-      script {
-         public radio_state;
-         public radio_disabled;
-      }
-      parts {
-         part { name: "bg";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: RADIO_BG_SIZE;
-               image.normal: "core_radio_bg";
-               aspect: 1 1;
-               aspect_preference: BOTH;
-               color: 0 0 0 102; /*(Changeable UI) color_class: "W014L1E1";*/
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W014L1";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 51; /*(Changeable UI) color_class: "W014L1D";*/
-            }
-         }
-         part { name: "bg_stroke";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: RADIO_BG_STROKE_SIZE;
-               image.normal: "core_radio_bg_stroke";
-               aspect: 1 1;
-               aspect_preference: BOTH;
-               color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2E1";*/
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 191 191 191 76; /*(Changeable UI) color_class: "W014L2D";*/
-            }
-         }
-         part { name: "radio";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: RADIO_SIZE;
-               rel1.to: "bg";
-               rel1.relative: 0.125 0.125;
-               rel2.to: "bg";
-               rel2.relative: 0.875 0.875;
-               aspect: 1 1;
-               aspect_preference: BOTH;
-               image.normal: "core_radio_icon";
-               color: 244 244 244 255; /*(Changeable UI) color_class: "W014Li";*/
-               visible:0;
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               visible:1;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 244 244 244 153; /*(Changeable UI) color_class: "W014LiD";*/
-            }
-         }
-         part { name: "event";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "click";
-            signal: "mouse,clicked,1";
-            source: "event";
-            script {
-               if (get_int(radio_disabled) == 1) return;
-               emit("elm,action,radio,toggle", "");
-            }
-         }
-         program { name: "unpressed";
-            signal: "mouse,up,1";
-            source: "event";
-            script {
-              if (get_int(radio_disabled) == 1) return;
-              if (get_int(radio_state) == 1) {
-                set_state(PART:"radio", "on", 0.0);
-                set_state(PART:"bg", "on", 0.0);
-                set_state(PART:"bg_stroke", "on", 0.0);
-              }
-              else {
-                set_state(PART:"radio", "default", 0.0);
-                set_state(PART:"bg", "default", 0.0);
-                set_state(PART:"bg_stroke", "default", 0.0);
-              }
-           }
-         }
-         program { name: "pressed";
-            signal: "mouse,down,1";
-            source: "event";
-            script {
-              if (get_int(radio_disabled) == 1) return;
-              if (get_int(radio_state) == 1) {
-                set_state(PART:"radio", "on", 0.0);
-                set_state(PART:"bg", "on", 0.0);
-                set_state(PART:"bg_stroke", "on", 0.0);
-              }
-              else {
-                set_state(PART:"radio", "default", 0.0);
-                set_state(PART:"bg", "default", 0.0);
-                set_state(PART:"bg_stroke", "default", 0.0);
-              }
-            }
-         }
-         program { name: "radio_on";
-            signal: "elm,state,radio,on";
-            source: "elm";
-            script {
-               if (get_int(radio_disabled) == 1) {
-                  set_state(PART:"bg", "disabled", 0.0);
-                  set_state(PART:"bg_stroke", "disabled", 0.0);
-               }
-               else {
-                  set_state(PART:"bg", "on", 0.0);
-                  set_state(PART:"bg_stroke", "on", 0.0);
-               }
-              set_state(PART:"radio", "on", 0.0);
-              set_int(radio_state, 1);
-            }
-         }
-         program { name: "radio_off";
-            signal: "elm,state,radio,off";
-            source: "elm";
-            script {
-               if (get_int(radio_disabled) == 1) {
-                  set_state(PART:"bg", "disabled", 0.0);
-                  set_state(PART:"bg_stroke", "disabled", 0.0);
-               }
-               else {
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"bg_stroke", "default", 0.0);
-               }
-              set_state(PART:"radio", "default", 0.0);
-              set_int(radio_state, 0);
-            }
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-              set_int(radio_disabled, 1);
-              set_state(PART:"bg", "disabled", 0.0);
-              set_state(PART:"bg_stroke", "disabled", 0.0);
-              set_state(PART:"radio", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-              set_int(radio_disabled, 0);
-              if (get_int(radio_state) == 1) {
-                set_state(PART:"bg", "on", 0.0);
-                set_state(PART:"bg_stroke", "on", 0.0);
-                set_state(PART:"radio", "on", 0.0);
-              }
-              else {
-                set_state(PART:"bg", "default", 0.0);
-                set_state(PART:"bg_stroke", "default", 0.0);
-                set_state(PART:"radio", "default", 0.0);
-              }
-            }
-         }
-      }
-   }
-
-group { name: "elm/radio/base/list";
-      images {
-         set {
-            name: "core_radio_bg";
-            image {
-               image: SMALL"images/Controls/core_radio_bg.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_radio_bg.png" COMP;
-            }
-         }
-         set {
-            name: "core_radio_bg_stroke";
-            image {
-               image: SMALL"images/Controls/core_radio_bg_stroke.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_radio_bg_stroke.png" COMP;
-            }
-         }
-         set {
-            name: "core_radio_icon";
-            image {
-               image: SMALL"images/Controls/core_radio_icon.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_radio_icon.png" COMP;
-            }
-         }
-      }
-      script {
-         public radio_state;
-         public radio_disabled;
-      }
-      parts {
-         part { name: "bg";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: RADIO_BG_SIZE;
-               image.normal: "core_radio_bg";
-               aspect: 1 1;
-               aspect_preference: BOTH;
-               color: 0 0 0 102; /*(Changeable UI) color_class: "W014L1E1";*/
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W014L1";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 51; /*(Changeable UI) color_class: "W014L1D";*/
-            }
-         }
-         part { name: "bg_stroke";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: RADIO_BG_STROKE_SIZE;
-               image.normal: "core_radio_bg_stroke";
-               aspect: 1 1;
-               aspect_preference: BOTH;
-               color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2E1";*/
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               color: 191 191 191 153; /*(Changeable UI) color_class: "W014L2";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 191 191 191 76; /*(Changeable UI) color_class: "W014L2D";*/
-            }
-         }
-         part { name: "radio";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: RADIO_SIZE;
-               rel1.to: "bg";
-               rel1.relative: 0.125 0.125;
-               rel2.to: "bg";
-               rel2.relative: 0.875 0.875;
-               aspect: 1 1;
-               aspect_preference: BOTH;
-               image.normal: "core_radio_icon";
-               color: 244 244 244 255; /*(Changeable UI) color_class: "W014Li";*/
-               visible:0;
-            }
-            description { state: "on" 0.0;
-               inherit: "default" 0.0;
-               visible:1;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 244 244 244 153; /*(Changeable UI) color_class: "W014LiD";*/
-            }
-         }
-         part { name: "event";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "unpressed";
-            signal: "elm,state,mouse,up";
-            source: "elm";
-            script {
-              if (get_int(radio_disabled) == 1) return;
-              if (get_int(radio_state) == 1) {
-                set_state(PART:"radio", "on", 0.0);
-                set_state(PART:"bg", "on", 0.0);
-                set_state(PART:"bg_stroke", "on", 0.0);
-              }
-              else {
-                set_state(PART:"radio", "default", 0.0);
-                set_state(PART:"bg", "default", 0.0);
-                set_state(PART:"bg_stroke", "default", 0.0);
-              }
-           }
-         }
-         program { name: "pressed";
-            signal: "elm,state,mouse,down";
-            source: "elm";
-            script {
-              if (get_int(radio_disabled) == 1) return;
-              if (get_int(radio_state) == 1) {
-                set_state(PART:"radio", "on", 0.0);
-                set_state(PART:"bg", "on", 0.0);
-                set_state(PART:"bg_stroke", "on", 0.0);
-              }
-              else {
-                set_state(PART:"radio", "default", 0.0);
-                set_state(PART:"bg", "default", 0.0);
-                set_state(PART:"bg_stroke", "default", 0.0);
-              }
-            }
-         }
-         program { name: "radio_on";
-            signal: "elm,state,radio,on";
-            source: "elm";
-            script {
-               if (get_int(radio_disabled) == 1) {
-                  set_state(PART:"bg", "disabled", 0.0);
-                  set_state(PART:"bg_stroke", "disabled", 0.0);
-               }
-               else {
-                  set_state(PART:"bg", "on", 0.0);
-                  set_state(PART:"bg_stroke", "on", 0.0);
-               }
-              set_state(PART:"radio", "on", 0.0);
-              set_int(radio_state, 1);
-            }
-         }
-         program { name: "radio_off";
-            signal: "elm,state,radio,off";
-            source: "elm";
-            script {
-               if (get_int(radio_disabled) == 1) {
-                  set_state(PART:"bg", "disabled", 0.0);
-                  set_state(PART:"bg_stroke", "disabled", 0.0);
-               }
-               else {
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"bg_stroke", "default", 0.0);
-               }
-              set_state(PART:"radio", "default", 0.0);
-              set_int(radio_state, 0);
-            }
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-              set_int(radio_disabled, 1);
-              set_state(PART:"bg", "disabled", 0.0);
-              set_state(PART:"bg_stroke", "disabled", 0.0);
-              set_state(PART:"radio", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-              set_int(radio_disabled, 0);
-              if (get_int(radio_state) == 1) {
-                set_state(PART:"bg", "on", 0.0);
-                set_state(PART:"bg_stroke", "on", 0.0);
-                set_state(PART:"radio", "on", 0.0);
-              }
-              else {
-                set_state(PART:"bg", "default", 0.0);
-                set_state(PART:"bg_stroke", "default", 0.0);
-                set_state(PART:"radio", "default", 0.0);
-              }
-            }
-         }
-      }
-   }
-
diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc
deleted file mode 100644
index bfb291b5..00000000
--- a/themes/widgets/slider.edc
+++ /dev/null
@@ -1,1464 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-   group { name: "elm/slider/horizontal/indicator/default";
-      images {
-         set {
-            name: "core_slider_handle_normal";
-            image {
-               image: SMALL"images/Controls/core_slider_handle_normal.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_slider_handle_normal.png" COMP;
-            }
-         }
-         set {
-            name: "core_slider_handle_press";
-            image {
-               image: SMALL"images/Controls/core_slider_handle_press.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_slider_handle_press.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "access";
-            type: RECT;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "button_events";
-            type: RECT;
-            mouse_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 2*SLIDER_INDICATOR_SIZE_INC 1.5*SLIDER_INDICATOR_SIZE_INC;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-               color: 0 0 0 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "button0";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
-               max: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
-               image {
-                  normal: "core_slider_handle_normal";
-               }
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W0641";*/
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "W0641D";
-               visible: 1;
-            }
-         }
-         part { name: "button0_press";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
-               max: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
-               image {
-                  normal: "core_slider_handle_press";
-               }
-               color_class: "W0641P";
-               visible: 0;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "mouse_down";
-            signal: "mouse,down,*";
-            source: "button_events";
-            action:  STATE_SET "pressed" 0.0;
-            target: "button0_press";
-         }
-         program { name: "mouse_up";
-            signal: "mouse,up,*";
-            source: "button_events";
-            action:  STATE_SET "default" 0.0;
-            target: "button0_press";
-         }
-         program { name: "slider_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target: "button0";
-            target: "button_events";
-         }
-         program { name: "slider_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "button0";
-            target: "button_events";
-         }
-      }
-   }
-group { name: "elm/slider/horizontal/default";
-      images {
-         set {
-            name: "core_progress_bar.#";
-            image {
-               image: SMALL"images/Controls/core_progress_bar.#.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_progress_bar.#.png" COMP;
-            }
-         }
-         set {
-            name: "core_slider_center_point_bg";
-            image {
-               image: SMALL"images/Controls/core_slider_center_point_bg.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_slider_center_point_bg.png" COMP;
-            }
-         }
-      }
-      script {
-         public invert_on = 0;
-         public popup_show = 1;
-         public show = 0;
-         public set_popup_show() {
-            set_int(popup_show, 1);
-         }
-         public set_popup_hide() {
-            set_int(popup_show, 0);
-         }
-         public set_invert_on() {
-            set_state(PART:"level", "inverted", 0.0);
-            set_state(PART:"level2", "inverted", 0.0);
-            set_int(invert_on, 1);
-         }
-         public set_invert_off() {
-            set_state(PART:"level", "default", 0.0);
-            set_state(PART:"level2", "default", 0.0);
-            set_int(invert_on, 0);
-         }
-         public thumb_down() {
-            if (get_int(invert_on) == 0) {
-              set_state(PART:"level", "pressed", 0.0);
-              set_state(PART:"level2", "pressed", 0.0);
-            }
-            if (get_int(popup_show) == 1)
-               emit("popup,show", "elm");
-            }
-         public thumb_up() {
-            if (get_int(invert_on) == 0) {
-              set_state(PART:"level", "default", 0.0);
-              set_state(PART:"level2", "default", 0.0);
-            }
-            if (get_int(popup_show) == 1)
-               emit("popup,hide", "elm");
-            }
-         public drag_state() {
-            new Float:dx, Float:dy;
-            get_drag(PART:"elm.dragable.slider", dx, dy);
-            if (dx > 0.5) {
-              set_state(PART:"level", "default", 0.0);
-              set_state(PART:"level2", "default", 0.0);
-              set_int(invert_on, 0);
-            }
-            else {
-              set_state(PART:"level", "inverted", 0.0);
-              set_state(PART:"level2", "inverted", 0.0);
-              set_int(invert_on, 1);
-            }
-         }
-      }
-         parts {
-            part { name: "access";
-               type: RECT;
-               description { state: "default" 0.0;
-                  fixed: 1 1;
-                  color: 0 0 0 0;
-               }
-            }
-            part {
-               name: "bg";
-               type: SPACER;
-               scale: 1;
-               description {
-                  state: "default" 0.0;
-                  min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
-               }
-            }
-            part {
-               name: "bar_image_left_padding";
-               type: SPACER;
-               scale: 1;
-               description {
-                  state: "default" 0.0;
-                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
-                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
-                  fixed: 1 0;
-                  rel1.to: "bg";
-                  rel2 {
-                     relative: 0.0  1.0;
-                     to: "bg";
-                  }
-                  align: 0.0 0.5;
-               }
-            }
-            part { name: "elm.swallow.icon";
-               type: SWALLOW;
-               clip_to: "icon_clipper";
-               scale: 1;
-               description { state: "default" 0.0;
-                  visible: 0;
-                  align: 0.0 0.5;
-                  max: SLIDER_SWALLOWBAR_HEIGHT_INC SLIDER_SWALLOWBAR_HEIGHT_INC;
-                  rel1 {
-                     relative: 1.0 0.0;
-                     to_x: "bar_image_left_padding";
-                     to_y: "bg";
-                  }
-                  rel2 {
-                     relative: 1.0 1.0;
-                     to_x: "bar_image_left_padding";
-                     to_y: "bg";
-                  }
-               }
-               description { state: "visible" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-               }
-            }
-            part {
-               name: "bar_icon_right_padding_1";
-               type: SPACER;
-               scale: 1;
-               description {
-                  state: "default" 0.0;
-                  align: 0.0 0.5;
-                  min: 0 0;
-                  max: 0 0;
-                  rel1 {
-                     relative: 1.0  0.0;
-                     to: "elm.swallow.icon";
-                  }
-                  rel2 {
-                     relative: 1.0  1.0;
-                     to: "elm.swallow.icon";
-                  }
-                  fixed: 1 1;
-               }
-               description { state: "visible";
-                  inherit: "default" 0.0;
-                  min: SLIDER_ICON_PADDING_SIZE_INC;
-                  max: SLIDER_ICON_PADDING_SIZE_INC;
-               }
-            }
-            part {
-               name: "bar_icon_right_padding_2";
-               type: SPACER;
-               scale: 1;
-               description {
-                  state: "default" 0.0;
-                  align: 0.0 0.5;
-                  min: 0 0;
-                  max: 0 0;
-                  rel1 {
-                     relative: 1.0  0.0;
-                     to: "bar_icon_right_padding_1";
-                  }
-                  rel2 {
-                     relative: 1.0  1.0;
-                     to: "bar_icon_right_padding_1";
-                  }
-                  fixed: 1 1;
-               }
-               description { state: "visible";
-                  inherit: "default" 0.0;
-                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
-                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
-               }
-            }
-            part { name: "base";
-               mouse_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                  min: 0 SLIDER_BASE_HEIGHT_INC;
-                  max: -1 SLIDER_BASE_HEIGHT_INC;
-                  rel1 {
-                     to: "bar_icon_right_padding_2";
-                     relative: 1.0 0.0;
-                  }
-                  rel2 {
-                     to: "bar_image_right_padding";
-                     relative: 0.0 1.0;
-                  }
-                  fixed: 0 1;
-                  image.normal: "core_progress_bar.#";
-                  color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-               }
-               description { state: "disabled" 0.0;
-                  inherit: "default" 0.0;
-                  color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-               }
-            }
-            part { name: "drag_base";
-               type: "SPACER";
-               description { state: "default" 0.0;
-                  min: 0 SLIDER_SWALLOWBAR_HEIGHT_INC;
-                  rel1 {
-                     to_x: "bar_image_left_padding";
-                     to_y: "bg";
-                     relative: 0.0 0.0;
-                  }
-                  rel2.to: "bg";
-                  fixed: 1 1;
-               }
-               description { state: "visible" 0.0;
-                  inherit: "default" 0.0;
-                  rel1 {
-                     to_x: "bar_icon_right_padding_2";
-                     to_y: "bg";
-                     relative: 0.0 0.0;
-                  }
-                  rel2.to: "bg";
-               }
-            }
-            part { name: "level";
-               mouse_events: 0;
-               scale: 1;
-               clip_to: "clipper";
-               description { state: "default" 0.0;
-                  rel1 {
-                     to_x: "bar_icon_right_padding_2";
-                     relative: 1.0 0.0;
-                  }
-                  rel2 {
-                     to_x: "elm.dragable.slider";
-                     relative: 0.5 1.0;
-                  }
-                  fixed: 1 1;
-                  min: 0 SLIDER_BASE_HEIGHT_INC;
-                  max: -1 SLIDER_BASE_HEIGHT_INC;
-                  image.normal: "core_progress_bar.#";
-               }
-               description { state: "inverted" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 0;
-               }
-            }
-            part { name: "level2";
-               mouse_events: 0;
-               scale: 1;
-               clip_to: "clipper";
-               description { state: "default" 0.0;
-                  fixed: 1 1;
-                  visible: 0;
-                  rel1 {
-                     to_y: "base";
-                     to_x: "elm.dragable.slider";
-                     relative: 0.5 0.0;
-                  }
-                  rel2.to: "base";
-                  image.normal: "core_progress_bar.#";
-               }
-               description { state: "inverted" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-               }
-            }
-            part {
-               name: "bar_image_right_padding";
-               type: SPACER;
-               scale: 1;
-               description {
-                  state: "default" 0.0;
-                  min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
-                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
-                  fixed: 1 0;
-                  rel1 {
-                     relative: 1.0  0.0;
-                     to: "bg";
-                  }
-                  rel2 {
-                     relative: 1.0  1.0;
-                     to: "bg";
-                  }
-                  align: 1.0 0.5;
-               }
-            }
-            part { name: "icon_clipper";
-               scale: 1;
-               type: RECT;
-               description { state: "default" 0.0;
-                  color: 232 224 0 255; /*(Changeable UI) color_class: "W0661";*/
-               }
-               description { state: "disabled" 0.0;
-                  color_class: "W0661D";
-               }
-            }
-            part { name: "elm.swallow.bar";
-               type: SWALLOW;
-               scale: 1;
-               description { state: "default" 0.0;
-                  min: 0  SLIDER_SWALLOWBAR_HEIGHT_INC;
-                  max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC;
-                  fixed: 0 1;
-                  rel1 {
-                     to: "bar_icon_right_padding_2";
-                     relative: 1.0 0.0;
-                  }
-                  rel2 {
-                     to: "bar_image_right_padding";
-                     relative: 0.0 1.0;
-                  }
-               }
-            }
-            part { name:"center_point";
-               scale: 1;
-               description { state: "default" 0.0;
-                  min: SLIDER_CENTER_POINT_SIZE_INC;
-                  max: SLIDER_CENTER_POINT_SIZE_INC;
-                  visible: 0;
-                  image.normal: "core_slider_center_point_bg";
-                  rel1.to: "base";
-                  rel2.to: "base";
-                  fixed: 0 1;
-                  color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-               }
-               description { state: "visible" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-               }
-               description { state: "disabled" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-                  color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-               }
-            }
-            part { name: "elm.track.slider";
-               type: SWALLOW;
-               mouse_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                  min: 0 SLIDER_POPUP_HEIGHT_INC;
-                  max: -1 SLIDER_POPUP_HEIGHT_INC;
-                  align: 0.5 1.0;
-                  fixed: 0 1;
-                  rel1.to: "elm.dragable.slider";
-                  rel1.offset: 0 8;
-                  rel2 {
-                     relative: 1.0 0.0;
-                     to: "elm.dragable.slider";
-                     offset: 0 8;
-                  }
-               }
-            }
-            part { name: "elm.dragable.slider";
-               type: GROUP;
-               source: "elm/slider/horizontal/indicator/default";
-               mouse_events: 1;
-               scale: 1;
-               dragable {
-                  x: 1 1 0;
-                  y: 0 0 0;
-                  confine: "drag_base";
-               }
-               description { state: "default" 0.0;
-                  min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
-                  fixed: 1 1;
-                  align: 0.5 0.5;
-                  rel1.to: "drag_base";
-                  rel1.relative: 0.5 0.5;
-                  rel2.to: "drag_base";
-                  rel2.relative: 0.5 0.5;
-                  color: 0 0 0 0;
-               }
-            }
-            part { name: "disabler";
-               type: RECT;
-               mouse_events: 1;
-               repeat_events: 0;
-               scale: 1;
-               description { state: "default" 0.0;
-                  visible: 0;
-                  color: 0 0 0 0;
-               }
-               description { state: "disabled" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-               }
-            }
-            part { name: "clipper";
-               type: RECT;
-               description { state: "default" 0.0;
-                  color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-               }
-               description { state: "pressed" 0.0;
-                  color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2P";*/
-               }
-               description { state: "disabled" 0.0;
-                  color_class: "W062L2D";
-               }
-            }
-         }
-      programs {
-         program { name: "invert_on";
-            signal: "elm,state,inverted,on";
-            source: "elm";
-            script {
-               set_invert_on();
-            }
-         }
-         program { name: "invert_off";
-            signal: "elm,state,inverted,off";
-            source: "elm";
-            script {
-               set_invert_off();
-            }
-         }
-         program { name: "val_show";
-            signal: "mouse,down,*";
-            source: "elm.dragable.slider";
-            script {
-               thumb_down();
-            }
-         }
-         program { name: "val_hide";
-            signal: "mouse,up,*";
-            source: "elm.dragable.slider";
-            script {
-               thumb_up();
-            }
-         }
-         program { name: "popup_show";
-            signal: "elm,state,val,show";
-            source: "elm";
-            script {
-               set_popup_show();
-            }
-         }
-         program { name: "popup_hide";
-            signal: "elm,state,val,hide";
-            source: "elm";
-            script {
-               set_popup_hide();
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "elm.swallow.icon";
-            target: "bar_icon_right_padding_1";
-            target: "bar_icon_right_padding_2";
-            target: "drag_base";
-         }
-         program { name: "center_point_enable";
-            signal: "slider,center,point,show";
-            source: "elm";
-            script {
-               set_state(PART:"center_point", "visible", 0.0);
-               set_int(show, 1);
-            }
-         }
-         program { name: "center_point_disable";
-            signal: "slider,center,point,hide";
-            source: "elm";
-            script {
-               set_state(PART:"center_point", "default", 0.0);
-               set_int(show, 0);
-            }
-         }
-         program { name: "slider_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               if (get_int(show))
-                  set_state(PART:"center_point", "disabled", 0.0);
-               set_state(PART:"disabler", "disabled", 0.0);
-               set_state(PART:"icon_clipper", "disabled", 0.0);
-               set_state(PART:"clipper", "disabled", 0.0);
-               set_state(PART:"base", "disabled", 0.0);
-            }
-         }
-         program { name: "slider_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               if (get_int(show))
-                  set_state(PART:"center_point", "default", 0.0);
-               set_state(PART:"disabler", "default", 0.0);
-               set_state(PART:"icon_clipper", "default", 0.0);
-               set_state(PART:"clipper", "default", 0.0);
-               set_state(PART:"base", "default", 0.0);
-            }
-         }
-      }
-   }
-
-group { name: "elm/slider/horizontal/center_point";
-      inherit: "elm/slider/horizontal/default";
-         parts {
-            part { name: "level";
-               mouse_events: 0;
-               scale: 1;
-               clip_to: "clipper";
-               description { state: "default" 0.0;
-                  fixed: 1 1;
-                  rel1 {
-                     to_x: "center_point";
-                     to_y: "base";
-                     relative: 0.5 0.0;
-                  }
-                  rel2 {
-                     to_x: "elm.dragable.slider";
-                     to_y: "base";
-                     relative: 0.5 1.0;
-                  }
-               }
-               description { state: "inverted" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 0;
-               }
-               description { state: "pressed" 0.0;
-                  inherit: "default" 0.0;
-               }
-            }
-            part { name: "level2";
-               mouse_events: 0;
-               scale: 1;
-               clip_to: "clipper";
-               description { state: "default" 0.0;
-                  fixed: 1 1;
-                  visible: 0;
-                  rel1 {
-                     to_x: "elm.dragable.slider";
-                     to_y: "base";
-                     relative: 0.5 0.0;
-                  }
-                  rel2 {
-                     to_x: "center_point";
-                     to_y: "base";
-                     relative: 0.5 1.0;
-                  }
-                  image.normal: "core_progress_bar.#";
-               }
-               description { state: "inverted" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-               }
-               description { state: "pressed" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
-               }
-            }
-            part { name:"center_point";
-               scale: 1;
-               description { state: "default" 0.0;
-                  min: SLIDER_CENTER_POINT_SIZE_INC;
-                  max: SLIDER_CENTER_POINT_SIZE_INC;
-                  image.normal: "core_slider_center_point_bg";
-                  rel1.to: "base";
-                  rel2.to: "base";
-                  fixed: 0 1;
-                  visible: 1;
-                  color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-               }
-            }
-         }
-         programs {
-            program { name: "center_point_calc";
-               signal: "drag";
-               source: "elm.dragable.slider";
-               script {
-                  drag_state();
-               }
-            }
-            program { name: "center_point_calc1";
-               signal: "drag,start";
-               source: "elm.dragable.slider";
-               script {
-                  drag_state();
-               }
-            }
-            program { name: "center_point_calc2";
-               signal: "drag,set";
-               source: "elm.dragable.slider";
-               script {
-                  drag_state();
-               }
-            }
-            program { name: "center_point_calc3";
-               signal: "mouse,up,*";
-               source: "elm.swallow.bar";
-               script {
-                  drag_state();
-               }
-            }
-            program { name: "center_point_calc4";
-               signal: "mouse,move";
-               source: "elm.swallow.bar";
-               script {
-                  drag_state();
-               }
-            }
-         }
-   }
-group { name: "elm/slider/vertical/default";
-  images {
-      set {
-         name: "core_progress_bar_v.#";
-         image {
-            image: SMALL"images/Controls/core_progress_bar_v.#.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_progress_bar_v.#.png" COMP;
-         }
-      }
-      set {
-         name: "core_slider_center_point_bg_v";
-         image {
-            image: SMALL"images/Controls/core_slider_center_point_bg_v.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Controls/core_slider_center_point_bg_v.png" COMP;
-         }
-      }
-  }
-  script {
-     public invert_on = 0;
-     public show = 0;
-     public popup_show = 1;
-     public set_popup_show() {
-        set_int(popup_show, 1);
-     }
-     public set_popup_hide() {
-        set_int(popup_show, 0);
-     }
-     public set_invert_on() {
-        set_state(PART:"level", "inverted", 0.0);
-        set_state(PART:"level2", "inverted", 0.0);
-        set_int(invert_on, 1);
-     }
-     public set_invert_off() {
-        set_state(PART:"level", "default", 0.0);
-        set_state(PART:"level2", "default", 0.0);
-        set_int(invert_on, 0);
-     }
-     public thumb_down() {
-        if (get_int(invert_on) == 0) {
-           set_state(PART:"level", "pressed", 0.0);
-           set_state(PART:"level2", "pressed", 0.0);
-        }
-        if (get_int(popup_show) == 1)
-           emit("popup,show", "elm");
-        }
-     public thumb_up() {
-        if (get_int(invert_on) == 0) {
-           set_state(PART:"level", "default", 0.0);
-           set_state(PART:"level2", "default", 0.0);
-        }
-        if (get_int(popup_show) == 1)
-           emit("popup,hide", "elm");
-        }
-     public drag_state() {
-        new Float:dx, Float:dy;
-        get_drag(PART:"elm.dragable.slider", dx, dy);
-        if (dy > 0.5) {
-          set_state(PART:"level", "default", 0.0);
-          set_state(PART:"level2", "default", 0.0);
-          set_int(invert_on, 0);
-        }
-        else {
-          set_state(PART:"level", "inverted", 0.0);
-          set_state(PART:"level2", "inverted", 0.0);
-          set_int(invert_on, 1);
-        }
-     }
-  }
-  parts {
-     part { name: "access";
-        type: RECT;
-           description { state: "default" 0.0;
-           fixed: 1 1;
-           color: 0 0 0 0;
-           }
-      }
-        part {
-           name: "bg";
-           type: SPACER;
-           scale: 1;
-           description {
-              state: "default" 0.0;
-              min: SLIDER_SWALLOWBAR_WIDTH_INC 0;
-              max: SLIDER_SWALLOWBAR_WIDTH_INC -1;
-           }
-        }
-        part {
-           name: "bar_image_top_padding";
-           type: SPACER;
-           scale: 1;
-           description {
-              state: "default" 0.0;
-              min: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC;
-              max: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC;
-              fixed: 1 1;
-              rel1 {
-                 relative: 0.0  0.0;
-                 to: "bg";
-              }
-              rel2 {
-                 relative: 1.0  0.0;
-                 to: "bg";
-              }
-              align: 0.5 0.0;
-           }
-        }
-        part { name: "base";
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              min: SLIDER_VERTICAL_BASE_HEIGHT_INC 0;
-              max: SLIDER_VERTICAL_BASE_HEIGHT_INC -1;
-              fixed: 1 1;
-              rel1 {
-                 to: "bar_image_top_padding";
-                 relative: 0.0 1.0;
-              }
-              rel2 {
-                 to: "bar_image_bottom_padding";
-                 relative: 1.0 0.0;
-              }
-              fixed: 1 1;
-              image.normal: "core_progress_bar_v.#";
-              color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-           }
-        }
-        part { name: "drag_base";
-           type: "SPACER";
-           description { state: "default" 0.0;
-              min: SLIDER_SWALLOWBAR_HEIGHT_INC 0;
-              rel1 {
-                 to: "bar_image_top_padding";
-                 relative: 0.0 0.0;
-              }
-              rel2 {
-                 to: "bg";
-                 relative: 1.0 1.0;
-              }
-              fixed: 1 1;
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              rel1 {
-                 to: "bar_image_top_padding";
-                 relative: 0.0 0.0;
-              }
-              rel2 {
-                 to: "bg";
-                 relative: 1.0 1.0;
-              }
-           }
-        }
-        part { name: "level";
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              visible: 0;
-              rel1 {
-                 to_y: "elm.dragable.slider";
-                 to_x: "base";
-                 relative: 0.0 0.5;
-              }
-              rel2 {
-                 to_y: "bar_image_bottom_padding";
-                 to_x: "base";
-                 relative: 1.0 0.0;
-              }
-              fixed: 1 1;
-              min: SLIDER_BASE_HEIGHT_INC 0;
-              max: SLIDER_BASE_HEIGHT_INC -1;
-              image.normal: "core_progress_bar_v.#";
-           }
-           description { state: "inverted" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "level2";
-           mouse_events: 0;
-           scale: 1;
-           clip_to: "clipper";
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              rel1 {
-                 to: "base";
-                 relative: 0.5 0.0;
-              }
-              rel2 {
-                 to_y: "elm.dragable.slider";
-                 to_x: "bar_image_top_padding";
-                 relative: 0.5 0.5;
-              }
-              fixed: 1 1;
-              min: SLIDER_BASE_HEIGHT_INC 0;
-              max: SLIDER_BASE_HEIGHT_INC -1;
-              image.normal: "core_progress_bar_v.#";
-           }
-           description { state: "inverted" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-           }
-        }
-        part {
-           name: "bar_image_bottom_padding";
-           type: SPACER;
-           scale: 1;
-           description {
-              state: "default" 0.0;
-              min: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC;
-              max: SLIDER_TOP_BOTTOM_PADDING_SIZE_INC;
-              fixed: 1 1;
-              rel1 {
-                 relative: 0.0  1.0;
-                 to: "bg";
-              }
-              rel2 {
-                 relative: 1.0  1.0;
-                 to: "bg";
-              }
-              align: 0.5 1.0;
-           }
-        }
-        part { name: "elm.swallow.bar";
-           type: SWALLOW;
-           scale: 1;
-           description { state: "default" 0.0;
-              min: SLIDER_SWALLOWBAR_HEIGHT_INC 0;
-              max: SLIDER_SWALLOWBAR_HEIGHT_INC -1;
-              fixed: 1 0;
-              rel1 {
-                 to: "bar_image_top_padding";
-                 relative: 0.0 1.0;
-              }
-              rel2 {
-                 to: "bar_image_bottom_padding";
-                 relative: 1.0 0.0;
-              }
-           }
-        }
-        part { name:"center_point";
-           scale: 1;
-           description { state: "default" 0.0;
-              min: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
-              max: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
-              visible: 0;
-              image.normal: "core_slider_center_point_bg_v";
-              rel1.to: "base";
-              rel2.to: "base";
-              fixed: 1 0;
-              color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-           }
-           description { state: "visible" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-              color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1D";*/
-           }
-        }
-        part { name: "elm.track.slider";
-           type: SWALLOW;
-           mouse_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              min: 0 SLIDER_POPUP_HEIGHT_INC;
-              max: -1 SLIDER_POPUP_HEIGHT_INC;
-              align: 0.5 1.0;
-              fixed: 0 1;
-              rel1.to: "elm.dragable.slider";
-              rel1.offset: 0 8;
-              rel2 {
-                 relative: 1.0 0.0;
-                 to: "elm.dragable.slider";
-                 offset: 0 8;
-              }
-           }
-        }
-        part { name: "elm.dragable.slider";
-           type: GROUP;
-           source: "elm/slider/horizontal/indicator/default";
-           mouse_events: 1;
-           scale: 1;
-           dragable {
-              x: 0 0 0;
-              y: 1 1 0;
-              confine: "drag_base";
-           }
-           description { state: "default" 0.0;
-              min: SLIDER_INDICATOR_SIZE_INC SLIDER_INDICATOR_SIZE_INC;
-              fixed: 1 1;
-              align: 0.5 0.5;
-              rel1.to: "drag_base";
-              rel1.relative: 0.5 0.5;
-              rel2.to: "drag_base";
-              rel2.relative: 0.5 0.5;
-              color: 0 0 0 0;
-           }
-        }
-        part { name: "disabler";
-           type: RECT;
-           mouse_events: 1;
-           repeat_events: 0;
-           scale: 1;
-           description { state: "default" 0.0;
-              visible: 0;
-              color: 0 0 0 0;
-           }
-           description { state: "disabled" 0.0;
-              inherit: "default" 0.0;
-              visible: 1;
-           }
-        }
-        part { name: "clipper";
-           type: RECT;
-           description { state: "default" 0.0;
-              color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2";*/
-           }
-           description { state: "pressed" 0.0;
-              color: 2 61 132 255; /*(Changeable UI) color_class: "W062L2P";*/
-           }
-           description { state: "disabled" 0.0;
-              color_class: "W062L2D";
-           }
-        }
-     }
-     programs {
-        program { name: "invert_on";
-           signal: "elm,state,inverted,on";
-           source: "elm";
-           script {
-              set_invert_on();
-           }
-        }
-        program { name: "invert_off";
-           signal: "elm,state,inverted,off";
-           source: "elm";
-           script {
-              set_invert_off();
-           }
-        }
-        program { name: "val_show";
-           signal: "mouse,down,*";
-           source: "elm.dragable.slider";
-           script {
-              thumb_down();
-           }
-        }
-        program { name: "val_hide";
-           signal: "mouse,up,*";
-           source: "elm.dragable.slider";
-           script {
-              thumb_up();
-           }
-        }
-        program { name: "popup_show";
-           signal: "elm,state,val,show";
-           source: "elm";
-           script {
-              set_popup_show();
-           }
-        }
-        program { name: "popup_hide";
-           signal: "elm,state,val,hide";
-           source: "elm";
-           script {
-              set_popup_hide();
-           }
-        }
-        program { name: "icon_show";
-           signal: "elm,state,icon,visible";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "drag_base";
-        }
-        program { name: "center_point_enable";
-           signal: "slider,center,point,show";
-           source: "elm";
-           action:  STATE_SET "visible" 0.0;
-           target: "center_point";
-        }
-        program { name: "center_point_disable";
-           signal: "slider,center,point,hide";
-           source: "elm";
-           action:  STATE_SET "default" 0.0;
-           target: "center_point";
-        }
-         program { name: "slider_disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               if (get_int(show))
-                  set_state(PART:"center_point", "disabled", 0.0);
-               set_state(PART:"disabler", "disabled", 0.0);
-               set_state(PART:"clipper", "disabled", 0.0);
-               set_state(PART:"base", "disabled", 0.0);
-            }
-         }
-         program { name: "slider_enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               if (get_int(show))
-                  set_state(PART:"center_point", "default", 0.0);
-               set_state(PART:"disabler", "default", 0.0);
-               set_state(PART:"clipper", "default", 0.0);
-               set_state(PART:"base", "default", 0.0);
-            }
-         }
-      }
-   }
-   group { name: "elm/slider/horizontal/popup/default";
-      alias: "elm/slider/vertical/popup/default";
-      images {
-         set {
-            name: "core_slider_popup_bg";
-            image {
-               image: SMALL"images/Controls/core_slider_popup_bg.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_slider_popup_bg.png" COMP;
-            }
-         }
-         set {
-            name: "core_slider_popup_bg_stroke";
-            image {
-               image: SMALL"images/Controls/core_slider_popup_bg_stroke.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_slider_popup_bg_stroke.png" COMP;
-            }
-         }
-         set {
-            name: "core_slider_popup_bg_ef";
-            image {
-               image: SMALL"images/Controls/core_slider_popup_bg_ef.png" COMP;
-            }
-            image {
-               image: MEDIUM"images/Controls/core_slider_popup_bg_ef.png" COMP;
-            }
-         }
-      }
-      parts {
-         part { name: "bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
-               max: -1 SLIDER_POPUP_HEIGHT_INC;
-            }
-         }
-         part { name: "bg.image";
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
-               max: -1 SLIDER_POPUP_HEIGHT_INC;
-               image.normal: "core_slider_popup_bg";
-               color: 255 255 255 255; /*(Changeable UI) color_class: "W0631";*/
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "bg.effect.image";
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
-               max: -1 SLIDER_POPUP_HEIGHT_INC;
-               image.normal: "core_slider_popup_bg_ef";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "bg.stroke";
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: SLIDER_POPUP_WIDTH_INC SLIDER_POPUP_HEIGHT_INC;
-               max: -1 SLIDER_POPUP_HEIGHT_INC;
-               image.normal: "core_slider_popup_bg_stroke";
-               color: 2 61 132 255; /*(Changeable UI) color_class: "W0632";*/
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part {
-            name: "indicator.top.pad";
-            type: SPACER;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               min: 0 SLIDER_INDICATOR_PADDING_TOP;
-               max: -1 SLIDER_INDICATOR_PADDING_TOP;
-               fixed: 0 1;
-               rel1 {
-                  relative: 0.0  0.0;
-                  to: "bg.image";
-               }
-               rel2 {
-                  relative: 1.0  0.0;
-                  to: "bg.image";
-               }
-               align: 0.5 0.0;
-            }
-         }
-         part {
-            name: "indicator.bottom.pad";
-            type: SPACER;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               min: 0 SLIDER_INDICATOR_PADDING_BOTTOM;
-               max: -1 SLIDER_INDICATOR_PADDING_BOTTOM;
-               fixed: 0 1;
-               rel1 {
-                  relative: 0.0  1.0;
-                  to: "bg.image";
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  to: "bg.image";
-               }
-               align: 0.5 1.0;
-            }
-         }
-         part { name: "elm.indicator";
-            type: TEXT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
-               max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
-               color: 0 0 0 255; /*(Changeable UI) color_class: "T116";*/
-               rel1 {
-                  to: "indicator.top.pad";
-                  relative: 0.0 1.0;
-               }
-               rel2 {
-                  to: "indicator.bottom.pad";
-                  relative: 1.0 0.0;
-               }
-               text {
-                  min: 1 1;
-                  font: "Bold"; size: "33"; /*(Changeable UI) text_class: "T116";*/
-                  ellipsis: -1;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "popup,val,show";
-            signal: "elm,state,val,show";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "elm.indicator";
-            target: "bg.image";
-            target: "bg.effect.image";
-            target: "bg.stroke";
-         }
-         program { name: "popup,val,hide";
-            signal: "elm,state,val,hide";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.indicator";
-            target: "bg.image";
-            target: "bg.effect.image";
-            target: "bg.stroke";
-         }
-         program { name: "popup,show";
-            signal: "popup,show";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "elm.indicator";
-            target: "bg.image";
-            target: "bg.effect.image";
-            target: "bg.stroke";
-         }
-         program { name: "popup,hide";
-            signal: "popup,hide";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "elm.indicator";
-            target: "bg.image";
-            target: "bg.effect.image";
-            target: "bg.stroke";
-            after: "popup,hide,done";
-         }
-         program { name: "popup,hide,done";
-            action: SIGNAL_EMIT "popup,hide,done" "elm";
-         }
-      }
-   }
-   group { name: "elm/slider/vertical/center_point";
-      inherit: "elm/slider/vertical/default";
-      parts {
-         part { name: "level2";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  to_y: "center_point";
-                  to_x: "base";
-                  relative: 0.0 0.5;
-               }
-               rel2 {
-                  to_y: "elm.dragable.slider";
-                  to_x: "base";
-                  relative: 1.0 0.5;
-               }
-            }
-            description { state: "inverted" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "level";
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  to_y: "elm.dragable.slider";
-                  to_x: "base";
-                  relative: 0.0 0.5;
-               }
-               rel2 {
-                  to_y: "center_point";
-                  to_x: "base";
-                  relative: 1.0 0.5;
-               }
-               image.normal: "core_progress_bar_v.#";
-            }
-            description { state: "inverted" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name:"center_point";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
-               max: SLIDER_VERTICAL_CENTER_POINT_SIZE_INC;
-               image.normal: "core_slider_center_point_bg_v";
-               rel1.to: "base";
-               rel2.to: "base";
-               fixed: 1 0;
-               visible: 1;
-               color: 178 178 178 255; /*(Changeable UI) color_class: "W062L1";*/
-            }
-         }
-      }
-     programs {
-        program { name: "center_point_calc";
-           signal: "drag";
-           source: "elm.dragable.slider";
-           script {
-              drag_state();
-           }
-         }
-         program { name: "center_point_calc1";
-            signal: "drag,start";
-             source: "elm.dragable.slider";
-             script {
-                drag_state();
-             }
-          }
-          program { name: "center_point_calc2";
-             signal: "drag,set";
-              source: "elm.dragable.slider";
-              script {
-                  drag_state();
-              }
-          }
-          program { name: "center_point_calc3";
-             signal: "mouse,up,*";
-             source: "elm.swallow.bar";
-              script {
-                 drag_state();
-              }
-          }
-          program { name: "center_point_calc4";
-             signal: "mouse,move";
-              source: "elm.swallow.bar";
-              script {
-                 drag_state();
-              }
-          }
-       }
-   }
diff --git a/themes/widgets_default/button.edc b/themes/widgets_default/button.edc
deleted file mode 100644
index 827f50b4..00000000
--- a/themes/widgets_default/button.edc
+++ /dev/null
@@ -1,1188 +0,0 @@
-group { name: "elm/button/base/hoversel_vertical_entry/default";
-   alias: "elm/button/base/hoversel_vertical_entry/entry";
-   alias: "elm/button/base/hoversel_horizontal_entry/default";
-   alias: "elm/button/base/hoversel_horizontal_entry/entry";
-   parts {
-      part { name: "button_image";
-         type: RECT;
-         mouse_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 0 BUTTON_HOVERSEL_HEIGHT;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color_class: "W012P";
-         }
-      }
-      part { name: "elm.padding.content.left";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 0.5;
-            fixed: 1 0;
-            min: BUTTON_HOVERSEL_PADDING_SIZE_DEFAULT 0;
-            rel2.relative: 0 1;
-         }
-      }
-      part { name: "elm.padding.text.left";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 0.5;
-            fixed: 1 0;
-            min: BUTTON_HOVERSEL_PADDING_SIZE_DEFAULT 0;
-            rel1 {
-               to: "elm.swallow.content";
-               relative: 1 0;
-            }
-            rel2 {
-               to: "elm.swallow.content";
-               relative: 1 1;
-            }
-         }
-      }
-      part {
-         name: "elm.padding.text.right";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1 0.5;
-            fixed: 1 0;
-            min: BUTTON_HOVERSEL_PADDING_SIZE_DEFAULT 0;
-            rel1.relative: 1 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            visible: 0;
-            align: 0 0.5;
-            min: 0 BUTTON_HOVERSEL_CONTENT_HEIGHT;
-            max: BUTTON_HOVERSEL_CONTENT_WIDTH BUTTON_HOVERSEL_CONTENT_HEIGHT;
-            fixed: 1 1;
-            rel1 {
-               to: "elm.padding.content.left";
-               relative: 1 0;
-            }
-            rel2 {
-               to: "elm.padding.content.left";
-               relative: 1 1;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            fixed: 1 0;
-            visible: 1;
-            aspect: 1.0 1.0;
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            fixed: 0 0;
-            visible: 1;
-            align: 0.5 0.5;
-            aspect_preference: VERTICAL;
-         }
-      }
-      part { name: "textvis";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            rel1 {
-               to: "elm.padding.content.left";
-               relative: 1 0;
-            }
-            rel2 {
-               to: "elm.padding.text.right";
-               relative: 0 1;
-            }
-         }
-         description {
-            state: "visible" 0.0;
-            visible: 1;
-            rel1 {
-               to: "elm.padding.content.left";
-               relative: 1 0;
-            }
-            rel2 {
-               to: "elm.padding.text.right";
-               relative: 0 1;
-            }
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events:  0;
-         scale: 1;
-         clip_to: "textvis";
-         description { state: "default" 0.0;
-            rel1 {
-               to_x: "elm.padding.text.left";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to: "elm.padding.text.right";
-               relative: 0 1;
-            }
-            text {
-               style: "button_hoversel_entry_main";
-               min: 1 0;
-               max: 1 0;
-               ellipsis: -1;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            text.min: 1 1;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            text.style: "button_main_press";
-         }
-      }
-      part { name: "over2";
-         type: RECT;
-         mouse_events: 1;
-         description { state: "default" 0.0;
-            color: BUTTON_COLOR_TRANPARENT;
-         }
-      }
-      // used to force sizing of icon to follow label sizing nearby
-      part { name: "sizer.content";
-         type: TEXT;
-         mouse_events:  0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            text {
-               font:     "SLP:style=Medium";
-               size:     BUTTON_HOVERSEL_TEXT_SIZE;
-               min:      0 0;
-               align:    0.5 0.5;
-               text_class: "slp_medium";
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            text {
-               min: 1 1;
-               text: "M";
-               ellipsis: -1;
-            }
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            text {
-               min: 1 1;
-               text: "M";
-               ellipsis: -1;
-            }
-         }
-      }
-      // end sizer
-   }
-   programs {
-      program { name:   "button_click";
-         signal: "mouse,down,1";
-         source: "over2";
-         action: STATE_SET "clicked" 0.0;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name:   "button_unclick";
-         signal: "mouse,up,1";
-         source: "over2";
-         action: STATE_SET "default" 0.0;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name:   "button_unclick3";
-         signal: "mouse,up,1";
-         source: "over2";
-         action: SIGNAL_EMIT "elm,action,click" "";
-      }
-      program { name: "text_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
-            if (!strcmp(st, "icononly")) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
-               set_state(PART:"sizer.content", "visible", 0.0);
-            }
-            set_state(PART:"textvis", "visible", 0.0);
-            set_state(PART:"elm.text", "visible", 0.0);
-         }
-      }
-      program { name: "text_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
-            if (!strcmp(st, "visible")) {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
-               set_state(PART:"sizer.content", "icononly", 0.0);
-            }
-            set_state(PART:"textvis", "default", 0.0);
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-      program { name: "icon_show";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"textvis", st, 30, vl);
-            if (!strcmp(st, "visible")) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
-               set_state(PART:"sizer.content", "visible", 0.0);
-            }
-            else {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
-               set_state(PART:"sizer.content", "icononly", 0.0);
-            }
-         }
-      }
-      program { name: "icon_hide";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
-         target: "sizer.content";
-      }
-   }
-}
-
-group { name: "elm/button/base/hoversel_vertical/default";
-   alias: "elm/button/base/hoversel_vertical/entry";
-   alias: "elm/button/base/hoversel_horizontal/default";
-   alias: "elm/button/base/hoversel_horizontal/entry";
-   images {
-      image: "core_list_button_bg.#.png" COMP;
-      image: "whitetheme/btn_arrow_updown_nor.png" COMP;
-      image: "whitetheme/btn_arrow_updown_sel.png" COMP;
-   }
-   parts {
-      part { name: "button_image";
-         mouse_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            color_class: "W012";
-            image {
-               normal: "core_list_button_bg.#.png";
-            }
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color_class: "W012P";
-            image {
-               normal: "core_list_button_bg.#.png";
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit:  "default" 0.0;
-            color_class: "W012D";
-            image {
-               normal: "core_list_button_bg.#.png";
-            }
-         }
-      }
-      part { name: "elm.padding.arrow.left-top";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 0;
-            rel2.relative: 0 0;
-            fixed: 1 1;
-            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE BUTTON_ANCHOR_PADDING_DEFAULT_SIZE;
-         }
-      }
-      part { name: "elm.padding.arrow.bottom";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 1;
-            rel1.relative: 0 1;
-            fixed: 1 1;
-            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE BUTTON_ANCHOR_PADDING_DEFAULT_SIZE;
-         }
-      }
-      part { name: "arrow";
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: BUTTON_HOVERSEL_ICON_SIZE BUTTON_HOVERSEL_ICON_SIZE;
-            max: BUTTON_HOVERSEL_ICON_SIZE BUTTON_HOVERSEL_ICON_SIZE;
-            rel1 {
-               to: "elm.padding.arrow.left-top";
-               relative: 1 1;
-            }
-            rel2 {
-               to: "elm.padding.arrow.bottom";
-               relative: 1 0;
-            }
-            image.normal: "whitetheme/btn_arrow_updown_nor.png";
-            align: 0.0 0.5;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "whitetheme/btn_arrow_updown_sel.png";
-            min: BUTTON_HOVERSEL_ICON_SIZE BUTTON_HOVERSEL_ICON_SIZE;
-            max: BUTTON_HOVERSEL_ICON_SIZE BUTTON_HOVERSEL_ICON_SIZE;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            visible: 0;
-            align: 0.0 0.5;
-            rel1 {
-               to: "arrow";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to: "arrow";
-               relative: 1.0 1.0;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            fixed: 1 0;
-            visible: 1;
-            aspect: 1.0 1.0;
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            fixed: 0 0;
-            visible: 1;
-            align: 0.5 0.5;
-            rel1 {
-               to_x: "button_image";
-               relative: 1.0 1.0;
-            }
-         }
-      }
-      part { name: "elm.padding.text.left";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 0 0.5;
-            rel1 {
-               to: "arrow";
-               relative: 1 0;
-            }
-            rel2 {
-               to: "arrow";
-               relative: 1 1;
-            }
-            fixed: 1 0;
-            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE 0;
-         }
-      }
-      part { name: "elm.padding.text.right-bottom";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1 1;
-            rel1.relative: 1 1;
-            fixed: 1 1;
-            min: 25 16;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events:  0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 1;
-            rel1 {
-               to: "elm.padding.text.left";
-               relative: 1 0;
-            }
-            rel2 {
-               to : "elm.padding.text.right-bottom";
-               relative: 0 0;
-            }
-            align: 0.5 0.5;
-            text {
-               style: "button_main";
-               min: 1 0;
-               max: 1 0;
-               ellipsis: -1;
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_main_press";
-            }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text.style: "button_main_dim";
-         }
-         description { state: "disabled_visible" 0.0;
-            inherit: "default" 0.0;
-            color: BUTTON_ANCHOR_DISABLE_COLOR;
-            visible: 1;
-         }
-      }
-      part { name: "over2";
-         type: RECT;
-         mouse_events: 1;
-         repeat_events: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit:  "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "over3";
-         type: RECT;
-         mouse_events: 1;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "clicked" 0.0;
-            inherit:  "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "disabler";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      // used to force sizing of icon to follow label sizing nearby
-      part { name: "sizer.content"; type: TEXT;
-         mouse_events:  0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            text {
-               font: "Sans,Edje-Vera";
-               size: 10;
-               min: 0 0;
-               text_class: "button";
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            text {
-               min: 1 1;
-               text: "M";
-               ellipsis: -1;
-            }
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            text {
-               min: 1 1;
-               text: "M";
-               ellipsis: -1;
-            }
-         }
-      }
-      // end sizer
-   }
-   programs {
-      program { name:   "button_click";
-         signal: "mouse,down,1";
-         source: "over2";
-         action: SIGNAL_EMIT "elm,action,press" "";
-         after: "button_click_anim";
-      }
-      program { name: "button_click_anim";
-         action: STATE_SET "clicked" 0.0;
-         target: "button_image";
-         target: "arrow";
-         after: "text_clicked";
-      }
-      program { name: "text_clicked";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "visible"))
-              set_state(PART:"elm.text", "clicked", 0.0);
-         }
-      }
-      program { name:   "button_unclick";
-         signal: "mouse,up,1";
-         source: "over2";
-         action: STATE_SET "default" 0.0;
-         target: "button_image";
-         target: "arrow";
-         after: "text_unclicked";
-      }
-      program { name: "button_unclick_anim";
-         action: STATE_SET "clicked" 0.0;
-         target: "button_image";
-         after: "text_unclicked";
-      }
-      program { name: "text_unclicked";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "clicked"))
-              set_state(PART:"elm.text", "visible", 0.0);
-         }
-      }
-      program { name:   "button_unclick3";
-         signal: "mouse,up,1";
-         source: "over2";
-         action: SIGNAL_EMIT "elm,action,click" "";
-      }
-      program { name: "text_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
-            if (!strcmp(st, "icononly")) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
-               set_state(PART:"sizer.content", "visible", 0.0);
-            }
-            set_state(PART:"elm.text", "visible", 0.0);
-         }
-      }
-      program { name: "text_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
-            if (!strcmp(st, "visible")) {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
-               set_state(PART:"sizer.content", "icononly", 0.0);
-            }
-            set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-      program { name: "icon_show";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "visible")) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
-               set_state(PART:"sizer.content", "visible", 0.0);
-            }
-            else {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
-               set_state(PART:"sizer.content", "icononly", 0.0);
-            }
-         }
-      }
-      program { name: "icon_hide";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
-         target: "sizer.content";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "button_image";
-         target: "over2";
-         target: "disabler";
-         after: "disable_text";
-      }
-      program { name: "disable_text";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "visible"))
-              set_state(PART:"elm.text", "disabled_visible", 0.0);
-            else
-              set_state(PART:"elm.text", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "button_image";
-         target: "over2";
-         target: "disabler";
-         after: "enable_text";
-      }
-      program { name: "enable_text";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "disabled_visible"))
-              set_state(PART:"elm.text", "visible", 0.0);
-            else
-              set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-   }
-}
-
-group { name: "elm/button/base/anchor";
-   images {
-      image: "whitetheme/btn_style_nor.png" COMP;
-      image: "whitetheme/btn_style_sel.png" COMP;
-   }
-   parts {
-      part { name: "button_image";
-         mouse_events: 1;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
-            visible: 0;
-            image {
-               normal: "whitetheme/btn_style_nor.png";
-               border: BUTTON_ANCHOR_BG_BORDER;
-               middle: SOLID;
-            }
-         }
-         description { state: "clicked" 0.0;
-            visible: 1;
-            min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
-            color_class: "W012P";
-            image {
-               normal: "whitetheme/btn_style_nor.png";
-               border: BUTTON_ANCHOR_BG_BORDER;
-               border_scale: 1;
-            }
-         }
-         description { state: "visible" 0.0;
-            visible: 1;
-            min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
-            color_class: "W012";
-            image {
-               normal: "whitetheme/btn_style_nor.png";
-               border: BUTTON_ANCHOR_BG_BORDER;
-               border_scale: 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit:  "default" 0.0;
-            image {
-               normal: "whitetheme/btn_style_nor.png";
-               border: BUTTON_ANCHOR_BG_BORDER;
-            }
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            visible: 0;
-            align: 0.0 0.5;
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            fixed: 1 0;
-            visible: 1;
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            fixed: 0 0;
-            visible: 1;
-            align: 0.5 0.5;
-            aspect: 1.0 1.0;
-            rel2.relative: 1.0 1.0;
-            aspect_preference: VERTICAL;
-         }
-      }
-      part { name: "elm.padding.text.left";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description {  state: "default" 0.0;
-            align: 0 0.5;
-            fixed: 1 0;
-            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE 0;
-            rel1 {
-               to: "elm.swallow.content";
-               relative: 1 0;
-            }
-            rel2 {
-               to: "elm.swallow.content";
-               relative: 1 1;
-            }
-         }
-      }
-      part { name: "elm.padding.text.right";
-         type: SPACER;
-         scale: 1;
-         mouse_events: 0;
-         description {  state: "default" 0.0;
-            align: 1 0.5;
-            rel1.relative: 1 0;
-            fixed: 1 0;
-            min: BUTTON_ANCHOR_PADDING_DEFAULT_SIZE 10;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         mouse_events:  0;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            rel1 {
-               to_x: "elm.padding.text.left";
-               relative: 1 0;
-            }
-            rel2 {
-               to : "elm.padding.text.right";
-               relative: 0 1;
-            }
-            color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-            color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-            text {
-               font: "SLP:style=Regular";
-               size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
-               min: 0 0;
-               text_class: "slp";
-            }
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-         }
-         description { state: "disabled_visible" 0.0;
-            inherit: "default" 0.0;
-            color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-            visible: 1;
-            text.min: 1 1;
-            text.ellipsis: -1;
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         mouse_events: 1;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            color: BUTTON_ANCHOR_COLOR_TRANSPARENT;
-         }
-      }
-      part { name: "disabler";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: BUTTON_ANCHOR_COLOR_TRANSPARENT;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      // used to force sizing of icon to follow label sizing nearby
-      part { name: "sizer.content"; type: TEXT;
-         mouse_events:  0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            text {
-               font: "SLP:style=Medium";
-               size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
-               min: 0 0;
-               text_class: "button";
-            }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            text {
-               min: 1 1;
-               text: "M";
-               ellipsis: -1;
-            }
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
-            text {
-               min: 1 1;
-               text: "M";
-               ellipsis: -1;
-            }
-         }
-      }
-      // end sizer
-   }
-   programs {
-      program { name: "button_mouse_in";
-         signal: "mouse,in";
-         source: "over";
-         action: STATE_SET "visible" 0.0;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name: "button_mouse_out";
-         signal: "mouse,out";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name: "button_unclick";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "visible" 0.0;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name: "button_click2";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "clicked" 0.0;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name: "button_unclick2";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
-         target: "button_image";
-         target: "elm.text";
-      }
-      program { name: "button_unclick3";
-         signal: "mouse,up,1";
-         source: "over";
-         action: SIGNAL_EMIT "elm,action,click" "";
-      }
-      program { name: "text_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
-            if (!strcmp(st, "icononly")) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
-               set_state(PART:"sizer.content", "visible", 0.0);
-            }
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible")))
-              set_state(PART:"elm.text", "disabled_visible", 0.0);
-            else
-              set_state(PART:"elm.text", "visible", 0.0);
-         }
-      }
-      program { name: "text_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
-            if (!strcmp(st, "visible")) {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
-               set_state(PART:"sizer.content", "icononly", 0.0);
-            }
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "default") || (!strcmp(st, "visible")))
-              set_state(PART:"elm.text", "default", 0.0);
-            else
-              set_state(PART:"elm.text", "disabled", 0.0);
-         }
-      }
-      program { name: "icon_show";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "visible")) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
-               set_state(PART:"sizer.content", "visible", 0.0);
-            }
-            else {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
-               set_state(PART:"sizer.content", "icononly", 0.0);
-            }
-         }
-      }
-      program { name: "icon_hide";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
-         target: "sizer.content";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            set_state(PART:"button_image", "disabled", 0.0);
-            set_state(PART:"over", "disabled", 0.0);
-            set_state(PART:"disabler", "disabled", 0.0);
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible"))
-              set_state(PART:"elm.text", "disabled_visible", 0.0);
-            else
-              set_state(PART:"elm.text", "disabled", 0.0);
-         }
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
-            set_state(PART:"button_image", "visible", 0.0);
-            set_state(PART:"over", "visible", 0.0);
-            set_state(PART:"disabler", "visible", 0.0);
-            get_state(PART:"elm.text", st, 30, vl);
-            if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible"))
-              set_state(PART:"elm.text", "visible", 0.0);
-            else
-              set_state(PART:"elm.text", "default", 0.0);
-         }
-      }
-   }
-}
-
-group { name: "elm/button/base/dropdown";
-      script {
-         public mouse_down = 0;
-         public multi_down = 0;
-      }
-      images {
-         image: "core_dropdown_label_icon_arrow.png" COMP;
-      }
-      parts {
-         part { name: "base";
-            scale: 1;
-            type: SPACER;
-            description { state: "default" 0.0;
-               min: BUTTON_MIN_WIDTH BUTTON_DROPDOWN_MIN_HEIGHT;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_left_top";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1.to: "base";
-               rel2 {
-                 relative: 0.0 0.0;
-                 to: "base";
-               }
-               min: BUTTON_DROPDOWN_PADDING_LEFT_RIGHT 0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1 {
-                 relative: 1.0 1.0;
-                 to:"base";
-               }
-               rel2.to:"base";
-               min: BUTTON_DROPDOWN_PADDING_LEFT_RIGHT 0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to: "padding_after_text";
-               }
-               text {
-                  style: "button_dropdown";
-               }
-            }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "arrow_icon";
-            scale: 1;
-            description { state: "default" 0.0;
-              min: BUTTON_DROPDOWN_ICON_SIZE;
-              max: BUTTON_DROPDOWN_ICON_SIZE;
-              image.normal: "core_dropdown_label_icon_arrow.png";
-              color_class: "B0734";
-              rel2 {
-                 to_x: "padding_right_bottom";
-                 to_y: "underline_bottom";
-                 relative: 0.0 0.0;
-              }
-              align: 1.0 1.0;
-            }
-         }
-         part { name: "underline_bottom";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min:  0 BUTTON_DROPDOWN_UNDERLINE_HEIGHT;
-               color_class:"B0733L2";
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_left_top";
-                  to_y: "base";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_right_bottom";
-                  to_y: "base";
-               }
-               align: 1.0 1.0 ;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_after_text";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-              min: BUTTON_DROPDOWN_PADDING_TEXT_WIDTH 0;
-              rel1 {
-                 relative: 0.0 0.0;
-                 to: "arrow_icon";
-              }
-              rel2 {
-                 relative: 0.0 1.0;
-                 to: "arrow_icon";
-              }
-              align: 0.0 0.0;
-              fixed: 1 1;
-            }
-         }
-         part { name: "event";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              color: 0 0 0 0;
-            }
-         }
-      }
-      programs {
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "event";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(multi_down) == 0) {
-                  get_state(PART:"base", st, 30, vl);
-                  if (strcmp(st, "disabled")) {
-                     emit("elm,action,click", "");
-                  }
-               }
-            }
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: elm.text;
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "invisible" 0.0;
-            target: elm.text;
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "base";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "base";
-         }
-         program { name: "multi_down";
-            signal: "elm,action,multi,down";
-            source: "elm";
-            script {
-               set_int(multi_down, 1);
-            }
-         }
-         program { name: "multi_up";
-            signal: "elm,action,multi,up";
-            source: "elm";
-            script {
-               set_int(multi_down, 0);
-            }
-         }
-      }
-   }
-
diff --git a/themes/widgets_default/slider.edc b/themes/widgets_default/slider.edc
deleted file mode 100644
index b1f93e4a..00000000
--- a/themes/widgets_default/slider.edc
+++ /dev/null
@@ -1,38 +0,0 @@
-group { name: "elm/slider/hidden/limit";
-   parts {
-      part { name: "elm.units.min";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            align: 1.0 0.5;
-            color: 0 0 0 255;
-            text {
-               font: "SLP:style=Medium";
-               size: SLIDER_HIDDEN_FONT_SIZE;
-               min: 1 1;
-               align: 0.0 0.5;
-               ellipsis: -1;
-            }
-         }
-      }
-      part { name: "elm.units.max";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            visible: 0;
-            align: 1.0 0.5;
-            color: 0 0 0 255;
-            text {
-               font: "SLP:style=Medium";
-               size: SLIDER_HIDDEN_FONT_SIZE;
-               min: 1 1;
-               align: 0.0 0.5;
-               ellipsis: -1;
-            }
-         }
-      }
-   }
-}