diff --git a/lib/src/screens/backup/edit_backup_password_page.dart b/lib/src/screens/backup/edit_backup_password_page.dart
index ccbefe14f..93207c191 100644
--- a/lib/src/screens/backup/edit_backup_password_page.dart
+++ b/lib/src/screens/backup/edit_backup_password_page.dart
@@ -7,6 +7,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/view_model/edit_backup_password_view_model.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class EditBackupPasswordPage extends BasePage {
   EditBackupPasswordPage(this.editBackupPasswordViewModel)
@@ -39,10 +40,7 @@ class EditBackupPasswordPage extends BasePage {
                         controller: textEditingController,
                         style: TextStyle(
                             fontSize: 26,
-                            color: Theme.of(context)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!)))),
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)))),
             Positioned(
                 child: Observer(
                     builder: (_) => PrimaryButton(
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index f3a068e9c..6f0246a8f 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -52,8 +53,8 @@ abstract class BasePage extends StatelessWidget {
   Color? pageIconColor(BuildContext context) =>
       titleColor ??
       (gradientBackground
-          ? Theme.of(context).primaryTextTheme.titleLarge!.color!
-          : Theme.of(context).primaryTextTheme.titleLarge!.color!);
+          ? Theme.of(context).extension<CakeTextTheme>()!.titleColor
+          : Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
   Widget closeButton(BuildContext context) => Image.asset(
         currentTheme.type == ThemeType.dark
@@ -106,7 +107,7 @@ abstract class BasePage extends StatelessWidget {
                 fontWeight: FontWeight.bold,
                 fontFamily: 'Lato',
                 color: titleColor ??
-                    Theme.of(context).primaryTextTheme.titleLarge!.color!),
+                    Theme.of(context).extension<CakeTextTheme>()!.titleColor),
           );
   }
 
diff --git a/lib/src/screens/buy/pre_order_page.dart b/lib/src/screens/buy/pre_order_page.dart
index ecb94cde9..a23a234c8 100644
--- a/lib/src/screens/buy/pre_order_page.dart
+++ b/lib/src/screens/buy/pre_order_page.dart
@@ -3,6 +3,7 @@ import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
@@ -179,7 +180,7 @@ class PreOrderPage extends BasePage {
                       S.of(context).buy_with + ':',
                       textAlign: TextAlign.center,
                       style: TextStyle(
-                          color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                           fontSize: 18,
                           fontWeight: FontWeight.bold
                       ),
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 122ba2eb5..68888774b 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -13,6 +13,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
 import 'package:cake_wallet/src/widgets/collapsible_standart_list.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class ContactListPage extends BasePage {
   ContactListPage(this.contactListViewModel);
@@ -34,7 +35,7 @@ class ContactListPage extends BasePage {
           alignment: Alignment.center,
           children: <Widget>[
             Icon(Icons.add,
-                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 size: 22.0),
             ButtonTheme(
               minWidth: 32.0,
@@ -71,10 +72,7 @@ class ContactListPage extends BasePage {
               return Container(
                   padding: EdgeInsets.only(bottom: 10),
                   child: Text(title, style: TextStyle(
-                          color: Theme.of(context)
-                              .primaryTextTheme
-                              .titleLarge!
-                              .color!,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                           fontSize: 36)));
             },
             itemCounter: (int sectionIndex) =>
@@ -138,7 +136,7 @@ class ContactListPage extends BasePage {
                   style: TextStyle(
                       fontSize: 14,
                       fontWeight: FontWeight.normal,
-                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 ),
               )
             )
diff --git a/lib/src/screens/contact/contact_page.dart b/lib/src/screens/contact/contact_page.dart
index 9ec2a0372..099be41d5 100644
--- a/lib/src/screens/contact/contact_page.dart
+++ b/lib/src/screens/contact/contact_page.dart
@@ -19,6 +19,7 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
 import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class ContactPage extends BasePage {
   ContactPage(this.contactViewModel)
@@ -103,10 +104,7 @@ class ContactPage extends BasePage {
                       ],
                       buttonColor: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
                       iconColor: PaletteDark.gray,
-                      borderColor: Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .backgroundColor!,
+                      borderColor: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
                       validator:
                           AddressValidator(type: contactViewModel.currency!),
                     ),
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
index 74ad54870..8119e9fd4 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class SideMenuItem extends StatelessWidget {
   const SideMenuItem({
@@ -16,7 +17,7 @@ class SideMenuItem extends StatelessWidget {
 
   Color _setColor(BuildContext context) {
     if (isSelected) {
-      return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+      return Theme.of(context).extension<CakeTextTheme>()!.titleColor;
     } else {
       return Theme.of(context).highlightColor;
     }
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
index 501252978..e02bcef85 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
@@ -1,4 +1,5 @@
 import 'package:another_flushbar/flushbar.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/desktop_dropdown_item.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -36,14 +37,14 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
         'assets/images/new_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       );
 
   Image _restoreWalletImage(BuildContext context) => Image.asset(
         'assets/images/restore_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       );
 
   Flushbar<void>? _progressBar;
diff --git a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
index 14dcbb0d8..aa7012ae5 100644
--- a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class DropDownItemWidget extends StatelessWidget {
@@ -23,7 +24,7 @@ class DropDownItemWidget extends StatelessWidget {
               style: TextStyle(
                 fontSize: 22,
                 fontWeight: FontWeight.w500,
-                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
               ),
               overflow: TextOverflow.ellipsis,
               maxLines: 1,
diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart
index da408fe72..ec867ae49 100644
--- a/lib/src/screens/dashboard/widgets/filter_widget.dart
+++ b/lib/src/screens/dashboard/widgets/filter_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/filter_tile.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
@@ -62,10 +63,7 @@ class FilterWidget extends StatelessWidget {
                               child: Text(
                                 title,
                                 style: TextStyle(
-                                    color: Theme.of(context)
-                                        .primaryTextTheme!
-                                        .titleLarge!
-                                        .color!,
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     fontSize: 16,
                                     fontFamily: 'Lato',
                                     fontWeight: FontWeight.bold,
diff --git a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
index 90f03c969..b5ec34cd3 100644
--- a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
+++ b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/rounded_checkbox.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
@@ -111,10 +112,7 @@ class PresentReceiveOptionPicker extends StatelessWidget {
                                 Text(option.toString(),
                                     textAlign: TextAlign.left,
                                     style: textSmall(
-                                      color: Theme.of(context)
-                                          .primaryTextTheme!
-                                          .titleLarge!
-                                          .color!,
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     ).copyWith(
                                       fontWeight:
                                           value == option ? FontWeight.w800 : FontWeight.w500,
diff --git a/lib/src/screens/disclaimer/disclaimer_page.dart b/lib/src/screens/disclaimer/disclaimer_page.dart
index 32ec85e39..b9223c2eb 100644
--- a/lib/src/screens/disclaimer/disclaimer_page.dart
+++ b/lib/src/screens/disclaimer/disclaimer_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
@@ -88,10 +89,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                 style: TextStyle(
                                     fontSize: 20.0,
                                     fontWeight: FontWeight.bold,
-                                    color: Theme.of(context)
-                                        .primaryTextTheme!
-                                        .titleLarge!
-                                        .color!),
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             )
                           ],
@@ -108,10 +106,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                 style: TextStyle(
                                     fontSize: 12.0,
                                     fontWeight: FontWeight.bold,
-                                    color: Theme.of(context)
-                                        .primaryTextTheme!
-                                        .titleLarge!
-                                        .color!),
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             )
                           ],
@@ -127,10 +122,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                               style: TextStyle(
                                   fontSize: 12.0,
                                   fontWeight: FontWeight.normal,
-                                  color: Theme.of(context)
-                                      .primaryTextTheme!
-                                      .titleLarge!
-                                      .color!),
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                             ))
                           ],
                         ),
@@ -147,10 +139,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                 style: TextStyle(
                                     fontSize: 14.0,
                                     fontWeight: FontWeight.bold,
-                                    color: Theme.of(context)
-                                        .primaryTextTheme!
-                                        .titleLarge!
-                                        .color!),
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             )
                           ],
@@ -234,10 +223,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                   ),
                                   decoration: BoxDecoration(
                                       border: Border.all(
-                                          color: Theme.of(context)
-                                              .primaryTextTheme!
-                                              .bodySmall!
-                                              .color!,
+                                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
                                           width: 1.0),
                                       borderRadius: BorderRadius.all(
                                           Radius.circular(8.0)),
@@ -255,10 +241,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                   style: TextStyle(
                                       fontWeight: FontWeight.bold,
                                       fontSize: 14.0,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme!
-                                          .titleLarge!
-                                          .color!),
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                                 )
                               ],
                             ),
diff --git a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
index e7ae2ea52..03c6fdd47 100644
--- a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
@@ -42,10 +43,7 @@ class PickerItemWidget extends StatelessWidget {
                       style: TextStyle(
                         color: isSelected
                             ? Palette.blueCraiola
-                            : Theme.of(context)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!,
+                            : Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                         fontSize: isSelected ? 16 : 14.0,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w600,
diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
index dfe65b621..8070febdf 100644
--- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
@@ -38,10 +39,7 @@ class ExchangeConfirmPage extends BasePage {
                   style: TextStyle(
                       fontSize: 18.0,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .color!),
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 ),
               )),
               Container(
@@ -75,10 +73,7 @@ class ExchangeConfirmPage extends BasePage {
                             style: TextStyle(
                                 fontSize: 20,
                                 fontWeight: FontWeight.w600,
-                                color: Theme.of(context)
-                                    .primaryTextTheme!
-                                    .titleLarge!
-                                    .color!),
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                           ),
                         ],
                       ),
@@ -94,10 +89,7 @@ class ExchangeConfirmPage extends BasePage {
                             },
                             text: S.of(context).copy_id,
                             color: Theme.of(context).extension<ExchangePageTheme>()!.buttonBackgroundColor,
-                            textColor: Theme.of(context)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!),
+                            textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                       ),
                     )
                   ],
diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart
index 96ad3d97a..ee968a0c0 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/utils/request_review_handler.dart';
@@ -53,7 +54,7 @@ class ExchangeTradePage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     final questionImage = Image.asset('assets/images/question_mark.png',
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
     return SizedBox(
       height: 20.0,
@@ -139,10 +140,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                             ),
                             if (trade.expiredAt != null)
                               TimerWidget(trade.expiredAt!,
-                                  color: Theme.of(context)
-                                      .primaryTextTheme!
-                                      .titleLarge!
-                                      .color!)
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)
                           ])
                     : Offstage(),
                 Padding(
@@ -331,10 +329,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                         style: TextStyle(
                           fontSize: 22,
                           fontWeight: FontWeight.bold,
-                          color: Theme.of(popupContext)
-                              .primaryTextTheme!
-                              .titleLarge!
-                              .color,
+                          color: Theme.of(popupContext).extension<CakeTextTheme>()!.titleColor,
                           decoration: TextDecoration.none,
                         ),
                       ),
@@ -383,10 +378,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                           style: TextStyle(
                             fontSize: 22,
                             fontWeight: FontWeight.bold,
-                            color: Theme.of(popupContext)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!,
+                            color: Theme.of(popupContext).extension<CakeTextTheme>()!.titleColor,
                             decoration: TextDecoration.none,
                           ),
                         ),
diff --git a/lib/src/screens/exchange_trade/information_page.dart b/lib/src/screens/exchange_trade/information_page.dart
index 7f66531b0..37e7a1b6d 100644
--- a/lib/src/screens/exchange_trade/information_page.dart
+++ b/lib/src/screens/exchange_trade/information_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
@@ -48,7 +49,7 @@ class InformationPage extends StatelessWidget {
                   onPressed: () => Navigator.of(context).pop(),
                   text: S.of(context).send_got_it,
                   color: Theme.of(context).extension<ExchangePageTheme>()!.buttonBackgroundColor,
-                  textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!
+                  textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor
                 ),
               )
             ],
diff --git a/lib/src/screens/faq/faq_item.dart b/lib/src/screens/faq/faq_item.dart
index c41adf399..9ed346ef4 100644
--- a/lib/src/screens/faq/faq_item.dart
+++ b/lib/src/screens/faq/faq_item.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
 
@@ -26,12 +27,12 @@ class FAQItemState extends State<FAQItem> {
   @override
   Widget build(BuildContext context) {
     final addIcon = Icon(Icons.add,
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
     final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
     final icon = isActive ? removeIcon : addIcon;
     final color = isActive
         ? Palette.blueCraiola
-        : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+        : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
 
     return ListTileTheme(
       contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
@@ -54,7 +55,7 @@ class FAQItemState extends State<FAQItem> {
                     fontSize: 14,
                     fontWeight: FontWeight.normal,
                     color:
-                        Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
               ),
             ))
           ])
diff --git a/lib/src/screens/ionia/auth/ionia_create_account_page.dart b/lib/src/screens/ionia/auth/ionia_create_account_page.dart
index 2acade582..e6dc83c3c 100644
--- a/lib/src/screens/ionia/auth/ionia_create_account_page.dart
+++ b/lib/src/screens/ionia/auth/ionia_create_account_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/core/email_validator.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
 import 'package:cake_wallet/routes.dart';
@@ -40,7 +41,7 @@ class IoniaCreateAccountPage extends BasePage {
     return Text(
       S.current.sign_up,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
diff --git a/lib/src/screens/ionia/auth/ionia_login_page.dart b/lib/src/screens/ionia/auth/ionia_login_page.dart
index 5d1793af7..1bdcfc3a4 100644
--- a/lib/src/screens/ionia/auth/ionia_login_page.dart
+++ b/lib/src/screens/ionia/auth/ionia_login_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/email_validator.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -33,7 +34,7 @@ class IoniaLoginPage extends BasePage {
     return Text(
       S.current.login,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
diff --git a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
index 42a114c02..e8327b71c 100644
--- a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
+++ b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
 import 'package:cake_wallet/palette.dart';
@@ -42,7 +43,7 @@ class IoniaVerifyIoniaOtp extends BasePage {
     return Text(
       S.current.verification,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
diff --git a/lib/src/screens/ionia/auth/ionia_welcome_page.dart b/lib/src/screens/ionia/auth/ionia_welcome_page.dart
index e286cfdc1..e44e3a26d 100644
--- a/lib/src/screens/ionia/auth/ionia_welcome_page.dart
+++ b/lib/src/screens/ionia/auth/ionia_welcome_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -14,7 +15,7 @@ class IoniaWelcomePage extends BasePage {
     return Text(
       S.current.welcome_to_cakepay,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
@@ -35,7 +36,7 @@ class IoniaWelcomePage extends BasePage {
                   fontSize: 18,
                   fontWeight: FontWeight.w400,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
               SizedBox(height: 20),
@@ -45,7 +46,7 @@ class IoniaWelcomePage extends BasePage {
                   fontSize: 18,
                   fontWeight: FontWeight.w400,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
             ],
@@ -68,7 +69,7 @@ class IoniaWelcomePage extends BasePage {
                   fontSize: 15,
                   fontWeight: FontWeight.w500,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
               SizedBox(height: 8),
diff --git a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart
index c24f83f8a..b96249b69 100644
--- a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart
@@ -1,4 +1,5 @@
 
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
 import 'package:cake_wallet/ionia/ionia_gift_card.dart';
 import 'package:cake_wallet/routes.dart';
@@ -24,7 +25,7 @@ class IoniaAccountCardsPage extends BasePage {
     return Text(
       S.of(context).cards,
       style: textLargeSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
@@ -73,7 +74,7 @@ class _IoniaCardTabsState extends State<_IoniaCardTabs> with SingleTickerProvide
             width: 230,
             padding: EdgeInsets.all(5),
             decoration: BoxDecoration(
-              color: Theme.of(context).primaryTextTheme.titleLarge!.color!
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor
                   .withOpacity(0.1),
               borderRadius: BorderRadius.circular(
                 25.0,
@@ -91,7 +92,7 @@ class _IoniaCardTabsState extends State<_IoniaCardTabs> with SingleTickerProvide
                 ),
                 labelColor: Theme.of(context).extension<OrderTheme>()!.iconColor,
                 unselectedLabelColor:
-                    Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                    Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 tabs: [
                   Tab(
                     text: S.of(context).active,
@@ -186,12 +187,12 @@ class _IoniaCardListView extends StatelessWidget {
                 child: CardItem(
                   onTap: () => onTap?.call(merchant),
                   title: merchant.legalName,
-                  backgroundColor: Theme.of(context).primaryTextTheme.titleLarge!.color!
+                  backgroundColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor
                       .withOpacity(0.1),
                   discount: 0,
                   hideBorder: true,
                   discountBackground: AssetImage('assets/images/red_badge_discount.png'),
-                  titleColor: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                  titleColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: '',
                   logoUrl: merchant.logoUrl,
diff --git a/lib/src/screens/ionia/cards/ionia_account_page.dart b/lib/src/screens/ionia/cards/ionia_account_page.dart
index f0a740da3..8fddc507a 100644
--- a/lib/src/screens/ionia/cards/ionia_account_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_account_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -20,7 +21,7 @@ class IoniaAccountPage extends BasePage {
     return Text(
       S.current.account,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
diff --git a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart
index ccd579973..f0e641c42 100644
--- a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -23,7 +24,7 @@ class IoniaActivateDebitCardPage extends BasePage {
     return Text(
       S.current.debit_card,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
diff --git a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
index 7ac64400d..c32bd2597 100644
--- a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_merchant.dart';
 import 'package:cake_wallet/ionia/ionia_tip.dart';
 import 'package:cake_wallet/palette.dart';
@@ -31,7 +32,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
   Widget middle(BuildContext context) {
     return Text(
       ioniaPurchaseViewModel.ioniaMerchant.legalName,
-      style: textMediumSemiBold(color: Theme.of(context).primaryTextTheme.titleLarge!.color!),
+      style: textMediumSemiBold(color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
     );
   }
 
@@ -166,7 +167,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
                     Text(
                       S.of(context).tip,
                       style: TextStyle(
-                        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                         fontWeight: FontWeight.w700,
                         fontSize: 14,
                       ),
@@ -402,17 +403,17 @@ class TipButton extends StatelessWidget {
 
   Color captionTextColor(BuildContext context) {
     if (isDark(context)) {
-      return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+      return Theme.of(context).extension<CakeTextTheme>()!.titleColor;
     }
 
     return isSelected
       ? Theme.of(context).dialogTheme.backgroundColor!
-      : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+      : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
   }
 
   Color subTitleTextColor(BuildContext context) {
     if (isDark(context)) {
-      return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+      return Theme.of(context).extension<CakeTextTheme>()!.titleColor;
     }
 
     return isSelected
@@ -424,12 +425,12 @@ class TipButton extends StatelessWidget {
     if (isDark(context)) {
       return isSelected
         ? null
-        : Theme.of(context).primaryTextTheme.titleLarge!.color!.withOpacity(0.01);
+        : Theme.of(context).extension<CakeTextTheme>()!.titleColor.withOpacity(0.01);
     }
 
     return isSelected
         ? null
-        : Theme.of(context).primaryTextTheme.titleLarge!.color!.withOpacity(0.1);
+        : Theme.of(context).extension<CakeTextTheme>()!.titleColor.withOpacity(0.1);
   }
 
   @override
diff --git a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
index c8b2b6b3b..6e6bf8534 100644
--- a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@@ -147,10 +148,10 @@ class IoniaBuyGiftCardPage extends BasePage {
                 padding: const EdgeInsets.all(24.0),
                 child: CardItem(
                   title: merchant.legalName,
-                  backgroundColor: Theme.of(context).primaryTextTheme.titleLarge!.color!
+                  backgroundColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor
                       .withOpacity(0.1),
                   discount: merchant.discount,
-                  titleColor: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                  titleColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: merchant.avaibilityStatus,
                   logoUrl: merchant.logoUrl,
diff --git a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
index 6ea8d20f4..e224a88bf 100644
--- a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@@ -137,12 +138,12 @@ class IoniaCustomRedeemPage extends BasePage {
                 padding: const EdgeInsets.all(24.0),
                 child: CardItem(
                   title: giftCard.legalName,
-                  backgroundColor: Theme.of(context).primaryTextTheme.titleLarge!.color!
+                  backgroundColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor
                       .withOpacity(0.1),
                   discount: giftCard.remainingAmount,
                   isAmount: true,
                   discountBackground: AssetImage('assets/images/red_badge_discount.png'),
-                  titleColor: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                  titleColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: S.of(context).online,
                   logoUrl: giftCard.logoUrl,
diff --git a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
index 6b76e9b72..7c4202f2b 100644
--- a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_merchant.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@@ -145,10 +146,10 @@ class IoniaCustomTipPage extends BasePage {
                 padding: const EdgeInsets.all(24.0),
                 child: CardItem(
                   title: merchant.legalName,
-                  backgroundColor: Theme.of(context).primaryTextTheme.titleLarge!.color!
+                  backgroundColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor
                       .withOpacity(0.1),
                   discount: 0.0,
-                  titleColor: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                  titleColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline,
                   logoUrl: merchant.logoUrl,
diff --git a/lib/src/screens/ionia/cards/ionia_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_debit_card_page.dart
index ad07c6d8a..48db3c963 100644
--- a/lib/src/screens/ionia/cards/ionia_debit_card_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_debit_card_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_virtual_card.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -25,7 +26,7 @@ class IoniaDebitCardPage extends BasePage {
     return Text(
       S.current.debit_card,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
diff --git a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
index 4b4130e6e..37e1ef0f5 100644
--- a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/ionia/ionia_gift_card.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -33,7 +34,7 @@ class IoniaGiftCardDetailPage extends BasePage {
 
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       size: 16,
     );
     return Padding(
@@ -60,7 +61,7 @@ class IoniaGiftCardDetailPage extends BasePage {
     return Text(
       viewModel.giftCard.legalName,
       style: textMediumSemiBold(
-          color: Theme.of(context).primaryTextTheme.titleLarge!.color!),
+          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
     );
   }
 
@@ -143,7 +144,7 @@ class IoniaGiftCardDetailPage extends BasePage {
                     },
                     text: S.of(context).more_options,
                     color: Theme.of(context).cardColor,
-                    textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                    textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   ),
                   SizedBox(height: 12),
                   LoadingPrimaryButton(
diff --git a/lib/src/screens/ionia/cards/ionia_more_options_page.dart b/lib/src/screens/ionia/cards/ionia_more_options_page.dart
index 00f937b79..eb6ed8860 100644
--- a/lib/src/screens/ionia/cards/ionia_more_options_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_more_options_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/ionia/ionia_gift_card.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -16,7 +17,7 @@ class IoniaMoreOptionsPage extends BasePage {
     return Text(
       S.current.more_options,
       style: textMediumSemiBold(
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
@@ -35,7 +36,7 @@ class IoniaMoreOptionsPage extends BasePage {
             child: Text(
               S.of(context).choose_from_available_options,
               style: textMedium(
-                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
               ),
             ),
           ),
diff --git a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
index 0d1f44161..dce976444 100644
--- a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/ionia/ionia_gift_card.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
@@ -24,7 +25,7 @@ class IoniaPaymentStatusPage extends BasePage {
         S.of(context).generating_gift_card,
         textAlign: TextAlign.center,
         style: textMediumSemiBold(
-            color: Theme.of(context).primaryTextTheme.titleLarge!.color!));
+            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor));
   }
 
   @override
@@ -91,7 +92,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
             Text(
               S.of(context).awaiting_payment_confirmation,
               style: textLargeSemiBold(
-                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor))
             ]),
           SizedBox(height: 40),
           Row(children: [
@@ -130,7 +131,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
                   Text(
                     S.of(context).gift_card_is_generated,
                     style: textLargeSemiBold(
-                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor))
                   ]));
             }
 
@@ -148,7 +149,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
               Text(
                 S.of(context).generating_gift_card,
                 style: textLargeSemiBold(
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))]);
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor))]);
           }),
         ],
       ),
@@ -161,7 +162,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
                 widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation
                     : S.of(context).proceed_after_one_minute,
                 style: textMedium(
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ).copyWith(fontWeight: FontWeight.w500),
                 textAlign: TextAlign.center,
               )),
@@ -181,7 +182,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
                   onPressed: () => Navigator.of(context).pushNamed(Routes.support),
                   text: S.of(context).contact_support,
                   color: Theme.of(context).cardColor,
-                  textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
+                  textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
                 })
             ])
       ),
@@ -204,7 +205,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
           Text(
             subtitle,
             style: textMedium(
-              color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
             ),
           ),
         ],
diff --git a/lib/src/screens/ionia/widgets/ionia_alert_model.dart b/lib/src/screens/ionia/widgets/ionia_alert_model.dart
index 4890f5612..57a93a127 100644
--- a/lib/src/screens/ionia/widgets/ionia_alert_model.dart
+++ b/lib/src/screens/ionia/widgets/ionia_alert_model.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:cake_wallet/typography.dart';
@@ -59,7 +60,7 @@ class IoniaAlertModal extends StatelessWidget {
                     text: actionTitle,
                     color: Theme.of(context).cardColor,
                     textColor:
-                        Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   ),
                   SizedBox(height: 21),
                 ],
diff --git a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
index ae042ce2b..8a6820fcd 100644
--- a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
+++ b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/src/screens/ionia/widgets/rounded_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -47,7 +48,7 @@ class IoniaFilterModal extends StatelessWidget {
                       child: TextField(
                         onChanged: ioniaGiftCardsListViewModel.onSearchFilter,
                         style: textMedium(
-                          color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                         ),
                         decoration: InputDecoration(
                           filled: true,
@@ -85,12 +86,12 @@ class IoniaFilterModal extends StatelessWidget {
                                   children: [
                                     Image.asset(
                                       category.iconPath,
-                                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     ),
                                     SizedBox(width: 10),
                                     Text(category.title,
                                         style: textSmall(
-                                          color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                         ).copyWith(fontWeight: FontWeight.w500)),
                                   ],
                                 ),
diff --git a/lib/src/screens/ionia/widgets/ionia_tile.dart b/lib/src/screens/ionia/widgets/ionia_tile.dart
index a74102899..932674451 100644
--- a/lib/src/screens/ionia/widgets/ionia_tile.dart
+++ b/lib/src/screens/ionia/widgets/ionia_tile.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/typography.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
@@ -34,7 +35,7 @@ class IoniaTile extends StatelessWidget {
             Text(
               subTitle,
               style: textMediumBold(
-                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
               ),
             ),
           ],
diff --git a/lib/src/screens/ionia/widgets/text_icon_button.dart b/lib/src/screens/ionia/widgets/text_icon_button.dart
index 600e62aa2..937df3a36 100644
--- a/lib/src/screens/ionia/widgets/text_icon_button.dart
+++ b/lib/src/screens/ionia/widgets/text_icon_button.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/typography.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class TextIconButton extends StatelessWidget {
@@ -22,12 +23,12 @@ class TextIconButton extends StatelessWidget {
             Text(
               label,
               style: textMediumSemiBold(
-                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
               ),
             ),
             Icon(
               Icons.chevron_right_rounded,
-              color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
             ),
           ],
         ),
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 845c626b9..eea8eecbf 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/entities/generate_name.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/main.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
@@ -119,10 +120,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                             style: TextStyle(
                                 fontSize: 20.0,
                                 fontWeight: FontWeight.w600,
-                                color: Theme.of(context)
-                                    .primaryTextTheme!
-                                    .titleLarge!
-                                    .color!),
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                             decoration: InputDecoration(
                               hintStyle: TextStyle(
                                   fontSize: 18.0,
@@ -183,10 +181,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                         style: TextStyle(
                             fontSize: 16.0,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!),
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                       ),
                     ),
                     Padding(
diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart
index c45e3f412..514d15ae3 100644
--- a/lib/src/screens/new_wallet/new_wallet_type_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
@@ -80,10 +81,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
                   style: TextStyle(
                       fontSize: 16,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .color!),
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 ),
               ),
               ...types.map((type) => Padding(
diff --git a/lib/src/screens/new_wallet/widgets/select_button.dart b/lib/src/screens/new_wallet/widgets/select_button.dart
index d21792d5c..b921edeae 100644
--- a/lib/src/screens/new_wallet/widgets/select_button.dart
+++ b/lib/src/screens/new_wallet/widgets/select_button.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 
@@ -22,7 +23,7 @@ class SelectButton extends StatelessWidget {
         : Theme.of(context).cardColor;
     final textColor = isSelected
         ? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
-        : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+        : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
     final arrowColor = isSelected
         ? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
         : Theme.of(context).extension<FilterTheme>()!.titlesColor;
diff --git a/lib/src/screens/pin_code/pin_code_widget.dart b/lib/src/screens/pin_code/pin_code_widget.dart
index 5153044ff..aa9bb3918 100644
--- a/lib/src/screens/pin_code/pin_code_widget.dart
+++ b/lib/src/screens/pin_code/pin_code_widget.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:another_flushbar/flushbar.dart';
@@ -111,11 +112,11 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
   Widget body(BuildContext context) {
     final deleteIconImage = Image.asset(
       'assets/images/delete_icon.png',
-      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
     );
     final faceImage = Image.asset(
       'assets/images/face.png',
-      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
     );
 
     return RawKeyboardListener(
@@ -144,7 +145,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                     fontSize: 20,
                     fontWeight: FontWeight.w500,
                     color:
-                        Theme.of(context).primaryTextTheme!.titleLarge!.color!)),
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
             Spacer(flex: 3),
             Container(
               width: 180,
@@ -160,10 +161,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                       decoration: BoxDecoration(
                         shape: BoxShape.circle,
                         color: isFilled
-                            ? Theme.of(context)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!
+                            ? Theme.of(context).extension<CakeTextTheme>()!.titleColor
                             : Theme.of(context).extension<PinCodeTheme>()!.indicatorsColor
                                 .withOpacity(0.25),
                       ));
@@ -251,10 +249,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                                         style: TextStyle(
                                             fontSize: 30.0,
                                             fontWeight: FontWeight.w600,
-                                            color: Theme.of(context)
-                                                .primaryTextTheme!
-                                                .titleLarge!
-                                                .color!)),
+                                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
                                   ),
                                 );
                               }),
diff --git a/lib/src/screens/receive/widgets/anonpay_status_section.dart b/lib/src/screens/receive/widgets/anonpay_status_section.dart
index 966fca382..f92186aa4 100644
--- a/lib/src/screens/receive/widgets/anonpay_status_section.dart
+++ b/lib/src/screens/receive/widgets/anonpay_status_section.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
 import 'package:cake_wallet/themes/extensions/address_theme.dart';
@@ -54,10 +55,7 @@ class AnonInvoiceStatusSection extends StatelessWidget {
                     Text(
                       invoiceInfo.status ?? '',
                       style: textSmallSemiBold(
-                        color: Theme.of(context)
-                            .primaryTextTheme!
-                            .titleLarge!
-                            .color,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                       ),
                     )
                   ],
@@ -80,7 +78,7 @@ class AnonInvoiceStatusSection extends StatelessWidget {
               Text(
                 invoiceInfo.invoiceId ?? '',
                 style: textSmallSemiBold(
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
             ],
diff --git a/lib/src/screens/restore/sweeping_wallet_page.dart b/lib/src/screens/restore/sweeping_wallet_page.dart
index 1309ebfae..75fccf638 100644
--- a/lib/src/screens/restore/sweeping_wallet_page.dart
+++ b/lib/src/screens/restore/sweeping_wallet_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -95,10 +96,7 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                                 style: TextStyle(
                                   fontSize: 36,
                                   fontWeight: FontWeight.bold,
-                                  color: Theme.of(context)
-                                      .primaryTextTheme!
-                                      .titleLarge!
-                                      .color!,
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                 ),
                                 textAlign: TextAlign.center,
                               ),
diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart
index e42eec313..e5d3df1fe 100644
--- a/lib/src/screens/restore/wallet_restore_page.dart
+++ b/lib/src/screens/restore/wallet_restore_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -94,7 +95,7 @@ class WalletRestorePage extends BasePage {
                 fontWeight: FontWeight.bold,
                 fontFamily: 'Lato',
                 color: titleColor ??
-                    Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                    Theme.of(context).extension<CakeTextTheme>()!.titleColor),
           ));
 
   final WalletRestoreViewModel walletRestoreViewModel;
diff --git a/lib/src/screens/restore/widgets/restore_button.dart b/lib/src/screens/restore/widgets/restore_button.dart
index 44439cd31..83ce966c4 100644
--- a/lib/src/screens/restore/widgets/restore_button.dart
+++ b/lib/src/screens/restore/widgets/restore_button.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/cupertino.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
@@ -46,10 +47,7 @@ class RestoreButton extends StatelessWidget {
                       style: TextStyle(
                           fontSize: 16,
                           fontWeight: FontWeight.w500,
-                          color: Theme.of(context)
-                              .primaryTextTheme!
-                              .titleLarge!
-                              .color!),
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                     ),
                     Padding(
                       padding: EdgeInsets.only(top: 5),
diff --git a/lib/src/screens/seed/pre_seed_page.dart b/lib/src/screens/seed/pre_seed_page.dart
index 40fcc5ba1..237859c3d 100644
--- a/lib/src/screens/seed/pre_seed_page.dart
+++ b/lib/src/screens/seed/pre_seed_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
@@ -60,10 +61,7 @@ class PreSeedPage extends BasePage {
                             style: TextStyle(
                                 fontSize: 14,
                                 fontWeight: FontWeight.normal,
-                                color: Theme.of(context)
-                                    .primaryTextTheme!
-                                    .bodySmall!
-                                    .color!),
+                                color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
                           ),
                         ),
                         PrimaryButton(
diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart
index 284357428..bd535e948 100644
--- a/lib/src/screens/seed/wallet_seed_page.dart
+++ b/lib/src/screens/seed/wallet_seed_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
@@ -115,10 +116,7 @@ class WalletSeedPage extends BasePage {
                                 style: TextStyle(
                                     fontSize: 20,
                                     fontWeight: FontWeight.w600,
-                                    color: Theme.of(context)
-                                        .primaryTextTheme!
-                                        .titleLarge!
-                                        .color!),
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                               Padding(
                                 padding:
@@ -129,10 +127,7 @@ class WalletSeedPage extends BasePage {
                                   style: TextStyle(
                                       fontSize: 14,
                                       fontWeight: FontWeight.normal,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme!
-                                          .bodySmall!
-                                          .color!),
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
                                 ),
                               )
                             ],
diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart
index 287a1ef07..b15da0375 100644
--- a/lib/src/screens/seed_language/seed_language_page.dart
+++ b/lib/src/screens/seed_language/seed_language_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/src/widgets/seed_language_selector.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -67,7 +68,7 @@ class SeedLanguageFormState extends State<SeedLanguageForm> {
                     fontSize: 16.0,
                     fontWeight: FontWeight.w500,
                     color:
-                        Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
               ),
             ),
             Padding(
diff --git a/lib/src/screens/send/widgets/choose_yat_address_alert.dart b/lib/src/screens/send/widgets/choose_yat_address_alert.dart
index 2c5f35781..00f93ff4b 100644
--- a/lib/src/screens/send/widgets/choose_yat_address_alert.dart
+++ b/lib/src/screens/send/widgets/choose_yat_address_alert.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:flutter/material.dart';
@@ -95,7 +96,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
                                     fontSize: 15,
                                     fontWeight: FontWeight.w600,
                                     fontFamily: 'Lato',
-                                    color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     decoration: TextDecoration.none,
                                   ),
                                 )
diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart
index 775971fe8..7f74f54a2 100644
--- a/lib/src/screens/send/widgets/confirm_sending_alert.dart
+++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:flutter/material.dart';
@@ -205,8 +206,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                 fontSize: 16,
                                 fontWeight: FontWeight.normal,
                                 fontFamily: 'Lato',
-                                color: Theme.of(context).primaryTextTheme!
-                                    .titleLarge!.color!,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                 decoration: TextDecoration.none,
                               ),
                             ),
@@ -219,8 +219,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                     fontSize: 18,
                                     fontWeight: FontWeight.w600,
                                     fontFamily: 'Lato',
-                                    color: Theme.of(context).primaryTextTheme!
-                                        .titleLarge!.color!,
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     decoration: TextDecoration.none,
                                   ),
                                 ),
@@ -240,10 +239,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                             fontSize: 16,
                             fontWeight: FontWeight.normal,
                             fontFamily: 'Lato',
-                            color: Theme.of(context)
-                                .primaryTextTheme!
-                                .titleLarge!
-                                .color!,
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                             decoration: TextDecoration.none,
                           ),
                         ),
@@ -256,10 +252,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                 fontSize: 18,
                                 fontWeight: FontWeight.w600,
                                 fontFamily: 'Lato',
-                                color: Theme.of(context)
-                                    .primaryTextTheme!
-                                    .titleLarge!
-                                    .color,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                 decoration: TextDecoration.none,
                               ),
                             ),
@@ -290,7 +283,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                 fontSize: 16,
                                 fontWeight: FontWeight.normal,
                                 fontFamily: 'Lato',
-                                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                 decoration: TextDecoration.none,
                               ),
                             ),
@@ -303,7 +296,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                     fontSize: 18,
                                     fontWeight: FontWeight.w600,
                                     fontFamily: 'Lato',
-                                    color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     decoration: TextDecoration.none,
                                   ),
                                 ),
@@ -332,10 +325,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                               fontSize: 16,
                               fontWeight: FontWeight.normal,
                               fontFamily: 'Lato',
-                              color: Theme.of(context)
-                                  .primaryTextTheme!
-                                  .titleLarge!
-                                  .color!,
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                               decoration: TextDecoration.none,
                             ),
                           ),
diff --git a/lib/src/screens/settings/widgets/settings_choices_cell.dart b/lib/src/screens/settings/widgets/settings_choices_cell.dart
index ae768b921..134d864ab 100644
--- a/lib/src/screens/settings/widgets/settings_choices_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_choices_cell.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/themes/extensions/address_theme.dart';
@@ -23,7 +24,7 @@ class SettingsChoicesCell extends StatelessWidget {
                 style: TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.normal,
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
             ],
@@ -58,10 +59,7 @@ class SettingsChoicesCell extends StatelessWidget {
                           style: TextStyle(
                             color: isSelected
                                 ? Colors.white
-                                : Theme.of(context)
-                                    .primaryTextTheme!
-                                    .bodySmall!
-                                    .color!,
+                                : Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
                             fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal,
                           ),
                         ),
diff --git a/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart b/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart
index f9ea2a5a6..2535338e5 100644
--- a/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart
+++ b/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:flutter/material.dart';
@@ -30,7 +31,7 @@ class PopUpCancellableAlertDialog extends StatelessWidget {
         fontSize: 16,
         fontWeight: FontWeight.normal,
         fontFamily: 'Lato',
-        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
         decoration: TextDecoration.none,
       ),
     );
diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart
index 3cd49e79b..2c7934d19 100644
--- a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart
+++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
@@ -47,7 +48,7 @@ class TextFieldListRow extends StatelessWidget {
                     fontSize: valueFontSize,
                     fontWeight: FontWeight.w500,
                     color:
-                        Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 decoration: InputDecoration(
                     isDense: true,
                     contentPadding: EdgeInsets.only(top: 12, bottom: 0),
diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
index 432fdc5f6..1c1fbfa5d 100644
--- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
+++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
@@ -18,7 +18,7 @@ class UnspentCoinsListPage extends BasePage {
   //@override
   //Widget trailing(BuildContext context) {
   //  final questionImage = Image.asset('assets/images/question_mark.png',
-  //      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
+  //      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
   //  return SizedBox(
   //    height: 20.0,
diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
index 7ba40965c..54d7d9938 100644
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -58,7 +59,7 @@ class WalletListBodyState extends State<WalletListBody> {
     final newWalletImage =
         Image.asset('assets/images/new_wallet.png', height: 12, width: 12, color: Colors.white);
     final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
-        height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
+        height: 12, width: 12, color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
     return Container(
       padding: EdgeInsets.only(top: 16),
@@ -135,10 +136,7 @@ class WalletListBodyState extends State<WalletListBody> {
                                         style: TextStyle(
                                             fontSize: 22,
                                             fontWeight: FontWeight.w500,
-                                            color: Theme.of(context)
-                                                .primaryTextTheme
-                                                .titleLarge!
-                                                .color!),
+                                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                                       )
                                     ],
                                   ),
@@ -183,7 +181,7 @@ class WalletListBodyState extends State<WalletListBody> {
                 image: restoreWalletImage,
                 text: S.of(context).wallet_list_restore_wallet,
                 color: Theme.of(context).cardColor,
-                textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!)
+                textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor)
           ])),
     );
   }
diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart
index 900f8fc45..5a3c51568 100644
--- a/lib/src/screens/welcome/welcome_page.dart
+++ b/lib/src/screens/welcome/welcome_page.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
@@ -57,7 +58,7 @@ class WelcomePage extends BasePage {
     final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
     return WillPopScope(
         onWillPop: () async => false,
@@ -101,10 +102,7 @@ class WelcomePage extends BasePage {
                                     style: TextStyle(
                                       fontSize: 36,
                                       fontWeight: FontWeight.bold,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme!
-                                          .titleLarge!
-                                          .color!,
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     ),
                                     textAlign: TextAlign.center,
                                   ),
@@ -155,10 +153,7 @@ class WelcomePage extends BasePage {
                                       image: restoreWalletImage,
                                       text: S.of(context).restore_wallet,
                                       color: Theme.of(context).cardColor,
-                                      textColor: Theme.of(context)
-                                          .primaryTextTheme!
-                                          .titleLarge!
-                                          .color!),
+                                      textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                                 )
                               ],
                             )
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index b5b5cf514..0d883eca6 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -1,4 +1,5 @@
 
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/services.dart';
@@ -69,7 +70,7 @@ class AddressTextField extends StatelessWidget {
           style: textStyle ??
               TextStyle(
                   fontSize: 16,
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
           decoration: InputDecoration(
             suffixIcon: SizedBox(
               width: prefixIconWidth * options.length +
diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart
index 508434b5d..ebbd691ba 100644
--- a/lib/src/widgets/base_alert_dialog.dart
+++ b/lib/src/widgets/base_alert_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:cake_wallet/themes/extensions/alert_theme.dart';
@@ -26,7 +27,7 @@ class BaseAlertDialog extends StatelessWidget {
         fontSize: 20,
         fontFamily: 'Lato',
         fontWeight: FontWeight.w600,
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
         decoration: TextDecoration.none,
       ),
     );
@@ -40,7 +41,7 @@ class BaseAlertDialog extends StatelessWidget {
         fontSize: 16,
         fontWeight: FontWeight.normal,
         fontFamily: 'Lato',
-        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
         decoration: TextDecoration.none,
       ),
     );
diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart
index a9dd51380..5649a0784 100644
--- a/lib/src/widgets/base_text_form_field.dart
+++ b/lib/src/widgets/base_text_form_field.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -78,7 +79,7 @@ class BaseTextFormField extends StatelessWidget {
           TextStyle(
               fontSize: 16.0,
               color: textColor ??
-                  Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                  Theme.of(context).extension<CakeTextTheme>()!.titleColor),
       decoration: InputDecoration(
           prefix: prefix,
           prefixIcon: prefixIcon,
@@ -92,26 +93,17 @@ class BaseTextFormField extends StatelessWidget {
           focusedBorder: UnderlineInputBorder(
               borderSide: BorderSide(
                   color: borderColor ??
-                      Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .backgroundColor!,
+                      Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
                   width: borderWidth)),
           disabledBorder: UnderlineInputBorder(
               borderSide: BorderSide(
                   color: borderColor ??
-                      Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .backgroundColor!,
+                      Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
                   width: borderWidth)),
           enabledBorder: UnderlineInputBorder(
               borderSide: BorderSide(
                   color: borderColor ??
-                      Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .backgroundColor!,
+                      Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
                   width: borderWidth))),
       validator: validator,
     );
diff --git a/lib/src/widgets/blockchain_height_widget.dart b/lib/src/widgets/blockchain_height_widget.dart
index 6d2b891db..2ba0a3406 100644
--- a/lib/src/widgets/blockchain_height_widget.dart
+++ b/lib/src/widgets/blockchain_height_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/date_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
@@ -81,7 +82,7 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
                   fontSize: 16.0,
                   fontWeight: FontWeight.w500,
                   color:
-                      Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                      Theme.of(context).extension<CakeTextTheme>()!.titleColor),
             ),
           ),
           Row(
diff --git a/lib/src/widgets/check_box_picker.dart b/lib/src/widgets/check_box_picker.dart
index 1fad5f17b..30f81e981 100644
--- a/lib/src/widgets/check_box_picker.dart
+++ b/lib/src/widgets/check_box_picker.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
@@ -132,7 +133,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
                   fontWeight: FontWeight.w600,
                   color: item.isDisabled
                       ? Colors.grey.withOpacity(0.5)
-                      : Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                      : Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   decoration: TextDecoration.none,
                 ),
               ),
diff --git a/lib/src/widgets/checkbox_widget.dart b/lib/src/widgets/checkbox_widget.dart
index 560187050..7427974ad 100644
--- a/lib/src/widgets/checkbox_widget.dart
+++ b/lib/src/widgets/checkbox_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:cake_wallet/palette.dart';
 import 'package:flutter/cupertino.dart';
@@ -65,7 +66,7 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
             child: Text(
               caption,
               style: TextStyle(
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   fontSize: 18,
                   fontFamily: 'Lato',
                   fontWeight: FontWeight.w500,
@@ -77,4 +78,4 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
       ),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/widgets/list_row.dart b/lib/src/widgets/list_row.dart
index 610b75358..c404a443b 100644
--- a/lib/src/widgets/list_row.dart
+++ b/lib/src/widgets/list_row.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
@@ -45,10 +46,7 @@ class ListRow extends StatelessWidget {
                           style: TextStyle(
                               fontSize: valueFontSize,
                               fontWeight: FontWeight.w500,
-                              color: Theme.of(context)
-                                  .primaryTextTheme!
-                                  .titleLarge!
-                                  .color!)),
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
                     ),
                     image != null
                     ? Padding(
diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart
index 3f5dafd19..ca806e6b9 100644
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@@ -1,5 +1,6 @@
 // ignore_for_file: deprecated_member_use
 
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
@@ -161,10 +162,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
                         child: TextFormField(
                           controller: searchController,
                           style: TextStyle(
-                              color: Theme.of(context)
-                                  .primaryTextTheme!
-                                  .titleLarge!
-                                  .color!),
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                           decoration: InputDecoration(
                             hintText: widget.hintText,
                             prefixIcon:
@@ -216,10 +214,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
                                       fontWeight: FontWeight.w500,
                                       fontFamily: 'Lato',
                                       decoration: TextDecoration.none,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme!
-                                          .titleLarge!
-                                          .color!,
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                                     ),
                                   ),
                                 )
@@ -311,10 +306,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
                           fontSize: 14,
                           fontFamily: 'Lato',
                           fontWeight: FontWeight.w600,
-                          color: Theme.of(context)
-                              .primaryTextTheme!
-                              .titleLarge!
-                              .color!,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                           decoration: TextDecoration.none,
                         ),
                       ),
@@ -392,10 +384,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
                           fontSize: 16,
                           fontFamily: 'Lato',
                           fontWeight: FontWeight.w700,
-                          color: Theme.of(context)
-                              .primaryTextTheme!
-                              .titleLarge!
-                              .color!,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                           decoration: TextDecoration.none,
                         ),
                       ),
diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart
index 39e104844..ddafa924b 100644
--- a/lib/src/widgets/seed_widget.dart
+++ b/lib/src/widgets/seed_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/src/widgets/validable_annotated_editable_text.dart';
 import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
@@ -90,10 +91,7 @@ class SeedWidgetState extends State<SeedWidget> {
                   cursorColor: Colors.blue,
                   backgroundCursorColor: Colors.blue,
                   validStyle: TextStyle(
-                      color: Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .color!,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                       backgroundColor: Colors.transparent,
                       fontWeight: FontWeight.normal,
                       fontSize: 16),
@@ -106,10 +104,7 @@ class SeedWidgetState extends State<SeedWidget> {
                   controller: controller,
                   words: words,
                   textStyle: TextStyle(
-                      color: Theme.of(context)
-                          .primaryTextTheme!
-                          .titleLarge!
-                          .color!,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                       backgroundColor: Colors.transparent,
                       fontWeight: FontWeight.normal,
                       fontSize: 16),
@@ -135,10 +130,7 @@ class SeedWidgetState extends State<SeedWidget> {
           Container(
               margin: EdgeInsets.only(top: 15),
               height: 1.0,
-              color: Theme.of(context)
-                  .primaryTextTheme!
-                  .titleLarge!
-                  .backgroundColor!),
+              color: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor),
         ]));
   }
 
diff --git a/lib/src/widgets/standard_checkbox.dart b/lib/src/widgets/standard_checkbox.dart
index da2bfdfc0..d5d66e35c 100644
--- a/lib/src/widgets/standard_checkbox.dart
+++ b/lib/src/widgets/standard_checkbox.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -27,7 +28,7 @@ class StandardCheckbox extends StatelessWidget {
     ], begin: Alignment.centerLeft, end: Alignment.centerRight);
 
     final boxBorder = Border.all(
-        color: borderColor ?? Theme.of(context).primaryTextTheme!.bodySmall!.color!, width: 1.0);
+        color: borderColor ?? Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor, width: 1.0);
 
     final checkedBoxDecoration = BoxDecoration(
         gradient: gradientBackground ? baseGradient : null,
@@ -61,7 +62,7 @@ class StandardCheckbox extends StatelessWidget {
                 child: Text(
                   caption,
                   style: TextStyle(
-                      fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                      fontSize: 16.0, color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 ))
         ],
       ),
diff --git a/lib/src/widgets/standard_list.dart b/lib/src/widgets/standard_list.dart
index 9abef70b1..2e0c9bebf 100644
--- a/lib/src/widgets/standard_list.dart
+++ b/lib/src/widgets/standard_list.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/widgets/standard_list_card.dart';
 import 'package:cake_wallet/src/widgets/standard_list_status_row.dart';
@@ -54,7 +55,7 @@ class StandardListRow extends StatelessWidget {
 
   Color titleColor(BuildContext context) => isSelected
       ? Palette.blueCraiola
-      : Theme.of(context).primaryTextTheme.titleLarge!.color!;
+      : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
 }
 
 class SectionHeaderListRow extends StatelessWidget {
diff --git a/lib/src/widgets/standard_list_status_row.dart b/lib/src/widgets/standard_list_status_row.dart
index 602ae0792..e24010358 100644
--- a/lib/src/widgets/standard_list_status_row.dart
+++ b/lib/src/widgets/standard_list_status_row.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
 import 'package:flutter/cupertino.dart';
@@ -52,10 +53,7 @@ class StandardListStatusRow extends StatelessWidget {
                             style: TextStyle(
                                 fontSize: 16,
                                 fontWeight: FontWeight.w500,
-                                color: Theme.of(context)
-                                    .primaryTextTheme!
-                                    .titleLarge!
-                                    .color!))
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor))
                       ],
                     ),
                   ),
diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart
index 7c45bba50..c50650a28 100644
--- a/lib/src/widgets/template_tile.dart
+++ b/lib/src/widgets/template_tile.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
@@ -48,7 +49,7 @@ class TemplateTileState extends State<TemplateTile> {
 
   @override
   Widget build(BuildContext context) {
-    final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
+    final color = isRemovable ? Colors.white : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
     final toIcon = Image.asset('assets/images/to_icon.png', color: color);
 
     final content = Row(
@@ -151,4 +152,4 @@ class TemplateTileState extends State<TemplateTile> {
 
     return isRemovable ? removableTile : tile;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/themes/bright_theme.dart b/lib/themes/bright_theme.dart
index 2ab96fbde..ec6ac1f85 100644
--- a/lib/themes/bright_theme.dart
+++ b/lib/themes/bright_theme.dart
@@ -146,14 +146,5 @@ class BrightTheme extends LightTheme {
                   Colors.white // background of tiles (account list)
               ),
           ),
-      primaryTextTheme: TextTheme(
-          titleLarge: TextStyle(
-              color: Palette.darkBlueCraiola, // title color
-              backgroundColor: Palette.wildPeriwinkle // textfield underline
-              ),
-          bodySmall: TextStyle(
-              color: PaletteDark.pigeonBlue, // secondary text
-              ),
-        ),
       );
 }
diff --git a/lib/themes/dark_theme.dart b/lib/themes/dark_theme.dart
index 66872425d..4f2d3fc95 100644
--- a/lib/themes/dark_theme.dart
+++ b/lib/themes/dark_theme.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/themes/extensions/address_theme.dart';
 import 'package:cake_wallet/themes/extensions/alert_theme.dart';
 import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
@@ -166,6 +167,12 @@ class DarkTheme extends ThemeBase {
       detailsTitlesColor: PaletteDark.lightBlueGrey,
       rowsColor: PaletteDark.wildNightBlue);
 
+  @override
+  CakeTextTheme get cakeTextTheme => CakeTextTheme(
+      secondaryTextColor: PaletteDark.darkCyanBlue,
+      textfieldUnderlineColor: PaletteDark.darkOceanBlue,
+      titleColor: Colors.white);
+
   @override
   ThemeData get themeData => super.themeData.copyWith(
       indicatorColor: PaletteDark.cyanBlue, // page indicator
@@ -216,15 +223,5 @@ class DarkTheme extends ThemeBase {
                   .darkOceanBlue // background of tiles (account list)
               ),
       ),
-      primaryTextTheme: TextTheme(
-          // title -> titleLarge
-          titleLarge: TextStyle(
-              color: Colors.white, // title color
-              backgroundColor: PaletteDark.darkOceanBlue // textfield underline
-              ),
-          bodySmall: TextStyle(
-              color: PaletteDark.darkCyanBlue, // secondary text
-              ),
-      ),
       );
 }
diff --git a/lib/themes/extensions/cake_text_theme.dart b/lib/themes/extensions/cake_text_theme.dart
new file mode 100644
index 000000000..30337252a
--- /dev/null
+++ b/lib/themes/extensions/cake_text_theme.dart
@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+
+class CakeTextTheme extends ThemeExtension<CakeTextTheme> {
+  final Color secondaryTextColor;
+  final Color textfieldUnderlineColor;
+  final Color titleColor;
+
+  CakeTextTheme(
+      {required this.secondaryTextColor,
+      required this.textfieldUnderlineColor,
+      required this.titleColor});
+
+  @override
+  CakeTextTheme copyWith(
+          {Color? secondaryTextColor,
+          Color? textfieldUnderlineColor,
+          Color? titleColor}) =>
+      CakeTextTheme(
+          secondaryTextColor: secondaryTextColor ?? this.secondaryTextColor,
+          textfieldUnderlineColor:
+              textfieldUnderlineColor ?? this.textfieldUnderlineColor,
+          titleColor: titleColor ?? this.titleColor);
+
+  @override
+  CakeTextTheme lerp(ThemeExtension<CakeTextTheme>? other, double t) {
+    if (other is! CakeTextTheme) {
+      return this;
+    }
+
+    return CakeTextTheme(
+        secondaryTextColor:
+            Color.lerp(secondaryTextColor, other.secondaryTextColor, t)!,
+        textfieldUnderlineColor: Color.lerp(
+            textfieldUnderlineColor, other.textfieldUnderlineColor, t)!,
+        titleColor: Color.lerp(titleColor, other.titleColor, t)!);
+  }
+}
diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart
index 3deb47ec1..b8fd59808 100644
--- a/lib/themes/light_theme.dart
+++ b/lib/themes/light_theme.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/themes/extensions/address_theme.dart';
 import 'package:cake_wallet/themes/extensions/alert_theme.dart';
 import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
@@ -168,6 +169,12 @@ class LightTheme extends ThemeBase {
       detailsTitlesColor: Palette.darkGray,
       rowsColor: Palette.blueAlice);
 
+  @override
+  CakeTextTheme get cakeTextTheme => CakeTextTheme(
+      secondaryTextColor: PaletteDark.pigeonBlue,
+      textfieldUnderlineColor: Palette.wildPeriwinkle,
+      titleColor: Palette.darkBlueCraiola);
+
   @override
   ThemeData get themeData => super.themeData.copyWith(
       indicatorColor:
@@ -220,15 +227,5 @@ class LightTheme extends ThemeBase {
                   Colors.white // background of tiles (account list)
               ),
       ),
-      primaryTextTheme: TextTheme(
-          // title -> titleLarge
-          titleLarge: TextStyle(
-              color: Palette.darkBlueCraiola, // title color
-              backgroundColor: Palette.wildPeriwinkle // textfield underline
-              ),
-          bodySmall: TextStyle(
-              color: PaletteDark.pigeonBlue, // secondary text
-              ),
-      ),
       );
 }
diff --git a/lib/themes/theme_base.dart b/lib/themes/theme_base.dart
index a9d21fb0d..31a6c64f1 100644
--- a/lib/themes/theme_base.dart
+++ b/lib/themes/theme_base.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/themes/extensions/address_theme.dart';
 import 'package:cake_wallet/themes/extensions/alert_theme.dart';
 import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
@@ -97,6 +98,8 @@ abstract class ThemeBase {
 
   TransactionTradeTheme get transactionTradeTheme;
 
+  CakeTextTheme get cakeTextTheme;
+
   ThemeData get themeData => generatedThemeData.copyWith(
       primaryColor: primaryColor,
       cardColor: containerColor,
@@ -123,6 +126,7 @@ abstract class ThemeBase {
         seedWidgetTheme,
         placeholderTheme,
         transactionTradeTheme,
+        cakeTextTheme,
       ],
       scrollbarTheme: ScrollbarThemeData(
           thumbColor: MaterialStateProperty.all(scrollbarTheme.thumbColor),