diff --git a/lib/models/isar/sw_theme.dart b/lib/models/isar/sw_theme.dart
index af1362c87..69988e6cc 100644
--- a/lib/models/isar/sw_theme.dart
+++ b/lib/models/isar/sw_theme.dart
@@ -1646,17 +1646,17 @@ class StackTheme {
       name: json["name"] as String,
       assetBundleUrl: json["asset_bundle_url"] as String,
       brightnessString: json["brightness"] as String,
-      backgroundInt:
-          parseColor(json["colors"]["background"]["background"] as String),
-      backgroundAppBarInt: parseColor(
-          json["colors"]["background"]["backgroundAppBar"] as String),
-      gradientBackgroundString: json["gradients"] as String?,
+      backgroundInt: parseColor(json["colors"]["background"] as String),
+      backgroundAppBarInt:
+          parseColor(json["colors"]["background_app_bar"] as String),
+      gradientBackgroundString: json["colors"]["gradients"] as String?,
       standardBoxShadowString:
-          jsonEncode(json["box_shadows"]["standard"] as Map),
+          jsonEncode(json["colors"]["box_shadows"]["standard"] as Map),
       homeViewButtonBarBoxShadowString:
-          json["box_shadows"]["home_view_button_bar"] == null
+          json["colors"]["box_shadows"]["home_view_button_bar"] == null
               ? null
-              : jsonEncode(json["box_shadows"]["home_view_button_bar"] as Map),
+              : jsonEncode(
+                  json["colors"]["box_shadows"]["home_view_button_bar"] as Map),
       coinColorsJsonString: jsonEncode(json["colors"]['coin'] as Map),
       assets: ThemeAssets.fromJson(
         json: json,
@@ -1664,272 +1664,278 @@ class StackTheme {
         internalThemeUuid:
             "dark", //TODO - Replace this with the uuid (_id) once setup
       ),
-      overlayInt: parseColor(json["overlay"] as String),
+      overlayInt: parseColor(json["colors"]["overlay"] as String),
       accentColorBlueInt:
-          parseColor(json["colors"]["accent"]["blue"] as String),
+          parseColor(json["colors"]["accent_color_blue"] as String),
       accentColorGreenInt:
-          parseColor(json["colors"]["accent"]["green"] as String),
+          parseColor(json["colors"]["accent_color_green"] as String),
       accentColorYellowInt:
-          parseColor(json["colors"]["accent"]["yellow"] as String),
-      accentColorRedInt: parseColor(json["colors"]["accent"]["red"] as String),
+          parseColor(json["colors"]["accent_color_yellow"] as String),
+      accentColorRedInt:
+          parseColor(json["colors"]["accent_color_red"] as String),
       accentColorOrangeInt:
-          parseColor(json["colors"]["accent"]["orange"] as String),
+          parseColor(json["colors"]["accent_color_orange"] as String),
       accentColorDarkInt:
-          parseColor(json["colors"]["accent"]["dark"] as String),
-      shadowInt: parseColor(json["shadow"] as String),
-      textDarkInt: parseColor(json["colors"]["text"]["dark_one"] as String),
-      textDark2Int: parseColor(json["colors"]["text"]["dark_two"] as String),
-      textDark3Int: parseColor(json["colors"]["text"]["dark_three"] as String),
-      textWhiteInt: parseColor(json["colors"]["text"]["white"] as String),
+          parseColor(json["colors"]["accent_color_dark"] as String),
+      shadowInt: parseColor(json["colors"]["shadow"] as String),
+      textDarkInt: parseColor(json["colors"]["text_dark_one"] as String),
+      textDark2Int: parseColor(json["colors"]["text_dark_two"] as String),
+      textDark3Int: parseColor(json["colors"]["text_dark_three"] as String),
+      textWhiteInt: parseColor(json["colors"]["text_white"] as String),
       textFavoriteCardInt:
-          parseColor(json["colors"]["text"]["favorite"] as String),
-      textErrorInt: parseColor(json["colors"]["text"]["error"] as String),
-      textRestoreInt: parseColor(json["colors"]["text"]["restore"] as String),
+          parseColor(json["colors"]["text_favorite"] as String),
+      textErrorInt: parseColor(json["colors"]["text_error"] as String),
+      textRestoreInt: parseColor(json["colors"]["text_restore"] as String),
       buttonBackPrimaryInt:
-          parseColor(json["colors"]["button_back_colors"]["primary"] as String),
-      buttonBackSecondaryInt: parseColor(
-          json["colors"]["button_back_colors"]["secondary"] as String),
-      buttonBackPrimaryDisabledInt: parseColor(
-          json["colors"]["button_back_colors"]["primary_disabled"] as String),
+          parseColor(json["colors"]["button_back_primary"] as String),
+      buttonBackSecondaryInt:
+          parseColor(json["colors"]["button_back_secondary"] as String),
+      buttonBackPrimaryDisabledInt:
+          parseColor(json["colors"]["button_back_primary_disabled"] as String),
       buttonBackSecondaryDisabledInt: parseColor(
-          json["colors"]["button_back_colors"]["secondary_disabled"] as String),
+          json["colors"]["button_back_secondary_disabled"] as String),
       buttonBackBorderInt:
-          parseColor(json["colors"]["button_back_colors"]["border"] as String),
-      buttonBackBorderDisabledInt: parseColor(
-          json["colors"]["button_back_colors"]["border_disabled"] as String),
-      buttonBackBorderSecondaryInt: parseColor(
-          json["colors"]["button_back_colors"]["border_secondary"] as String),
-      buttonBackBorderSecondaryDisabledInt: parseColor(json["colors"]
-          ["button_back_colors"]["border_secondary_disabled"] as String),
+          parseColor(json["colors"]["button_back_border"] as String),
+      buttonBackBorderDisabledInt:
+          parseColor(json["colors"]["button_back_border_disabled"] as String),
+      buttonBackBorderSecondaryInt:
+          parseColor(json["colors"]["button_back_border_secondary"] as String),
+      buttonBackBorderSecondaryDisabledInt: parseColor(
+          json["colors"]["button_back_border_secondary_disabled"] as String),
       numberBackDefaultInt:
-          parseColor(json["colors"]["button_back_colors"]["number"] as String),
+          parseColor(json["colors"]["number_back_default"] as String),
       numpadBackDefaultInt:
-          parseColor(json["colors"]["button_back_colors"]["numpad"] as String),
-      bottomNavBackInt:
-          parseColor(json["colors"]["button_back_colors"]["nav"] as String),
+          parseColor(json["colors"]["numpad_back_default"] as String),
+      bottomNavBackInt: parseColor(json["colors"]["button_nav_back"] as String),
       textSubtitle1Int:
-          parseColor(json["text_subtitles"]["subtitle_one"] as String),
+          parseColor(json["colors"]["text_subtitle_one"] as String),
       textSubtitle2Int:
-          parseColor(json["text_subtitles"]["subtitle_two"] as String),
+          parseColor(json["colors"]["text_subtitle_two"] as String),
       textSubtitle3Int:
-          parseColor(json["text_subtitles"]["subtitle_three"] as String),
+          parseColor(json["colors"]["text_subtitle_three"] as String),
       textSubtitle4Int:
-          parseColor(json["text_subtitles"]["subtitle_four"] as String),
+          parseColor(json["colors"]["text_subtitle_four"] as String),
       textSubtitle5Int:
-          parseColor(json["text_subtitles"]["subtitle_five"] as String),
+          parseColor(json["colors"]["text_subtitle_five"] as String),
       textSubtitle6Int:
-          parseColor(json["text_subtitles"]["subtitle_six"] as String),
+          parseColor(json["colors"]["text_subtitle_six"] as String),
       buttonTextPrimaryInt:
-          parseColor(json["colors"]["button_text"]["primary"] as String),
+          parseColor(json["colors"]["button_text_primary"] as String),
       buttonTextSecondaryInt:
-          parseColor(json["colors"]["button_text"]["secondary"] as String),
-      buttonTextPrimaryDisabledInt: parseColor(
-          json["colors"]["button_text"]["primary_disabled"] as String),
+          parseColor(json["colors"]["button_text_secondary"] as String),
+      buttonTextPrimaryDisabledInt:
+          parseColor(json["colors"]["button_text_primary_disabled"] as String),
       buttonTextSecondaryDisabledInt: parseColor(
-          json["colors"]["button_text"]["secondary_disabled"] as String),
+          json["colors"]["button_text_secondary_disabled"] as String),
       buttonTextBorderInt:
-          parseColor(json["colors"]["button_text"]["border"] as String),
+          parseColor(json["colors"]["button_text_border"] as String),
       buttonTextDisabledInt:
-          parseColor(json["colors"]["button_text"]["disabled"] as String),
+          parseColor(json["colors"]["button_text_disabled"] as String),
       buttonTextBorderlessInt:
-          parseColor(json["colors"]["button_text"]["borderless"] as String),
+          parseColor(json["colors"]["button_text_borderless"] as String),
       buttonTextBorderlessDisabledInt: parseColor(
-          json["colors"]["button_text"]["borderless_disabled"] as String),
-      numberTextDefaultInt: parseColor(json["number_text_default"] as String),
-      numpadTextDefaultInt: parseColor(json["numpad_text_default"] as String),
-      bottomNavTextInt: parseColor(json["bottom_nav_text"] as String),
-      customTextButtonEnabledTextInt:
-          parseColor(json["custom_text_button_enabled_text"] as String),
-      customTextButtonDisabledTextInt:
-          parseColor(json["custom_text_button_disabled_text"] as String),
-      switchBGOnInt: parseColor(json["colors"]["switch"]["bg_on"] as String),
-      switchBGOffInt: parseColor(json["colors"]["switch"]["bg_off"] as String),
+          json["colors"]["button_text_borderless_disabled"] as String),
+      numberTextDefaultInt:
+          parseColor(json["colors"]["number_text_default"] as String),
+      numpadTextDefaultInt:
+          parseColor(json["colors"]["numpad_text_default"] as String),
+      bottomNavTextInt: parseColor(json["colors"]["bottom_nav_text"] as String),
+      customTextButtonEnabledTextInt: parseColor(
+          json["colors"]["custom_text_button_enabled_text"] as String),
+      customTextButtonDisabledTextInt: parseColor(
+          json["colors"]["custom_text_button_disabled_text"] as String),
+      switchBGOnInt: parseColor(json["colors"]["switch_bg_on"] as String),
+      switchBGOffInt: parseColor(json["colors"]["switch_bg_off"] as String),
       switchBGDisabledInt:
-          parseColor(json["colors"]["switch"]["bg_disabled"] as String),
+          parseColor(json["colors"]["switch_bg_disabled"] as String),
       switchCircleOnInt:
-          parseColor(json["colors"]["switch"]["circle_on"] as String),
+          parseColor(json["colors"]["switch_circle_on"] as String),
       switchCircleOffInt:
-          parseColor(json["colors"]["switch"]["circle_off"] as String),
+          parseColor(json["colors"]["switch_circle_off"] as String),
       switchCircleDisabledInt:
-          parseColor(json["colors"]["switch"]["circle_disabled"] as String),
+          parseColor(json["colors"]["switch_circle_disabled"] as String),
       stepIndicatorBGCheckInt:
-          parseColor(json["step_indicator"]["bg_check"] as String),
+          parseColor(json["colors"]["step_indicator_bg_check"] as String),
       stepIndicatorBGNumberInt:
-          parseColor(json["step_indicator"]["bg_number"] as String),
+          parseColor(json["colors"]["step_indicator_bg_number"] as String),
       stepIndicatorBGInactiveInt:
-          parseColor(json["step_indicator"]["bg_inactive"] as String),
+          parseColor(json["colors"]["step_indicator_bg_inactive"] as String),
       stepIndicatorBGLinesInt:
-          parseColor(json["step_indicator"]["bg_lines"] as String),
-      stepIndicatorBGLinesInactiveInt:
-          parseColor(json["step_indicator"]["bg_lines_inactive"] as String),
+          parseColor(json["colors"]["step_indicator_bg_lines"] as String),
+      stepIndicatorBGLinesInactiveInt: parseColor(
+          json["colors"]["step_indicator_bg_lines_inactive"] as String),
       stepIndicatorIconTextInt:
-          parseColor(json["step_indicator"]["icon_text"] as String),
+          parseColor(json["colors"]["step_indicator_icon_text"] as String),
       stepIndicatorIconNumberInt:
-          parseColor(json["step_indicator"]["icon_number"] as String),
+          parseColor(json["colors"]["step_indicator_icon_number"] as String),
       stepIndicatorIconInactiveInt:
-          parseColor(json["step_indicator"]["icon_inactive"] as String),
+          parseColor(json["colors"]["step_indicator_icon_inactive"] as String),
       checkboxBGCheckedInt:
-          parseColor(json["checkbox"]["bg_checked"] as String),
+          parseColor(json["colors"]["checkbox_bg_checked"] as String),
       checkboxBorderEmptyInt:
-          parseColor(json["checkbox"]["border_empty"] as String),
+          parseColor(json["colors"]["checkbox_border_empty"] as String),
       checkboxBGDisabledInt:
-          parseColor(json["checkbox"]["bg_disabled"] as String),
+          parseColor(json["colors"]["checkbox_bg_disabled"] as String),
       checkboxIconCheckedInt:
-          parseColor(json["checkbox"]["icon_checked"] as String),
+          parseColor(json["colors"]["checkbox_icon_checked"] as String),
       checkboxIconDisabledInt:
-          parseColor(json["checkbox"]["icon_disabled"] as String),
+          parseColor(json["colors"]["checkbox_icon_disabled"] as String),
       checkboxTextLabelInt:
-          parseColor(json["checkbox"]["text_label"] as String),
+          parseColor(json["colors"]["checkbox_text_label"] as String),
       snackBarBackSuccessInt:
-          parseColor(json["snack_bar"]["back_success"] as String),
+          parseColor(json["colors"]["snack_bar_back_success"] as String),
       snackBarBackErrorInt:
-          parseColor(json["snack_bar"]["back_error"] as String),
-      snackBarBackInfoInt: parseColor(json["snack_bar"]["back_info"] as String),
+          parseColor(json["colors"]["snack_bar_back_error"] as String),
+      snackBarBackInfoInt:
+          parseColor(json["colors"]["snack_bar_back_info"] as String),
       snackBarTextSuccessInt:
-          parseColor(json["snack_bar"]["text_success"] as String),
+          parseColor(json["colors"]["snack_bar_text_success"] as String),
       snackBarTextErrorInt:
-          parseColor(json["snack_bar"]["text_error"] as String),
-      snackBarTextInfoInt: parseColor(json["snack_bar"]["text_info"] as String),
+          parseColor(json["colors"]["snack_bar_text_error"] as String),
+      snackBarTextInfoInt:
+          parseColor(json["colors"]["snack_bar_text_info"] as String),
       bottomNavIconBackInt:
-          parseColor(json["icons"]["bottom_nav_icon_back"] as String),
+          parseColor(json["colors"]["bottom_nav_icon_back"] as String),
       bottomNavIconIconInt:
-          parseColor(json["icons"]["bottom_nav_icon_icon"] as String),
+          parseColor(json["colors"]["bottom_nav_icon_icon"] as String),
       topNavIconPrimaryInt:
-          parseColor(json["icons"]["top_nav_icon_primary"] as String),
+          parseColor(json["colors"]["top_nav_icon_primary"] as String),
       topNavIconGreenInt:
-          parseColor(json["icons"]["top_nav_icon_green"] as String),
+          parseColor(json["colors"]["top_nav_icon_green"] as String),
       topNavIconYellowInt:
-          parseColor(json["icons"]["top_nav_icon_yellow"] as String),
-      topNavIconRedInt: parseColor(json["icons"]["top_nav_icon_red"] as String),
+          parseColor(json["colors"]["top_nav_icon_yellow"] as String),
+      topNavIconRedInt:
+          parseColor(json["colors"]["top_nav_icon_red"] as String),
       settingsIconBackInt:
-          parseColor(json["icons"]["settings_icon_back"] as String),
+          parseColor(json["colors"]["settings_icon_back"] as String),
       settingsIconIconInt:
-          parseColor(json["icons"]["settings_icon_icon"] as String),
+          parseColor(json["colors"]["settings_icon_icon"] as String),
       settingsIconBack2Int:
-          parseColor(json["icons"]["settings_icon_back_two"] as String),
+          parseColor(json["colors"]["settings_icon_back_two"] as String),
       settingsIconElementInt:
-          parseColor(json["icons"]["settings_icon_element"] as String),
+          parseColor(json["colors"]["settings_icon_element"] as String),
       textFieldActiveBGInt:
-          parseColor(json["text_field"]["active_bg"] as String),
+          parseColor(json["colors"]["text_field_active_bg"] as String),
       textFieldDefaultBGInt:
-          parseColor(json["text_field"]["default_bg"] as String),
-      textFieldErrorBGInt: parseColor(json["text_field"]["error_bg"] as String),
+          parseColor(json["colors"]["text_field_default_bg"] as String),
+      textFieldErrorBGInt:
+          parseColor(json["colors"]["text_field_error_bg"] as String),
       textFieldSuccessBGInt:
-          parseColor(json["text_field"]["success_bg"] as String),
+          parseColor(json["colors"]["text_field_success_bg"] as String),
       textFieldErrorBorderInt:
-          parseColor(json["text_field"]["error_border"] as String),
+          parseColor(json["colors"]["text_field_error_border"] as String),
       textFieldSuccessBorderInt:
-          parseColor(json["text_field"]["success_border"] as String),
-      textFieldActiveSearchIconLeftInt:
-          parseColor(json["text_field"]["active_search_icon_left"] as String),
-      textFieldDefaultSearchIconLeftInt:
-          parseColor(json["text_field"]["default_search_icon_left"] as String),
-      textFieldErrorSearchIconLeftInt:
-          parseColor(json["text_field"]["error_search_icon_left"] as String),
-      textFieldSuccessSearchIconLeftInt:
-          parseColor(json["text_field"]["success_search_icon_left"] as String),
+          parseColor(json["colors"]["text_field_success_border"] as String),
+      textFieldActiveSearchIconLeftInt: parseColor(
+          json["colors"]["text_field_active_search_icon_left"] as String),
+      textFieldDefaultSearchIconLeftInt: parseColor(
+          json["colors"]["text_field_default_search_icon_left"] as String),
+      textFieldErrorSearchIconLeftInt: parseColor(
+          json["colors"]["text_field_error_search_icon_left"] as String),
+      textFieldSuccessSearchIconLeftInt: parseColor(
+          json["colors"]["text_field_success_search_icon_left"] as String),
       textFieldActiveTextInt:
-          parseColor(json["text_field"]["active_text"] as String),
+          parseColor(json["colors"]["text_field_active_text"] as String),
       textFieldDefaultTextInt:
-          parseColor(json["text_field"]["default_text"] as String),
+          parseColor(json["colors"]["text_field_default_text"] as String),
       textFieldErrorTextInt:
-          parseColor(json["text_field"]["error_text"] as String),
+          parseColor(json["colors"]["text_field_error_text"] as String),
       textFieldSuccessTextInt:
-          parseColor(json["text_field"]["success_text"] as String),
+          parseColor(json["colors"]["text_field_success_text"] as String),
       textFieldActiveLabelInt:
-          parseColor(json["text_field"]["active_label"] as String),
+          parseColor(json["colors"]["text_field_active_label"] as String),
       textFieldErrorLabelInt:
-          parseColor(json["text_field"]["error_label"] as String),
+          parseColor(json["colors"]["text_field_error_label"] as String),
       textFieldSuccessLabelInt:
-          parseColor(json["text_field"]["success_label"] as String),
-      textFieldActiveSearchIconRightInt:
-          parseColor(json["text_field"]["active_search_icon_right"] as String),
-      textFieldDefaultSearchIconRightInt:
-          parseColor(json["text_field"]["default_search_icon_right"] as String),
-      textFieldErrorSearchIconRightInt:
-          parseColor(json["text_field"]["error_search_icon_right"] as String),
-      textFieldSuccessSearchIconRightInt:
-          parseColor(json["text_field"]["success_search_icon_right"] as String),
-      settingsItem2ActiveBGInt:
-          parseColor(json["settings_item_level_two"]["active_bg"] as String),
-      settingsItem2ActiveTextInt:
-          parseColor(json["settings_item_level_two"]["active_text"] as String),
-      settingsItem2ActiveSubInt:
-          parseColor(json["settings_item_level_two"]["active_sub"] as String),
+          parseColor(json["colors"]["text_field_success_label"] as String),
+      textFieldActiveSearchIconRightInt: parseColor(
+          json["colors"]["text_field_active_search_icon_right"] as String),
+      textFieldDefaultSearchIconRightInt: parseColor(
+          json["colors"]["text_field_default_search_icon_right"] as String),
+      textFieldErrorSearchIconRightInt: parseColor(
+          json["colors"]["text_field_error_search_icon_right"] as String),
+      textFieldSuccessSearchIconRightInt: parseColor(
+          json["colors"]["text_field_success_search_icon_right"] as String),
+      settingsItem2ActiveBGInt: parseColor(
+          json["colors"]["settings_item_level_two_active_bg"] as String),
+      settingsItem2ActiveTextInt: parseColor(
+          json["colors"]["settings_item_level_two_active_text"] as String),
+      settingsItem2ActiveSubInt: parseColor(
+          json["colors"]["settings_item_level_two_active_sub"] as String),
       radioButtonIconBorderInt:
-          parseColor(json["radio_button"]["icon_border"] as String),
-      radioButtonIconBorderDisabledInt:
-          parseColor(json["radio_button"]["icon_border_disabled"] as String),
+          parseColor(json["colors"]["radio_button_icon_border"] as String),
+      radioButtonIconBorderDisabledInt: parseColor(
+          json["colors"]["radio_button_icon_border_disabled"] as String),
       radioButtonBorderEnabledInt:
-          parseColor(json["radio_button"]["border_enabled"] as String),
+          parseColor(json["colors"]["radio_button_border_enabled"] as String),
       radioButtonBorderDisabledInt:
-          parseColor(json["radio_button"]["border_disabled"] as String),
+          parseColor(json["colors"]["radio_button_border_disabled"] as String),
       radioButtonIconCircleInt:
-          parseColor(json["radio_button"]["icon_circle"] as String),
+          parseColor(json["colors"]["radio_button_icon_circle"] as String),
       radioButtonIconEnabledInt:
-          parseColor(json["radio_button"]["icon_circle"] as String),
+          parseColor(json["colors"]["radio_button_icon_enabled"] as String),
       radioButtonTextEnabledInt:
-          parseColor(json["radio_button"]["text_enabled"] as String),
+          parseColor(json["colors"]["radio_button_text_enabled"] as String),
       radioButtonTextDisabledInt:
-          parseColor(json["radio_button"]["text_disabled"] as String),
+          parseColor(json["colors"]["radio_button_text_disabled"] as String),
       radioButtonLabelEnabledInt:
-          parseColor(json["radio_button"]["label_enabled"] as String),
+          parseColor(json["colors"]["radio_button_label_enabled"] as String),
       radioButtonLabelDisabledInt:
-          parseColor(json["radio_button"]["label_disabled"] as String),
-      infoItemBGInt: parseColor(json["info_text"]["item_bg"] as String),
-      infoItemLabelInt: parseColor(json["info_text"]["item_label"] as String),
-      infoItemTextInt: parseColor(json["info_text"]["item_text"] as String),
-      infoItemIconsInt: parseColor(json["info_text"]["item_icons"] as String),
-      popupBGInt: parseColor(json["popup_bg"] as String),
+          parseColor(json["colors"]["radio_button_label_disabled"] as String),
+      infoItemBGInt: parseColor(json["colors"]["info_item_bg"] as String),
+      infoItemLabelInt: parseColor(json["colors"]["info_item_label"] as String),
+      infoItemTextInt: parseColor(json["colors"]["info_item_text"] as String),
+      infoItemIconsInt: parseColor(json["colors"]["info_item_icons"] as String),
+      popupBGInt: parseColor(json["colors"]["popup_bg"] as String),
       currencyListItemBGInt:
-          parseColor(json["currency_list_item_bg"] as String),
-      stackWalletBGInt: parseColor(json["bottom_nav"]["sw_bg"] as String),
-      stackWalletMidInt: parseColor(json["bottom_nav"]["sw_mid"] as String),
-      stackWalletBottomInt:
-          parseColor(json["bottom_nav"]["sw_bottom"] as String),
-      bottomNavShadowInt: parseColor(json["bottom_nav"]["shadow"] as String),
-      splashInt: parseColor(json["bottom_nav"]["splash"] as String),
-      highlightInt: parseColor(json["bottom_nav"]["highlight"] as String),
+          parseColor(json["colors"]["currency_list_item_bg"] as String),
+      stackWalletBGInt: parseColor(json["colors"]["sw_bg"] as String),
+      stackWalletMidInt: parseColor(json["colors"]["sw_mid"] as String),
+      stackWalletBottomInt: parseColor(json["colors"]["sw_bottom"] as String),
+      bottomNavShadowInt:
+          parseColor(json["colors"]["bottom_nav_shadow"] as String),
+      splashInt: parseColor(json["colors"]["splash"] as String),
+      highlightInt: parseColor(json["colors"]["highlight"] as String),
       warningForegroundInt:
-          parseColor(json["bottom_nav"]["warning_foreground"] as String),
+          parseColor(json["colors"]["warning_foreground"] as String),
       warningBackgroundInt:
-          parseColor(json["bottom_nav"]["warning_background"] as String),
-      loadingOverlayTextColorInt: parseColor(
-          json["bottom_nav"]["loading_overlay_text_color"] as String),
+          parseColor(json["colors"]["warning_background"] as String),
+      loadingOverlayTextColorInt:
+          parseColor(json["colors"]["loading_overlay_text_color"] as String),
       myStackContactIconBGInt:
-          parseColor(json["bottom_nav"]["my_stack_contact_icon_bg"] as String),
+          parseColor(json["colors"]["my_stack_contact_icon_bg"] as String),
       textConfirmTotalAmountInt:
-          parseColor(json["bottom_nav"]["text_confirm_total_amount"] as String),
+          parseColor(json["colors"]["text_confirm_total_amount"] as String),
       textSelectedWordTableItemInt: parseColor(
-          json["bottom_nav"]["text_selected_word_table_iterm"] as String),
+          json["colors"]["text_selected_word_table_iterm"] as String),
       favoriteStarActiveInt:
-          parseColor(json["favorite_star"]["active"] as String),
+          parseColor(json["colors"]["favorite_star_active"] as String),
       favoriteStarInactiveInt:
-          parseColor(json["favorite_star"]["inactive"] as String),
+          parseColor(json["colors"]["favorite_star_inactive"] as String),
       rateTypeToggleColorOnInt:
-          parseColor(json["rate_type_toggle"]["color_on"] as String),
+          parseColor(json["colors"]["rate_type_toggle_color_on"] as String),
       rateTypeToggleColorOffInt:
-          parseColor(json["rate_type_toggle"]["color_off"] as String),
-      rateTypeToggleDesktopColorOnInt:
-          parseColor(json["rate_type_toggle"]["desktop_color_on"] as String),
-      rateTypeToggleDesktopColorOffInt:
-          parseColor(json["rate_type_toggle"]["desktop_color_off"] as String),
-      ethTagTextInt: parseColor(json["token_view"]["eth_tag_text"] as String),
-      ethTagBGInt: parseColor(json["token_view"]["eth_tag_bg"] as String),
+          parseColor(json["colors"]["rate_type_toggle_color_off"] as String),
+      rateTypeToggleDesktopColorOnInt: parseColor(
+          json["colors"]["rate_type_toggle_desktop_color_on"] as String),
+      rateTypeToggleDesktopColorOffInt: parseColor(
+          json["colors"]["rate_type_toggle_desktop_color_off"] as String),
+      ethTagTextInt: parseColor(json["colors"]["eth_tag_text"] as String),
+      ethTagBGInt: parseColor(json["colors"]["eth_tag_bg"] as String),
       ethWalletTagTextInt:
-          parseColor(json["token_view"]["eth_wallet_tag_text"] as String),
+          parseColor(json["colors"]["eth_wallet_tag_text"] as String),
       ethWalletTagBGInt:
-          parseColor(json["token_view"]["eth_wallet_tag_bg"] as String),
-      tokenSummaryTextPrimaryInt: parseColor(
-          json["token_view"]["token_summary_text_primary"] as String),
-      tokenSummaryTextSecondaryInt: parseColor(
-          json["token_view"]["token_summary_text_secondary"] as String),
+          parseColor(json["colors"]["eth_wallet_tag_bg"] as String),
+      tokenSummaryTextPrimaryInt:
+          parseColor(json["colors"]["token_summary_text_primary"] as String),
+      tokenSummaryTextSecondaryInt:
+          parseColor(json["colors"]["token_summary_text_secondary"] as String),
       tokenSummaryBGInt:
-          parseColor(json["token_view"]["token_summary_bg"] as String),
+          parseColor(json["colors"]["token_summary_bg"] as String),
       tokenSummaryButtonBGInt:
-          parseColor(json["token_view"]["token_summary_button_bg"] as String),
+          parseColor(json["colors"]["token_summary_button_bg"] as String),
       tokenSummaryIconInt:
-          parseColor(json["token_view"]["token_summary_icon"] as String),
+          parseColor(json["colors"]["token_summary_icon"] as String),
     );
   }
 
diff --git a/lib/themes/chan.dart b/lib/themes/chan.dart
new file mode 100644
index 000000000..8113015e5
--- /dev/null
+++ b/lib/themes/chan.dart
@@ -0,0 +1,221 @@
+final Map<String, dynamic> darkJson = {
+  "name": "Chan",
+  "asset_bundle_url": "",
+  "brightness": "light",
+  "colors": {
+    "coin": {
+      "bitcoin": "0xFFFCC17B",
+      "litecoin": "0xFF7FA6E1",
+      "bitcoincash": "0xFF7BCFB8",
+      "firo": "0xFFFF897A",
+      "dogecoin": "0xFFFFE079",
+      "epicCash": "0xFFC5C7CB",
+      "ethereum": "0xFFA7ADE9",
+      "monero": "0xFFFF9E6B",
+      "namecoin": "0xFF91B1E1",
+      "wownero": "0xFFED80C1",
+      "particl": "0xFF8175BD"
+    },
+    "background": "0xFFF7F7F7",
+    "background_app_bar": "0xFFF7F7F7",
+    "overlay": "0xFF111215",
+    "accent_color_blue": "0xFF0052DF",
+    "accent_color_green": "0xFF4CC0A0",
+    "accent_color_yellow": "0xFFF7D65D",
+    "accent_color_red": "0xFFD34E50",
+    "accent_color_orange": "0xFFFEA68D",
+    "accent_color_dark": "0xFF232323",
+    "shadow": "0x0F2D3132",
+    "text_dark_one": "0xFF232323",
+    "text_dark_two": "0xFF414141",
+    "text_dark_three": "0xFF747778",
+    "text_white": "0xFFFFFFFF",
+    "text_favorite": "0xFF232323",
+    "text_error": "0xFF930006",
+    "text_restore": "0xFF111215",
+    "text_subtitle_one": "0xFF8E9192",
+    "text_subtitle_two": "0xFFA9ACAC",
+    "text_subtitle_three": "0xFFC4C7C7",
+    "text_subtitle_four": "0xFFE0E3E3",
+    "text_subtitle_five": "0xFFEEEFF1",
+    "text_subtitle_six": "0xFFF5F5F5",
+    "button_back_primary": "0xFF232323",
+    "button_back_secondary": "0xFFE0E3E3",
+    "button_back_primary_disabled": "0xFFD7D7D7",
+    "button_back_secondary_disabled": "0xFFF0F1F1",
+    "button_back_border": "0xFF232323",
+    "button_back_border_disabled": "0xFFB6B6B6",
+    "button_back_border_secondary": "0xFFE0E3E3",
+    "button_back_border_secondary_disabled": "0xFFF0F1F1",
+    "number_back_default": "0xFFFFFFFF",
+    "numpad_back_default": "0xFFFFFFFF",
+    "button_nav_back": "0xFF232323",
+    "button_text_primary": "0xFFFFFFFF",
+    "button_text_secondary": "0xFF232323",
+    "button_text_primary_disabled": "0xFFF8F8F8",
+    "button_text_secondary_disabled": "0xFFB7B7B7",
+    "button_text_border": "0xFF232323",
+    "button_text_disabled": "0xFFB6B6B6",
+    "button_text_borderless": "0xFF0052DF",
+    "button_text_borderless_disabled": "0xFFB6B6B6",
+    "number_text_default": "0xFF232323",
+    "numpad_text_default": "0xFFFFFFFF",
+    "bottom_nav_text": "0xFF232323",
+    "custom_text_button_enabled_text": "0xFF0052DF",
+    "custom_text_button_disabled_text": "0xFF8E9192",
+    "switch_bg_on": "0xFF0052DF",
+    "switch_bg_off": "0xFFD8E4FB",
+    "switch_bg_disabled": "0xFFC5C6C9",
+    "switch_circle_on": "0xFFDAE2FF",
+    "switch_circle_off": "0xFFFBFCFF",
+    "switch_circle_disabled": "0xFFFBFCFF",
+    "step_indicator_bg_check": "0xFFD9E2FF",
+    "step_indicator_bg_number": "0xFFD9E2FF",
+    "step_indicator_bg_inactive": "0xFFCDCDCD",
+    "step_indicator_bg_lines": "0xFF0056D2",
+    "step_indicator_bg_lines_inactive": "0xFFCDCDCD",
+    "step_indicator_icon_text": "0xFF0056D2",
+    "step_indicator_icon_number": "0xFF0056D2",
+    "step_indicator_icon_inactive": "0xFFF7F7F7",
+    "checkbox_bg_checked": "0xFF0056D2",
+    "checkbox_border_empty": "0xFF8E9192",
+    "checkbox_bg_disabled": "0xFFADC7EC",
+    "checkbox_icon_checked": "0xFFFFFFFF",
+    "checkbox_icon_disabled": "0xFFFFFFFF",
+    "checkbox_text_label": "0xFF232323",
+    "snack_bar_back_success": "0xFFB9E9D4",
+    "snack_bar_back_error": "0xFFFFDAD4",
+    "snack_bar_back_info": "0xFFDAE2FF",
+    "snack_bar_text_success": "0xFF006C4D",
+    "snack_bar_text_error": "0xFF930006",
+    "snack_bar_text_info": "0xFF002A78",
+    "bottom_nav_icon_back": "0xFFA2A2A2",
+    "bottom_nav_icon_icon": "0xFF232323",
+    "top_nav_icon_primary": "0xFF232323",
+    "top_nav_icon_green": "0xFF00A578",
+    "top_nav_icon_yellow": "0xFFF4C517",
+    "top_nav_icon_red": "0xFFC00205",
+    "settings_icon_back": "0xFFE0E3E3",
+    "settings_icon_icon": "0xFF232323",
+    "settings_icon_back_two": "0xFF94D6C4",
+    "settings_icon_element": "0xFF00A578",
+    "text_field_active_bg": "0xFFEEEFF1",
+    "text_field_default_bg": "0xFFEEEFF1",
+    "text_field_error_bg": "0xFFFFDAD4",
+    "text_field_success_bg": "0xFFB9E9D4",
+    "text_field_error_border": "0xFFFFDAD4",
+    "text_field_success_border": "0xFFB9E9D4",
+    "text_field_active_search_icon_left": "0xFFA9ACAC",
+    "text_field_default_search_icon_left": "0xFFA9ACAC",
+    "text_field_error_search_icon_left": "0xFF930006",
+    "text_field_success_search_icon_left": "0xFF006C4D",
+    "text_field_active_text": "0xFF232323",
+    "text_field_default_text": "0xFFA9ACAC",
+    "text_field_error_text": "0xFF000000",
+    "text_field_success_text": "0xFF000000",
+    "text_field_active_label": "0xFFA9ACAC",
+    "text_field_error_label": "0xFF930006",
+    "text_field_success_label": "0xFF006C4D",
+    "text_field_active_search_icon_right": "0xFF747778",
+    "text_field_default_search_icon_right": "0xFF747778",
+    "text_field_error_search_icon_right": "0xFF930006",
+    "text_field_success_search_icon_right": "0xFF006C4D",
+    "settings_item_level_two_active_bg": "0xFFFFFFFF",
+    "settings_item_level_two_active_text": "0xFF232323",
+    "settings_item_level_two_active_sub": "0xFF8E9192",
+    "radio_button_icon_border": "0xFF0056D2",
+    "radio_button_icon_border_disabled": "0xFF8F909A",
+    "radio_button_border_enabled": "0xFF0056D2",
+    "radio_button_border_disabled": "0xFF8F909A",
+    "radio_button_icon_circle": "0xFF0056D2",
+    "radio_button_icon_enabled": "0xFF0056D2",
+    "radio_button_text_enabled": "0xFF44464E",
+    "radio_button_text_disabled": "0xFF44464E",
+    "radio_button_label_enabled": "0xFF8E9192",
+    "radio_button_label_disabled": "0xFF8E9192",
+    "info_item_bg": "0xFFFFFFFF",
+    "info_item_label": "0xFF8E9192",
+    "info_item_text": "0xFF232323",
+    "info_item_icons": "0xFF0056D2",
+    "popup_bg": "0xFFFFFFFF",
+    "currency_list_item_bg": "0xFFF9F9FC",
+    "sw_bg": "0xFFFFFFFF",
+    "sw_mid": "0xFFFFFFFF",
+    "sw_bottom": "0xFF232323",
+    "bottom_nav_shadow": "0xFF282E33",
+    "favorite_star_active": "0xFF0056D2",
+    "favorite_star_inactive": "0xFFC4C7C7",
+    "splash": "0x358E9192",
+    "highlight": "0x44A9ACAC",
+    "warning_foreground": "0xFF232323",
+    "warning_background": "0xFFFFDAD3",
+    "loading_overlay_text_color": "0xFFF7F7F7",
+    "my_stack_contact_icon_bg": "0xFFEEEFF1",
+    "text_confirm_total_amount": "0xFF232323",
+    "text_selected_word_table_iterm": "0xFF232323",
+    "rate_type_toggle_color_on": "0xFFEEEFF1",
+    "rate_type_toggle_color_off": "0xFFFFFFFF",
+    "rate_type_toggle_desktop_color_on": "0xFFEEEFF1",
+    "rate_type_toggle_desktop_color_off": "0xFFE0E3E3",
+    "eth_tag_text": "0xFFFFFFFF",
+    "eth_tag_bg": "0xFF4D5798",
+    "eth_wallet_tag_text": "0xFF4D5798",
+    "eth_wallet_tag_bg": "0xFFF0F3FD",
+    "token_summary_text_primary": "0xFF232323",
+    "token_summary_text_secondary": "0xFF8488AB",
+    "token_summary_bg": "0xFFE9EAFF",
+    "token_summary_button_bg": "0xFFFFFFFF",
+    "token_summary_icon": "0xFF424A97",
+    "box_shadows": {
+      "standard": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      },
+      "home_view_button_bar": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      }
+    },
+  },
+  "assets": {
+    "background": "",
+    "bitcoin": "svg/coin_icons/small/Bitcoin.svg",
+    "litecoin": "svg/coin_icons/small/Litecoin.svg",
+    "bitcoincash": "svg/coin_icons/small/Bitcoincash.svg",
+    "dogecoin": "svg/coin_icons/small/Dogecoin.svg",
+    "epicCash": "svg/coin_icons/small/EpicCash.svg",
+    "ethereum": "svg/coin_icons/small/Ethereum.svg",
+    "firo": "svg/coin_icons/small/Firo.svg",
+    "monero": "svg/coin_icons/small/Monero.svg",
+    "wownero": "svg/coin_icons/small/Wownero.svg",
+    "namecoin": "svg/coin_icons/small/Namecoin.svg",
+    "particl": "svg/coin_icons/small/Particl.svg",
+    "bitcoin_image": "svg/coin_icons/big/bitcoin.svg",
+    "litecoin_image": "svg/coin_icons/big/litecoin.svg",
+    "bitcoincash_image": "svg/coin_icons/big/bitcoincash.svg",
+    "dogecoin_image": "svg/coin_icons/big/doge.svg",
+    "epicCash_image": "svg/coin_icons/big/epic-cash.svg",
+    "ethereum_image": "svg/coin_icons/big/ethereum.svg",
+    "firo_image": "svg/coin_icons/big/firo.svg",
+    "monero_image": "svg/coin_icons/big/monero.svg",
+    "wownero_image": "svg/coin_icons/big/wownero.svg",
+    "namecoin_image": "svg/coin_icons/big/namecoin.svg",
+    "particl_image": "svg/coin_icons/big/particl.svg",
+    "bell_new": "svg/bell-new.svg",
+    "persona_incognito": "svg/persona-incognito-1.svg",
+    "persona_easy": "svg/persona-easy-1.svg",
+    "stack": "svg/stack.svg",
+    "stack_icon": "svg/stack-icon1.svg",
+    "receive": "svg/tx-icon-receive.svg",
+    "receive_pending": "svg/tx-icon-receive-pending.svg",
+    "receive_cancelled": "svg/tx-icon-receive-failed.svg",
+    "send": "svg/tx-icon-send.svg",
+    "send_pending": "svg/tx-icon-send-pending.svg",
+    "send_cancelled": "svg/tx-icon-send-failed.svg",
+    "theme_preview": "svg/chanstheme.svg",
+    "chan_persona_easy": "chan-persona-easy.png",
+    "chan_persona_incognito": "chan-persona-incognito.png",
+  }
+};
diff --git a/lib/themes/defaults/dark.dart b/lib/themes/defaults/dark.dart
index c52dcc694..98a26bda0 100644
--- a/lib/themes/defaults/dark.dart
+++ b/lib/themes/defaults/dark.dart
@@ -14,103 +14,81 @@ final Map<String, dynamic> darkJson = {
       "monero": "0xFFFF9E6B",
       "namecoin": "0xFF91B1E1",
       "wownero": "0xFFED80C1",
-      "particl": "0xFF8175BD"
+      "particl": "0xFF8175BD",
     },
-    "background": {
-      "background": "0xFF2A2D34",
-      "backgroundAppBar": "0xFF2A2D34"
-    },
-    "accent": {
-      "blue": "0xFF4C86E9",
-      "green": "0xFF4CC0A0",
-      "yellow": "0xFFF7D65D",
-      "red": "0xFFD34E50",
-      "orange": "0xFFFEA68D",
-      "dark": "0xFFF3F3F3"
-    },
-    "text": {
-      "dark_one": "0xFFF3F3F3",
-      "dark_two": "0xFFDBDBDB",
-      "dark_three": "0xFFEEEFF1",
-      "white": "0xFF232323",
-      "favorite": "0xFF232323",
-      "error": "0xFFF37475",
-      "restore": "0xFF111215"
-    },
-    "button_text": {
-      "primary": "0xFFFFFFFF",
-      "secondary": "0xFFFFFFFF",
-      "primary_disabled": "0xFFFFFFFF",
-      "secondary_disabled": "0xFF6A6C71",
-      "border": "0xFF4C86E9",
-      "disabled": "0xFF314265",
-      "borderless": "0xFF4C86E9",
-      "borderless_disabled": "0xFFB6B6B6"
-    },
-    "switch": {
-      "bg_on": "0xFF4C86E9",
-      "bg_off": "0xFFC1D9FF",
-      "bg_disabled": "0xFFB5B7BA",
-      "circle_on": "0xFFC9DDFF",
-      "circle_off": "0xFFFFFFFF",
-      "circle_disabled": "0xFFFFFFFF"
-    },
-    "button_back_colors": {
-      "primary": "0xFF4C86E9",
-      "secondary": "0xFF444E5C",
-      "primary_disabled": "0xFF38517C",
-      "secondary_disabled": "0xFF3B3F46",
-      "border": "0xFF4C86E9",
-      "border_disabled": "0xFF314265",
-      "border_secondary": "0xFF444E5C",
-      "border_secondary_disabled": "0xFF3B3F46",
-      "number": "0xFF484B51",
-      "numpad": "0xFF4C86E9",
-      "nav": "0xFF3E4148",
-    },
-  },
-  "overlay": "0xFF111215",
-  "shadow": "0x0F2D3132",
-  "text_subtitles": {
-    "subtitle_one": "0xFF9E9E9E",
-    "subtitle_two": "0xFF969696",
-    "subtitle_three": "0xFFA9ACAC",
-    "subtitle_four": "0xFF8E9192",
-    "subtitle_five": "0xFF747778",
-    "subtitle_six": "0xFF414141"
-  },
-  "number_text_default": "0xFFFFFFFF",
-  "numpad_text_default": "0xFFFFFFFF",
-  "bottom_nav_text": "0xFFFFFFFF",
-  "custom_text_button_enabled_text": "0xFF4C86E9",
-  "custom_text_button_disabled_text": "0xFF9E9E9E",
-  "step_indicator": {
-    "bg_check": "0xFF4C86E9",
-    "bg_number": "0xFF4C86E9",
-    "bg_inactive": "0xFF3B3F46",
-    "bg_lines": "0xFF4C86E9",
-    "bg_lines_inactive": "0xFF3B3F46",
-    "icon_text": "0xFFFFFFFF",
-    "icon_number": "0xFFFFFFFF",
-    "icon_inactive": "0xFF747474"
-  },
-  "checkbox": {
-    "bg_checked": "0xFF4C86E9",
-    "border_empty": "0xFF8E9192",
-    "bg_disabled": "0xFFADC7EC",
-    "icon_checked": "0xFFFFFFFF",
-    "icon_disabled": "0xFFFFFFFF",
-    "text_label": "0xFFFFFFFF"
-  },
-  "snack_bar": {
-    "back_success": "0xFF8EF5C3",
-    "back_error": "0xFFFFB4A9",
-    "back_info": "0xFFB4C4FF",
-    "text_success": "0xFF003921",
-    "text_error": "0xFF690001",
-    "text_info": "0xFF00297A"
-  },
-  "icons": {
+    "background": "0xFF2A2D34",
+    "background_app_bar": "0xFF2A2D34",
+    "overlay": "0xFF111215",
+    "accent_color_blue": "0xFF4C86E9",
+    "accent_color_green": "0xFF4CC0A0",
+    "accent_color_yellow": "0xFFF7D65D",
+    "accent_color_red": "0xFFD34E50",
+    "accent_color_orange": "0xFFFEA68D",
+    "accent_color_dark": "0xFFF3F3F3",
+    "shadow": "0x0F2D3132",
+    "text_dark_one": "0xFFF3F3F3",
+    "text_dark_two": "0xFFDBDBDB",
+    "text_dark_three": "0xFFEEEFF1",
+    "text_white": "0xFF232323",
+    "text_favorite": "0xFF232323",
+    "text_error": "0xFFF37475",
+    "text_restore": "0xFF111215",
+    "text_subtitle_one": "0xFF9E9E9E",
+    "text_subtitle_two": "0xFF969696",
+    "text_subtitle_three": "0xFFA9ACAC",
+    "text_subtitle_four": "0xFF8E9192",
+    "text_subtitle_five": "0xFF747778",
+    "text_subtitle_six": "0xFF414141",
+    "button_back_primary": "0xFF4C86E9",
+    "button_back_secondary": "0xFF444E5C",
+    "button_back_primary_disabled": "0xFF38517C",
+    "button_back_secondary_disabled": "0xFF3B3F46",
+    "button_back_border": "0xFF4C86E9",
+    "button_back_border_disabled": "0xFF314265",
+    "button_back_border_secondary": "0xFF444E5C",
+    "button_back_border_secondary_disabled": "0xFF3B3F46",
+    "number_back_default": "0xFF484B51",
+    "numpad_back_default": "0xFF4C86E9",
+    "button_nav_back": "0xFF3E4148",
+    "button_text_primary": "0xFFFFFFFF",
+    "button_text_secondary": "0xFFFFFFFF",
+    "button_text_primary_disabled": "0xFFFFFFFF",
+    "button_text_secondary_disabled": "0xFF6A6C71",
+    "button_text_border": "0xFF4C86E9",
+    "button_text_disabled": "0xFF314265",
+    "button_text_borderless": "0xFF4C86E9",
+    "button_text_borderless_disabled": "0xFFB6B6B6",
+    "number_text_default": "0xFFFFFFFF",
+    "numpad_text_default": "0xFFFFFFFF",
+    "bottom_nav_text": "0xFFFFFFFF",
+    "custom_text_button_enabled_text": "0xFF4C86E9",
+    "custom_text_button_disabled_text": "0xFF9E9E9E",
+    "switch_bg_on": "0xFF4C86E9",
+    "switch_bg_off": "0xFFC1D9FF",
+    "switch_bg_disabled": "0xFFB5B7BA",
+    "switch_circle_on": "0xFFC9DDFF",
+    "switch_circle_off": "0xFFFFFFFF",
+    "switch_circle_disabled": "0xFFFFFFFF",
+    "step_indicator_bg_check": "0xFF4C86E9",
+    "step_indicator_bg_number": "0xFF4C86E9",
+    "step_indicator_bg_inactive": "0xFF3B3F46",
+    "step_indicator_bg_lines": "0xFF4C86E9",
+    "step_indicator_bg_lines_inactive": "0xFF3B3F46",
+    "step_indicator_icon_text": "0xFFFFFFFF",
+    "step_indicator_icon_number": "0xFFFFFFFF",
+    "step_indicator_icon_inactive": "0xFF747474",
+    "checkbox_bg_checked": "0xFF4C86E9",
+    "checkbox_border_empty": "0xFF8E9192",
+    "checkbox_bg_disabled": "0xFFADC7EC",
+    "checkbox_icon_checked": "0xFFFFFFFF",
+    "checkbox_icon_disabled": "0xFFFFFFFF",
+    "checkbox_text_label": "0xFFFFFFFF",
+    "snack_bar_back_success": "0xFF8EF5C3",
+    "snack_bar_back_error": "0xFFFFB4A9",
+    "snack_bar_back_info": "0xFFB4C4FF",
+    "snack_bar_text_success": "0xFF003921",
+    "snack_bar_text_error": "0xFF690001",
+    "snack_bar_text_info": "0xFF00297A",
     "bottom_nav_icon_back": "0xFF7F8185",
     "bottom_nav_icon_icon": "0xFFFFFFFF",
     "top_nav_icon_primary": "0xFFFFFFFF",
@@ -120,61 +98,53 @@ final Map<String, dynamic> darkJson = {
     "settings_icon_back": "0xFFE0E3E3",
     "settings_icon_icon": "0xFF232323",
     "settings_icon_back_two": "0xFF94D6C4",
-    "settings_icon_element": "0xFF00A578"
-  },
-  "text_field": {
-    "active_bg": "0xFF4C5360",
-    "default_bg": "0xFF444953",
-    "error_bg": "0xFFFFB4A9",
-    "success_bg": "0xFF8EF5C3",
-    "error_border": "0xFFFFB4A9",
-    "success_border": "0xFF8EF5C3",
-    "active_search_icon_left": "0xFFA9ACAC",
-    "default_search_icon_left": "0xFFA9ACAC",
-    "error_search_icon_left": "0xFF690001",
-    "success_search_icon_left": "0xFF003921",
-    "active_text": "0xFFFFFFFF",
-    "default_text": "0xFFA9ACAC",
-    "error_text": "0xFF000000",
-    "success_text": "0xFF000000",
-    "active_label": "0xFFA9ACAC",
-    "error_label": "0xFF690001",
-    "success_label": "0xFF003921",
-    "active_search_icon_right": "0xFFC4C7C7",
-    "default_search_icon_right": "0xFF747778",
-    "error_search_icon_right": "0xFF690001",
-    "success_search_icon_right": "0xFF003921"
-  },
-  "settings_item_level_two": {
-    "active_bg": "0xFF484B51",
-    "active_text": "0xFFFFFFFF",
-    "active_sub": "0xFF9E9E9E"
-  },
-  "radio_button": {
-    "icon_border": "0xFF4C86E9",
-    "icon_border_disabled": "0xFF9E9E9E",
-    "border_enabled": "0xFF4C86E9",
-    "border_disabled": "0xFFCDCDCD",
-    "icon_circle": "0xFF9E9E9E",
-    "icon_enabled": "0xFF4C86E9",
-    "text_enabled": "0xFF44464E",
-    "text_disabled": "0xFF44464E",
-    "label_enabled": "0xFF8E9192",
-    "label_disabled": "0xFF8E9192"
-  },
-  "info_text": {
-    "item_bg": "0xFF333942",
-    "item_label": "0xFF9E9E9E",
-    "item_text": "0xFFFFFFFF",
-    "item_icons": "0xFF4C86E9"
-  },
-  "popup_bg": "0xFF333942",
-  "currency_list_item_bg": "0xFF484B51",
-  "bottom_nav": {
+    "settings_icon_element": "0xFF00A578",
+    "text_field_active_bg": "0xFF4C5360",
+    "text_field_default_bg": "0xFF444953",
+    "text_field_error_bg": "0xFFFFB4A9",
+    "text_field_success_bg": "0xFF8EF5C3",
+    "text_field_error_border": "0xFFFFB4A9",
+    "text_field_success_border": "0xFF8EF5C3",
+    "text_field_active_search_icon_left": "0xFFA9ACAC",
+    "text_field_default_search_icon_left": "0xFFA9ACAC",
+    "text_field_error_search_icon_left": "0xFF690001",
+    "text_field_success_search_icon_left": "0xFF003921",
+    "text_field_active_text": "0xFFFFFFFF",
+    "text_field_default_text": "0xFFA9ACAC",
+    "text_field_error_text": "0xFF000000",
+    "text_field_success_text": "0xFF000000",
+    "text_field_active_label": "0xFFA9ACAC",
+    "text_field_error_label": "0xFF690001",
+    "text_field_success_label": "0xFF003921",
+    "text_field_active_search_icon_right": "0xFFC4C7C7",
+    "text_field_default_search_icon_right": "0xFF747778",
+    "text_field_error_search_icon_right": "0xFF690001",
+    "text_field_success_search_icon_right": "0xFF003921",
+    "settings_item_level_two_active_bg": "0xFF484B51",
+    "settings_item_level_two_active_text": "0xFFFFFFFF",
+    "settings_item_level_two_active_sub": "0xFF9E9E9E",
+    "radio_button_icon_border": "0xFF4C86E9",
+    "radio_button_icon_border_disabled": "0xFF9E9E9E",
+    "radio_button_border_enabled": "0xFF4C86E9",
+    "radio_button_border_disabled": "0xFFCDCDCD",
+    "radio_button_icon_circle": "0xFF9E9E9E",
+    "radio_button_icon_enabled": "0xFF4C86E9",
+    "radio_button_text_enabled": "0xFF44464E",
+    "radio_button_text_disabled": "0xFF44464E",
+    "radio_button_label_enabled": "0xFF8E9192",
+    "radio_button_label_disabled": "0xFF8E9192",
+    "info_item_bg": "0xFF333942",
+    "info_item_label": "0xFF9E9E9E",
+    "info_item_text": "0xFFFFFFFF",
+    "info_item_icons": "0xFF4C86E9",
+    "popup_bg": "0xFF333942",
+    "currency_list_item_bg": "0xFF484B51",
     "sw_bg": "0xFF35383D",
     "sw_mid": "0xFF292D34",
     "sw_bottom": "0xFFFFFFFF",
-    "shadow": "0xFF282E33",
+    "bottom_nav_shadow": "0xFF282E33",
+    "favorite_star_active": "0xFFF7D65D",
+    "favorite_star_inactive": "0xFF969696",
     "splash": "0x358E9192",
     "highlight": "0x44A9ACAC",
     "warning_foreground": "0xFF690001",
@@ -182,16 +152,11 @@ final Map<String, dynamic> darkJson = {
     "loading_overlay_text_color": "0xFFF7F7F7",
     "my_stack_contact_icon_bg": "0x88747778",
     "text_confirm_total_amount": "0xFF003921",
-    "text_selected_word_table_iterm": "0xFF00297A"
-  },
-  "favorite_star": {"active": "0xFFF7D65D", "inactive": "0xFF969696"},
-  "rate_type_toggle": {
-    "color_on": "0xFF444953",
-    "color_off": "0xFF333942",
-    "desktop_color_on": "0xFF444953",
-    "desktop_color_off": "0xFF444E5C"
-  },
-  "token_view": {
+    "text_selected_word_table_iterm": "0xFF00297A",
+    "rate_type_toggle_color_on": "0xFF444953",
+    "rate_type_toggle_color_off": "0xFF333942",
+    "rate_type_toggle_desktop_color_on": "0xFF444953",
+    "rate_type_toggle_desktop_color_off": "0xFF444E5C",
     "eth_tag_text": "0xFFFFFFFF",
     "eth_tag_bg": "0xFF5761A2",
     "eth_wallet_tag_text": "0xFFE7EBFF",
@@ -200,19 +165,19 @@ final Map<String, dynamic> darkJson = {
     "token_summary_text_secondary": "0xFFC9D0FF",
     "token_summary_bg": "0xFF464C73",
     "token_summary_button_bg": "0xFFC9D0FF",
-    "token_summary_icon": "0xFF252C78"
-  },
-  "box_shadows": {
-    "standard": {
-      "color": "0x0F2D3132",
-      "spread_radius": 3.0,
-      "blur_radius": 4.0
+    "token_summary_icon": "0xFF252C78",
+    "box_shadows": {
+      "standard": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      },
+      "home_view_button_bar": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      }
     },
-    "home_view_button_bar": {
-      "color": "0x0F2D3132",
-      "spread_radius": 3.0,
-      "blur_radius": 4.0
-    }
   },
   "assets": {
     "background": "",
diff --git a/lib/themes/defaults/light.dart b/lib/themes/defaults/light.dart
index ec6e4cd2f..afccd32fc 100644
--- a/lib/themes/defaults/light.dart
+++ b/lib/themes/defaults/light.dart
@@ -1,4 +1,4 @@
-final Map<String, dynamic> lightJson = {
+final Map<String, dynamic> darkJson = {
   "name": "Light",
   "asset_bundle_url": "",
   "brightness": "light",
@@ -16,101 +16,79 @@ final Map<String, dynamic> lightJson = {
       "wownero": "0xFFED80C1",
       "particl": "0xFF8175BD"
     },
-    "background": {
-      "background": "0xFFF7F7F7",
-      "backgroundAppBar": "0xFFF7F7F7"
-    },
-    "accent": {
-      "blue": "0xFF0052DF",
-      "green": "0xFF4CC0A0",
-      "yellow": "0xFFF7D65D",
-      "red": "0xFFD34E50",
-      "orange": "0xFFFEA68D",
-      "dark": "0xFF232323"
-    },
-    "text": {
-      "dark_one": "0xFF232323",
-      "dark_two": "0xFF414141",
-      "dark_three": "0xFF747778",
-      "white": "0xFFFFFFFF",
-      "favorite": "0xFF232323",
-      "error": "0xFF930006",
-      "restore": "0xFF111215"
-    },
-    "button_text": {
-      "primary": "0xFFFFFFFF",
-      "secondary": "0xFF232323",
-      "primary_disabled": "0xFFF8F8F8",
-      "secondary_disabled": "0xFFB7B7B7",
-      "border": "0xFF232323",
-      "disabled": "0xFFB6B6B6",
-      "borderless": "0xFF0052DF",
-      "borderless_disabled": "0xFFB6B6B6"
-    },
-    "switch": {
-      "bg_on": "0xFF0052DF",
-      "bg_off": "0xFFD8E4FB",
-      "bg_disabled": "0xFFC5C6C9",
-      "circle_on": "0xFFDAE2FF",
-      "circle_off": "0xFFFBFCFF",
-      "circle_disabled": "0xFFFBFCFF"
-    },
-    "button_back_colors": {
-      "primary": "0xFF232323",
-      "secondary": "0xFFE0E3E3",
-      "primary_disabled": "0xFFD7D7D7",
-      "secondary_disabled": "0xFFF0F1F1",
-      "border": "0xFF232323",
-      "border_disabled": "0xFFB6B6B6",
-      "border_secondary": "0xFFE0E3E3",
-      "border_secondary_disabled": "0xFFF0F1F1",
-      "number": "0xFFFFFFFF",
-      "numpad": "0xFF232323",
-      "nav": "0xFFFFFFFF",
-    },
-  },
-  "overlay": "0xFF111215",
-  "shadow": "0x0F2D3132",
-  "text_subtitles": {
-    "subtitle_one": "0xFF8E9192",
-    "subtitle_two": "0xFFA9ACAC",
-    "subtitle_three": "0xFFC4C7C7",
-    "subtitle_four": "0xFFE0E3E3",
-    "subtitle_five": "0xFFEEEFF1",
-    "subtitle_six": "0xFFF5F5F5"
-  },
-  "number_text_default": "0xFF232323",
-  "numpad_text_default": "0xFFFFFFFF",
-  "bottom_nav_text": "0xFF232323",
-  "custom_text_button_enabled_text": "0xFF0052DF",
-  "custom_text_button_disabled_text": "0xFF8E9192",
-  "step_indicator": {
-    "bg_check": "0xFFD9E2FF",
-    "bg_number": "0xFFD9E2FF",
-    "bg_inactive": "0xFFCDCDCD",
-    "bg_lines": "0xFF0056D2",
-    "bg_lines_inactive": "0xFFCDCDCD",
-    "icon_text": "0xFF0056D2",
-    "icon_number": "0xFF0056D2",
-    "icon_inactive": "0xFFF7F7F7"
-  },
-  "checkbox": {
-    "bg_checked": "0xFF4C86E9",
-    "border_empty": "0xFF8E9192",
-    "bg_disabled": "0xFFADC7EC",
-    "icon_checked": "0xFFFFFFFF",
-    "icon_disabled": "0xFFFFFFFF",
-    "text_label": "0xFF232323"
-  },
-  "snack_bar": {
-    "back_success": "0xFFB9E9D4",
-    "back_error": "0xFFFFDAD4",
-    "back_info": "0xFFDAE2FF",
-    "text_success": "0xFF006C4D",
+    "background": "0xFFF7F7F7",
+    "background_app_bar": "0xFFF7F7F7",
+    "overlay": "0xFF111215",
+    "accent_color_blue": "0xFF0052DF",
+    "accent_color_green": "0xFF4CC0A0",
+    "accent_color_yellow": "0xFFF7D65D",
+    "accent_color_red": "0xFFD34E50",
+    "accent_color_orange": "0xFFFEA68D",
+    "accent_color_dark": "0xFF232323",
+    "shadow": "0x0F2D3132",
+    "text_dark_one": "0xFF232323",
+    "text_dark_two": "0xFF414141",
+    "text_dark_three": "0xFF747778",
+    "text_white": "0xFFFFFFFF",
+    "text_favorite": "0xFF232323",
     "text_error": "0xFF930006",
-    "text_info": "0xFF002A78"
-  },
-  "icons": {
+    "text_restore": "0xFF111215",
+    "text_subtitle_one": "0xFF8E9192",
+    "text_subtitle_two": "0xFFA9ACAC",
+    "text_subtitle_three": "0xFFC4C7C7",
+    "text_subtitle_four": "0xFFE0E3E3",
+    "text_subtitle_five": "0xFFEEEFF1",
+    "text_subtitle_six": "0xFFF5F5F5",
+    "button_back_primary": "0xFF232323",
+    "button_back_secondary": "0xFFE0E3E3",
+    "button_back_primary_disabled": "0xFFD7D7D7",
+    "button_back_secondary_disabled": "0xFFF0F1F1",
+    "button_back_border": "0xFF232323",
+    "button_back_border_disabled": "0xFFB6B6B6",
+    "button_back_border_secondary": "0xFFE0E3E3",
+    "button_back_border_secondary_disabled": "0xFFF0F1F1",
+    "number_back_default": "0xFFFFFFFF",
+    "numpad_back_default": "0xFF232323",
+    "button_nav_back": "0xFFFFFFFF",
+    "button_text_primary": "0xFFFFFFFF",
+    "button_text_secondary": "0xFF232323",
+    "button_text_primary_disabled": "0xFFF8F8F8",
+    "button_text_secondary_disabled": "0xFFB7B7B7",
+    "button_text_border": "0xFF232323",
+    "button_text_disabled": "0xFFB6B6B6",
+    "button_text_borderless": "0xFF0052DF",
+    "button_text_borderless_disabled": "0xFFB6B6B6",
+    "number_text_default": "0xFF232323",
+    "numpad_text_default": "0xFFFFFFFF",
+    "bottom_nav_text": "0xFF232323",
+    "custom_text_button_enabled_text": "0xFF0052DF",
+    "custom_text_button_disabled_text": "0xFF8E9192",
+    "switch_bg_on": "0xFF0052DF",
+    "switch_bg_off": "0xFFD8E4FB",
+    "switch_bg_disabled": "0xFFC5C6C9",
+    "switch_circle_on": "0xFFDAE2FF",
+    "switch_circle_off": "0xFFFBFCFF",
+    "switch_circle_disabled": "0xFFFBFCFF",
+    "step_indicator_bg_check": "0xFFD9E2FF",
+    "step_indicator_bg_number": "0xFFD9E2FF",
+    "step_indicator_bg_inactive": "0xFFCDCDCD",
+    "step_indicator_bg_lines": "0xFF0056D2",
+    "step_indicator_bg_lines_inactive": "0xFFCDCDCD",
+    "step_indicator_icon_text": "0xFF0056D2",
+    "step_indicator_icon_number": "0xFF0056D2",
+    "step_indicator_icon_inactive": "0xFFF7F7F7",
+    "checkbox_bg_checked": "0xFF0056D2",
+    "checkbox_border_empty": "0xFF8E9192",
+    "checkbox_bg_disabled": "0xFFADC7EC",
+    "checkbox_icon_checked": "0xFFFFFFFF",
+    "checkbox_icon_disabled": "0xFFFFFFFF",
+    "checkbox_text_label": "0xFF232323",
+    "snack_bar_back_success": "0xFFB9E9D4",
+    "snack_bar_back_error": "0xFFFFDAD4",
+    "snack_bar_back_info": "0xFFDAE2FF",
+    "snack_bar_text_success": "0xFF006C4D",
+    "snack_bar_text_error": "0xFF930006",
+    "snack_bar_text_info": "0xFF002A78",
     "bottom_nav_icon_back": "0xFFA2A2A2",
     "bottom_nav_icon_icon": "0xFF232323",
     "top_nav_icon_primary": "0xFF232323",
@@ -120,61 +98,53 @@ final Map<String, dynamic> lightJson = {
     "settings_icon_back": "0xFFE0E3E3",
     "settings_icon_icon": "0xFF232323",
     "settings_icon_back_two": "0xFF94D6C4",
-    "settings_icon_element": "0xFF00A578"
-  },
-  "text_field": {
-    "active_bg": "0xFFEEEFF1",
-    "default_bg": "0xFFEEEFF1",
-    "error_bg": "0xFFFFDAD4",
-    "success_bg": "0xFFB9E9D4",
-    "error_border": "0xFFFFDAD4",
-    "success_border": "0xFFB9E9D4",
-    "active_search_icon_left": "0xFFA9ACAC",
-    "default_search_icon_left": "0xFFA9ACAC",
-    "error_search_icon_left": "0xFF930006",
-    "success_search_icon_left": "0xFF006C4D",
-    "active_text": "0xFF232323",
-    "default_text": "0xFFA9ACAC",
-    "error_text": "0xFF000000",
-    "success_text": "0xFF000000",
-    "active_label": "0xFFA9ACAC",
-    "error_label": "0xFF930006",
-    "success_label": "0xFF006C4D",
-    "active_search_icon_right": "0xFF747778",
-    "default_search_icon_right": "0xFF747778",
-    "error_search_icon_right": "0xFF930006",
-    "success_search_icon_right": "0xFF006C4D"
-  },
-  "settings_item_level_two": {
-    "active_bg": "0xFFFFFFFF",
-    "active_text": "0xFF232323",
-    "active_sub": "0xFF8E9192"
-  },
-  "radio_button": {
-    "icon_border": "0xFF0056D2",
-    "icon_border_disabled": "0xFF8F909A",
-    "border_enabled": "0xFF0056D2",
-    "border_disabled": "0xFF8F909A",
-    "icon_circle": "0xFF0056D2",
-    "icon_enabled": "0xFF0056D2",
-    "text_enabled": "0xFF44464E",
-    "text_disabled": "0xFF44464E",
-    "label_enabled": "0xFF8E9192",
-    "label_disabled": "0xFF8E9192"
-  },
-  "info_text": {
-    "item_bg": "0xFFFFFFFF",
-    "item_label": "0xFF8E9192",
-    "item_text": "0xFF232323",
-    "item_icons": "0xFF0056D2"
-  },
-  "popup_bg": "0xFFFFFFFF",
-  "currency_list_item_bg": "0xFFF9F9FC",
-  "bottom_nav": {
+    "settings_icon_element": "0xFF00A578",
+    "text_field_active_bg": "0xFFEEEFF1",
+    "text_field_default_bg": "0xFFEEEFF1",
+    "text_field_error_bg": "0xFFFFDAD4",
+    "text_field_success_bg": "0xFFB9E9D4",
+    "text_field_error_border": "0xFFFFDAD4",
+    "text_field_success_border": "0xFFB9E9D4",
+    "text_field_active_search_icon_left": "0xFFA9ACAC",
+    "text_field_default_search_icon_left": "0xFFA9ACAC",
+    "text_field_error_search_icon_left": "0xFF930006",
+    "text_field_success_search_icon_left": "0xFF006C4D",
+    "text_field_active_text": "0xFF232323",
+    "text_field_default_text": "0xFFA9ACAC",
+    "text_field_error_text": "0xFF000000",
+    "text_field_success_text": "0xFF000000",
+    "text_field_active_label": "0xFFA9ACAC",
+    "text_field_error_label": "0xFF930006",
+    "text_field_success_label": "0xFF006C4D",
+    "text_field_active_search_icon_right": "0xFF747778",
+    "text_field_default_search_icon_right": "0xFF747778",
+    "text_field_error_search_icon_right": "0xFF930006",
+    "text_field_success_search_icon_right": "0xFF006C4D",
+    "settings_item_level_two_active_bg": "0xFFFFFFFF",
+    "settings_item_level_two_active_text": "0xFF232323",
+    "settings_item_level_two_active_sub": "0xFF8E9192",
+    "radio_button_icon_border": "0xFF0056D2",
+    "radio_button_icon_border_disabled": "0xFF8F909A",
+    "radio_button_border_enabled": "0xFF0056D2",
+    "radio_button_border_disabled": "0xFF8F909A",
+    "radio_button_icon_circle": "0xFF0056D2",
+    "radio_button_icon_enabled": "0xFF0056D2",
+    "radio_button_text_enabled": "0xFF44464E",
+    "radio_button_text_disabled": "0xFF44464E",
+    "radio_button_label_enabled": "0xFF8E9192",
+    "radio_button_label_disabled": "0xFF8E9192",
+    "info_item_bg": "0xFFFFFFFF",
+    "info_item_label": "0xFF8E9192",
+    "info_item_text": "0xFF232323",
+    "info_item_icons": "0xFF0056D2",
+    "popup_bg": "0xFFFFFFFF",
+    "currency_list_item_bg": "0xFFF9F9FC",
     "sw_bg": "0xFFFFFFFF",
     "sw_mid": "0xFFFFFFFF",
     "sw_bottom": "0xFF232323",
-    "shadow": "0xFF282E33",
+    "bottom_nav_shadow": "0xFF282E33",
+    "favorite_star_active": "0xFF0056D2",
+    "favorite_star_inactive": "0xFFC4C7C7",
     "splash": "0x358E9192",
     "highlight": "0x44A9ACAC",
     "warning_foreground": "0xFF232323",
@@ -182,16 +152,11 @@ final Map<String, dynamic> lightJson = {
     "loading_overlay_text_color": "0xFFF7F7F7",
     "my_stack_contact_icon_bg": "0xFFEEEFF1",
     "text_confirm_total_amount": "0xFF232323",
-    "text_selected_word_table_iterm": "0xFF232323"
-  },
-  "favorite_star": {"active": "0xFF0056D2", "inactive": "0xFFC4C7C7"},
-  "rate_type_toggle": {
-    "color_on": "0xFFEEEFF1",
-    "color_off": "0xFFFFFFFF",
-    "desktop_color_on": "0xFFEEEFF1",
-    "desktop_color_off": "0xFFE0E3E3"
-  },
-  "token_view": {
+    "text_selected_word_table_iterm": "0xFF232323",
+    "rate_type_toggle_color_on": "0xFFEEEFF1",
+    "rate_type_toggle_color_off": "0xFFFFFFFF",
+    "rate_type_toggle_desktop_color_on": "0xFFEEEFF1",
+    "rate_type_toggle_desktop_color_off": "0xFFE0E3E3",
     "eth_tag_text": "0xFFFFFFFF",
     "eth_tag_bg": "0xFF4D5798",
     "eth_wallet_tag_text": "0xFF4D5798",
@@ -200,19 +165,19 @@ final Map<String, dynamic> lightJson = {
     "token_summary_text_secondary": "0xFF8488AB",
     "token_summary_bg": "0xFFE9EAFF",
     "token_summary_button_bg": "0xFFFFFFFF",
-    "token_summary_icon": "0xFF424A97"
-  },
-  "box_shadows": {
-    "standard": {
-      "color": "0x0F2D3132",
-      "spread_radius": 3.0,
-      "blur_radius": 4.0
+    "token_summary_icon": "0xFF424A97",
+    "box_shadows": {
+      "standard": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      },
+      "home_view_button_bar": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      }
     },
-    "home_view_button_bar": {
-      "color": "0x0F2D3132",
-      "spread_radius": 3.0,
-      "blur_radius": 4.0
-    }
   },
   "assets": {
     "background": "",
diff --git a/lib/themes/forest.dart b/lib/themes/forest.dart
new file mode 100644
index 000000000..db6c361e3
--- /dev/null
+++ b/lib/themes/forest.dart
@@ -0,0 +1,254 @@
+final Map<String, dynamic> darkJson = {
+  "name": "Forest",
+  "asset_bundle_url": "",
+  "brightness": "light",
+  "colors": {
+    "coin": {
+      "bitcoin": "0xFFFCC17B",
+      "litecoin": "0xFF7FA6E1",
+      "bitcoincash": "0xFF7BCFB8",
+      "firo": "0xFFFF897A",
+      "dogecoin": "0xFFFFE079",
+      "epicCash": "0xFFC5C7CB",
+      "ethereum": "0xFFA7ADE9",
+      "monero": "0xFFFF9E6B",
+      "namecoin": "0xFF91B1E1",
+      "wownero": "0xFFED80C1",
+      "particl": "0xFF8175BD"
+    },
+    "background": {
+      "background": "0xFFF3FAF5",
+      "backgroundAppBar": "0xFFF3FAF5"
+    },
+    "accent": {
+      "blue": "0xFF077CBE",
+      "green": "0xFF00A591",
+      "yellow": "0xFFF4C517",
+      "red": "0xFFD1382D",
+      "orange": "0xFFFF985F",
+      "dark": "0xFF22867A"
+    },
+    "text": {
+      "dark_one": "0xFF232323",
+      "dark_two": "0xFF333333",
+      "dark_three": "0xFF696B6C",
+      "white": "0xFFFFFFFF",
+      "favorite": "0xFF232323",
+      "error": "0xFF8D0006",
+      "restore": "0xFF111215"
+    },
+    "button_text": {
+      "primary": "0xFFFFFFFF",
+      "secondary": "0xFF232323",
+      "primary_disabled": "0xFFFFFFFF",
+      "secondary_disabled": "0xFFBDD5DB",
+      "border": "0xFFBDD5DB",
+      "disabled": "0xFF22867A",
+      "borderless": "0xFFFFFFFF",
+      "borderless_disabled": "0xFF056EC6"
+    },
+    "switch": {
+      "bg_on": "0xFF2DAB9C",
+      "bg_off": "0xFFD6F0E8",
+      "bg_disabled": "0xFFC5C6C9",
+      "circle_on": "0xFFDEFFF2",
+      "circle_off": "0xFFFBFCFF",
+      "circle_disabled": "0xFFFBFCFF"
+    },
+    "button_back_colors": {
+      "primary": "0xFF22867A",
+      "secondary": "0xFFC2E2D5",
+      "primary_disabled": "0xFFBDDBCB",
+      "secondary_disabled": "0xFFBDBDBD",
+      "border": "0xFF22867A",
+      "border_disabled": "0xFFBDD5DB",
+      "border_secondary": "0xFFC2E2D5",
+      "border_secondary_disabled": "0xFFBDBDBD",
+      "number": "0xFFFFFFFF",
+      "numpad": "0xFF22867A",
+      "nav": "0xFFFFFFFF",
+    },
+  },
+  "overlay": "0xFF111215",
+  "shadow": "0x0F2D3132",
+  "text_subtitles": {
+    "subtitle_one": "0xFF7E8284",
+    "subtitle_two": "0xFF919393",
+    "subtitle_three": "0xFFB0B2B2",
+    "subtitle_four": "0xFFD1D3D3",
+    "subtitle_five": "0xFFDEDFE1",
+    "subtitle_six": "0xFFF1F1F1"
+  },
+  "number_text_default": "0xFFFFFFFF",
+  "numpad_text_default": "0xFF22867A",
+  "bottom_nav_text": "0xFFFFFFFF",
+  "custom_text_button_enabled_text": "0xFF056EC6",
+  "custom_text_button_disabled_text": "0xFF7E8284",
+  "step_indicator": {
+    "bg_check": "0xFFBBF0DB",
+    "bg_number": "0xFFCDD9FF",
+    "bg_inactive": "0xFFD2EDE5",
+    "bg_lines": "0xFF90B8DC",
+    "bg_lines_inactive": "0xFFBCEAD9",
+    "icon_text": "0xFF22867A",
+    "icon_number": "0xFF005BAF",
+    "icon_inactive": "0xFFD4DFFF"
+  },
+  "checkbox": {
+    "bg_checked": "0xFF22867A",
+    "border_empty": "0xFF8C8F90",
+    "bg_disabled": "0xFFB0C9ED",
+    "icon_checked": "0xFFFFFFFF",
+    "icon_disabled": "0xFFFFFFFF",
+    "text_label": "0xFF232323"
+  },
+  "snack_bar": {
+    "back_success": "0xFFADD6D2",
+    "back_error": "0xFFADD6D2",
+    "back_info": "0xFFCCD7FF",
+    "text_success": "0xFF075547",
+    "text_error": "0xFF8D0006",
+    "text_info": "0xFF002569"
+  },
+  "icons": {
+    "bottom_nav_icon_back": "0xFFA7C7CF",
+    "bottom_nav_icon_icon": "0xFF22867A",
+    "top_nav_icon_primary": "0xFF227386",
+    "top_nav_icon_green": "0xFF00A591",
+    "top_nav_icon_yellow": "0xFFFDD33A",
+    "top_nav_icon_red": "0xFFEA4649",
+    "settings_icon_back": "0xFFE0E3E3",
+    "settings_icon_icon": "0xFF232323",
+    "settings_icon_back_two": "0xFF80D2C8",
+    "settings_icon_element": "0xFF00A591"
+  },
+  "text_field": {
+    "active_bg": "0xFFE3FFF3",
+    "default_bg": "0xFFDDF3EA",
+    "error_bg": "0xFFF6C7C3",
+    "success_bg": "0xFFADD6D2",
+    "error_border": "0xFFF6C7C3",
+    "success_border": "0xFFADD6D2",
+    "active_search_icon_left": "0xFF86898C",
+    "default_search_icon_left": "0xFF86898C",
+    "error_search_icon_left": "0xFF8D0006",
+    "success_search_icon_left": "0xFF006C4D",
+    "active_text": "0xFF232323",
+    "default_text": "0xFF86898C",
+    "error_text": "0xFF000000",
+    "success_text": "0xFF000000",
+    "active_label": "0xFF86898C",
+    "error_label": "0xFF8D0006",
+    "success_label": "0xFF077C6E",
+    "active_search_icon_right": "0xFF22867A",
+    "default_search_icon_right": "0xFF22867A",
+    "error_search_icon_right": "0xFF8D0006",
+    "success_search_icon_right": "0xFF077C6E"
+  },
+  "settings_item_level_two": {
+    "active_bg": "0xFFFFFFFF",
+    "active_text": "0xFF232323",
+    "active_sub": "0xFF8C8F90"
+  },
+  "radio_button": {
+    "icon_border": "0xFF056EC6",
+    "icon_border_disabled": "0xFF8C8D97",
+    "border_enabled": "0xFF056EC6",
+    "border_disabled": "0xFF8C8D97",
+    "icon_circle": "0xFF056EC6",
+    "icon_enabled": "0xFF056EC6",
+    "text_enabled": "0xFF42444B",
+    "text_disabled": "0xFF42444B",
+    "label_enabled": "0xFF8C8F90",
+    "label_disabled": "0xFF8C8F90"
+  },
+  "info_text": {
+    "item_bg": "0xFFFFFFFF",
+    "item_label": "0xFF838788",
+    "item_text": "0xFF232323",
+    "item_icons": "0xFF056EC6"
+  },
+  "popup_bg": "0xFFFFFFFF",
+  "currency_list_item_bg": "0xFFF0F5F7",
+  "bottom_nav": {
+    "sw_bg": "0xFFFFFFFF",
+    "sw_mid": "0xFFFFFFFF",
+    "sw_bottom": "0xFF232323",
+    "shadow": "0xFF388192",
+    "splash": "0xFF8E9192",
+    "highlight": "0xFFA9ACAC",
+    "warning_foreground": "0xFF232323",
+    "warning_background": "0xFFF6C7C3",
+    "loading_overlay_text_color": "0xFFF7F7F7",
+    "my_stack_contact_icon_bg": "0xFFD8E7EB",
+    "text_confirm_total_amount": "0xFF232323",
+    "text_selected_word_table_iterm": "0xFF232323"
+  },
+  "favorite_star": {"active": "0xFFF4C517", "inactive": "0xFFB0B2B2"},
+  "rate_type_toggle": {
+    "color_on": "0xFFDDF3EA",
+    "color_off": "0xFFFFFFFF",
+    "desktop_color_on": "0xFFDDF3EA",
+    "desktop_color_off": "0xFFC2E2D5"
+  },
+  "token_view": {
+    "eth_tag_text": "0xFFFFFFFF",
+    "eth_tag_bg": "0xFF4D5798",
+    "eth_wallet_tag_text": "0xFF4D5798",
+    "eth_wallet_tag_bg": "0xFFF0F3FD",
+    "token_summary_text_primary": "0xFF232323",
+    "token_summary_text_secondary": "0xFF8488AB",
+    "token_summary_bg": "0xFFE9EAFF",
+    "token_summary_button_bg": "0xFFFFFFFF",
+    "token_summary_icon": "0xFF424A97"
+  },
+  "box_shadows": {
+    "standard": {
+      "color": "0x0F2D3132",
+      "spread_radius": 3.0,
+      "blur_radius": 4.0
+    },
+    "home_view_button_bar": {
+      "color": "0x0F2D3132",
+      "spread_radius": 3.0,
+      "blur_radius": 4.0
+    }
+  },
+  "assets": {
+    "background": "",
+    "bitcoin": "svg/coin_icons/small/Bitcoin.svg",
+    "litecoin": "svg/coin_icons/small/Litecoin.svg",
+    "bitcoincash": "svg/coin_icons/small/Bitcoincash.svg",
+    "dogecoin": "svg/coin_icons/small/Dogecoin.svg",
+    "epicCash": "svg/coin_icons/small/EpicCash.svg",
+    "ethereum": "svg/coin_icons/small/Ethereum.svg",
+    "firo": "svg/coin_icons/small/Firo.svg",
+    "monero": "svg/coin_icons/small/Monero.svg",
+    "wownero": "svg/coin_icons/small/Wownero.svg",
+    "namecoin": "svg/coin_icons/small/Namecoin.svg",
+    "particl": "svg/coin_icons/small/Particl.svg",
+    "bitcoin_image": "svg/coin_icons/big/bitcoin.svg",
+    "litecoin_image": "svg/coin_icons/big/litecoin.svg",
+    "bitcoincash_image": "svg/coin_icons/big/bitcoincash.svg",
+    "dogecoin_image": "svg/coin_icons/big/doge.svg",
+    "epicCash_image": "svg/coin_icons/big/epic-cash.svg",
+    "ethereum_image": "svg/coin_icons/big/ethereum.svg",
+    "firo_image": "svg/coin_icons/big/firo.svg",
+    "monero_image": "svg/coin_icons/big/monero.svg",
+    "wownero_image": "svg/coin_icons/big/wownero.svg",
+    "namecoin_image": "svg/coin_icons/big/namecoin.svg",
+    "particl_image": "svg/coin_icons/big/particl.svg",
+    "bell_new": "svg/bell-new.svg",
+    "persona_incognito": "svg/persona-incognito-1.svg",
+    "persona_easy": "svg/persona-easy-1.svg",
+    "stack": "svg/stack.svg",
+    "stack_icon": "svg/stack-icon1.svg",
+    "receive": "svg/tx-icon-receive.svg",
+    "receive_pending": "svg/tx-icon-receive-pending.svg",
+    "receive_cancelled": "svg/tx-icon-receive-failed.svg",
+    "send": "svg/tx-icon-send.svg",
+    "send_pending": "svg/tx-icon-send-pending.svg",
+    "send_cancelled": "svg/tx-icon-send-failed.svg",
+    "theme_preview": "svg/forest-theme.svg",
+  }
+};