-#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 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 255 255 255 255
-#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 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 255 255 255 255
-#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76
-
-#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 76
-
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 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_TEXT_STYLE1_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
+
+#define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 0 0 0 255
+#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 128
+
+#define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#000000FF"
+#define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#00000080"
+
+#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAC0"
+#define BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
+
+#define BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
+
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
+
+#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
+#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 255
+
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
+
+#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
+#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
+
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
+#define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"