[gengrid] UX 1.3 & 1.4 implementation. Macros and images are added.
[framework/uifw/efl-theme-white.git] / themes / inc / white-hd-inc.edc
index 49fe5f2..60a757d 100644 (file)
 #define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0
 #define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50
 #define POPUP_CUSTOMSTYLE_TITLE_BOTTOM_LINE_COLOR_INC 70 82 102 255
-#define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 249 249 249 255
+#define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 80 147 182 255
 
+#define CTXPOPUP_ARROW_LEFT_OFFSET 0.1
+#define CTXPOPUP_ARROW_RIGHT_OFFSET 0.9
+#define CTXPOPUP_ARROW_UP_OFFSET 0.3
+#define CTXPOPUP_ARROW_DOWN_OFFSET 0.9
 #define CTXPOPUP_BUBBLE_BG_IMAGE "00_popup_bubble_bg_shadow.png"
-#define CTXPOPUP_BG_IMAGE "00_popup_bubble_bg_ctx.png"
+#define CTXPOPUP_BG_IMAGE "00_popup_bubble_bg.png"
+#define CTXPOPUP_FRAME_BG_LEFT_TOP_PADDING "frame_shadow_left_top_padding"
+#define CTXPOPUP_FRAME_BG_RIGHT_BOTTOM_PADDING "frame_shadow_right_bottom_padding"
 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 13 13 13 13
-#define CTXPOPUP_BG_IMAGE_BORDER 9 9 9 9
-#define CTXPOPUP_BG_COLOR_INC 224 224 224 255
+#define CTXPOPUP_BG_IMAGE_BORDER 19 19 19 19
+#define CTXPOPUP_BG_COLOR_INC 0 0 0 0
 #define CTXPOPUP_BG_PRESS_COLOR_INC 42 137 194 255
 #define CTXPOPUP_MAIN_TEXT_UNREAD_COLOR_INC 19 58 83 255
 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 249 249 249 255
 #define DISKSELECTOR_DF_FONT_SIZE_INC 44
 #define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC "106"
 
-#define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF"
+#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_ITEM_BG_COLOR_INC 239 239 239 255
+#define GENGRID_PART_REORDER_DEFAULT_BG_COLOR_INC 0 0 0 102
 #define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 128
-#define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#F9F9F9"
-
-#define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
-
-// Group Title
-#define GENLIST_GT_PAD_T_H 36
-#define GENLIST_GT_PAD_B_H 10
-#define GENLIST_GT_PAD_M_H 36
-#define GENLIST_GT_TEXT_H  36
-#define GENLIST_GT_PAD_L_W 16
-#define GENLIST_GT_PAD_R_W 36
-#define GENLIST_GT_PAD_M_W 16
-#define GENLIST_GT_H       GENLIST_GT_PAD_T_H + GENLIST_GT_PAD_B_H + GENLIST_GT_TEXT_H
+#define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#000000"
+
+#define GENGRID_PART_BACKGROUND_COLOR_INC 255 255 255 255
+
+#define GENGRID_DEFAULT_LEFT_TOP_PADDING_INC 5 5
+#define GENGRID_DEFAULT_RIGHT_BOTTOM_PADDING_INC 5 5
+#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_GRID_TEXT_LEFT_TOP_PADDING_INC 5 5
+#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 5 68
+#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 68
+
+#define GENGRID_GRID_TEXT2_LEFT_TOP_PADDING_INC 5 68
+#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_PADDING_INC 5 5
+#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 68
+#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_FOCUS_PADDING_INC 2 2
+
+#define GENLIST_ICON_BIG_SIZE     72
+#define GENLIST_ICON_SIZE_64     64
 
 #define GENLIST_HEIGHT_1_INC 1
 #define GENLIST_HEIGHT_16_INC 16
 #define GENLIST_HEIGHT_89_INC 89
 #define GENLIST_HEIGHT_93_INC 93
 #define GENLIST_HEIGHT_97_INC 97
-#define GENLIST_HEIGHT_113_INC 113
 #define GENLIST_HEIGHT_129_INC 129
+#define GENLIST_HEIGHT_142_INC 142
 #define GENLIST_HEIGHT_161_INC 161
 #define GENLIST_HEIGHT_163_INC 163
 #define GENLIST_HEIGHT_164_INC 164
 #define GENLIST_FONT_STYLE_40_INC "40"
 #define GENLIST_FONT_42_INC 42
 #define GENLIST_FONT_STYLE_42_INC "42"
-#define GENLIST_FONT_44_INC 44
-#define GENLIST_FONT_STYLE_44_INC "44"
 #define GENLIST_FONT_48_INC 48
 #define GENLIST_FONT_STYLE_48_INC "48"
 
 #define GENLIST_SIZE_18_INC 18
 #define GENLIST_SIZE_21_INC 21
 #define GENLIST_SIZE_28_INC 28
-#define GENLIST_ICON_SMALL_SIZE 32
 #define GENLIST_SIZE_35_INC 35
 #define GENLIST_SIZE_38_INC 38
 #define GENLIST_SIZE_40_INC 40
 #define GENLIST_SIZE_60_INC 60
 #define GENLIST_SIZE_61_INC 61
 #define GENLIST_SIZE_SLIDE_60_INC 60
-#define GENLIST_SIZE_ICON_BIG 64
 #define GENLIST_SIZE_66_INC 66
 #define GENLIST_SIZE_74_INC 74
 #define GENLIST_SIZE_SLIDE_74_INC 74
 
 #define GENLIST_TREESIZE_16_INC 16
 #define GENLIST_TREESIZE_20_INC 20
-#define GENLIST_TREESIZE_DEFAULT 32
-
-// new
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_READ_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC 42 137 194 204
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_COLOR_INC 149 149 149 255
-#define GENLIST_PART_FONT_INDEX_LIST_COLOR_INC 0 94 160 255
-#define GENLIST_PART_FONT_EDITFIELD_TEXT_COLOR_INC 158 187 205 255
-#define GENLIST_PART_FONT_EDITFIELD_TEXT_CURSOR_COLOR_INC 42 137 194 255
-#define GENLIST_PART_FONT_MULTILINE_TEXT_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_COLOR_INC 124 124 124 255
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_CONVERTOR_STYLE_FOCUS_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_UNREAD_EMAIL_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_CONTENTS_TEXT_COLOR_INC 210 210 210 255
-#define GENLIST_PART_FONT_NAME_TEXT_COLOR_INC 128 128 128 255
-#define GENLIST_PART_FONT_NAME_TEXT_DIM_COLOR_INC 42 137 194 255
-#define GENLIST_PART_FONT_BUBBLE_READ_MESSAGE_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_TIME_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_SENT_MESSAGE_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_SOS_MESSAGE_COLOR_INC 192 23 23 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_DATE_COLOR_INC 128 128 128 255
-#define GENLIST_PART_FONT_BUBBLE_LINK_MESSAGE_COLOR_INC 34 129 157 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_FAILED_COLOR_INC 211 0 0 255
-#define GENLIST_PART_FONT_BUBBLE_READ_MESSAGE_NAME_COLOR_INC 57 166 215 255
-#define GENLIST_PART_FONT_BUBBLE_MESSAGE_HELP_COLOR_INC 146 146 146 255
-#define GENLIST_PART_FONT_LIST_BUBBLE_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_FONT_LIST_MESSAGE_TEXT_COLOR_INC 0 0 0 255
-#define GENLIST_PART_FONT_SWEEP_STYLE_COLOR_INC 118 118 118 255
-
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#000000FF"
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_STYLE_COLOR_INC "#7C7C7CFF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC "#000000FF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_STYLE_COLOR_INC "#7C7C7CFF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#000000FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC "#7C7C7CFF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC "#7C7C7CFF"
-
-#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 110 // alpha was 64 [???]
-#define GENLIST_PART_BG_COLOR_INC 236 240 242 255
-#define GENLIST_PART_LIST_BG_COLOR_INC 249 249 249 255
+
+// Group Index (in genlist)
+#define GENLIST_INDEX_LIST_SIZE 32
+#define GENLIST_INDEX_LIST_COLOR 29 100 149 255
+
+// Genlist Text
+#define GENLIST_LIST_MAIN_TEXT_SIZE 44
+#define GENLIST_LIST_MAIN_TEXT_READ_COLOR 124 124 124 255
+#define GENLIST_LIST_MAIN_TEXT_READ_COLOR_STYLE "#7C7C7CFF"
+#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_FOCUS_COLOR 249 249 249 255
+#define GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE "#F9F9F9FF"
+
+#define GENLIST_LIST_SUB_TEXT_SIZE 32
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR 124 124 124 255
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE "#7C7C7CFF"
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR 42 137 194 204
+#define GENLIST_LIST_SUB_TEXT_FOCUS_COLOR 249 249 249 255
+#define GENLIST_LIST_SUB_TEXT_FOCUS_COLOR_STYLE "#F9F9F9FF"
+
+#define GENLIST_FLEXIBLE_TEXT_MAIN_SIZE 44
+#define GENLIST_FLEXIBLE_TEXT_MAIN_COLOR 0 0 0 255
+#define GENLIST_FLEXIBLE_TEXT_MAIN_COLOR_STYLE "#000000FF"
+#define GENLIST_FLEXIBLE_TEXT_SUB_SIZE 36
+#define GENLIST_FLEXIBLE_TEXT_SUB_COLOR 149 149 149 255
+#define GENLIST_FLEXIBLE_TEXT_SUB_COLOR_STYLE "#959595FF"
+
+#define GENLIST_MULTILINE_TEXT_SIZE 32
+#define GENLIST_MULTILINE_TEXT_COLOR 124 124 124 255
+#define GENLIST_MULTILINE_TEXT_COLOR_STYLE "#7C7C7CFF"
+
+#define GENLIST_3LINE_MAIN_TEXT_01_SIZE 40
+#define GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR 124 124 124 255
+#define GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR 0 0 0 255
+#define GENLIST_3LINE_MAIN_TEXT_01_FOCUS_COLOR 249 249 249 255
+#define GENLIST_3LINE_MAIN_TEXT_02_SIZE 36
+#define GENLIST_3LINE_MAIN_TEXT_02_COLOR 124 124 124 255
+#define GENLIST_3LINE_MAIN_TEXT_02_COLOR_FOCUS 249 249 249 255
+#define GENLIST_3LINE_MAIN_TEXT_03_SIZE 30
+#define GENLIST_3LINE_MAIN_TEXT_03_COLOR 124 124 124 255
+#define GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR 249 249 249 255
+
+#define GENLIST_CONVERTOR_STYLE_SIZE 40
+#define GENLIST_CONVERTOR_STYLE_COLOR 0 0 0 255
+#define GENLIST_CONVERTOR_STYLE_FOCUS_COLOR 249 249 249 255
+
+#define GENLIST_UNREAD_EMAIL_SIZE 44
+#define GENLIST_UNREAD_EMAIL_COLOR 0 0 0 255
+
+#define GENLIST_CONTENTS_TEXT_SIZE 30
+#define GENLIST_CONTENTS_TEXT_COLOR 45 45 45 255
+
+#define GENLIST_NAME_TEXT_SIZE 32
+#define GENLIST_NAME_TEXT_COLOR 128 128 128 255
+#define GENLIST_NAME_TEXT_COLOR_STYLE "#808080FF"
+#define GENLIST_NAME_TEXT_DIM_COLOR 42 137 194 255
+
+#define GENLIST_LIST_BUBBLE_TEXT_SIZE 32
+#define GENLIST_LIST_BUBBLE_TEXT_COLOR 249 249 249 255
+#define GENLIST_LIST_BUBBLE_TEXT_COLOR_STYLE "#F9F9F9FF"
+#define GENLIST_LIST_MESSAGE_TEXT_SIZE 32
+#define GENLIST_LIST_MESSAGE_TEXT_COLOR 0 0 0 255
+#define GENLIST_LIST_MESSAGE_TEXT_COLOR_STYLE "#000000FF"
+
+#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE 32
+#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#7C7C7CFF"
+
+#define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255
+#define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#646464"
+#define GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC "#9E9E9EFF"
+#define GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC "#000000FF"
+#define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#A8A8A8"
+#define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252"
+#define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525"
+
+
+// Belows are used??
+#define GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE 0 0 0 255
+#define GENLIST_TEXT_COLOR_SWEEP_STYLE 118 118 118 255
+
+
+
+
+
+
+#define GENLIST_PART_DISCLIP_COLOR 255 255 255 110 // alpha was 64 [???]
+#define GENLIST_PART_REORDER_BG_COLOR 236 240 242 255
+#define GENLIST_PART_FLIP_BG_COLOR 249 249 249 255
+#define GENLIST_PART_DIALOGUE_GROUP_BG_COLOR 236 240 242 255
+#define GENLIST_PART_LIST_BG_COLOR 249 249 249 255
 #define GENLIST_PART_LIST_LINE_COLOR_INC 169 169 169 255
 #define GENLIST_PART_LIST_PRESS_COLOR_INC 42 137 194 255
-#define GENLIST_PART_TEXT_PRESS_COLOR_INC 249 249 249 255
+
 #define GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC 215 225 232 255
 #define GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC 215 225 232 255
 #define GENLIST_PART_EDIT_SELECT_ALL_BG_COLOR_INC 215 225 232 255
 #define GENLIST_PART_EDIT_1PIXEL_LINE_COLOR_INC 169 169 169 255
 #define GENLIST_PART_BUBBLE_DATE_BG_COLOR_INC 56 69 90 255
 #define GENLIST_PART_BUBBLE_1PIXEL_LINE_COLOR_INC 153 153 153 255
-//
-// Remove this, use GENLIST_PART_BASE_EVENT_OFF instead
-#define GENLIST_PART_INDEX_LIST_BASE_EVENT_INC \
-         part { name: "base_event";\
-            type: RECT;\
-            repeat_events: 0;\
-            description { state: "default" 0.0;\
-               color: 0 0 0 0;\
-            }\
-         }
-#define GENLIST_PART_INDEX_LIST_BASE_IMAGE_INC \
-         part { name: "base_image";\
-            repeat_events: 1;\
-            description { state: "default" 0.0;\
-               rel1.to: "rect";\
-               rel2.to: "rect";\
-               image {\
-                  normal: "00_index list_bg.png";\
-               }\
-            }\
-         }
-
-#define GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC "#F9F9F9FF"
+
 #define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
 
-#define GENLIST_DIALOGUE_GT_TEXT_COLOR 102 102 102 255
+
+#define DIALOGUE_PASSWORD_TITLE_COLOR 124 124 124 255
+#define DIALOGUE_PASSWORD_TITLE_SIZE 32
+#define GENLIST_DIALOGUE_FONT_PASSWORD_INPUT_TEXT_COLOR_INC 0 0 0 255
+
+#define GENLIST_DIALOGUE_GT_TEXT_COLOR 92 151 187 255
 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_01_COLOR_INC 100 100 100 255
 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_01_FOCUS_COLOR_INC 249 249 249 255
 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_02_COLOR_INC 249 249 249 255
 #define GENLIST_DIALOGUE_FONT_APPS_PRICE_ORIGINAL_COLOR_INC 7 180 211 255
 #define GENLIST_DIALOGUE_FONT_APPS_PRICE_SALE_COLOR_INC 221 134 21 255
 #define GENLIST_DIALOGUE_FONT_APPS_PRICE_FREE_COLOR_INC 7 180 211 255
-#define GENLIST_DIALOGUE_FONT_PASSWORD_TITLE_COLOR_INC 124 124 124 255
-#define GENLIST_DIALOGUE_FONT_PASSWORD_INPUT_TEXT_COLOR_INC 0 0 0 255
+
 #define GENLIST_DIALOGUE_FONT_DETAIL_WORD_COLOR_INC 249 249 249 255
 #define GENLIST_DIALOGUE_FONT_DETAIL_PRONUNCIATION_COLOR_INC 7 180 211 255
 #define GENLIST_DIALOGUE_FONT_DETAIL_NATION_COLOR_INC 146 146 146 255
 
 #define GENLIST_SWEEP_BG_COLOR_INC 236 240 242 255
 
-//old
-#if 0
-#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 110 // alpha was 64 [???]
-#define GENLIST_PART_BG_COLOR_INC 0 0 0 255
-#define GENLIST_PART_BG_SELECTED_COLOR_INC 60 100 155 255
-#define GENLIST_PART_BG_UNSELECTED_COLOR_INC 60 100 155 0
-#define GENLIST_PART_DIALOGUE_BG_COLOR_INC 15 15 15 255
-#define GENLIST_PART_SELECT_ALL_BG_COLOR_INC 239 237 230 255
-#define GENLIST_PART_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_TEXT_SELECTED_COLOR_INC 249 249 249 255
-#define GENLIST_PART_SUB_TEXT_COLOR_INC 100 100 100 255
-#define GENLIST_PART_SUB_TEXT_SETTINGS_COLOR_INC 7 180 211 255
-#define GENLIST_PART_MULTILINE_TEXT_COLOR_INC 100 100 100 255
-#define GENLIST_PART_MULTILINE_TITLE_COLOR_INC 249 249 249 255
-#define GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#646464FF"
-#define GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC "#a8a8a8"
-#define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#646464FF"
-#define GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC "#b4b4b4"
-#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
-#define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255
-#define GENLIST_PART_BOTTOM_LINE_INC 87 87 87 255
-#define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 168 168 168 255
-#define GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC 87 87 87 255
-#define GENLIST_PART_EMAIL_READ_TEXT_COLOR_INC 108 108 108 255
-#define GENLIST_PART_EMAIL_UNREAD_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255
-#define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255
-#endif
-#define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255
-#define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#a8a8a8FF"
-#define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#646464"
-#define GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC "#9E9E9EFF"
-#define GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC "#d2d2d2FF"
-#define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#a8a8a8"
-#define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252"
-#define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525"
-#if 0
-#define GENLIST_GROUP_PART_TEXT_COLOR_INC 131 154 192 255
-#define GENLIST_GROUP_PART_BASE_EVENT_INC \
-         part { name: "base_event";\
-            type: RECT;\
-            repeat_events: 0;\
-            description { state: "default" 0.0;\
-               color: 0 0 0 0;\
-            }\
-         }
-#define GENLIST_GROUP_PART_BASE_IMAGE_INC
-#define GENLIST_GROUP_BG_COLOR_DEFAULT_INC 17 23 27 255
-#define GENLIST_GROUP_BG_COLOR_ALPHA_OFF_INC 17 23 27 255  // [???]
-#define GENLIST_GROUP_LEFT_BG_COLOR_INC 15 15 15 255
-#define GENLIST_EDIT_PART_LINE_INC 41 40 36 150
-#define GENLIST_EDIT_PART_BOTTOM_LINE_INC 82 82 82 255
-#define GENLIST_EDIT_BG_COLOR_INC 0 0 0 255
-#define GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC 17 23 27 255
-#define GENLIST_EXPANDABLE_PART_BG_COLOR_INC GENLIST_PART_BG_COLOR_INC
-#define GENLIST_EXPANDABLE2_PART_BG_COLOR_INC 15 15 15 255
-#define GENLIST_EXPANDABLE2_NOSHADOW_BG_COLOR_INC 15 15 15 255 // [???]
-#define GENLIST_EXPANDABLE3_PART_BG_COLOR_INC 30 30 30 255
-#define GENLIST_EXPANDABLE_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-          }
-#define GENLIST_PART_BG_EXPANDABLE3_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_EXPANDABLE3_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_EXPANDABLE3_NOSHADOW_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_noshadow_bg.png"; \
-                  border: 0 0 0 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC 31 31 31 255
-#define GENLIST_DIALOGUE_EXPANDABLE3_PART_BG_COLOR_INC 34 37 40 255
-#define GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC 57 166 215 255
-#define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 56 69 90 255
-#define GENLIST_BUBBLE_BG_COLOR_INC 153 153 153 255
-#endif
-
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  255 255 255 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 230 230 230 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
 
-#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 211 211 211 255
+#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 249 249 249 255
 #define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 249 249 249 255
 #define BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 211 211 211 127
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#f9f9f9"
 #define BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC 56 56
 
+#define BUTTON_DATETIME_AMPM_BG_MIN_INC 120 60
+
 #define BUTTON_TEXT_STYLE1_BG_MIN_INC 100 72
 #define BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC 148 74
 #define BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC 74 74
 #define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 36
-#define BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC 28
+#define BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC 32
 
 #define BUTTON_TEXT_STYLE2_BG_MIN_INC 100 72
 #define BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC 148 74
 #define BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
 #define BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC 38 38
 #define BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 32
-#define BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC 28
+#define BUTTON_TEXT_STYLE2_FONT_SIZE_INC 36
+#define BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC 32
 
 #define BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC 64 64
 #define BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC 64 64
 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38
 #define BUTTON_POPUP_TEXT_MIN_INC 64 20
-#define BUTTON_POPUP_TEXT_FONT_SIZE_INC 32
+#define BUTTON_POPUP_TEXT_FONT_SIZE_INC 36
 #define BUTTON_POPUP_MULTILINE_TEXT_FONT_SIZE_INC 28
 
 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74
 #define BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0
 #define BUTTON_SWEEP_ICONONLY_ICON_MIN_INC 38 38
 #define BUTTON_SWEEP_TEXT_MIN_INC 90 32
-#define BUTTON_SWEEP_FONT_SIZE_INC 32
-#define BUTTON_SWEEP_MULTILINE_FONT_SIZE_INC 28
+#define BUTTON_SWEEP_FONT_SIZE_INC 36
+#define BUTTON_SWEEP_MULTILINE_FONT_SIZE_INC 32
 
-#define BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC 12 74
+#define BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC 14 72
 #define BUTTON_SEARCHBAR_BG_BORDER_INC 6 6 6 6
 #define BUTTON_SEARCHBAR_PADDING_MIN_INC 5 5
 #define BUTTON_SEARCHBAR_ICON_RECT_MIN_INC 0 28
 #define BUTTON_SEARCHBAR_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
 #define BUTTON_SEARCHBAR_ICONONLY_ICON_MIN_INC 28 28
 #define BUTTON_SEARCHBAR_TEXT_MIN_INC 90 28
-#define BUTTON_SEARCHBAR_FONT_SIZE_INC 32
+#define BUTTON_SEARCHBAR_FONT_SIZE_INC 36
 
 #define BUTTON_HIDDEN_BG_NORMAL_MIN_INC 12 60
 #define BUTTON_HIDDEN_BG_BORDER_INC 5 5 5 5
 #define BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC 30
 
 #define BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC 108 44
-#define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 5 5 5 5
+#define BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC 6 6 6 6
 #define BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC 16 1
-#define BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND__MIN_MAX_INC 16 22
-#define BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC 44 44
+#define BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND__MIN_MAX_INC 18 26
+#define BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC 42 44
 #define BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC 32
 
 #define BUTTON_CONTACT_DELETE_BG_NORMAL_MIN_INC 50 74
 #define BUTTON_CONTACT_PADDING_MIN_INC 20 1
 #define BUTTON_CONTACT_FONT_SIZE_INC 36
 
-#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 106 74
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 144 114
 #define BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC 5 5 5 5
 #define BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC 56 56
 
 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54
 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34
 #define BUTTON_TICKERNOTI_ICONONLY_BG_MIN_INC 54 54
-#define BUTTON_TICKERNOTI_BG_BORDER_INC 5 5 5 5
+#define BUTTON_TICKERNOTI_BG_BORDER_INC 6 6 6 6
 #define BUTTON_TICKERNOTI_PADDING_MIN_INC 5 5
 #define BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC 44 44
 #define BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC 32
 #define BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC 128 56
 
-#define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
+#define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 72 72
 #define BUTTON_COLORSELECTOR_BG_BORDER_INC 5 5 5 5
-#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 72 72
 
-#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 28 74
+#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 28 72
 #define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 6 6 6 6
 #define BUTTON_DEFAULT_STYLE_PADDING_MIN_INC 5 5
 #define BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0
 #define BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC 38 38
 #define BUTTON_DEFAULT_STYLE_TEXT_MIN_INC 144 38
-#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 32
+#define BUTTON_DEFAULT_STYLE_FONT_SIZE_INC 36
 
-#define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
-#define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
+#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 32
+#define CHECK_DEFAULT_TEXT_FONT_SIZE_INC 36
 
 #define CHECK_ONOFF_BG_NORMAL_MIN_MAX_INC 60 80
 #define CHECK_ONOFF_CHECK_IMAGE_BORDER_INC 5 5 5 5
 #define CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC 75
 #define CHECK_STYLE_DEFAULT_BG_NORMAL_MIN_MAX_INC 60 60
 
-#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_IMAGE_MIN_MAX_WIDTH_INC 72 72
+#define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC 124 72
 #define CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC 8 0 5 5
 #define CHECK_STYLE_DELETE_BUTTON_TEXT_FONT_SIZE_INC 32
 
 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 50
 #define RADIO_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 50
 #define RADIO_STYLE_DEFAULT_BG_MIN_MAX_INC 60 60
-#define RADIO_STYLE_DEFAULT_FONT_SIZE_INC 32
+#define RADIO_STYLE_DEFAULT_FONT_SIZE_INC 36
 
 #define PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC 15
 #define PANES_STYLE_DEFAULT_MIDDLE_SIZE_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 BUTTON_TICKERNOTI_PRESSED_COLOR_INC       249 249 249 255
 #define BUTTON_TICKERNOTI_DISABLED_COLOR_INC      249 249 249 155
 
-#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        249 249 249 255
-#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      249 249 249 255
+#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC        0 0 0 255
+#define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC      0 0 0 255
 #define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC          48 49 50 255
 
-#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        249 249 249 255
-#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      249 249 249 255
+#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC        0 0 0 255
+#define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC      0 0 0 255
 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC          48 49 50 255
 
 #define CONTROLBAR_LARGE_HEIGHT_INC 122
 #define MULTIBUTTONENTRY_TEXT_COLOR_INC "#000000"
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 70 70 70 255
 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#F9F9F9"
-#define MULTIBUTTONENTRY_WIDTH_PAD_INC 15
-#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 20
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 16
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 18
 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 300
 #define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 76
 #define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 28 28 0 0
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 12
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 15
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 15
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 15
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 38
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC 44
+#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 20
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 16
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 28
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 36
+#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 27
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 42
+#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 16
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 36
 #define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC 75
 
 #define SEARCHBAR_BACKGROUND_COLOR_INC          215 225 232 255
 #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 588 0
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 588 300
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 40
 
 #define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 620 0
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 4 4 3 3
 #define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 14 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62
-#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 620 0
+#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 620 300
 #define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96
 #define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 40
 #define POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC 620 64
 #define POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC 3 3 3 3
 #define POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC 62 62
-#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 620 0
+#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 620 300
 #define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 620 286
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #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 408
+#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_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC 620 64
 #define POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC 0 1
 #define POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62
-#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 620 0
+#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 620 300
 #define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 620 96
 #define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC 38
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC 0 31
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC 40 0
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC 40 0
-#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 544 64
+#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 544 300
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 31
 
-#define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          249 249 249 255
-#define PROGRESSBAR_DEFAULT_STYLE_STATUS_TEXT_COLOR_INC          249 249 249 255
-#define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          249 249 249 255
-#define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          224 224 224 255
-#define PROGRESSBAR_LIST_TITLE_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC      108 108 108 255
+#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 SLIDER_EBOOK_INDICATOR_DRAG_TEXT_SIZE_INC 48
 #define SLIDER_EBOOK_INDICATOR_WIDTH_INC 54
 #define SLIDER_EBOOK_INDICATOR_HEIGHT_INC 54
-#define SLIDER_DISABLER_PART_COLOR_INC   185 185 185 100
 
 #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#f9f9f9"
-#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#8eaaba"
+#define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#cad3d9"
 
 #define DATETIME_FIELD_MIN_SIZE_INC                60 60
 #define DATETIME_SEPARATOR_MIN_SIZE_INC            40 60
 #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 10
+#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