remove CFColors and some more dark color fixes

lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart

@@ -9,7 +9,7 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my
 import 'package:stackwallet/providers/global/wallets_service_provider.dart';
 import 'package:stackwallet/providers/ui/verify_recovery_phrase/mnemonic_word_count_state_provider.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/add_wallet_type_enum.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';

lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart

@@ -14,7 +14,7 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/services/coins/manager.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/clipboard_interface.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
@@ -148,6 +148,7 @@ class _NewWalletRecoveryPhraseViewState
                             Assets.svg.copy,
                             width: 24,
                             height: 24,
+                            color: StackTheme.instance.color.topNavIconPrimary,
                           ),
                           onPressed: () async {
                             await _copy();

lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/mnemonic_word_count_select_sheet.dart

@@ -119,9 +119,7 @@ class MnemonicWordCountSelectSheet extends ConsumerWidget {
                                 ),
                                 Text(
                                   "${lengthOptions[i]} words",
-                                  style: STextStyles.titleBold12.copyWith(
+                                  style: STextStyles.titleBold12,
-                                    color: const Color(0xFF44464E),
-                                  ),
                                   textAlign: TextAlign.left,
                                 ),
                               ],

lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_succeeded_dialog.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/widgets/stack_dialog.dart';

lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart

@@ -12,7 +12,7 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/exit_to_my
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/services/coins/manager.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
 import 'package:stackwallet/utilities/text_styles.dart';

lib/pages/address_book_views/subviews/address_book_filter_view.dart

@@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackwallet/providers/global/prefs_provider.dart';
 import 'package:stackwallet/providers/ui/address_book_providers/address_book_filter_provider.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
-import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackwallet/widgets/rounded_white_container.dart';
 

lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart

@@ -8,7 +8,7 @@ import 'package:stackwallet/providers/ui/address_book_providers/address_entry_da
 import 'package:stackwallet/utilities/address_utils.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/barcode_scanner_interface.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/clipboard_interface.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';

lib/pages/exchange_view/exchange_view.dart

@@ -1461,6 +1461,7 @@ class _ExchangeViewState extends ConsumerState<ExchangeView> {
 
                                 debugPrint("name: ${manager.walletName}");
 
+                                // TODO store tx data completely locally in isar so we don't lock up ui here when querying txData
                                 final txData = await manager.transactionData;
 
                                 final tx = txData.getAllTransactions()[txid];

lib/pages/exchange_view/wallet_initiated_exchange_view.dart

@@ -1483,17 +1483,9 @@ class _WalletInitiatedExchangeViewState
                                             },
                                           ),
                                           rightButton: TextButton(
-                                            style: Theme.of(context)
+                                            style: StackTheme.instance
-                                                .textButtonTheme
+                                                .getPrimaryEnabledButtonColor(
-                                                .style
+                                                    context),
-                                                ?.copyWith(
-                                                  backgroundColor:
-                                                      MaterialStateProperty
-                                                          .all<Color>(StackTheme
-                                                              .instance
-                                                              .color
-                                                              .accentColorDark),
-                                                ),
                                             child: Text(
                                               "Attempt",
                                               style: STextStyles.button,

lib/pages/home_view/home_view.dart

@@ -144,7 +144,6 @@ class _HomeViewState extends ConsumerState<HomeView> {
                 onTap: _hiddenOptions,
                 child: SvgPicture.asset(
                   Assets.svg.stackIcon,
-                  // color: StackTheme.instance.color.accentColorDark
                   width: 24,
                   height: 24,
                 ),

lib/pages/loading_view.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 
 class LoadingView extends StatelessWidget {

lib/pages/notification_views/notifications_view.dart

@@ -3,9 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackwallet/notifications/notification_card.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/providers/ui/unread_notifications_provider.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
-import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackwallet/widgets/rounded_white_container.dart';
 

lib/pages/send_view/confirm_transaction_view.dart

@@ -313,14 +313,7 @@ class _ConfirmTransactionViewState
                           height: 16,
                         ),
                         TextButton(
-                          style: Theme.of(context)
+                          style:  StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                              .textButtonTheme
-                              .style
-                              ?.copyWith(
-                                backgroundColor:
-                                    MaterialStateProperty.all<Color>(StackTheme
-                                        .instance.color.accentColorDark),
-                              ),
                           onPressed: () async {
                             final unlocked = await Navigator.push(
                               context,

lib/pages/send_view/send_view.dart

@@ -1492,17 +1492,9 @@ class _SendViewState extends ConsumerState<SendView> {
                                             },
                                           ),
                                           rightButton: TextButton(
-                                            style: Theme.of(context)
+                                            style: StackTheme.instance
-                                                .textButtonTheme
+                                                .getPrimaryEnabledButtonColor(
-                                                .style
+                                                    context),
-                                                ?.copyWith(
-                                                  backgroundColor:
-                                                      MaterialStateProperty
-                                                          .all<Color>(StackTheme
-                                                              .instance
-                                                              .color
-                                                              .accentColorDark),
-                                                ),
                                             child: Text(
                                               "Yes",
                                               style: STextStyles.button,

lib/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart

@@ -144,9 +144,7 @@ class _FiroBalanceSelectionSheetState
                               //   children: [
                               Text(
                                 "Private balance",
-                                style: STextStyles.titleBold12.copyWith(
+                                style: STextStyles.titleBold12,
-                                  color: const Color(0xFF44464E),
-                                ),
                                 textAlign: TextAlign.left,
                               ),
                               const SizedBox(
@@ -235,9 +233,7 @@ class _FiroBalanceSelectionSheetState
                               //   children: [
                               Text(
                                 "Public balance",
-                                style: STextStyles.titleBold12.copyWith(
+                                style: STextStyles.titleBold12,
-                                  color: const Color(0xFF44464E),
-                                ),
                                 textAlign: TextAlign.left,
                               ),
                               const SizedBox(

lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart

@@ -263,9 +263,7 @@ class _TransactionFeeSelectionSheetState
                                     children: [
                                       Text(
                                         FeeRateType.fast.prettyName,
-                                        style: STextStyles.titleBold12.copyWith(
+                                        style: STextStyles.titleBold12,
-                                          color: const Color(0xFF44464E),
-                                        ),
                                         textAlign: TextAlign.left,
                                       ),
                                       const SizedBox(
@@ -388,9 +386,7 @@ class _TransactionFeeSelectionSheetState
                                     children: [
                                       Text(
                                         FeeRateType.average.prettyName,
-                                        style: STextStyles.titleBold12.copyWith(
+                                        style: STextStyles.titleBold12,
-                                          color: const Color(0xFF44464E),
-                                        ),
                                         textAlign: TextAlign.left,
                                       ),
                                       const SizedBox(
@@ -514,9 +510,7 @@ class _TransactionFeeSelectionSheetState
                                     children: [
                                       Text(
                                         FeeRateType.slow.prettyName,
-                                        style: STextStyles.titleBold12.copyWith(
+                                        style: STextStyles.titleBold12,
-                                          color: const Color(0xFF44464E),
-                                        ),
                                         textAlign: TextAlign.left,
                                       ),
                                       const SizedBox(

lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart

@@ -140,13 +140,8 @@ class _DebugViewState extends ConsumerState<DebugView> {
                         },
                       ),
                       rightButton: TextButton(
-                        style: Theme.of(context)
+                        style: StackTheme.instance
-                            .textButtonTheme
+                            .getPrimaryEnabledButtonColor(context),
-                            .style
-                            ?.copyWith(
-                              backgroundColor: MaterialStateProperty.all<Color>(
-                                  StackTheme.instance.color.accentColorDark),
-                            ),
                         child: Text(
                           "Delete logs",
                           style: STextStyles.button,

lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart

@@ -342,17 +342,9 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
                                           onPressed: () async {
                                             Navigator.of(context).pop(true);
                                           },
-                                          style: Theme.of(context)
+                                          style: StackTheme.instance
-                                              .textButtonTheme
+                                              .getPrimaryEnabledButtonColor(
-                                              .style
+                                                  context),
-                                              ?.copyWith(
-                                                backgroundColor:
-                                                    MaterialStateProperty
-                                                        .all<Color>(StackTheme
-                                                            .instance
-                                                            .color
-                                                            .accentColorDark),
-                                              ),
                                           child: Text(
                                             "Save",
                                             style: STextStyles.button,

lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart

@@ -93,11 +93,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
             },
           ),
           rightButton: TextButton(
-            style: Theme.of(context).textButtonTheme.style?.copyWith(
+            style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                  backgroundColor: MaterialStateProperty.all<Color>(
-                    StackTheme.instance.color.accentColorDark,
-                  ),
-                ),
             child: Text(
               "Continue",
               style: STextStyles.button,
@@ -149,11 +145,7 @@ class _AutoBackupViewState extends ConsumerState<AutoBackupView> {
             },
           ),
           rightButton: TextButton(
-            style: Theme.of(context).textButtonTheme.style?.copyWith(
+            style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                  backgroundColor: MaterialStateProperty.all<Color>(
-                    StackTheme.instance.color.accentColorDark,
-                  ),
-                ),
             child: Text(
               "Disable",
               style: STextStyles.button,

lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_information_view.dart

@@ -63,13 +63,8 @@ class CreateBackupInfoView extends StatelessWidget {
                       ),
                       const Spacer(),
                       TextButton(
-                        style: Theme.of(context)
+                        style: StackTheme.instance
-                            .textButtonTheme
+                            .getPrimaryEnabledButtonColor(context),
-                            .style
-                            ?.copyWith(
-                              backgroundColor: MaterialStateProperty.all<Color>(
-                                  StackTheme.instance.color.accentColorDark),
-                            ),
                         onPressed: () {
                           Navigator.of(context)
                               .pushNamed(CreateBackupView.routeName);

lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/backup_frequency_type_select_sheet.dart

@@ -94,7 +94,7 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
                           child: Container(
                             color: Colors.transparent,
                             child: Row(
-                              crossAxisAlignment: CrossAxisAlignment.center,
+                              crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
                                 SizedBox(
                                   width: 20,
@@ -119,17 +119,17 @@ class BackupFrequencyTypeSelectSheet extends ConsumerWidget {
                                 const SizedBox(
                                   width: 12,
                                 ),
-                                Column(
+                                Flexible(
-                                  children: [
+                                  child: Column(
-                                    Text(
+                                    children: [
-                                      prettyFrequencyType(
+                                      Text(
-                                          BackupFrequencyType.values[i]),
+                                        prettyFrequencyType(
-                                      style: STextStyles.titleBold12.copyWith(
+                                            BackupFrequencyType.values[i]),
-                                        color: const Color(0xFF44464E),
+                                        style: STextStyles.titleBold12,
+                                        textAlign: TextAlign.left,
                                       ),
-                                      textAlign: TextAlign.left,
+                                    ],
-                                    ),
+                                  ),
-                                  ],
                                 ),
                               ],
                             ),

lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/recovery_phrase_view.dart

@@ -4,11 +4,10 @@ import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/notifications/show_flush_bar.dart';
 import 'package:stackwallet/pages/add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
-import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/utilities/clipboard_interface.dart';
 import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 
 class RecoverPhraseView extends StatelessWidget {

lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart

@@ -131,10 +131,7 @@ class WalletBackupView extends ConsumerWidget {
               height: 12,
             ),
             TextButton(
-              style: Theme.of(context).textButtonTheme.style?.copyWith(
+              style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                    backgroundColor: MaterialStateProperty.all<Color>(
-                        StackTheme.instance.color.accentColorDark),
-                  ),
               onPressed: () {
                 String data = AddressUtils.encodeQRSeedData(mnemonic);
 

lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_recovery_phrase_view.dart

@@ -147,10 +147,7 @@ class _DeleteWalletRecoveryPhraseViewState
               height: 16,
             ),
             TextButton(
-              style: Theme.of(context).textButtonTheme.style?.copyWith(
+              style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                    backgroundColor: MaterialStateProperty.all<Color>(
-                        StackTheme.instance.color.accentColorDark),
-                  ),
               onPressed: () {
                 showDialog<dynamic>(
                   barrierDismissible: true,
@@ -170,10 +167,8 @@ class _DeleteWalletRecoveryPhraseViewState
                       ),
                     ),
                     rightButton: TextButton(
-                      style: Theme.of(context).textButtonTheme.style?.copyWith(
+                      style: StackTheme.instance
-                            backgroundColor: MaterialStateProperty.all<Color>(
+                          .getPrimaryEnabledButtonColor(context),
-                                StackTheme.instance.color.accentColorDark),
-                          ),
                       onPressed: () async {
                         final walletId = _manager.walletId;
                         final walletsInstance =

lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart

@@ -74,10 +74,7 @@ class DeleteWalletWarningView extends ConsumerWidget {
               height: 12,
             ),
             TextButton(
-              style: Theme.of(context).textButtonTheme.style?.copyWith(
+              style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                    backgroundColor: MaterialStateProperty.all<Color>(
-                        StackTheme.instance.color.accentColorDark),
-                  ),
               onPressed: () async {
                 final manager = ref
                     .read(walletsChangeNotifierProvider)

lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart

@@ -106,10 +106,7 @@ class _RenameWalletViewState extends ConsumerState<RenameWalletView> {
             ),
             const Spacer(),
             TextButton(
-              style: Theme.of(context).textButtonTheme.style?.copyWith(
+              style: StackTheme.instance.getPrimaryEnabledButtonColor(context),
-                    backgroundColor: MaterialStateProperty.all<Color>(
-                        StackTheme.instance.color.accentColorDark),
-                  ),
               onPressed: () async {
                 final newName = _controller.text;
                 final success = await ref

lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart

@@ -114,14 +114,8 @@ class WalletSettingsWalletSettingsView extends ConsumerWidget {
                           ),
                         ),
                         rightButton: TextButton(
-                          style: Theme.of(context)
+                          style: StackTheme.instance
-                              .textButtonTheme
+                              .getPrimaryEnabledButtonColor(context),
-                              .style
-                              ?.copyWith(
-                                backgroundColor:
-                                    MaterialStateProperty.all<Color>(StackTheme
-                                        .instance.color.accentColorDark),
-                              ),
                           onPressed: () {
                             Navigator.pop(context);
                             Navigator.push(

lib/pages/wallet_view/transaction_views/edit_note_view.dart

@@ -129,14 +129,8 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
                               Navigator.of(context).pop();
                             }
                           },
-                          style: Theme.of(context)
+                          style: StackTheme.instance
-                              .textButtonTheme
+                              .getPrimaryEnabledButtonColor(context),
-                              .style
-                              ?.copyWith(
-                                backgroundColor:
-                                    MaterialStateProperty.all<Color>(StackTheme
-                                        .instance.color.accentColorDark),
-                              ),
                           child: Text(
                             "Save",
                             style: STextStyles.button,

lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart

@@ -695,15 +695,8 @@ class _TransactionSearchViewState
                             child: SizedBox(
                               height: 48,
                               child: TextButton(
-                                style: Theme.of(context)
+                                style: StackTheme.instance
-                                    .textButtonTheme
+                                    .getPrimaryEnabledButtonColor(context),
-                                    .style
-                                    ?.copyWith(
-                                      backgroundColor:
-                                          MaterialStateProperty.all<Color>(
-                                              StackTheme.instance.color
-                                                  .accentColorDark),
-                                    ),
                                 onPressed: () async {
                                   _onApplyPressed();
                                 },

lib/pages/wallet_view/wallet_view.dart

@@ -568,15 +568,8 @@ class _WalletViewState extends ConsumerState<WalletView> {
 
                                       unawaited(attemptAnonymize());
                                     },
-                                    style: Theme.of(context)
+                                    style: StackTheme.instance
-                                        .textButtonTheme
+                                        .getPrimaryEnabledButtonColor(context),
-                                        .style
-                                        ?.copyWith(
-                                          backgroundColor:
-                                              MaterialStateProperty.all<Color>(
-                                                  StackTheme.instance.color
-                                                      .accentColorDark),
-                                        ),
                                     child: Text(
                                       "Continue",
                                       style: STextStyles.button,

lib/pages/wallets_view/sub_widgets/all_wallets.dart

@@ -4,6 +4,7 @@ import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/add_wallet_vi
 import 'package:stackwallet/pages/wallets_view/sub_widgets/wallet_list_item.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
 
 class AllWallets extends StatelessWidget {
@@ -19,7 +20,9 @@ class AllWallets extends StatelessWidget {
           children: [
             Text(
               "All wallets",
-              style: STextStyles.itemSubtitle,
+              style: STextStyles.itemSubtitle.copyWith(
+                color: StackTheme.instance.color.textDark,
+              ),
             ),
             BlueTextButton(
               text: "Add new",

lib/pages/wallets_view/sub_widgets/empty_wallets.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/utilities/util.dart';

lib/pages/wallets_view/sub_widgets/favorite_card.dart

@@ -134,7 +134,9 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                     Text(
                       ref.watch(
                           managerProvider.select((value) => value.walletName)),
-                      style: STextStyles.itemSubtitle12,
+                      style: STextStyles.itemSubtitle12.copyWith(
+                        color: StackTheme.instance.color.textFavoriteCard,
+                      ),
                     ),
                     const Spacer(),
                     SvgPicture.asset(
@@ -179,6 +181,7 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                             )} ${coin.ticker}",
                             style: STextStyles.titleBold12.copyWith(
                               fontSize: 16,
+                              color: StackTheme.instance.color.textFavoriteCard,
                             ),
                           ),
                         ),
@@ -199,6 +202,7 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                           )}",
                           style: STextStyles.itemSubtitle12.copyWith(
                             fontSize: 10,
+                            color: StackTheme.instance.color.textFavoriteCard,
                           ),
                         ),
                       ],

lib/pages/wallets_view/sub_widgets/favorite_wallets.dart

@@ -8,7 +8,6 @@ import 'package:stackwallet/pages/wallets_view/sub_widgets/favorite_card.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/services/coins/manager.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
@@ -83,7 +82,9 @@ class _FavoriteWalletsState extends ConsumerState<FavoriteWallets> {
             children: [
               Text(
                 "Favorite Wallets",
-                style: STextStyles.itemSubtitle,
+                style: STextStyles.itemSubtitle.copyWith(
+                  color: StackTheme.instance.color.textDark3,
+                ),
               ),
               const Spacer(),
               if (hasFavorites)
@@ -96,6 +97,7 @@ class _FavoriteWalletsState extends ConsumerState<FavoriteWallets> {
                     Assets.svg.ellipsis,
                     width: 16,
                     height: 16,
+                    color: StackTheme.instance.color.accentColorDark,
                   ),
                   onPressed: () {
                     Navigator.of(context).pushNamed(

lib/pages/wallets_view/sub_widgets/wallet_list_item.dart

@@ -92,7 +92,10 @@ class WalletListItem extends ConsumerWidget {
                     children: [
                       Row(
                         children: [
-                          Text(coin.prettyName),
+                          Text(
+                            coin.prettyName,
+                            style: STextStyles.titleBold12,
+                          ),
                           const Spacer(),
                           Text(
                             "$priceString $currency/${coin.ticker}",

lib/pages_desktop_specific/home/my_stack_view/wallet_summary_table.dart

@@ -4,7 +4,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/coin_wallets_table.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/format.dart';

lib/utilities/assets.dart

@@ -1,4 +1,3 @@
-import 'package:stackwallet/services/coins/namecoin/namecoin_wallet.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 
@@ -159,7 +158,7 @@ class _SVG {
       case Coin.bitcoinTestNet:
         return bitcoinTestnet;
       case Coin.bitcoincashTestnet:
-        return bitcoinTestnet;
+        return bitcoincashTestnet;
       case Coin.firoTestNet:
         return firoTestnet;
       case Coin.dogecoinTestNet:

lib/utilities/cfcolors.dart

@@ -1,9 +0,0 @@
-abstract class CFColors {
-  // static const Color primary = Color(0xFF0052DF);
-  // static const Color primaryLight = Color(0xFFDAE2FF);
-  //
-  //
-  // // generic
-  // static const Color white = Color(0xFFFFFFFF);
-
-}

lib/utilities/theme/color_theme.dart

@@ -33,6 +33,7 @@ abstract class StackColorTheme {
   Color get textSubtitle5;
   Color get textSubtitle6;
   Color get textWhite;
+  Color get textFavoriteCard;
   Color get textError;
 
 // button background

lib/utilities/theme/dark_colors.dart

@@ -49,7 +49,8 @@ class DarkColors extends StackColorTheme {
   Color get textSubtitle6 => const Color(0xFF414141);
   @override
   Color get textWhite => const Color(0xFF232323);
-
+  @override
+  Color get textFavoriteCard => const Color(0xFF232323);
   @override
   Color get textError => const Color(0xFFF37475);
 
@@ -272,7 +273,7 @@ class DarkColors extends StackColorTheme {
 
   // currency list
   @override
-  Color get currencyListItemBG => const Color(0xFF35383D);
+  Color get currencyListItemBG => const Color(0xFF484B51);
 
   // bottom nav
   @override

lib/utilities/theme/light_colors.dart

@@ -49,7 +49,8 @@ class LightColors extends StackColorTheme {
   Color get textSubtitle6 => const Color(0xFFF5F5F5);
   @override
   Color get textWhite => const Color(0xFFFFFFFF);
-
+  @override
+  Color get textFavoriteCard => const Color(0xFF232323);
   @override
   Color get textError => const Color(0xFF930006);
 

lib/widgets/custom_buttons/app_bar_icon_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 import 'package:stackwallet/utilities/util.dart';
 

lib/widgets/custom_buttons/favorite_toggle.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 
 class FavoriteToggle extends StatefulWidget {

lib/widgets/gradient_card.dart

@@ -1,8 +1,5 @@
 // import 'package:flutter/material.dart';
 // import 'package:stackwallet/utilities/cfcolors.dart';
-import 'package:stackwallet/utilities/theme/stack_theme.dart';
-//
-// class GradientCard extends StatelessWidget {
 //   const GradientCard(
 //       {Key key,
 //       this.child,

lib/widgets/icon_widgets/addressbook_icon.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/cfcolors.dart';
+
 import 'package:stackwallet/utilities/theme/stack_theme.dart';
 
 class AddressBookIcon extends StatelessWidget {