#define NAVIFRAME_PADDING_INC 16 0
#define NAVIFRAME_LANDSCAPE_PADDING_INC 34 0
#define NAVIFRAME_PADDING2_INC 9 0
-#define NAVIFRAME_PADDING_BADGE_INC 2 0
#define NAVIFRAME_PADDING3_INC 8 0
#define NAVIFRAME_MIDDLE_PADDING_INC 0 12
#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11
#define NAVIFRAME_BOTTOM_PADDING_INC 0 12
#define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
#define NAVIFRAME_BADGE_PADDING_INC 85 0
+#define NAVIFRAME_BADGE_LEFT_PADDING_INC 8 0
#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
-#define NAVIFRAME_BADGE_LEFT_TEXT_PADDING_INC 10 0
+#define NAVIFRAME_BADGE_TEXT_LEFT_PADDING_INC 12 54
#define NAVIFRAME_BADGE_TEXT_H_INC 26
-#define NAVIFRAME_BADGE_TEXT_W_INC 42
+#define NAVIFRAME_BADGE_TEXT_MIN_W_INC 30
+#define NAVIFRAME_BADGE_TEXT_MAX_W_INC 60
#define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 54
#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
#define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
#define CTXPOPUP_SHADOW_TOP_PADDING 14
#define CTXPOPUP_SHADOW_BOTTOM_PADDING 14
#define CTXPOPUP_CONTENT_PADDING_WIDTH 1
-#define CTXPOPUP_CONTENT_PADDING_HEIGHT 8
+#define CTXPOPUP_CONTENT_PADDING_HEIGHT 1
+#define CTXPOPUP_PRESS_PADDING 4
+#define CTXPOPUP_PRESS_PADDING2 3
#define CTXPOPUP_ARROW_PADDING 1
#define CTXPOPUP_SCROLLER_PADDING 8
#define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
#define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
#define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18
+#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 255 255 255 255
+#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 255 255 255 76
#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_DIM_COLOR_INC 255 255 255 76
#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_DIM_COLOR_INC 255 255 255 76
#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_SEPARATOR2_COLOR_INC 98 102 117 255
#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255
#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 96
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 96
#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_TP_HEIGHT_INC 102
#define CTXPOPUP_MORE_WIDTH_MIN_INC 502
#define CTXPOPUP_MORE_WIDTH_MAX_INC 720
+#define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280
#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_MIN_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 334
#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_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70
#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 16 16
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 250 250 250 255
#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98
#define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85
#define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
#define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 13 13
-#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 45 45
#define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74
#define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 13 13
#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0
#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 720
#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
+#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 32 47
#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 636 78
#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 816 78
#define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
#define POPUP_LABEL_DESC_TOP_PADDING 32
#define POPUP_LABEL_DESC_BOTTOM_PADDING 32
#define POPUP_ACTION_DESC_TOP_PADDING 20
+#define POPUP_TITLE_LEFT_PADDING 42
+#define POPUP_TITLE_RIGHT_PADDING 42
#define POPUP_TITLE_TOP_PADDING 20
#define POPUP_TITLE_BOTTOM_PADDING 0
#define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0
#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_PADDING_COLOR_TOP_INC 185 184 178 255
+#define COLORSELECTOR_PADDING_COLOR_BOTTOM_INC 225 223 218 255
#define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86
#define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86