#define LAYOUT_INDICATOR_HEIGHT_INC 60
#define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
+#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255
+#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255
#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32
#define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC 0 15
#define NAVIFRAME_TITLE_TOP_PADDING2_INC 0 18
#define NAVIFRAME_BADGE_TEXT_H_INC 26
#define NAVIFRAME_BADGE_TEXT_W_INC 42
#define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 48
-#define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 8 8
-#define NAVIFRAME_TOOLBAR_BG_IMAGE_BORDER_INC 8 8 8 8
#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
#define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
#define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 16
#define CTXPOPUP_WIDTH_MIN_INC 386
#define CTXPOPUP_WIDTH_MAX_INC 620
#define CTXPOPUP_TEXT_MAX_INC 572
+#define CTXPOPUP_ICON_TEXT_MAX_INC 515
+#define CTXPOPUP_MORE_TEXT_MAX_INC 377
#define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30
#define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8
#define CTXPOPUP_SHADOW_LEFT_PADDING 10
#define CTXPOPUP_CONTENT_PADDING 4
#define CTXPOPUP_ARROW_PADDING 1
#define CTXPOPUP_SCROLLER_PADDING 8
-#define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 18
+#define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
+#define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22
#define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255
#define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74
#define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
#define CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC 40
+#define CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC (CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC * 2)
#define CTXPOPUP_MAIN_TEXT_SIZE_INC 32
#define CTXPOPUP_ITEM_HEIGHT_MIN_INC 110
#define CTXPOPUP_ITEM_HEIGHT_MAX_INC 130
#define CTXPOPUP_TP_BG_IMAGE_BORDER 8 8 8 8
#define CTXPOPUP_TP_ARROW_SIZE_INC 27 18
#define CTXPOPUP_TP_HEIGHT_INC 102
-#define CTXPOPUP_MORE_WIDTH_INC 502
+#define CTXPOPUP_MORE_WIDTH_MIN_INC 502
+#define CTXPOPUP_MORE_WIDTH_MAX_INC 720
#define CTXPOPUP_MORE_ITEM_PADDING_INC 16
#define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110
#define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130
#define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40
#define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20
#define CTXPOPUP_MOVE_PAD_INC 40
-#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720
#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC 90
#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC 130
#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_NAVIFRAME_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 163
+#define BUTTON_NAVIFRAME_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 163
+
+#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC "#FFFFFFA3"
+#define BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000A3"
#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_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC 255 255 255 255
#define BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC 58 58 58 76
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_PRESSED_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_FOCUSED_COLOR_INC "#FFFFFFFF"
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A4C"
+
#define BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC 101 101 101 255
#define BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC 255 255 255 255
#define BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC 101 101 101 76
#define BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC 255 255 255 255
#define BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC 101 101 101 76
-#define BUTTON_DATETIME_AMPM_BG_MIN_INC 106 56
+#define BUTTON_DATETIME_AMPM_BG_MIN_INC 95 60
+#define BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC 34
#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 13 13
#define BUTTON_SEARCH_BUTTON_BG_MIN_INC 100 66
#define BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC 72 72
#define BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC 45 45
#define BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC 45 45
+#define BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC 13 13
+#define BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC 14 14
#define BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC 72
#define BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC 72