Cw 373 theme refactoring in preparation to support additional themes (#933)

* refactor(Theme): migrate accentColor

- based on the specs at https://docs.flutter.dev/release/breaking-changes/theme-data-accent-properties#migration-guide.

* refactor(Theme): all deprecated TextTheme styles

* refactor(Theme): deprecated backgroundColor for colorScheme.background

* refactor(Theme): deprecated buttonColor to use TextTheme backgroundColor instead

* refactor(Theme): deprecated isAlwaysShown to use thumbVisibility instead

lib/src/screens/auth/auth_page.dart

@@ -141,7 +141,7 @@ class AuthPageState extends State<AuthPage> {
                       ),
                     ))
                 : Container(),
-            backgroundColor: Theme.of(context).backgroundColor,
+            backgroundColor: Theme.of(context).colorScheme.background,
             border: null),
         resizeToAvoidBottomInset: false,
         body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),

lib/src/screens/backup/backup_page.dart

@@ -79,7 +79,10 @@ class BackupPage extends BasePage {
                   isLoading: backupViewModelBase.state is IsExecutingState,
                   onPressed: () => onExportBackup(context),
                   text: S.of(context).export_backup,
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white)),
           bottom: 24,
           left: 24,

lib/src/screens/backup/edit_backup_password_page.dart

@@ -38,14 +38,20 @@ class EditBackupPasswordPage extends BasePage {
                         keyboardType: TextInputType.visiblePassword,
                         controller: textEditingController,
                         style: TextStyle(
-                          fontSize: 26,
-                          color: Theme.of(context).primaryTextTheme!.headline6!.color!)))),
+                            fontSize: 26,
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .titleLarge!
+                                .color!)))),
             Positioned(
                 child: Observer(
                     builder: (_) => PrimaryButton(
                         onPressed: () => onSave(context),
                         text: S.of(context).save,
-                        color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .bodyLarge!
+                            .color!,
                         textColor: Colors.white,
                         isDisabled: !editBackupPasswordViewModel.canSave)),
                 bottom: 24,

lib/src/screens/base_page.dart

@@ -48,7 +48,7 @@ abstract class BasePage extends StatelessWidget {
     }
 
     final _backButton = Icon(Icons.arrow_back_ios,
-      color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!,
+      color: titleColor ?? Theme.of(context).primaryTextTheme!.titleLarge!.color!,
       size: 16,);
 
     return MergeSemantics(
@@ -83,7 +83,7 @@ abstract class BasePage extends StatelessWidget {
                 fontWeight: FontWeight.bold,
                 fontFamily: 'Lato',
                 color: titleColor ??
-                    Theme.of(context).primaryTextTheme!.headline6!.color!),
+                    Theme.of(context).primaryTextTheme!.titleLarge!.color!),
           );
   }
 

lib/src/screens/buy/pre_order_page.dart

@@ -80,7 +80,9 @@ class PreOrderPage extends BasePage {
     return KeyboardActions(
       config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!
+            keyboardBarColor: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
                 .backgroundColor!,
             nextFocus: false,
             actions: [
@@ -91,7 +93,7 @@ class PreOrderPage extends BasePage {
             ]),
       child: Container(
           height: 0,
-          color: Theme.of(context).backgroundColor,
+          color: Theme.of(context).colorScheme.background,
           child: ScrollableWithBottomSection(
             contentPadding: EdgeInsets.only(bottom: 24),
             content: Observer(builder: (_) => Column(
@@ -102,9 +104,9 @@ class PreOrderPage extends BasePage {
                           bottomLeft: Radius.circular(24),
                           bottomRight: Radius.circular(24)),
                       gradient: LinearGradient(colors: [
-                        Theme.of(context).primaryTextTheme.subtitle1!.color!,
+                        Theme.of(context).primaryTextTheme!.titleMedium!.color!,
                         Theme.of(context)
-                            .primaryTextTheme.subtitle1!
+                            .primaryTextTheme!.titleMedium!
                             .decorationColor!,
                       ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                     ),
@@ -160,11 +162,11 @@ class PreOrderPage extends BasePage {
                             ),
                           ),
                           hintText: '0.00',
-                          borderColor: Theme.of(context).primaryTextTheme.bodyText1!.decorationColor!,
+                          borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
                           borderWidth: 0.5,
                           textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white),
                           placeholderTextStyle: TextStyle(
-                            color: Theme.of(context).primaryTextTheme.headline5!.decorationColor!,
+                            color: Theme.of(context).primaryTextTheme!.headlineSmall!.decorationColor!,
                             fontWeight: FontWeight.w500,
                             fontSize: 36,
                           ),
@@ -179,7 +181,7 @@ class PreOrderPage extends BasePage {
                       S.of(context).buy_with + ':',
                       textAlign: TextAlign.center,
                       style: TextStyle(
-                          color: Theme.of(context).primaryTextTheme.headline6!.color!,
+                          color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
                           fontSize: 18,
                           fontWeight: FontWeight.bold
                       ),
@@ -246,7 +248,7 @@ class PreOrderPage extends BasePage {
                           ? S.of(context).buy
                           : S.of(context).buy_with +
                             ' ${buyViewModel.selectedProvider!.description.title}',
-                    color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+                    color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                     textColor: Colors.white,
                     isLoading: buyViewModel.isRunning,
                     isDisabled: (buyViewModel.selectedProvider == null) ||

lib/src/screens/contact/contact_list_page.dart

@@ -29,12 +29,15 @@ class ContactListPage extends BasePage {
         height: 32.0,
         decoration: BoxDecoration(
             shape: BoxShape.circle,
-            color: Theme.of(context).accentTextTheme.caption!.color!),
+            color: Theme.of(context)
+                .accentTextTheme!
+                .bodySmall!
+                .color!),
         child: Stack(
           alignment: Alignment.center,
           children: <Widget>[
             Icon(Icons.add,
-                color: Theme.of(context).primaryTextTheme.headline6!.color!,
+                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                 size: 22.0),
             ButtonTheme(
               minWidth: 32.0,
@@ -64,9 +67,9 @@ class ContactListPage extends BasePage {
           return CollapsibleSectionList(
               context: context,
               sectionCount: 2,
-              themeColor: Theme.of(context).primaryTextTheme.headline6!.color!,
+              themeColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
               dividerThemeColor:
-              Theme.of(context).primaryTextTheme.caption!.decorationColor!,
+              Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!,
               sectionTitleBuilder: (_, int sectionIndex) {
                 var title = S.current.contact_list_contacts;
 
@@ -140,7 +143,7 @@ class ContactListPage extends BasePage {
                   style: TextStyle(
                       fontSize: 14,
                       fontWeight: FontWeight.normal,
-                      color: Theme.of(context).primaryTextTheme.headline6!.color!),
+                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
                 ),
               )
             )

lib/src/screens/contact/contact_page.dart

@@ -47,7 +47,8 @@ class ContactPage extends BasePage {
   @override
   Widget body(BuildContext context) {
     final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png',
-        color: Theme.of(context).primaryTextTheme!.overline!.color!, height: 8);
+        color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
+        height: 8);
 
     reaction((_) => contactViewModel.state, (ExecutionState state) {
       if (state is FailureState) {
@@ -98,12 +99,14 @@ class ContactPage extends BasePage {
                         AddressTextFieldOption.paste,
                         AddressTextFieldOption.qrCode,
                       ],
-                      buttonColor:
-                          Theme.of(context).accentTextTheme!.headline3!.color!,
+                      buttonColor: Theme.of(context)
+                          .accentTextTheme!
+                          .displaySmall!
+                          .color!,
                       iconColor: PaletteDark.gray,
                       borderColor: Theme.of(context)
                           .primaryTextTheme!
-                          .headline6!
+                          .titleLarge!
                           .backgroundColor!,
                       validator:
                           AddressValidator(type: contactViewModel.currency!),
@@ -142,7 +145,7 @@ class ContactPage extends BasePage {
                           text: S.of(context).save,
                           color: Theme.of(context)
                               .accentTextTheme!
-                              .bodyText1!
+                              .bodyLarge!
                               .color!,
                           textColor: Colors.white,
                           isDisabled: !contactViewModel.isReady)))

lib/src/screens/dashboard/dashboard_page.dart

@@ -77,7 +77,7 @@ class _DashboardPageView extends BasePage {
       (BuildContext context, Widget scaffold) => Container(
           decoration: BoxDecoration(
               gradient: LinearGradient(colors: [
-            Theme.of(context).accentColor,
+            Theme.of(context).colorScheme.secondary,
             Theme.of(context).scaffoldBackgroundColor,
             Theme.of(context).primaryColor,
           ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -99,7 +99,10 @@ class _DashboardPageView extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     final menuButton = Image.asset('assets/images/menu.png',
-        color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!);
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayMedium!
+            .backgroundColor);
 
     return Container(
         alignment: Alignment.centerRight,
@@ -167,7 +170,7 @@ class _DashboardPageView extends BasePage {
                           dotColor: Theme.of(context).indicatorColor,
                           activeDotColor: Theme.of(context)
                               .accentTextTheme!
-                              .headline4!
+                              .headlineMedium!
                               .backgroundColor!),
                     ),
                   );
@@ -186,7 +189,10 @@ class _DashboardPageView extends BasePage {
                             : Colors.transparent,
                         width: 1,
                       ),
-                      color: Theme.of(context).textTheme.headline6!.backgroundColor!,
+                      color: Theme.of(context)
+                          .textTheme!
+                          .titleLarge!
+                          .backgroundColor!,
                     ),
                     child: Container(
                       padding: EdgeInsets.only(left: 32, right: 32),
@@ -207,12 +213,12 @@ class _DashboardPageView extends BasePage {
                                                     dashboardViewModel) ??
                                                 true
                                             ? Theme.of(context)
-                                                .accentTextTheme
-                                                .headline2!
+                                                .accentTextTheme!
+                                                .displayMedium!
                                                 .backgroundColor!
                                             : Theme.of(context)
-                                                .accentTextTheme
-                                                .headline3!
+                                                .accentTextTheme!
+                                                .displaySmall!
                                                 .backgroundColor!),
                                     title: action.name(context),
                                     onClick: () async => await action.onTap(
@@ -222,8 +228,8 @@ class _DashboardPageView extends BasePage {
                                             true
                                         ? null
                                         : Theme.of(context)
-                                            .accentTextTheme
-                                            .headline3!
+                                            .accentTextTheme!
+                                            .displaySmall!
                                             .backgroundColor!,
                                   ),
                                 ))

lib/src/screens/dashboard/desktop_dashboard_page.dart

@@ -37,7 +37,7 @@ class DesktopDashboardPage extends StatelessWidget {
     _setEffects(context);
 
     return Container(
-      color: Theme.of(context).backgroundColor,
+      color: Theme.of(context).colorScheme.background,
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [

lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart

@@ -30,7 +30,7 @@ class DesktopActionButton extends StatelessWidget {
           width: double.infinity,
           decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(15.0),
-            color: Theme.of(context).textTheme.headline6!.backgroundColor!,
+            color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
           ),
           child: Center(
             child: Row(
@@ -41,8 +41,14 @@ class DesktopActionButton extends StatelessWidget {
                   height: 30,
                   width: 30,
                   color: isEnabled
-                      ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
-                      : Theme.of(context).accentTextTheme.headline3!.backgroundColor!,
+                      ? Theme.of(context)
+                          .accentTextTheme!
+                          .displayMedium!
+                          .backgroundColor!
+                      : Theme.of(context)
+                          .accentTextTheme!
+                          .displaySmall!
+                          .backgroundColor!,
                 ),
                 const SizedBox(width: 10),
                 AutoSizeText(
@@ -52,7 +58,10 @@ class DesktopActionButton extends StatelessWidget {
                     fontFamily: 'Lato',
                     fontWeight: FontWeight.bold,
                     color: isEnabled
-                        ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
+                        ? Theme.of(context)
+                            .accentTextTheme!
+                            .displayMedium!
+                            .backgroundColor!
                         : null,
                     height: 1,
                   ),

lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart

@@ -16,7 +16,7 @@ class SideMenuItem extends StatelessWidget {
 
   Color _setColor(BuildContext context) {
     if (isSelected) {
-      return Theme.of(context).primaryTextTheme.headline6!.color!;
+      return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
     } else {
       return Theme.of(context).highlightColor;
     }

lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart

@@ -126,7 +126,7 @@ class DesktopSidebarWrapper extends BasePage {
             children: [
               child,
               Container(
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).colorScheme.background,
                 padding: EdgeInsets.all(20),
                 child: Navigator(
                   initialRoute: Routes.support,

lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart

@@ -36,14 +36,14 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
         'assets/images/new_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).primaryTextTheme.headline6!.color!,
+        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
       );
 
   Image _restoreWalletImage(BuildContext context) => Image.asset(
         'assets/images/restore_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).primaryTextTheme.headline6!.color!,
+        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
       );
 
   Flushbar<void>? _progressBar;
@@ -93,8 +93,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
         onChanged: (item) {
           item?.onSelected();
         },
-        dropdownColor: themeData.textTheme.bodyText1?.decorationColor,
-        style: TextStyle(color: themeData.primaryTextTheme.headline6?.color),
+        dropdownColor: themeData.textTheme!.bodyLarge?.decorationColor,
+        style: TextStyle(color: themeData.primaryTextTheme!.titleLarge?.color),
         selectedItemBuilder: (context) => dropDownItems.map((item) => item.child).toList(),
         value: dropDownItems.firstWhere((element) => element.isSelected),
         underline: const SizedBox(),

lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart

@@ -23,7 +23,7 @@ class DropDownItemWidget extends StatelessWidget {
               style: TextStyle(
                 fontSize: 22,
                 fontWeight: FontWeight.w500,
-                color: Theme.of(context).primaryTextTheme.headline6!.color!,
+                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
               ),
               overflow: TextOverflow.ellipsis,
               maxLines: 1,

lib/src/screens/dashboard/widgets/action_button.dart

@@ -45,7 +45,11 @@ class ActionButton extends StatelessWidget {
               title,
               style: TextStyle(
                   fontSize: 10,
-                  color: textColor ?? Theme.of(context).accentTextTheme!.headline2!.backgroundColor!),
+                  color: textColor ??
+                      Theme.of(context)
+                          .accentTextTheme!
+                          .displayMedium!
+                          .backgroundColor!),
             )
           ],
         ),

lib/src/screens/dashboard/widgets/address_page.dart

@@ -63,7 +63,10 @@ class AddressPage extends BasePage {
   Widget? leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+      color: Theme.of(context)
+          .accentTextTheme!
+          .displayMedium!
+          .backgroundColor!,
       size: 16,
     );
     final _closeButton = currentTheme.type == ThemeType.dark
@@ -106,7 +109,7 @@ class AddressPage extends BasePage {
       (BuildContext context, Widget scaffold) => Container(
           decoration: BoxDecoration(
               gradient: LinearGradient(colors: [
-            Theme.of(context).accentColor,
+            Theme.of(context).colorScheme.secondary,
             Theme.of(context).scaffoldBackgroundColor,
             Theme.of(context).primaryColor,
           ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -131,7 +134,10 @@ class AddressPage extends BasePage {
         icon: Icon(
           Icons.share,
           size: 20,
-          color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+          color: Theme.of(context)
+              .accentTextTheme!
+              .displayMedium!
+              .backgroundColor!,
         ),
       ),
     );
@@ -172,7 +178,10 @@ class AddressPage extends BasePage {
         tapOutsideToDismiss: true,
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
+            keyboardBarColor: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
+                .backgroundColor!,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -204,8 +213,15 @@ class AddressPage extends BasePage {
                           decoration: BoxDecoration(
                               borderRadius: BorderRadius.all(Radius.circular(25)),
                               border: Border.all(
-                                  color: Theme.of(context).textTheme.subtitle1!.color!, width: 1),
-                              color: Theme.of(context).buttonColor),
+                                  color: Theme.of(context)
+                                      .textTheme!
+                                      .titleMedium!
+                                      .color!,
+                                  width: 1),
+                              color: Theme.of(context)
+                                  .textTheme!
+                                  .titleLarge!
+                                  .backgroundColor!),
                           child: Row(
                             mainAxisSize: MainAxisSize.max,
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -219,15 +235,17 @@ class AddressPage extends BasePage {
                                             fontSize: 14,
                                             fontWeight: FontWeight.w500,
                                             color: Theme.of(context)
-                                                .accentTextTheme
-                                                .headline2!
+                                                .accentTextTheme!
+                                                .displayMedium!
                                                 .backgroundColor!),
                                       )),
                               Icon(
                                 Icons.arrow_forward_ios,
                                 size: 14,
-                                color:
-                                    Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+                                color: Theme.of(context)
+                                    .accentTextTheme!
+                                    .displayMedium!
+                                    .backgroundColor!,
                               )
                             ],
                           ),
@@ -237,7 +255,10 @@ class AddressPage extends BasePage {
                         textAlign: TextAlign.center,
                         style: TextStyle(
                             fontSize: 15,
-                            color: Theme.of(context).accentTextTheme.headline3!.backgroundColor!));
+                            color: Theme.of(context)
+                                .accentTextTheme!
+                                .displaySmall!
+                                .backgroundColor!));
               })
             ],
           ),

lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart

@@ -37,19 +37,19 @@ class AnonpayTransactionRow extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 16,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)),
+                            color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)),
                     Text(amount + ' ' + currency,
                         style: TextStyle(
                             fontSize: 16,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!))
+                            color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!))
                   ]),
                   SizedBox(height: 5),
                   Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
                     Text(createdAt,
                         style: TextStyle(
                             fontSize: 14,
-                            color: Theme.of(context).textTheme.overline!.backgroundColor!))
+                            color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!))
                   ])
                 ],
               ))

lib/src/screens/dashboard/widgets/balance_page.dart

@@ -35,7 +35,10 @@ class BalancePage extends StatelessWidget {
                         fontSize: 24,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w600,
-                        color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .displayMedium!
+                            .backgroundColor!,
                         height: 1),
                     maxLines: 1,
                     textAlign: TextAlign.center);
@@ -98,7 +101,7 @@ class BalancePage extends StatelessWidget {
                 : Colors.transparent,
             width: 1,
           ),
-          color: Theme.of(context).textTheme!.headline6!.backgroundColor!),
+          color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!),
       child: Container(
           margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24),
           child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -111,7 +114,10 @@ class BalancePage extends StatelessWidget {
                     fontSize: 12,
                     fontFamily: 'Lato',
                     fontWeight: FontWeight.w400,
-                    color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .displaySmall!
+                        .backgroundColor!,
                     height: 1)),
             SizedBox(height: 5),
             Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
@@ -120,7 +126,10 @@ class BalancePage extends StatelessWidget {
                       fontSize: 24,
                       fontFamily: 'Lato',
                       fontWeight: FontWeight.w900,
-                      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .displayMedium!
+                          .backgroundColor!,
                       height: 1),
                   maxLines: 1,
                   textAlign: TextAlign.center),
@@ -129,7 +138,10 @@ class BalancePage extends StatelessWidget {
                       fontSize: 28,
                       fontFamily: 'Lato',
                       fontWeight: FontWeight.w800,
-                      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .displayMedium!
+                          .backgroundColor!,
                       height: 1)),
             ]),
             SizedBox(
@@ -141,7 +153,10 @@ class BalancePage extends StatelessWidget {
                     fontSize: 16,
                     fontFamily: 'Lato',
                     fontWeight: FontWeight.w500,
-                    color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .displayMedium!
+                        .backgroundColor!,
                     height: 1)),
             SizedBox(height: 26),
             if (frozenBalance.isNotEmpty)
@@ -152,7 +167,10 @@ class BalancePage extends StatelessWidget {
                         fontSize: 12,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w400,
-                        color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .displaySmall!
+                            .backgroundColor!,
                         height: 1)),
                 SizedBox(height: 8),
                 AutoSizeText(frozenBalance,
@@ -160,7 +178,10 @@ class BalancePage extends StatelessWidget {
                         fontSize: 20,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w400,
-                        color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .displayMedium!
+                            .backgroundColor!,
                         height: 1),
                     maxLines: 1,
                     textAlign: TextAlign.center),
@@ -172,7 +193,10 @@ class BalancePage extends StatelessWidget {
                       fontSize: 12,
                       fontFamily: 'Lato',
                       fontWeight: FontWeight.w400,
-                      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .displayMedium!
+                          .backgroundColor!,
                       height: 1),
                 ),
                 SizedBox(height: 24)
@@ -183,7 +207,10 @@ class BalancePage extends StatelessWidget {
                     fontSize: 12,
                     fontFamily: 'Lato',
                     fontWeight: FontWeight.w400,
-                    color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .displaySmall!
+                        .backgroundColor!,
                     height: 1)),
             SizedBox(height: 8),
             AutoSizeText(additionalBalance,
@@ -191,7 +218,10 @@ class BalancePage extends StatelessWidget {
                     fontSize: 20,
                     fontFamily: 'Lato',
                     fontWeight: FontWeight.w400,
-                    color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .displayMedium!
+                        .backgroundColor!,
                     height: 1),
                 maxLines: 1,
                 textAlign: TextAlign.center),
@@ -205,7 +235,10 @@ class BalancePage extends StatelessWidget {
                   fontSize: 12,
                   fontFamily: 'Lato',
                   fontWeight: FontWeight.w400,
-                  color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .displayMedium!
+                      .backgroundColor!,
                   height: 1),
             )
           ])),

lib/src/screens/dashboard/widgets/date_section_raw.dart

@@ -36,6 +36,9 @@ class DateSectionRaw extends StatelessWidget {
         child: Text(title,
             style: TextStyle(
                 fontSize: 12,
-                color: Theme.of(context).textTheme!.overline!.backgroundColor!)));
+                color: Theme.of(context)
+                    .textTheme!
+                    .labelSmall!
+                    .backgroundColor!)));
   }
 }

lib/src/screens/dashboard/widgets/filter_widget.dart

@@ -23,7 +23,7 @@ class FilterWidget extends StatelessWidget {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(24)),
             child: Container(
-              color: Theme.of(context).textTheme!.bodyText1!.decorationColor!,
+              color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!,
               child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
@@ -33,8 +33,8 @@ class FilterWidget extends StatelessWidget {
                         S.of(context).filter_by,
                         style: TextStyle(
                           color: Theme.of(context)
-                              .primaryTextTheme
-                              .overline!
+                              .primaryTextTheme!
+                              .labelSmall!
                               .color!,
                           fontSize: 16,
                           fontFamily: 'Lato',
@@ -65,7 +65,7 @@ class FilterWidget extends StatelessWidget {
                                 style: TextStyle(
                                     color: Theme.of(context)
                                         .primaryTextTheme!
-                                        .headline6!
+                                        .titleLarge!
                                         .color!,
                                     fontSize: 16,
                                     fontFamily: 'Lato',

lib/src/screens/dashboard/widgets/header_row.dart

@@ -12,7 +12,7 @@ class HeaderRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final filterIcon = Image.asset('assets/images/filter_icon.png',
-        color: Theme.of(context).textTheme!.caption!.decorationColor!);
+        color: Theme.of(context).textTheme!.bodySmall!.decorationColor!);
 
     return Container(
       height: 52,
@@ -25,10 +25,12 @@ class HeaderRow extends StatelessWidget {
           Text(
             S.of(context).transactions,
             style: TextStyle(
-              fontSize: 20,
-              fontWeight: FontWeight.w500,
-              color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!
-            ),
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context)
+                    .accentTextTheme!
+                    .displayMedium!
+                    .backgroundColor!),
           ),
           GestureDetector(
             onTap: () {
@@ -43,8 +45,7 @@ class HeaderRow extends StatelessWidget {
               width: 36,
               decoration: BoxDecoration(
                   shape: BoxShape.circle,
-                  color: Theme.of(context).textTheme!.overline!.color!
-              ),
+                  color: Theme.of(context).textTheme!.labelSmall!.color!),
               child: filterIcon,
             ),
           )

lib/src/screens/dashboard/widgets/market_place_page.dart

@@ -22,7 +22,7 @@ class MarketPlacePage extends StatelessWidget {
       child: RawScrollbar(
         thumbColor: Colors.white.withOpacity(0.15),
         radius: Radius.circular(20),
-        isAlwaysShown: true,
+        thumbVisibility: true,
         thickness: 2,
         controller: _scrollController,
         child: Padding(
@@ -36,7 +36,10 @@ class MarketPlacePage extends StatelessWidget {
                 style: TextStyle(
                   fontSize: 24,
                   fontWeight: FontWeight.w500,
-                  color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .displayMedium!
+                      .backgroundColor!,
                 ),
               ),
               Expanded(

lib/src/screens/dashboard/widgets/menu_widget.dart

@@ -84,9 +84,15 @@ class MenuWidgetState extends State<MenuWidget> {
     final itemCount = SettingActions.all.length;
 
     moneroIcon = Image.asset('assets/images/monero_menu.png',
-        color: Theme.of(context).accentTextTheme.overline!.decorationColor!);
+        color: Theme.of(context)
+            .accentTextTheme!
+            .labelSmall!
+            .decorationColor!);
     bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png',
-        color: Theme.of(context).accentTextTheme.overline!.decorationColor!);
+        color: Theme.of(context)
+            .accentTextTheme!
+            .labelSmall!
+            .decorationColor!);
     litecoinIcon = Image.asset('assets/images/litecoin_menu.png');
     havenIcon = Image.asset('assets/images/haven_menu.png');
 
@@ -108,7 +114,8 @@ class MenuWidgetState extends State<MenuWidget> {
                 borderRadius: BorderRadius.only(
                     topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)),
                 child: Container(
-                  color: Theme.of(context).textTheme.bodyText1!.decorationColor!,
+                  color:
+                      Theme.of(context).textTheme!.bodyLarge!.decorationColor!,
                   child: ListView.separated(
                       padding: EdgeInsets.only(top: 0),
                       itemBuilder: (_, index) {
@@ -117,9 +124,14 @@ class MenuWidgetState extends State<MenuWidget> {
                             height: headerHeight,
                             decoration: BoxDecoration(
                               gradient: LinearGradient(colors: [
-                                Theme.of(context).accentTextTheme.headline4!.color!,
-                                Theme.of(context).accentTextTheme.headline4!.decorationColor!,
-                              ], begin: Alignment.topLeft, end: Alignment.bottomRight),
+                                Theme.of(context)
+                                    .accentTextTheme!
+                                    .headlineMedium!
+                                    .color!,
+                                Theme.of(context)
+                                    .accentTextTheme!
+                                    .headlineMedium!
+                                    .decorationColor!,                              ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                             ),
                             padding: EdgeInsets.only(
                                 left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge),
@@ -149,8 +161,8 @@ class MenuWidgetState extends State<MenuWidget> {
                                                   widget.dashboardViewModel.subname,
                                                   style: TextStyle(
                                                       color: Theme.of(context)
-                                                          .accentTextTheme
-                                                          .overline!
+                                                          .accentTextTheme!
+                                                          .labelSmall!
                                                           .decorationColor!,
                                                       fontWeight: FontWeight.w500,
                                                       fontSize: 12),
@@ -182,7 +194,10 @@ class MenuWidgetState extends State<MenuWidget> {
                       },
                       separatorBuilder: (_, index) => Container(
                             height: 1,
-                            color: Theme.of(context).primaryTextTheme.caption!.decorationColor!,
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .bodySmall!
+                                .decorationColor!,
                           ),
                       itemCount: itemCount + 1),
                 )))

lib/src/screens/dashboard/widgets/order_row.dart

@@ -20,7 +20,7 @@ class OrderRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final iconColor =
-        Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!;
+        Theme.of(context).primaryTextTheme!.displayLarge!.backgroundColor!;
 
     final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor);
 
@@ -48,14 +48,14 @@ class OrderRow extends StatelessWidget {
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!
+                                    color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!
                                 )),
                             formattedAmount != null
                                 ? Text(formattedAmount! + ' ' + to,
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!
+                                    color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!
                                 ))
                                 : Container()
                           ]),
@@ -66,8 +66,10 @@ class OrderRow extends StatelessWidget {
                             Text(createdAtFormattedDate,
                                 style: TextStyle(
                                     fontSize: 14,
-                                    color: Theme.of(context).textTheme!
-                                        .overline!.backgroundColor!))
+                                    color: Theme.of(context)
+                                        .textTheme!
+                                        .labelSmall!
+                                        .backgroundColor!))
                           ])
                     ],
                   )

lib/src/screens/dashboard/widgets/present_receive_option_picker.dart

@@ -18,7 +18,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final textIconTheme = hasWhiteBackground
-        ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
+        ? Theme.of(context)
+            .accentTextTheme!
+            .displayMedium!
+            .backgroundColor!
         : Colors.white;
     final arrowBottom = Image.asset(
       'assets/images/arrow_bottom_purple_icon.png',
@@ -83,7 +86,7 @@ class PresentReceiveOptionPicker extends StatelessWidget {
                 margin: EdgeInsets.symmetric(horizontal: 24),
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(30),
-                  color: Theme.of(context).backgroundColor,
+                  color: Theme.of(context).colorScheme.background,
                 ),
                 child: Padding(
                   padding: const EdgeInsets.only(top: 24, bottom: 24),
@@ -110,7 +113,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
                                 Text(option.toString(),
                                     textAlign: TextAlign.left,
                                     style: textSmall(
-                                      color: Theme.of(context).primaryTextTheme.headline6!.color!,
+                                      color: Theme.of(context)
+                                          .primaryTextTheme!
+                                          .titleLarge!
+                                          .color!,
                                     ).copyWith(
                                       fontWeight:
                                           value == option ? FontWeight.w800 : FontWeight.w500,

lib/src/screens/dashboard/widgets/sync_indicator.dart

@@ -32,7 +32,7 @@ class SyncIndicator extends StatelessWidget {
           child: Container(
             height: 30,
             width: syncIndicatorWidth,
-            color: Theme.of(context).textTheme!.headline6!.decorationColor!,
+            color: Theme.of(context).textTheme!.titleLarge!.decorationColor!,
             child: Stack(
               alignment: Alignment.center,
               children: <Widget>[
@@ -44,7 +44,7 @@ class SyncIndicator extends StatelessWidget {
                     child: Container(
                       width: indicatorWidth,
                       height: 30,
-                      color: Theme.of(context).textTheme!.headline6!.backgroundColor!,
+                      color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
                     )
                 )
                 : Offstage(),
@@ -66,7 +66,7 @@ class SyncIndicator extends StatelessWidget {
                           style: TextStyle(
                             fontSize: 12,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context).textTheme!.headline6!.color!
+                            color: Theme.of(context).textTheme!.titleLarge!.color!
                           ),
                         ),
                       )

lib/src/screens/dashboard/widgets/sync_indicator_icon.dart

@@ -26,14 +26,15 @@ class SyncIndicatorIcon extends StatelessWidget {
     if (boolMode) {
       indicatorColor = isSynced
           ? PaletteDark.brightGreen
-          : Theme.of(context).textTheme!.caption!.color!;
+          : Theme.of(context).textTheme!.bodySmall!.color!;
     } else {
       switch (value.toLowerCase()) {
         case waiting:
           indicatorColor = Colors.red;
           break;
         case actionRequired:
-          indicatorColor = Theme.of(context).textTheme!.headline2!.decorationColor!;
+          indicatorColor =
+              Theme.of(context).textTheme!.displayMedium!.decorationColor!;
           break;
         case created:
           indicatorColor = PaletteDark.brightGreen;

lib/src/screens/dashboard/widgets/trade_row.dart

@@ -43,14 +43,14 @@ class TradeRow extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 16,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)),
+                            color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)),
                     formattedAmount != null
                         ? Text(formattedAmount! + ' ' + amountCrypto,
                             style: TextStyle(
                                 fontSize: 16,
                                 fontWeight: FontWeight.w500,
                                 color:
-                                    Theme.of(context).accentTextTheme!.headline2!.backgroundColor!))
+                                    Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!))
                         : Container()
                   ]),
                   SizedBox(height: 5),
@@ -59,7 +59,7 @@ class TradeRow extends StatelessWidget {
                       Text(createdAtFormattedDate!,
                           style: TextStyle(
                               fontSize: 14,
-                              color: Theme.of(context).textTheme!.overline!.backgroundColor!))
+                              color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!))
                   ])
                 ],
               ))

lib/src/screens/dashboard/widgets/transaction_raw.dart

@@ -35,7 +35,7 @@ class TransactionRow extends StatelessWidget {
                 width: 36,
                 decoration: BoxDecoration(
                     shape: BoxShape.circle,
-                    color: Theme.of(context).textTheme!.overline!.decorationColor!
+                    color: Theme.of(context).textTheme!.labelSmall!.decorationColor!
                 ),
                 child: Image.asset(
                     direction == TransactionDirection.incoming
@@ -55,13 +55,13 @@ class TransactionRow extends StatelessWidget {
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
                                     color: Theme.of(context).accentTextTheme!
-                                        .headline2!.backgroundColor!)),
+                                        .displayMedium!.backgroundColor!)),
                             Text(formattedAmount,
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
                                     color: Theme.of(context).accentTextTheme!
-                                        .headline2!.backgroundColor!))
+                                        .displayMedium!.backgroundColor!))
                           ]),
                       SizedBox(height: 5),
                       Row(
@@ -72,14 +72,14 @@ class TransactionRow extends StatelessWidget {
                                     fontSize: 14,
                                     color: Theme.of(context)
                                         .textTheme!
-                                        .overline!
+                                        .labelSmall!
                                         .backgroundColor!)),
                             Text(formattedFiatAmount,
                                 style: TextStyle(
                                     fontSize: 14,
                                     color: Theme.of(context)
                                         .textTheme!
-                                        .overline!
+                                        .labelSmall!
                                         .backgroundColor!))
                           ])
                     ],

lib/src/screens/dashboard/widgets/transactions_page.dart

@@ -28,7 +28,7 @@ class TransactionsPage extends StatelessWidget {
     return Container(
       color: ResponsiveLayoutUtil.instance.isMobile(context)
           ? null
-          : Theme.of(context).backgroundColor,
+          : Theme.of(context).colorScheme.background,
       padding: EdgeInsets.only(top: 24, bottom: 24),
       child: Column(
         children: <Widget>[
@@ -121,7 +121,7 @@ class TransactionsPage extends StatelessWidget {
                       S.of(context).placeholder_transactions,
                       style: TextStyle(
                           fontSize: 14,
-                          color: Theme.of(context).primaryTextTheme.overline!.decorationColor!),
+                          color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!),
                     ),
                   );
           }))

lib/src/screens/disclaimer/disclaimer_page.dart

@@ -67,7 +67,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
     return WillPopScope(
         onWillPop: () async => false,
         child: Container(
-          color: Theme.of(context).backgroundColor,
+          color: Theme.of(context).colorScheme.background,
           child: Column(
             children: <Widget>[
               SizedBox(height: 10.0),
@@ -89,7 +89,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                     fontWeight: FontWeight.bold,
                                     color: Theme.of(context)
                                         .primaryTextTheme!
-                                        .headline6!
+                                        .titleLarge!
                                         .color!),
                               ),
                             )
@@ -109,7 +109,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                     fontWeight: FontWeight.bold,
                                     color: Theme.of(context)
                                         .primaryTextTheme!
-                                        .headline6!
+                                        .titleLarge!
                                         .color!),
                               ),
                             )
@@ -128,7 +128,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                   fontWeight: FontWeight.normal,
                                   color: Theme.of(context)
                                       .primaryTextTheme!
-                                      .headline6!
+                                      .titleLarge!
                                       .color!),
                             ))
                           ],
@@ -148,7 +148,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                     fontWeight: FontWeight.bold,
                                     color: Theme.of(context)
                                         .primaryTextTheme!
-                                        .headline6!
+                                        .titleLarge!
                                         .color!),
                               ),
                             )
@@ -195,7 +195,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                   Theme.of(context)
                                       .backgroundColor
                                       .withOpacity(0.0),
-                                  Theme.of(context).backgroundColor,
+                                  Theme.of(context).colorScheme.background,
                                 ],
                                 begin: FractionalOffset.topCenter,
                                 end: FractionalOffset.bottomCenter,
@@ -234,12 +234,12 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                       border: Border.all(
                                           color: Theme.of(context)
                                               .primaryTextTheme!
-                                              .caption!
+                                              .bodySmall!
                                               .color!,
                                           width: 1.0),
                                       borderRadius: BorderRadius.all(
                                           Radius.circular(8.0)),
-                                      color: Theme.of(context).backgroundColor),
+                                      color: Theme.of(context).colorScheme.background),
                                   child: _checked
                                       ? Icon(
                                           Icons.check,
@@ -255,7 +255,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                       fontSize: 14.0,
                                       color: Theme.of(context)
                                           .primaryTextTheme!
-                                          .headline6!
+                                          .titleLarge!
                                           .color!),
                                 )
                               ],
@@ -275,11 +275,11 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                       text: 'Accept',
                       color: Theme.of(context)
                           .accentTextTheme!
-                          .subtitle2!
+                          .titleSmall!
                           .decorationColor!,
                       textColor: Theme.of(context)
                           .accentTextTheme!
-                          .headline5!
+                          .headlineSmall!
                           .decorationColor!),
                 ),
               ],

lib/src/screens/exchange/exchange_page.dart

@@ -151,7 +151,7 @@ class ExchangePage extends BasePage {
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
             keyboardBarColor:
-                Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
+                Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -162,7 +162,7 @@ class ExchangePage extends BasePage {
                   toolbarButtons: [(_) => KeyboardDoneButton()])
             ]),
         child: Container(
-          color: Theme.of(context).backgroundColor,
+          color: Theme.of(context).colorScheme.background,
           child: Form(
               key: _formKey,
               child: ScrollableWithBottomSection(
@@ -209,7 +209,7 @@ class ExchangePage extends BasePage {
                           style: TextStyle(
                               color: Theme.of(context)
                                   .primaryTextTheme!
-                                  .headline1!
+                                  .displayLarge!
                                   .decorationColor!,
                               fontWeight: FontWeight.w500,
                               fontSize: 12),
@@ -243,7 +243,7 @@ class ExchangePage extends BasePage {
                               }
                             }
                           },
-                          color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                          color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                           textColor: Colors.white,
                           isDisabled: exchangeViewModel.selectedProviders.isEmpty,
                           isLoading: exchangeViewModel.tradeState is TradeIsCreating)),
@@ -654,7 +654,7 @@ class ExchangePage extends BasePage {
       imageArrow: arrowBottomPurple,
       currencyButtonColor: Colors.transparent,
       addressButtonsColor: Theme.of(context).focusColor!,
-      borderColor: Theme.of(context).primaryTextTheme!.bodyText1!.color!,
+      borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
       currencyValueValidator: (value) {
         return !exchangeViewModel.isFixedRateMode
             ? AmountValidator(
@@ -704,7 +704,7 @@ class ExchangePage extends BasePage {
       currencyButtonColor: Colors.transparent,
       addressButtonsColor: Theme.of(context).focusColor!,
       borderColor:
-      Theme.of(context).primaryTextTheme!.bodyText1!.decorationColor!,
+      Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
       currencyValueValidator: (value) {
         return exchangeViewModel.isFixedRateMode
             ? AmountValidator(

lib/src/screens/exchange/exchange_template_page.dart

@@ -73,8 +73,10 @@ class ExchangeTemplatePage extends BasePage {
         disableScroll: true,
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor:
-                Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
+            keyboardBarColor: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
+                .backgroundColor!,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -85,7 +87,7 @@ class ExchangeTemplatePage extends BasePage {
                   toolbarButtons: [(_) => KeyboardDoneButton()])
             ]),
         child: Container(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: Form(
             key: _formKey,
             child: ScrollableWithBottomSection(
@@ -99,8 +101,8 @@ class ExchangeTemplatePage extends BasePage {
                   ),
                   gradient: LinearGradient(
                       colors: [
-                        Theme.of(context).primaryTextTheme.bodyText2!.color!,
-                        Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!,
+                        Theme.of(context).primaryTextTheme!.bodyMedium!.color!,
+                        Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!,
                       ],
                       stops: [0.35, 1.0],
                       begin: Alignment.topLeft,
@@ -119,10 +121,10 @@ class ExchangeTemplatePage extends BasePage {
                           gradient: LinearGradient(
                               colors: [
                                 Theme.of(context)
-                                    .primaryTextTheme.subtitle2!
+                                    .primaryTextTheme!.titleSmall!
                                     .color!,
                                 Theme.of(context)
-                                    .primaryTextTheme.subtitle2!
+                                    .primaryTextTheme!.titleSmall!
                                     .decorationColor!,
                               ],
                               begin: Alignment.topLeft,
@@ -157,7 +159,7 @@ class ExchangeTemplatePage extends BasePage {
                             addressButtonsColor:
                             Theme.of(context).focusColor,
                             borderColor: Theme.of(context)
-                                .primaryTextTheme.bodyText1!
+                                .primaryTextTheme!.bodyLarge!
                                 .color!,
                             currencyValueValidator: AmountValidator(
                                 currency: exchangeViewModel.depositCurrency),
@@ -197,7 +199,7 @@ class ExchangeTemplatePage extends BasePage {
                               addressButtonsColor:
                               Theme.of(context).focusColor,
                               borderColor: Theme.of(context)
-                                  .primaryTextTheme.bodyText1!
+                                  .primaryTextTheme!.bodyLarge!
                                   .decorationColor!,
                               currencyValueValidator: AmountValidator(
                                   currency: exchangeViewModel.receiveCurrency),
@@ -225,7 +227,7 @@ class ExchangeTemplatePage extends BasePage {
                         textAlign: TextAlign.center,
                         style: TextStyle(
                             color: Theme.of(context)
-                                .primaryTextTheme.headline1!
+                                .primaryTextTheme!.displayLarge!
                                 .decorationColor!,
                             fontWeight: FontWeight.w500,
                             fontSize: 12),

lib/src/screens/exchange/widgets/currency_picker_item_widget.dart

@@ -20,7 +20,10 @@ class PickerItemWidget extends StatelessWidget {
     return GestureDetector(
       onTap: onTap,
       child: Container(
-        color: Theme.of(context).accentTextTheme!.headline6!.color!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .titleLarge!
+            .color!,
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24),
           child: Row(
@@ -39,7 +42,12 @@ class PickerItemWidget extends StatelessWidget {
                     Text(
                       title.toUpperCase(),
                       style: TextStyle(
-                        color: isSelected ? Palette.blueCraiola : Theme.of(context).primaryTextTheme!.headline6!.color!,
+                        color: isSelected
+                            ? Palette.blueCraiola
+                            : Theme.of(context)
+                                .primaryTextTheme!
+                                .titleLarge!
+                                .color!,
                         fontSize: isSelected ? 16 : 14.0,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w600,
@@ -55,20 +63,33 @@ class PickerItemWidget extends StatelessWidget {
                             child: Text(
                               tag!,
                               style: TextStyle(
-                                  fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context).textTheme!.bodyText2!.color!),
+                                  fontSize: 7.0,
+                                  fontFamily: 'Lato',
+                                  color: Theme.of(context)
+                                      .textTheme!
+                                      .bodyMedium!
+                                      .color!),
                             ),
                           ),
                           decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(6.0),
                             //border: Border.all(color: ),
-                            color: Theme.of(context).textTheme!.bodyText2!.decorationColor!,
+                            color: Theme.of(context)
+                                .textTheme!
+                                .bodyMedium!
+                                .decorationColor!,
                           ),
                         ),
                       ),
                   ],
                 ),
               ),
-              if (isSelected) Icon(Icons.check_circle, color: Theme.of(context).accentTextTheme!.bodyText1!.color!)
+              if (isSelected)
+                Icon(Icons.check_circle,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .bodyLarge!
+                        .color!)
             ],
           ),
         ),

lib/src/screens/exchange/widgets/currency_picker_widget.dart

@@ -20,7 +20,10 @@ class CurrencyPickerWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!,
+      color: Theme.of(context)
+          .accentTextTheme!
+          .titleLarge!
+          .backgroundColor!,
       child: Scrollbar(
         controller: _scrollController,
         child: GridView.builder(

lib/src/screens/exchange/widgets/exchange_card.dart

@@ -160,7 +160,7 @@ class ExchangeCardState extends State<ExchangeCard> {
     final copyImage = Image.asset('assets/images/copy_content.png',
         height: 16,
         width: 16,
-        color: Theme.of(context).primaryTextTheme.headline3!.color!);
+        color: Theme.of(context).primaryTextTheme!.displaySmall!.color!);
 
     return Container(
       width: double.infinity,
@@ -175,7 +175,7 @@ class ExchangeCardState extends State<ExchangeCard> {
               style: TextStyle(
                   fontSize: 18,
                   fontWeight: FontWeight.w600,
-                  color: Theme.of(context).textTheme.headline5!.color!),
+                  color: Theme.of(context).textTheme!.headlineSmall!.color!),
             )
           ],
         ),
@@ -210,7 +210,11 @@ class ExchangeCardState extends State<ExchangeCard> {
                   child: Container(
                     height: 32,
                     decoration: BoxDecoration(
-                        color: widget.addressButtonsColor ?? Theme.of(context).primaryTextTheme.headline4!.color!,
+                        color: widget.addressButtonsColor ??
+                            Theme.of(context)
+                                .primaryTextTheme!
+                                .headlineMedium!
+                                .color!,
                         borderRadius:
                         BorderRadius.all(Radius.circular(6))),
                     child: Center(
@@ -221,7 +225,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                                 fontSize: 12,
                                 fontWeight: FontWeight.bold,
                                 color: Theme.of(context)
-                                    .primaryTextTheme.headline4!
+                                    .primaryTextTheme!
+                                    .headlineMedium!
                                     .decorationColor!)),
                       ),
                     ),
@@ -264,7 +269,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                                   fontSize: 16,
                                   fontWeight: FontWeight.w600,
                                   color: Theme.of(context)
-                                      .accentTextTheme.headline1!
+                                      .accentTextTheme!
+                                      .displayLarge!
                                       .decorationColor!),
                               validator: _isAmountEditable
                                   ? widget.currencyValueValidator
@@ -277,7 +283,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                           width: 32,
                           decoration: BoxDecoration(
                               color: Theme.of(context)
-                                  .primaryTextTheme.headline4!
+                                  .primaryTextTheme!
+                                  .headlineMedium!
                                   .color!,
                               borderRadius:
                               BorderRadius.all(Radius.circular(6))),
@@ -290,7 +297,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                                       fontSize: 12,
                                       fontWeight: FontWeight.bold,
                                       color: Theme.of(context)
-                                          .primaryTextTheme.headline4!
+                                          .primaryTextTheme!
+                                          .headlineMedium!
                                           .decorationColor!)),
                             ),
                           ),
@@ -300,9 +308,12 @@ class ExchangeCardState extends State<ExchangeCard> {
                 ),
               ],
             )),
-        Divider(height: 1,color: Theme.of(context)
-            .primaryTextTheme.headline5!
-            .decorationColor!),
+        Divider(
+            height: 1,
+            color: Theme.of(context)
+                .primaryTextTheme!
+                .headlineSmall!
+                .decorationColor!),
         Padding(
           padding: EdgeInsets.only(top: 5),
           child: Container(
@@ -319,7 +330,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                                 fontSize: 10,
                                 height: 1.2,
                                 color: Theme.of(context)
-                                    .accentTextTheme.headline1!
+                                    .accentTextTheme!
+                                    .displayLarge!
                                     .decorationColor!),
                           )
                         : Offstage(),
@@ -333,7 +345,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                                 fontSize: 10,
                                 height: 1.2,
                                 color: Theme.of(context)
-                                    .accentTextTheme.headline1!
+                                    .accentTextTheme!
+                                    .displayLarge!
                                     .decorationColor!))
                         : Offstage(),
                   ])),
@@ -347,7 +360,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                       fontSize: 14,
                       fontWeight: FontWeight.w500,
                       color: Theme.of(context)
-                          .accentTextTheme.headline1!
+                          .accentTextTheme!
+                          .displayLarge!
                           .decorationColor!),
                 ))
             : Offstage(),
@@ -387,7 +401,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                           fontSize: 16,
                           fontWeight: FontWeight.w600,
                           color: Theme.of(context)
-                              .accentTextTheme.headline1!
+                              .accentTextTheme!
+                              .displayLarge!
                               .decorationColor!),
                       buttonColor: widget.addressButtonsColor,
                       validator: widget.addressTextFieldValidator,
@@ -458,7 +473,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                                                   child: Image.asset(
                                                     'assets/images/open_book.png',
                                                     color: Theme.of(context)
-                                                        .primaryTextTheme.headline4!
+                                                        .primaryTextTheme!
+                                                        .headlineMedium!
                                                         .decorationColor!,
                                                   )),
                                             )),

lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart

@@ -21,8 +21,8 @@ class MobileExchangeCardsSection extends StatelessWidget {
         ),
         gradient: LinearGradient(
           colors: [
-            Theme.of(context).primaryTextTheme.bodyText2!.color!,
-            Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!,
+            Theme.of(context).primaryTextTheme!.bodyMedium!.color!,
+            Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!,
           ],
           stops: [0.35, 1.0],
           begin: Alignment.topLeft,
@@ -37,8 +37,11 @@ class MobileExchangeCardsSection extends StatelessWidget {
                   bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
               gradient: LinearGradient(
                 colors: [
-                  Theme.of(context).primaryTextTheme.subtitle2!.color!,
-                  Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!,
+                  Theme.of(context).primaryTextTheme!.titleSmall!.color!,
+                  Theme.of(context)
+                      .primaryTextTheme!
+                      .titleSmall!
+                      .decorationColor!,
                 ],
                 begin: Alignment.topLeft,
                 end: Alignment.bottomRight,

lib/src/screens/exchange/widgets/present_provider_picker.dart

@@ -49,7 +49,10 @@ class PresentProviderPicker extends StatelessWidget {
                             style: TextStyle(
                                 fontSize: 10.0,
                                 fontWeight: FontWeight.w500,
-                                color: Theme.of(context).textTheme.headline5!.color!)))
+                                color: Theme.of(context)
+                                    .textTheme!
+                                    .headlineSmall!
+                                    .color!)))
               ],
             ),
             SizedBox(width: 5),

lib/src/screens/exchange_trade/exchange_confirm_page.dart

@@ -36,7 +36,10 @@ class ExchangeConfirmPage extends BasePage {
                   style: TextStyle(
                       fontSize: 18.0,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context).primaryTextTheme!.headline6!.color!),
+                      color: Theme.of(context)
+                          .primaryTextTheme!
+                          .titleLarge!
+                          .color!),
                 ),
               )),
               Container(
@@ -45,8 +48,14 @@ class ExchangeConfirmPage extends BasePage {
                     borderRadius: BorderRadius.all(Radius.circular(30)),
                     border: Border.all(
                         width: 1,
-                        color: Theme.of(context).accentTextTheme!.caption!.color!),
-                    color: Theme.of(context).accentTextTheme!.headline6!.color!),
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .bodySmall!
+                            .color!),
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .titleLarge!
+                        .color!),
                 child: Column(
                   children: <Widget>[
                     Expanded(
@@ -63,7 +72,7 @@ class ExchangeConfirmPage extends BasePage {
                                 fontWeight: FontWeight.w500,
                                 color: Theme.of(context)
                                     .primaryTextTheme!
-                                    .overline!
+                                    .labelSmall!
                                     .color!),
                           ),
                           Text(
@@ -75,7 +84,7 @@ class ExchangeConfirmPage extends BasePage {
                                 fontWeight: FontWeight.w600,
                                 color: Theme.of(context)
                                     .primaryTextTheme!
-                                    .headline6!
+                                    .titleLarge!
                                     .color!),
                           ),
                         ],
@@ -93,10 +102,12 @@ class ExchangeConfirmPage extends BasePage {
                             text: S.of(context).copy_id,
                             color: Theme.of(context)
                                 .accentTextTheme!
-                                .caption!
+                                .bodySmall!
                                 .backgroundColor!,
-                            textColor:
-                                Theme.of(context).primaryTextTheme!.headline6!.color!),
+                            textColor: Theme.of(context)
+                                .primaryTextTheme!
+                                .titleLarge!
+                                .color!),
                       ),
                     )
                   ],
@@ -125,7 +136,10 @@ class ExchangeConfirmPage extends BasePage {
               onPressed: () => Navigator.of(context)
                   .pushReplacementNamed(Routes.exchangeTrade),
               text: S.of(context).saved_the_trade_id,
-              color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+              color: Theme.of(context)
+                  .accentTextTheme!
+                  .bodyLarge!
+                  .color!,
               textColor: Colors.white)
         ],
       ),

lib/src/screens/exchange_trade/exchange_trade_page.dart

@@ -51,7 +51,7 @@ class ExchangeTradePage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     final questionImage = Image.asset('assets/images/question_mark.png',
-        color: Theme.of(context).primaryTextTheme!.headline6!.color!);
+        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
 
     return SizedBox(
       height: 20.0,
@@ -111,7 +111,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
     final copyImage = Image.asset('assets/images/copy_content.png',
         height: 16,
         width: 16,
-        color: Theme.of(context).primaryTextTheme!.overline!.color!);
+        color: Theme.of(context).primaryTextTheme!.labelSmall!.color!);
 
     _setEffects();
 
@@ -135,14 +135,14 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                                   fontWeight: FontWeight.w500,
                                   color: Theme.of(context)
                                       .primaryTextTheme!
-                                      .overline!
+                                      .labelSmall!
                                       .color!),
                             ),
                             if (trade.expiredAt != null)
                               TimerWidget(trade.expiredAt!,
                                   color: Theme.of(context)
                                       .primaryTextTheme!
-                                      .headline6!
+                                      .titleLarge!
                                       .color!)
                           ])
                     : Offstage(),
@@ -162,7 +162,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                                           width: 3,
                                           color: Theme.of(context)
                                               .accentTextTheme!
-                                              .subtitle2!
+                                              .titleSmall!
                                               .color!
                                       )
                                   ),
@@ -181,7 +181,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                       height: 1,
                       color: Theme.of(context)
                           .accentTextTheme!
-                          .subtitle2!
+                          .titleSmall!
                           .backgroundColor!,
                     ),
                     itemBuilder: (context, index) {
@@ -228,7 +228,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                     onPressed: () =>
                         widget.exchangeTradeViewModel.confirmSending(),
                     text: S.of(context).confirm,
-                    color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .bodyLarge!
+                        .color!,
                     textColor: Colors.white)
                 : Offstage();
           })),
@@ -340,7 +343,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                           fontWeight: FontWeight.bold,
                           color: Theme.of(popupContext)
                               .primaryTextTheme!
-                              .headline6!
+                              .titleLarge!
                               .color,
                           decoration: TextDecoration.none,
                         ),
@@ -359,7 +362,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                           text: S.of(popupContext).send_got_it,
                           color: Theme.of(popupContext)
                               .accentTextTheme!
-                              .bodyText1!
+                              .bodyLarge!
                               .color!,
                           textColor: Colors.white))
                 ],
@@ -392,7 +395,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                           style: TextStyle(
                             fontSize: 22,
                             fontWeight: FontWeight.bold,
-                            color: Theme.of(popupContext).primaryTextTheme!.headline6!.color!,
+                            color: Theme.of(popupContext)
+                                .primaryTextTheme!
+                                .titleLarge!
+                                .color!,
                             decoration: TextDecoration.none,
                           ),
                         ),

lib/src/screens/exchange_trade/information_page.dart

@@ -21,7 +21,7 @@ class InformationPage extends StatelessWidget {
           ),
           decoration: BoxDecoration(
             borderRadius: BorderRadius.all(Radius.circular(30)),
-            color: Theme.of(context).textTheme!.bodyText1!.decorationColor!
+            color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!
           ),
           child: Column(
             mainAxisSize: MainAxisSize.min,
@@ -35,7 +35,7 @@ class InformationPage extends StatelessWidget {
                     fontWeight: FontWeight.normal,
                     fontFamily: 'Lato',
                     decoration: TextDecoration.none,
-                    color: Theme.of(context).accentTextTheme!.caption!.decorationColor!
+                    color: Theme.of(context).accentTextTheme!.bodySmall!.decorationColor!
                   ),
                 ),
               ),
@@ -44,8 +44,8 @@ class InformationPage extends StatelessWidget {
                 child: PrimaryButton(
                   onPressed: () => Navigator.of(context).pop(),
                   text: S.of(context).send_got_it,
-                  color: Theme.of(context).accentTextTheme!.caption!.backgroundColor!,
-                  textColor: Theme.of(context).primaryTextTheme!.headline6!.color!
+                  color: Theme.of(context).accentTextTheme!.bodySmall!.backgroundColor!,
+                  textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!
                 ),
               )
             ],

lib/src/screens/faq/faq_item.dart

@@ -25,13 +25,13 @@ class FAQItemState extends State<FAQItem> {
 
   @override
   Widget build(BuildContext context) {
-    final addIcon =
-        Icon(Icons.add, color: Theme.of(context).primaryTextTheme!.headline6!.color!);
+    final addIcon = Icon(Icons.add,
+        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
     final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
     final icon = isActive ? removeIcon : addIcon;
     final color = isActive
         ? Palette.blueCraiola
-        : Theme.of(context).primaryTextTheme!.headline6!.color!;
+        : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
 
     return ListTileTheme(
       contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
@@ -53,7 +53,8 @@ class FAQItemState extends State<FAQItem> {
                 style: TextStyle(
                     fontSize: 14,
                     fontWeight: FontWeight.normal,
-                    color: Theme.of(context).primaryTextTheme!.headline6!.color!),
+                    color:
+                        Theme.of(context).primaryTextTheme!.titleLarge!.color!),
               ),
             ))
           ])

lib/src/screens/ionia/auth/ionia_create_account_page.dart

@@ -40,7 +40,10 @@ class IoniaCreateAccountPage extends BasePage {
     return Text(
       S.current.sign_up,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -79,8 +82,12 @@ class IoniaCreateAccountPage extends BasePage {
                 builder: (_) => LoadingPrimaryButton(
                   text: S.of(context).create_account,
                   onPressed: _createAccount,
-                  isLoading: _authViewModel.createUserState is IoniaCreateStateLoading,
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  isLoading:
+                      _authViewModel.createUserState is IoniaCreateStateLoading,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white,
                 ),
               ),
@@ -100,7 +107,10 @@ class IoniaCreateAccountPage extends BasePage {
                     TextSpan(
                       text: S.of(context).settings_terms_and_conditions,
                       style: TextStyle(
-                        color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .bodyLarge!
+                            .color!,
                         fontWeight: FontWeight.w700,
                       ),
                       recognizer: TapGestureRecognizer()
@@ -112,7 +122,10 @@ class IoniaCreateAccountPage extends BasePage {
                     TextSpan(
                         text: S.of(context).privacy_policy,
                         style: TextStyle(
-                          color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                          color: Theme.of(context)
+                              .accentTextTheme!
+                              .bodyLarge!
+                              .color!,
                           fontWeight: FontWeight.w700,
                         ),
                         recognizer: TapGestureRecognizer()

lib/src/screens/ionia/auth/ionia_login_page.dart

@@ -33,7 +33,10 @@ class IoniaLoginPage extends BasePage {
     return Text(
       S.current.login,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -71,7 +74,10 @@ class IoniaLoginPage extends BasePage {
                   text: S.of(context).login,
                   onPressed: _login,
                   isLoading: _authViewModel.signInState is IoniaCreateStateLoading,
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white,
                 ),
               ),

lib/src/screens/ionia/auth/ionia_verify_otp_page.dart

@@ -41,7 +41,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
     return Text(
       S.current.verification,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -62,7 +65,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
     return KeyboardActions(
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
+          keyboardBarColor: Theme.of(context)
+              .accentTextTheme!
+              .bodyLarge!
+              .backgroundColor!,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -72,7 +78,7 @@ class IoniaVerifyIoniaOtp extends BasePage {
           ]),
       child: Container(
         height: 0,
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.all(24),
           content: Column(
@@ -120,7 +126,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
                       onPressed: _verify,
                       isDisabled: _authViewModel.otpState is IoniaOtpSendDisabled,
                       isLoading: _authViewModel.otpState is IoniaOtpValidating,
-                      color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .bodyLarge!
+                          .color!,
                       textColor: Colors.white,
                     ),
                   ),

lib/src/screens/ionia/auth/ionia_welcome_page.dart

@@ -17,7 +17,10 @@ class IoniaWelcomePage extends BasePage {
     return Text(
       S.current.welcome_to_cakepay,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -45,7 +48,7 @@ class IoniaWelcomePage extends BasePage {
                   fontSize: 18,
                   fontWeight: FontWeight.w400,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                 ),
               ),
               SizedBox(height: 20),
@@ -55,7 +58,7 @@ class IoniaWelcomePage extends BasePage {
                   fontSize: 18,
                   fontWeight: FontWeight.w400,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                 ),
               ),
             ],
@@ -66,7 +69,10 @@ class IoniaWelcomePage extends BasePage {
               PrimaryButton(
                 text: S.of(context).create_account,
                 onPressed: () => Navigator.of(context).pushNamed(Routes.ioniaCreateAccountPage),
-                color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                color: Theme.of(context)
+                    .accentTextTheme!
+                    .bodyLarge!
+                    .color!,
                 textColor: Colors.white,
               ),
               SizedBox(
@@ -78,7 +84,7 @@ class IoniaWelcomePage extends BasePage {
                   fontSize: 15,
                   fontWeight: FontWeight.w500,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                 ),
               ),
               SizedBox(height: 8),

lib/src/screens/ionia/cards/ionia_account_cards_page.dart

@@ -20,7 +20,10 @@ class IoniaAccountCardsPage extends BasePage {
     return Text(
       S.of(context).cards,
       style: textLargeSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -69,23 +72,34 @@ class _IoniaCardTabsState extends State<_IoniaCardTabs> with SingleTickerProvide
             width: 230,
             padding: EdgeInsets.all(5),
             decoration: BoxDecoration(
-              color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1),
+              color: Theme.of(context)
+                  .accentTextTheme!
+                  .displayLarge!
+                  .backgroundColor!
+                  .withOpacity(0.1),
               borderRadius: BorderRadius.circular(
                 25.0,
               ),
             ),
             child: Theme(
-              data: ThemeData(primaryTextTheme: TextTheme(bodyText1: TextStyle(backgroundColor: Colors.transparent))),
+              data: ThemeData(primaryTextTheme: TextTheme(bodyLarge: TextStyle(backgroundColor: Colors.transparent))),
               child: TabBar(
                 controller: _tabController,
                 indicator: BoxDecoration(
                   borderRadius: BorderRadius.circular(
                     25.0,
                   ),
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                 ),
-                labelColor: Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!,
-                unselectedLabelColor: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                labelColor: Theme.of(context)
+                    .primaryTextTheme!
+                    .displayLarge!
+                    .backgroundColor!,
+                unselectedLabelColor:
+                    Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                 tabs: [
                   Tab(
                     text: S.of(context).active,
@@ -154,9 +168,13 @@ class _IoniaCardListView extends StatelessWidget {
   Widget build(BuildContext context) {
     if(isLoading){
       return Center(
-          child: CircularProgressIndicator(
-          backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
-          valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyText2!.color!),
+        child: CircularProgressIndicator(
+          backgroundColor: Theme.of(context)
+              .accentTextTheme!
+              .displayMedium!
+              .backgroundColor!,
+          valueColor: AlwaysStoppedAnimation<Color>(
+              Theme.of(context).primaryTextTheme!.bodyMedium!.color!),
         ),
       );
     }
@@ -166,7 +184,7 @@ class _IoniaCardListView extends StatelessWidget {
               emptyText,
               textAlign: TextAlign.center,
               style: textSmall(
-                color: Theme.of(context).primaryTextTheme!.overline!.color!,
+                color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
               ),
             ),
           )
@@ -179,11 +197,18 @@ class _IoniaCardListView extends StatelessWidget {
                 child: CardItem(
                   onTap: () => onTap?.call(merchant),
                   title: merchant.legalName,
-                  backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1),
+                  backgroundColor: Theme.of(context)
+                      .accentTextTheme!
+                      .displayLarge!
+                      .backgroundColor!
+                      .withOpacity(0.1),
                   discount: 0,
                   hideBorder: true,
                   discountBackground: AssetImage('assets/images/red_badge_discount.png'),
-                  titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+                  titleColor: Theme.of(context)
+                      .accentTextTheme!
+                      .displayLarge!
+                      .backgroundColor!,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: '',
                   logoUrl: merchant.logoUrl,

lib/src/screens/ionia/cards/ionia_account_page.dart

@@ -19,7 +19,10 @@ class IoniaAccountPage extends BasePage {
     return Text(
       S.current.account,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -133,7 +136,10 @@ class IoniaAccountPage extends BasePage {
       bottomSection: Column(
         children: [
           PrimaryButton(
-            color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+            color: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
+                .color!,
             textColor: Colors.white,
             text: S.of(context).logout,
             onPressed: () {
@@ -164,11 +170,8 @@ class _GradiantContainer extends StatelessWidget {
         borderRadius: BorderRadius.circular(15),
         gradient: LinearGradient(
           colors: [
-            Theme.of(context)
-              .primaryTextTheme!
-              .subtitle1!
-              .decorationColor!,
-            Theme.of(context).primaryTextTheme!.subtitle1!.color!,           
+            Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
+            Theme.of(context).primaryTextTheme!.titleMedium!.color!,
           ],
           begin: Alignment.topRight,
           end: Alignment.bottomLeft,

lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart

@@ -23,7 +23,10 @@ class IoniaActivateDebitCardPage extends BasePage {
     return Text(
       S.current.debit_card,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -76,7 +79,10 @@ class IoniaActivateDebitCardPage extends BasePage {
         },
         isLoading: _cardsListViewModel.createCardState is IoniaCreateCardLoading,
         text: S.of(context).agree_and_continue,
-        color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .bodyLarge!
+            .color!,
         textColor: Colors.white,
       ),
     );

lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart

@@ -28,7 +28,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
   Widget middle(BuildContext context) {
     return Text(
       ioniaPurchaseViewModel.ioniaMerchant.legalName,
-      style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!),
+      style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!),
     );
   }
 
@@ -96,8 +96,8 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
                   borderRadius: BorderRadius.circular(20),
                   gradient: LinearGradient(
                     colors: [
-                      Theme.of(context).primaryTextTheme!.subtitle1!.color!,
-                      Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
+                      Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+                      Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
                     ],
                     begin: Alignment.topLeft,
                     end: Alignment.bottomRight,
@@ -163,7 +163,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
                     Text(
                       S.of(context).tip,
                       style: TextStyle(
-                        color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                        color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                         fontWeight: FontWeight.w700,
                         fontSize: 14,
                       ),
@@ -202,7 +202,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
                       ioniaPurchaseViewModel.invoiceCommittingState is IsExecutingState,
                   onPressed: () => purchaseCard(context),
                   text: S.of(context).purchase_gift_card,
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                   textColor: Colors.white,
                 );
               }),
@@ -212,7 +212,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
               onTap: () => _showTermsAndCondition(context),
               child: Text(S.of(context).settings_terms_and_conditions,
                   style: textMediumSemiBold(
-                    color: Theme.of(context).primaryTextTheme!.bodyText2!.color!,
+                    color: Theme.of(context).primaryTextTheme.bodyMedium!.color!,
                   ).copyWith(fontSize: 12)),
             ),
             SizedBox(height: 16)
@@ -232,7 +232,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
             child: Text(
               ioniaPurchaseViewModel.ioniaMerchant.termsAndConditions,
               style: textMedium(
-                color: Theme.of(context).textTheme!.headline3!.color!,
+                color: Theme.of(context).textTheme!.displaySmall!.color!,
               ),
             ),
           ),
@@ -270,13 +270,13 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
                             child: Text(
                               instruction.header,
                               style: textLargeSemiBold(
-                                color: Theme.of(context).textTheme!.headline3!.color!,
+                                color: Theme.of(context).textTheme!.displaySmall!.color!,
                               ),
                             )),
                         Text(
                           instruction.body,
                           style: textMedium(
-                            color: Theme.of(context).textTheme!.headline3!.color!,
+                            color: Theme.of(context).textTheme!.displaySmall!.color!,
                           ),
                         )
                       ];
@@ -323,7 +323,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
             alertLeftActionButtonTextColor: Colors.white,
             alertRightActionButtonTextColor: Colors.white,
             alertLeftActionButtonColor: Palette.brightOrange,
-            alertRightActionButtonColor: Theme.of(context).textTheme!.subtitle2!.color,
+            alertRightActionButtonColor: Theme.of(context).textTheme!.titleSmall!.color,
             actionRightButton: () async {
               Navigator.of(context).pop();
               await ioniaPurchaseViewModel.commitPaymentInvoice();
@@ -399,34 +399,34 @@ class TipButton extends StatelessWidget {
 
   Color captionTextColor(BuildContext context) {
     if (isDark(context)) {
-      return Theme.of(context).primaryTextTheme!.headline6!.color!;
+      return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
     }
 
     return isSelected
-      ? Theme.of(context).accentTextTheme!.headline6!.color!
-      : Theme.of(context).primaryTextTheme!.headline6!.color!;
+      ? Theme.of(context).accentTextTheme!.titleLarge!.color!
+      : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
   }
 
   Color subTitleTextColor(BuildContext context) {
     if (isDark(context)) {
-      return Theme.of(context).primaryTextTheme!.headline6!.color!;
+      return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
     }
 
     return isSelected
-      ? Theme.of(context).accentTextTheme!.headline6!.color!
-      : Theme.of(context).primaryTextTheme!.overline!.color!;
+      ? Theme.of(context).accentTextTheme!.titleLarge!.color!
+      : Theme.of(context).primaryTextTheme!.labelSmall!.color!;
   }
 
   Color? backgroundColor(BuildContext context) {
     if (isDark(context)) {
       return isSelected
         ? null
-        : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.01);
+        : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.01);
     }
 
     return isSelected
         ? null
-        : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1);
+        : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.1);
   }
 
   @override
@@ -459,8 +459,8 @@ class TipButton extends StatelessWidget {
           gradient: isSelected
               ? LinearGradient(
                   colors: [
-                    Theme.of(context).primaryTextTheme!.subtitle1!.color!,
-                    Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
+                    Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+                    Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
                   ],
                   begin: Alignment.topLeft,
                   end: Alignment.bottomRight,

lib/src/screens/ionia/cards/ionia_buy_gift_card.dart

@@ -50,7 +50,10 @@ class IoniaBuyGiftCardPage extends BasePage {
       disableScroll: true,
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
+          keyboardBarColor: Theme.of(context)
+              .accentTextTheme!
+              .bodyLarge!
+              .backgroundColor!,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -59,7 +62,7 @@ class IoniaBuyGiftCardPage extends BasePage {
             ),
           ]),
       child: Container(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.zero,
           content: Column(
@@ -72,8 +75,11 @@ class IoniaBuyGiftCardPage extends BasePage {
                     bottomRight: Radius.circular(24),
                   ),
                   gradient: LinearGradient(colors: [
-                    Theme.of(context).primaryTextTheme!.subtitle1!.color!,
-                    Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
+                    Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+                    Theme.of(context)
+                        .primaryTextTheme!
+                        .titleMedium!
+                        .decorationColor!,
                   ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                 ),
                 child: Column(
@@ -95,7 +101,10 @@ class IoniaBuyGiftCardPage extends BasePage {
                         ],
                         hintText: '1000',
                         placeholderTextStyle: TextStyle(
-                          color: Theme.of(context).primaryTextTheme.headline5!.color!,
+                          color: Theme.of(context)
+                              .primaryTextTheme!
+                              .headlineSmall!
+                              .color!,
                           fontWeight: FontWeight.w600,
                           fontSize: 36,
                         ),
@@ -115,7 +124,10 @@ class IoniaBuyGiftCardPage extends BasePage {
                       ),
                     ),
                     Divider(
-                      color: Theme.of(context).primaryTextTheme.headline5!.color!,
+                      color: Theme.of(context)
+                          .primaryTextTheme!
+                          .headlineSmall!
+                          .color!,
                       height: 1,
                     ),
                     SizedBox(height: 8),
@@ -126,13 +138,19 @@ class IoniaBuyGiftCardPage extends BasePage {
                         Text(
                           S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)),
                           style: TextStyle(
-                            color: Theme.of(context).primaryTextTheme!.headline5!.color!,
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .headlineSmall!
+                                .color!,
                           ),
                         ),
                         Text(
                           S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)),
                           style: TextStyle(
-                            color: Theme.of(context).primaryTextTheme!.headline5!.color!,
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .headlineSmall!
+                                .color!,
                           ),
                         ),
                       ],
@@ -147,11 +165,14 @@ class IoniaBuyGiftCardPage extends BasePage {
                   title: merchant.legalName,
                   backgroundColor: Theme.of(context)
                       .accentTextTheme!
-                      .headline1!
+                      .displayLarge!
                       .backgroundColor!
                       .withOpacity(0.1),
                   discount: merchant.discount,
-                  titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+                  titleColor: Theme.of(context)
+                      .accentTextTheme!
+                      .displayLarge!
+                      .backgroundColor!,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: merchant.avaibilityStatus,
                   logoUrl: merchant.logoUrl,
@@ -174,7 +195,10 @@ class IoniaBuyGiftCardPage extends BasePage {
                     ),
                     text: S.of(context).continue_text,
                     isDisabled: !ioniaBuyCardViewModel.isEnablePurchase,
-                    color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .bodyLarge!
+                        .color!,
                     textColor: Colors.white,
                   ),
                 );

lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart

@@ -50,7 +50,10 @@ class IoniaCustomRedeemPage extends BasePage {
       disableScroll: true,
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
+          keyboardBarColor: Theme.of(context)
+              .accentTextTheme!
+              .bodyLarge!
+              .backgroundColor!,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -59,7 +62,7 @@ class IoniaCustomRedeemPage extends BasePage {
             ),
           ]),
       child: Container(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.zero,
           content: Column(
@@ -70,8 +73,11 @@ class IoniaCustomRedeemPage extends BasePage {
                   borderRadius: BorderRadius.only(
                       bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
                   gradient: LinearGradient(colors: [
-                    Theme.of(context).primaryTextTheme.subtitle1!.color!,
-                    Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!,
+                    Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+                    Theme.of(context)
+                        .primaryTextTheme!
+                        .titleMedium!
+                        .decorationColor!,
                   ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                 ),
                 child: Column(
@@ -86,11 +92,17 @@ class IoniaCustomRedeemPage extends BasePage {
                       inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))],
                       hintText: '1000',
                       placeholderTextStyle: TextStyle(
-                        color: Theme.of(context).primaryTextTheme.headline5!.color!,
+                        color: Theme.of(context)
+                            .primaryTextTheme!
+                            .headlineSmall!
+                            .color!,
                         fontWeight: FontWeight.w500,
                         fontSize: 36,
                       ),
-                      borderColor: Theme.of(context).primaryTextTheme.headline5!.color!,
+                      borderColor: Theme.of(context)
+                          .primaryTextTheme!
+                          .headlineSmall!
+                          .color!,
                       textColor: Colors.white,
                       textStyle: TextStyle(
                         color: Colors.white,
@@ -121,7 +133,10 @@ class IoniaCustomRedeemPage extends BasePage {
                               child: Text(
                                 '\$${giftCard.remainingAmount} - \$${ioniaCustomRedeemViewModel.amount} = \$${ioniaCustomRedeemViewModel.formattedRemaining} ${S.of(context).remaining}',
                                 style: TextStyle(
-                                  color: Theme.of(context).primaryTextTheme.headline5!.color!,
+                                  color: Theme.of(context)
+                                      .primaryTextTheme!
+                                      .headlineSmall!
+                                      .color!,
                                 ),
                               ),
                             )
@@ -136,14 +151,17 @@ class IoniaCustomRedeemPage extends BasePage {
                 child: CardItem(
                   title: giftCard.legalName,
                   backgroundColor: Theme.of(context)
-                      .accentTextTheme
-                      .headline1!
+                      .accentTextTheme!
+                      .displayLarge!
                       .backgroundColor!
                       .withOpacity(0.1),
                   discount: giftCard.remainingAmount,
                   isAmount: true,
                   discountBackground: AssetImage('assets/images/red_badge_discount.png'),
-                  titleColor: Theme.of(context).accentTextTheme.headline1!.backgroundColor!,
+                  titleColor: Theme.of(context)
+                      .accentTextTheme!
+                      .displayLarge!
+                      .backgroundColor!,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: S.of(context).online,
                   logoUrl: giftCard.logoUrl,
@@ -160,7 +178,10 @@ class IoniaCustomRedeemPage extends BasePage {
                     isLoading: ioniaCustomRedeemViewModel.redeemState is IsExecutingState,
                     isDisabled: ioniaCustomRedeemViewModel.disableRedeem,
                     text: S.of(context).add_custom_redemption,
-                    color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .bodyLarge!
+                        .color!,
                     textColor: Colors.white,
                     onPressed: () => ioniaCustomRedeemViewModel.addCustomRedeem().then((value) {
                       Navigator.of(context).pop(ioniaCustomRedeemViewModel.remaining.toString());

lib/src/screens/ionia/cards/ionia_custom_tip_page.dart

@@ -51,7 +51,10 @@ class IoniaCustomTipPage extends BasePage {
       disableScroll: true,
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
+          keyboardBarColor: Theme.of(context)
+              .accentTextTheme!
+              .bodyLarge!
+              .backgroundColor!,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -60,7 +63,7 @@ class IoniaCustomTipPage extends BasePage {
             ),
           ]),
       child: Container(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.zero,
           content: Column(
@@ -70,8 +73,11 @@ class IoniaCustomTipPage extends BasePage {
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
                   gradient: LinearGradient(colors: [
-                    Theme.of(context).primaryTextTheme!.subtitle1!.color!,
-                    Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
+                    Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+                    Theme.of(context)
+                        .primaryTextTheme!
+                        .titleMedium!
+                        .decorationColor!,
                   ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                 ),
                 child: Column(
@@ -86,11 +92,17 @@ class IoniaCustomTipPage extends BasePage {
                       inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))],
                       hintText: '1000',
                       placeholderTextStyle: TextStyle(
-                        color: Theme.of(context).primaryTextTheme!.headline5!.color!,
+                        color: Theme.of(context)
+                            .primaryTextTheme!
+                            .headlineSmall!
+                            .color!,
                         fontWeight: FontWeight.w500,
                         fontSize: 36,
                       ),
-                      borderColor: Theme.of(context).primaryTextTheme!.headline5!.color!,
+                      borderColor: Theme.of(context)
+                          .primaryTextTheme!
+                          .headlineSmall!
+                          .color!,
                       textColor: Colors.white,
                       textStyle: TextStyle(
                         color: Colors.white,
@@ -125,7 +137,10 @@ class IoniaCustomTipPage extends BasePage {
                         text: TextSpan(
                           text: '\$${_amountController.text}',
                           style: TextStyle(
-                            color: Theme.of(context).primaryTextTheme!.headline5!.color!,
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .headlineSmall!
+                                .color!,
                           ),
                           children: [
                             TextSpan(text: ' ${S.of(context).is_percentage} '),
@@ -143,9 +158,16 @@ class IoniaCustomTipPage extends BasePage {
                 padding: const EdgeInsets.all(24.0),
                 child: CardItem(
                   title: merchant.legalName,
-                  backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1),
+                  backgroundColor: Theme.of(context)
+                      .accentTextTheme!
+                      .displayLarge!
+                      .backgroundColor!
+                      .withOpacity(0.1),
                   discount: 0.0,
-                  titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+                  titleColor: Theme.of(context)
+                      .accentTextTheme!
+                      .displayLarge!
+                      .backgroundColor!,
                   subtitleColor: Theme.of(context).hintColor,
                   subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline,
                   logoUrl: merchant.logoUrl,
@@ -162,7 +184,10 @@ class IoniaCustomTipPage extends BasePage {
                     Navigator.of(context).pop(customTipViewModel.customTip);
                   },
                   text: S.of(context).add_tip,
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white,
                 ),
               ),

lib/src/screens/ionia/cards/ionia_debit_card_page.dart

@@ -23,7 +23,10 @@ class IoniaDebitCardPage extends BasePage {
     return Text(
       S.current.debit_card,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -51,7 +54,11 @@ class IoniaDebitCardPage extends BasePage {
                   padding: const EdgeInsets.symmetric(horizontal: 20.0),
                   child: Text(
                     S.of(context).billing_address_info,
-                    style: textSmall(color: Theme.of(context).textTheme!.headline4!.color!),
+                    style: textSmall(
+                        color: Theme.of(context)
+                            .textTheme!
+                            .headlineMedium!
+                            .color!),
                     textAlign: TextAlign.center,
                   ),
                 ),
@@ -60,13 +67,16 @@ class IoniaDebitCardPage extends BasePage {
                   text: S.of(context).order_physical_card,
                   onPressed: () {},
                   color: Color(0xffE9F2FC),
-                  textColor: Theme.of(context).textTheme!.headline3!.color!,
+                  textColor: Theme.of(context).textTheme!.displaySmall!.color!,
                 ),
                 SizedBox(height: 8),
                 PrimaryButton(
                   text: S.of(context).add_value,
                   onPressed: () {},
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white,
                 ),
                 SizedBox(height: 16)
@@ -112,11 +122,17 @@ class IoniaDebitCardPage extends BasePage {
                   child: RichText(
                       text: TextSpan(
                     text: S.of(context).get_a,
-                    style: textMedium(color: Theme.of(context).textTheme!.headline3!.color!),
+                    style: textMedium(
+                        color:
+                            Theme.of(context).textTheme!.displaySmall!.color!),
                     children: [
                       TextSpan(
                         text: S.of(context).digital_and_physical_card,
-                        style: textMediumBold(color: Theme.of(context).textTheme!.headline3!.color!),
+                        style: textMediumBold(
+                            color: Theme.of(context)
+                                .textTheme!
+                                .displaySmall!
+                                .color!),
                       ),
                       TextSpan(
                         text: S.of(context).get_card_note,
@@ -134,7 +150,10 @@ class IoniaDebitCardPage extends BasePage {
           bottomSection: PrimaryButton(
             text: S.of(context).activate,
             onPressed: () => _showHowToUseCard(context, activate: true),
-            color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+            color: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
+                .color!,
             textColor: Colors.white,
           ),
         );
@@ -157,7 +176,7 @@ class IoniaDebitCardPage extends BasePage {
                     padding: EdgeInsets.only(top: 24, left: 24, right: 24),
                     margin: EdgeInsets.all(24),
                     decoration: BoxDecoration(
-                      color: Theme.of(context).backgroundColor,
+                      color: Theme.of(context).colorScheme.background,
                       borderRadius: BorderRadius.circular(30),
                     ),
                     child: Column(
@@ -165,7 +184,8 @@ class IoniaDebitCardPage extends BasePage {
                         Text(
                           S.of(context).how_to_use_card,
                           style: textLargeSemiBold(
-                            color: Theme.of(context).textTheme!.bodyText2!.color!,
+                            color:
+                                Theme.of(context).textTheme!.bodyMedium!.color!,
                           ),
                         ),
                         SizedBox(height: 24),
@@ -174,7 +194,10 @@ class IoniaDebitCardPage extends BasePage {
                           child: Text(
                             S.of(context).signup_for_card_accept_terms,
                             style: textSmallSemiBold(
-                              color: Theme.of(context).textTheme!.headline3!.color!,
+                              color: Theme.of(context)
+                                  .textTheme!
+                                  .displaySmall!
+                                  .color!,
                             ),
                           ),
                         ),
@@ -195,7 +218,8 @@ class IoniaDebitCardPage extends BasePage {
                               : Navigator.pop(context),
                           text: S.of(context).send_got_it,
                           color: Color.fromRGBO(233, 242, 252, 1),
-                          textColor: Theme.of(context).textTheme!.headline3!.color!,
+                          textColor:
+                              Theme.of(context).textTheme!.displaySmall!.color!,
                         ),
                         SizedBox(height: 21),
                       ],
@@ -259,8 +283,8 @@ class _IoniaDebitCardState extends State<_IoniaDebitCard> {
         borderRadius: BorderRadius.circular(24),
         gradient: LinearGradient(
           colors: [
-            Theme.of(context).primaryTextTheme!.subtitle1!.color!,
-            Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
+            Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+            Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
           ],
           begin: Alignment.topLeft,
           end: Alignment.bottomRight,
@@ -368,12 +392,14 @@ class _TitleSubtitleTile extends StatelessWidget {
       children: [
         Text(
           title,
-          style: textSmallSemiBold(color: Theme.of(context).textTheme!.headline3!.color!),
+          style: textSmallSemiBold(
+              color: Theme.of(context).textTheme!.displaySmall!.color!),
         ),
         SizedBox(height: 4),
         Text(
           subtitle,
-          style: textSmall(color: Theme.of(context).textTheme!.headline3!.color!),
+          style: textSmall(
+              color: Theme.of(context).textTheme!.displaySmall!.color!),
         ),
       ],
     );

lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart

@@ -33,7 +33,7 @@ class IoniaGiftCardDetailPage extends BasePage {
 
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).primaryTextTheme.headline6!.color!,
+      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
       size: 16,
     );
     return Padding(
@@ -59,8 +59,11 @@ class IoniaGiftCardDetailPage extends BasePage {
   Widget middle(BuildContext context) {
     return Text(
       viewModel.giftCard.legalName,
-      style:
-          textMediumSemiBold(color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!),
+      style: textMediumSemiBold(
+          color: Theme.of(context)
+              .accentTextTheme!
+              .displayLarge!
+              .backgroundColor!),
     );
   }
 
@@ -142,8 +145,8 @@ class IoniaGiftCardDetailPage extends BasePage {
                         viewModel.refeshCard();
                     },
                     text: S.of(context).more_options,
-                    color: Theme.of(context).accentTextTheme.caption!.color!,
-                    textColor: Theme.of(context).primaryTextTheme.headline6!.color!,
+                    color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
+                    textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                   ),
                   SizedBox(height: 12),
                   LoadingPrimaryButton(
@@ -155,7 +158,7 @@ class IoniaGiftCardDetailPage extends BasePage {
                       },
                     ),
                     text: S.of(context).mark_as_redeemed,
-                    color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+                    color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                     textColor: Colors.white,
                   ),
                 ],
@@ -198,13 +201,13 @@ class IoniaGiftCardDetailPage extends BasePage {
                             child: Text(
                               instruction.header,
                               style: textLargeSemiBold(
-                                color: Theme.of(context).textTheme.headline3!.color!,
+                                color: Theme.of(context).textTheme!.displaySmall!.color!,
                               ),
                             )),
                         Text(
                           instruction.body,
                           style: textMedium(
-                            color: Theme.of(context).textTheme.headline3!.color!,
+                            color: Theme.of(context).textTheme!.displaySmall!.color!,
                           ),
                         )
                       ];

lib/src/screens/ionia/cards/ionia_manage_cards_page.dart

@@ -48,7 +48,7 @@ class IoniaManageCardsPage extends BasePage {
         decoration: BoxDecoration(
           gradient: LinearGradient(
             colors: [
-              Theme.of(context).accentColor,
+              Theme.of(context).colorScheme.secondary,
               Theme.of(context).scaffoldBackgroundColor,
               Theme.of(context).primaryColor,
             ],
@@ -69,7 +69,10 @@ class IoniaManageCardsPage extends BasePage {
   Widget leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+      color: Theme.of(context)
+          .accentTextTheme!
+          .displayMedium!
+          .backgroundColor!,
       size: 16,
     );
 
@@ -94,7 +97,10 @@ class IoniaManageCardsPage extends BasePage {
     return Text(
       S.of(context).gift_cards,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayMedium!
+            .backgroundColor!,
       ),
     );
   }
@@ -118,7 +124,7 @@ class IoniaManageCardsPage extends BasePage {
           width: 32,
           padding: EdgeInsets.all(8),
           decoration: BoxDecoration(
-            color: Theme.of(context).textTheme!.headline6!.backgroundColor!,
+            color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
             border: Border.all(
               color: Colors.white.withOpacity(0.2),
             ),
@@ -126,7 +132,7 @@ class IoniaManageCardsPage extends BasePage {
           ),
           child: Image.asset(
             'assets/images/filter.png',
-            color: Theme.of(context).textTheme!.caption!.decorationColor!,
+            color: Theme.of(context).textTheme!.bodySmall!.decorationColor!,
           ),
         )
     );
@@ -225,9 +231,9 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
               },
               title: merchant.legalName,
               subTitle: merchant.avaibilityStatus,
-              backgroundColor: Theme.of(context).textTheme!.headline6!.backgroundColor!,
-              titleColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
-              subtitleColor: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
+              backgroundColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
+              titleColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
+              subtitleColor: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!,
               discount: merchant.discount,
             );
           },
@@ -238,8 +244,8 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
                 thumbHeight: thumbHeight,
                 rightOffset: 1,
                 width: 3,
-                backgroundColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.05),
-                thumbColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.5),
+                backgroundColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.05),
+                thumbColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.5),
                 fromTop: widget.cardsListViewModel.scrollOffsetFromTop,
               )
             : Offstage()
@@ -247,8 +253,8 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
          } 
          return Center(
           child: CircularProgressIndicator(
-            backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
-            valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyText2!.color!),
+            backgroundColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
+            valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyMedium!.color!),
           ),
         );
       }
@@ -269,12 +275,12 @@ class _SearchWidget extends StatelessWidget {
       padding: EdgeInsets.all(8),
       child: Image.asset(
         'assets/images/mini_search_icon.png',
-        color: Theme.of(context).textTheme!.caption!.decorationColor!,
+        color: Theme.of(context).textTheme!.bodySmall!.decorationColor!,
       ),
     );
 
     return TextField(
-      style: TextStyle(color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!),
+      style: TextStyle(color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!),
       controller: controller,
       decoration: InputDecoration(
           filled: true,
@@ -282,10 +288,10 @@ class _SearchWidget extends StatelessWidget {
             top: 10,
             left: 10,
           ),
-          fillColor: Theme.of(context).textTheme!.headline6!.backgroundColor!,
+          fillColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
           hintText: S.of(context).search,
           hintStyle: TextStyle(
-            color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
+            color: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!,
           ),
           alignLabelWithHint: true,
           floatingLabelBehavior: FloatingLabelBehavior.never,
@@ -329,7 +335,7 @@ class _TrailingIcon extends StatelessWidget {
         onPressed: onPressed,
         icon: Image.asset(
           asset,
-          color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+          color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
         ),
       ),
     );

lib/src/screens/ionia/cards/ionia_more_options_page.dart

@@ -15,7 +15,10 @@ class IoniaMoreOptionsPage extends BasePage {
     return Text(
       S.current.more_options,
       style: textMediumSemiBold(
-        color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayLarge!
+            .backgroundColor!,
       ),
     );
   }
@@ -34,7 +37,7 @@ class IoniaMoreOptionsPage extends BasePage {
             child: Text(
               S.of(context).choose_from_available_options,
               style: textMedium(
-                color: Theme.of(context).primaryTextTheme.headline6!.color!,
+                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
               ),
             ),
           ),
@@ -78,7 +81,7 @@ class _GradiantContainer extends StatelessWidget {
         gradient: LinearGradient(
           colors: [
             Theme.of(context).scaffoldBackgroundColor,
-            Theme.of(context).accentColor,
+            Theme.of(context).colorScheme.secondary,
           ],
           begin: Alignment.topRight,
           end: Alignment.bottomLeft,

lib/src/screens/ionia/cards/ionia_payment_status_page.dart

@@ -23,8 +23,11 @@ class IoniaPaymentStatusPage extends BasePage {
         S.of(context).generating_gift_card,
         textAlign: TextAlign.center,
         style: textMediumSemiBold(
-          color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!));
-    }
+            color: Theme.of(context)
+                .accentTextTheme!
+                .displayLarge!
+                .backgroundColor!));
+  }
 
   @override
   Widget body(BuildContext context) {
@@ -90,7 +93,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
             Text(
               S.of(context).awaiting_payment_confirmation,
               style: textLargeSemiBold(
-                color: Theme.of(context).primaryTextTheme!.headline6!.color!))
+                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
             ]),
           SizedBox(height: 40),
           Row(children: [
@@ -129,7 +132,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
                   Text(
                     S.of(context).gift_card_is_generated,
                     style: textLargeSemiBold(
-                      color: Theme.of(context).primaryTextTheme!.headline6!.color!))
+                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
                   ]));
             }
 
@@ -147,7 +150,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
               Text(
                 S.of(context).generating_gift_card,
                 style: textLargeSemiBold(
-                  color: Theme.of(context).primaryTextTheme!.headline6!.color!))]);
+                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))]);
           }),
         ],
       ),
@@ -160,7 +163,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!.headline6!.color!,
+                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                 ).copyWith(fontWeight: FontWeight.w500),
                 textAlign: TextAlign.center,
               )),
@@ -172,15 +175,15 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
                         Routes.ioniaGiftCardDetailPage,
                         arguments: [widget.viewModel.giftCard]),
                     text: S.of(context).open_gift_card,
-                    color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                    color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                     textColor: Colors.white);
                 }
 
                 return PrimaryButton(
                   onPressed: () => Navigator.of(context).pushNamed(Routes.support),
                   text: S.of(context).contact_support,
-                  color: Theme.of(context).accentTextTheme!.caption!.color!,
-                  textColor: Theme.of(context).primaryTextTheme!.headline6!.color!);
+                  color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
+                  textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
                 })
             ])
       ),
@@ -196,14 +199,14 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
           Text(
             title,
             style: textXSmall(
-              color: Theme.of(context).primaryTextTheme!.overline!.color!,
+              color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
             ),
           ),
           SizedBox(height: 8),
           Text(
             subtitle,
             style: textMedium(
-              color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+              color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
             ),
           ),
         ],

lib/src/screens/ionia/widgets/ionia_alert_model.dart

@@ -32,7 +32,7 @@ class IoniaAlertModal extends StatelessWidget {
               padding: EdgeInsets.only(top: 24, left: 24, right: 24),
               margin: EdgeInsets.all(24),
               decoration: BoxDecoration(
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).colorScheme.background,
                 borderRadius: BorderRadius.circular(30),
               ),
               child: Column(
@@ -41,7 +41,7 @@ class IoniaAlertModal extends StatelessWidget {
                     Text(
                       title,
                       style: textLargeSemiBold(
-                        color: Theme.of(context).textTheme!.bodyText2!.color!,
+                        color: Theme.of(context).textTheme!.bodyMedium!.color!,
                       ),
                     ),
                   Container(
@@ -56,8 +56,12 @@ class IoniaAlertModal extends StatelessWidget {
                   PrimaryButton(
                     onPressed: () => Navigator.pop(context),
                     text: actionTitle,
-                    color: Theme.of(context).accentTextTheme!.caption!.color!,
-                    textColor: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .bodySmall!
+                        .color!,
+                    textColor:
+                        Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                   ),
                   SizedBox(height: 21),
                 ],

lib/src/screens/ionia/widgets/ionia_filter_modal.dart

@@ -20,7 +20,7 @@ class IoniaFilterModal extends StatelessWidget {
       padding: EdgeInsets.all(10),
       child: Image.asset(
         'assets/images/mini_search_icon.png',
-        color: Theme.of(context).textTheme.subtitle2!.color!,
+        color: Theme.of(context).textTheme!.titleSmall!.color!,
       ),
     );
     return Scaffold(
@@ -34,7 +34,7 @@ class IoniaFilterModal extends StatelessWidget {
               padding: EdgeInsets.only(top: 24, bottom: 20),
               margin: EdgeInsets.all(24),
               decoration: BoxDecoration(
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).colorScheme.background,
                 borderRadius: BorderRadius.circular(30),
               ),
               child: Column(
@@ -46,14 +46,14 @@ class IoniaFilterModal extends StatelessWidget {
                       child: TextField(
                         onChanged: ioniaGiftCardsListViewModel.onSearchFilter,
                         style: textMedium(
-                          color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                          color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                         ),
                         decoration: InputDecoration(
                           filled: true,
                           prefixIcon: searchIcon,
                           hintText: S.of(context).search_category,
                           contentPadding: EdgeInsets.only(bottom: 5),
-                          fillColor: Theme.of(context).primaryTextTheme!.caption!.decorationColor!.withOpacity(0.5),
+                          fillColor: Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!.withOpacity(0.5),
                           border: OutlineInputBorder(
                             borderSide: BorderSide.none,
                             borderRadius: BorderRadius.circular(8),
@@ -84,12 +84,12 @@ class IoniaFilterModal extends StatelessWidget {
                                   children: [
                                     Image.asset(
                                       category.iconPath,
-                                      color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                                     ),
                                     SizedBox(width: 10),
                                     Text(category.title,
                                         style: textSmall(
-                                          color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                                          color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                                         ).copyWith(fontWeight: FontWeight.w500)),
                                   ],
                                 ),

lib/src/screens/ionia/widgets/ionia_tile.dart

@@ -26,14 +26,14 @@ class IoniaTile extends StatelessWidget {
             Text(
               title,
               style: textXSmall(
-                color: Theme.of(context).primaryTextTheme!.overline!.color!,
+                color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
               ),
             ),
             SizedBox(height: 8),
             Text(
               subTitle,
               style: textMediumBold(
-                color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
               ),
             ),
           ],

lib/src/screens/ionia/widgets/rounded_checkbox.dart

@@ -15,11 +15,11 @@ class RoundedCheckbox extends StatelessWidget {
               width: 20.0,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(50.0)),
-                color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
               ),
               child: Icon(
                 Icons.check,
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).colorScheme.background,
                 size: 14.0,
               ))
           : Offstage();

lib/src/screens/ionia/widgets/text_icon_button.dart

@@ -22,12 +22,12 @@ class TextIconButton extends StatelessWidget {
             Text(
               label,
               style: textMediumSemiBold(
-                color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
               ),
             ),
             Icon(
               Icons.chevron_right_rounded,
-              color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+              color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
             ),
           ],
         ),

lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart

@@ -56,7 +56,7 @@ class MoneroAccountEditOrCreatePage extends BasePage {
                         text: moneroAccountCreationViewModel.isEdit
                             ? S.of(context).rename
                             : S.of(context).add,
-                        color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                        color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                         textColor: Colors.white,
                         isLoading: moneroAccountCreationViewModel.state
                         is IsExecutingState,

lib/src/screens/monero_accounts/monero_account_list_page.dart

@@ -65,7 +65,7 @@ class MoneroAccountListPage extends StatelessWidget {
                           borderRadius: BorderRadius.all(Radius.circular(14)),
                           child: Container(
                             height: 296,
-                            color: Theme.of(context).textTheme!.headline1!.decorationColor!,
+                            color: Theme.of(context).textTheme!.displayLarge!.decorationColor!,
                             child: Column(
                               children: <Widget>[
                                 Expanded(

lib/src/screens/monero_accounts/widgets/account_tile.dart

@@ -20,11 +20,11 @@ class AccountTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final color = isCurrent
-        ? Theme.of(context).textTheme.subtitle2!.decorationColor!
-        : Theme.of(context).textTheme.headline1!.decorationColor!;
+        ? Theme.of(context).textTheme!.titleSmall!.decorationColor!
+        : Theme.of(context).textTheme!.displayLarge!.decorationColor!;
     final textColor = isCurrent
-        ? Theme.of(context).textTheme.subtitle2!.color!
-        : Theme.of(context).textTheme.headline1!.color!;
+        ? Theme.of(context).textTheme!.titleSmall!.color!
+        : Theme.of(context).textTheme!.displayLarge!.color!;
 
     final Widget cell = GestureDetector(
       onTap: onTap,
@@ -57,7 +57,7 @@ class AccountTile extends StatelessWidget {
                   fontSize: 15,
                   fontWeight: FontWeight.w600,
                   fontFamily: 'Lato',
-                  color: Theme.of(context).textTheme.headline4!.color!,
+                  color: Theme.of(context).textTheme!.headlineMedium!.color!,
                   decoration: TextDecoration.none,
                 ),
                          ),

lib/src/screens/new_wallet/advanced_privacy_settings_page.dart

@@ -111,7 +111,10 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
                 Navigator.pop(context);
               },
               text: S.of(context).continue_text,
-              color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+              color: Theme.of(context)
+                  .accentTextTheme!
+                  .bodyLarge!
+                  .color!,
               textColor: Colors.white,
             ),
             const SizedBox(height: 25),
@@ -121,7 +124,10 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
                 S.of(context).settings_can_be_changed_later,
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: Theme.of(context).accentTextTheme.headline2?.color,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .displayMedium!
+                      .color,
                 ),
               ),
             ),

lib/src/screens/new_wallet/new_wallet_page.dart

@@ -117,25 +117,31 @@ class _WalletNameFormState extends State<WalletNameForm> {
                             style: TextStyle(
                                 fontSize: 20.0,
                                 fontWeight: FontWeight.w600,
-                                color: Theme.of(context).primaryTextTheme!.headline6!.color!),
+                                color: Theme.of(context)
+                                    .primaryTextTheme!
+                                    .titleLarge!
+                                    .color!),
                             decoration: InputDecoration(
                               hintStyle: TextStyle(
                                   fontSize: 18.0,
                                   fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).accentTextTheme!.headline2!.color!),
+                                  color: Theme.of(context)
+                                      .accentTextTheme!
+                                      .displayMedium!
+                                      .color),
                               hintText: S.of(context).wallet_name,
                               focusedBorder: UnderlineInputBorder(
                                   borderSide: BorderSide(
                                       color: Theme.of(context)
                                           .accentTextTheme!
-                                          .headline2!
+                                          .displayMedium!
                                           .decorationColor!,
                                       width: 1.0)),
                               enabledBorder: UnderlineInputBorder(
                                 borderSide: BorderSide(
                                     color: Theme.of(context)
                                         .accentTextTheme!
-                                        .headline2!
+                                        .displayMedium!
                                         .decorationColor!,
                                     width: 1.0),
                               ),
@@ -165,7 +171,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                                       'assets/images/refresh_icon.png',
                                       color: Theme.of(context)
                                           .primaryTextTheme!
-                                          .headline4!
+                                          .headlineMedium!
                                           .decorationColor!,
                                     ),
                                   ),
@@ -187,7 +193,10 @@ class _WalletNameFormState extends State<WalletNameForm> {
                         style: TextStyle(
                             fontSize: 16.0,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context).primaryTextTheme!.headline6!.color!),
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .titleLarge!
+                                .color!),
                       ),
                     ),
                     Padding(

lib/src/screens/new_wallet/new_wallet_type_page.dart

@@ -80,7 +80,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
                   style: TextStyle(
                       fontSize: 16,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context).primaryTextTheme.headline6!.color!),
+                      color: Theme.of(context)
+                          .primaryTextTheme!
+                          .titleLarge!
+                          .color!),
                 ),
               ),
               ...types.map((type) => Padding(
@@ -99,7 +102,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
       bottomSection: PrimaryButton(
         onPressed: () => onTypeSelected(),
         text: S.of(context).seed_language_next,
-        color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+        color: Theme.of(context)
+            .accentTextTheme!
+            .bodyLarge!
+            .color!,
         textColor: Colors.white,
         isDisabled: selected == null,
       ),

lib/src/screens/new_wallet/widgets/select_button.dart

@@ -16,14 +16,26 @@ class SelectButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final color = isSelected
-          ? Colors.green
-          : Theme.of(context).accentTextTheme!.caption!.color!;
+        ? Colors.green
+        : Theme.of(context)
+            .accentTextTheme!
+            .bodySmall!
+            .color!;
     final textColor = isSelected
-          ? Theme.of(context).accentTextTheme!.headline5!.decorationColor!
-          : Theme.of(context).primaryTextTheme!.headline6!.color!;
+        ? Theme.of(context)
+            .accentTextTheme!
+            .headlineSmall!
+            .decorationColor!
+        : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
     final arrowColor = isSelected
-        ? Theme.of(context).accentTextTheme!.headline5!.decorationColor!
-        : Theme.of(context).accentTextTheme!.subtitle1!.color!;
+        ? Theme.of(context)
+            .accentTextTheme!
+            .headlineSmall!
+            .decorationColor!
+        : Theme.of(context)
+            .accentTextTheme!
+            .titleMedium!
+            .color!;
 
     final selectArrowImage = Image.asset('assets/images/select_arrow.png',
           color: arrowColor);

lib/src/screens/nodes/node_create_or_edit_page.dart

@@ -148,7 +148,10 @@ class NodeCreateOrEditPage extends BasePage {
                             Navigator.of(context).pop();
                           },
                           text: S.of(context).save,
-                          color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                          color: Theme.of(context)
+                              .accentTextTheme!
+                              .bodyLarge!
+                              .color!,
                           textColor: Colors.white,
                           isDisabled: (!nodeCreateOrEditViewModel.isReady)||
                               (nodeCreateOrEditViewModel

lib/src/screens/nodes/widgets/node_list_row.dart

@@ -36,7 +36,7 @@ class NodeHeaderListRow extends StandardListRow {
     return SizedBox(
       width: 20,
       child: Icon(Icons.add,
-          color: Theme.of(context).accentTextTheme.subtitle1?.color, size: 24.0),
+          color: Theme.of(context).accentTextTheme!.titleMedium!.color,size: 24.0),
     );
   }
 }

lib/src/screens/pin_code/pin_code_widget.dart

@@ -110,11 +110,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!.headline6!.color!,
+      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
     );
     final faceImage = Image.asset(
       'assets/images/face.png',
-      color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
     );
 
     return RawKeyboardListener(
@@ -133,7 +133,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
         }
       },
       child: Container(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0),
         child: Column(
           children: <Widget>[
@@ -142,7 +142,8 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                 style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.w500,
-                    color: Theme.of(context).primaryTextTheme!.headline6!.color!)),
+                    color:
+                        Theme.of(context).primaryTextTheme!.titleLarge!.color!)),
             Spacer(flex: 3),
             Container(
               width: 180,
@@ -158,10 +159,13 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                       decoration: BoxDecoration(
                         shape: BoxShape.circle,
                         color: isFilled
-                            ? Theme.of(context).primaryTextTheme!.headline6!.color!
+                            ? Theme.of(context)
+                                .primaryTextTheme!
+                                .titleLarge!
+                                .color!
                             : Theme.of(context)
                                 .accentTextTheme!
-                                .bodyText2!
+                                .bodyMedium!
                                 .color!
                                 .withOpacity(0.25),
                       ));
@@ -181,7 +185,10 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                   style: TextStyle(
                       fontSize: 14.0,
                       fontWeight: FontWeight.normal,
-                      color: Theme.of(context).accentTextTheme!.bodyText2!.decorationColor!),
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .bodyMedium!
+                          .decorationColor!),
                 ),
               )
             ],
@@ -225,7 +232,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                                         child: TextButton(
                                           onPressed: () => _pop(),
                                           style: TextButton.styleFrom(
-                                            backgroundColor: Theme.of(context).backgroundColor,
+                                            backgroundColor: Theme.of(context).colorScheme.background,
                                             shape: CircleBorder(),
                                           ),
                                           child: deleteIconImage,
@@ -242,7 +249,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                                   child: TextButton(
                                     onPressed: () => _push(index),
                                     style: TextButton.styleFrom(
-                                      backgroundColor: Theme.of(context).backgroundColor,
+                                      backgroundColor: Theme.of(context).colorScheme.background,
                                       shape: CircleBorder(),
                                     ),
                                     child: Text('$index',
@@ -251,7 +258,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                                             fontWeight: FontWeight.w600,
                                             color: Theme.of(context)
                                                 .primaryTextTheme!
-                                                .headline6!
+                                                .titleLarge!
                                                 .color!)),
                                   ),
                                 );

lib/src/screens/receive/anonpay_invoice_page.dart

@@ -73,7 +73,10 @@ class AnonPayInvoicePage extends BasePage {
       disableScroll: true,
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
+          keyboardBarColor: Theme.of(context)
+              .accentTextTheme!
+              .bodyLarge!
+              .backgroundColor!,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -82,7 +85,7 @@ class AnonPayInvoicePage extends BasePage {
             ),
           ]),
       child: Container(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.only(bottom: 24),
           content: Container(
@@ -91,8 +94,8 @@ class AnonPayInvoicePage extends BasePage {
                   bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
               gradient: LinearGradient(
                 colors: [
-                  Theme.of(context).primaryTextTheme.subtitle2!.color!,
-                  Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!,
+                  Theme.of(context).primaryTextTheme!.titleSmall!.color!,
+                  Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!,
                 ],
                 begin: Alignment.topLeft,
                 end: Alignment.bottomRight,
@@ -130,7 +133,10 @@ class AnonPayInvoicePage extends BasePage {
                           : S.of(context).anonpay_description("a donation link", "donate"),
                       textAlign: TextAlign.center,
                       style: TextStyle(
-                          color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!,
+                          color: Theme.of(context)
+                              .primaryTextTheme!
+                              .displayLarge!
+                              .decorationColor!,
                           fontWeight: FontWeight.w500,
                           fontSize: 12),
                     ),
@@ -157,7 +163,10 @@ class AnonPayInvoicePage extends BasePage {
                       anonInvoicePageViewModel.generateDonationLink();
                     }
                   },
-                  color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white,
                   isLoading: anonInvoicePageViewModel.state is IsExecutingState,
                 ),

lib/src/screens/receive/anonpay_receive_page.dart

@@ -35,7 +35,10 @@ class AnonPayReceivePage extends BasePage {
   Widget leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+      color: Theme.of(context)
+          .accentTextTheme!
+          .displayMedium!
+          .backgroundColor!,
       size: 16,
     );
 
@@ -62,7 +65,10 @@ class AnonPayReceivePage extends BasePage {
               fontSize: 18.0,
               fontWeight: FontWeight.bold,
               fontFamily: 'Lato',
-              color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
+              color: Theme.of(context)
+                  .accentTextTheme!
+                  .displayMedium!
+                  .backgroundColor!),
         ),
         Text(
           invoiceInfo is AnonpayInvoiceInfo
@@ -71,7 +77,7 @@ class AnonPayReceivePage extends BasePage {
           style: TextStyle(
               fontSize: 10.0,
               fontWeight: FontWeight.w500,
-              color: Theme.of(context).textTheme.headline5!.color!),
+              color: Theme.of(context).textTheme!.headlineSmall!.color!),
         )
       ],
     );
@@ -93,7 +99,10 @@ class AnonPayReceivePage extends BasePage {
         ),
         icon: Icon(
           Icons.edit,
-          color: Theme.of(context).accentTextTheme.caption!.color!,
+          color: Theme.of(context)
+              .accentTextTheme!
+              .bodySmall!
+              .color!,
           size: 22.0,
         ),
       ),
@@ -105,7 +114,7 @@ class AnonPayReceivePage extends BasePage {
       (BuildContext context, Widget scaffold) => Container(
           decoration: BoxDecoration(
               gradient: LinearGradient(colors: [
-            Theme.of(context).accentColor,
+            Theme.of(context).colorScheme.secondary,
             Theme.of(context).scaffoldBackgroundColor,
             Theme.of(context).primaryColor,
           ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -151,7 +160,10 @@ class AnonPayReceivePage extends BasePage {
                         decoration: BoxDecoration(
                           border: Border.all(
                             width: 3,
-                            color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                            color: Theme.of(context)
+                                .accentTextTheme!
+                                .displayMedium!
+                                .backgroundColor!,
                           ),
                         ),
                         child: QrImage(

lib/src/screens/receive/fullscreen_qr_page.dart

@@ -22,7 +22,10 @@ class FullscreenQRPage extends BasePage {
   Widget leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+      color: Theme.of(context)
+          .accentTextTheme!
+          .displayMedium!
+          .backgroundColor!,
       size: 16,
     );
 
@@ -48,7 +51,7 @@ class FullscreenQRPage extends BasePage {
       decoration: BoxDecoration(
         gradient: LinearGradient(
           colors: [
-            Theme.of(context).accentColor,
+            Theme.of(context).colorScheme.secondary,
             Theme.of(context).scaffoldBackgroundColor,
             Theme.of(context).primaryColor,
           ],
@@ -70,7 +73,12 @@ class FullscreenQRPage extends BasePage {
             child: Container(
               padding: EdgeInsets.all(10),
               decoration: BoxDecoration(
-                  border: Border.all(width: 3, color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)),
+                  border: Border.all(
+                      width: 3,
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .displayMedium!
+                          .backgroundColor!)),
               child: Container(
                   decoration: BoxDecoration(
                       border: Border.all(width: 3, color: Colors.white)),

lib/src/screens/receive/receive_page.dart

@@ -64,7 +64,10 @@ class ReceivePage extends BasePage {
           fontSize: 18.0,
           fontWeight: FontWeight.bold,
           fontFamily: 'Lato',
-          color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!),
+          color: Theme.of(context)
+              .accentTextTheme!
+              .displayMedium!
+              .backgroundColor!),
     );
   }
 
@@ -73,7 +76,7 @@ class ReceivePage extends BasePage {
       (BuildContext context, Widget scaffold) => Container(
           decoration: BoxDecoration(
               gradient: LinearGradient(colors: [
-            Theme.of(context).accentColor,
+            Theme.of(context).colorScheme.secondary,
             Theme.of(context).scaffoldBackgroundColor,
             Theme.of(context).primaryColor,
           ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -100,7 +103,10 @@ class ReceivePage extends BasePage {
             icon: Icon(
               Icons.share,
               size: 20,
-              color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+              color: Theme.of(context)
+                  .accentTextTheme!
+                  .displayMedium!
+                  .backgroundColor!,
             ),
           ),
         ));
@@ -113,7 +119,10 @@ class ReceivePage extends BasePage {
         ? KeyboardActions(
             config: KeyboardActionsConfig(
                 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-                keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
+                keyboardBarColor: Theme.of(context)
+                    .accentTextTheme!
+                    .bodyLarge!
+                    .backgroundColor!,
                 nextFocus: false,
                 actions: [
                   KeyboardActionsItem(
@@ -154,7 +163,10 @@ class ReceivePage extends BasePage {
                                   icon: Icon(
                                     Icons.arrow_forward_ios,
                                     size: 14,
-                                    color: Theme.of(context).textTheme!.headline4!.color!,
+                                    color: Theme.of(context)
+                                        .textTheme!
+                                        .headlineMedium!
+                                        .color!,
                                   ));
                             }
 
@@ -166,7 +178,10 @@ class ReceivePage extends BasePage {
                                   icon: Icon(
                                     Icons.add,
                                     size: 20,
-                                    color: Theme.of(context).textTheme!.headline4!.color!,
+                                    color: Theme.of(context)
+                                        .textTheme!
+                                        .headlineMedium!
+                                        .color!,
                                   ));
                             }
 
@@ -175,11 +190,23 @@ class ReceivePage extends BasePage {
                                 final isCurrent =
                                     item.address == addressListViewModel.address.address;
                                 final backgroundColor = isCurrent
-                                    ? Theme.of(context).textTheme!.headline2!.decorationColor!
-                                    : Theme.of(context).textTheme!.headline3!.decorationColor!;
+                                    ? Theme.of(context)
+                                        .textTheme!
+                                        .displayMedium!
+                                        .decorationColor!
+                                    : Theme.of(context)
+                                        .textTheme!
+                                        .displaySmall!
+                                        .decorationColor!;
                                 final textColor = isCurrent
-                                    ? Theme.of(context).textTheme!.headline2!.color!
-                                    : Theme.of(context).textTheme!.headline3!.color!;
+                                    ? Theme.of(context)
+                                        .textTheme!
+                                        .displayMedium!
+                                        .color!
+                                    : Theme.of(context)
+                                        .textTheme!
+                                        .displaySmall!
+                                        .color!;
 
                                 return AddressCell.fromItem(item,
                                     isCurrent: isCurrent,
@@ -225,7 +252,10 @@ class ReceivePage extends BasePage {
                     textAlign: TextAlign.center,
                     style: TextStyle(
                         fontSize: 15,
-                        color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!)),
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .displaySmall!
+                            .backgroundColor!)),
               ],
             ),
           );

lib/src/screens/receive/widgets/anonpay_currency_input_field.dart

@@ -32,7 +32,8 @@ class AnonpayCurrencyInputField extends StatelessWidget {
             decoration: BoxDecoration(
               border: Border(
                   bottom: BorderSide(
-                      color: Theme.of(context).primaryTextTheme.bodyText1!.color!,
+                      color:
+                          Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
                       width: 1)),
             ),
             child: Padding(
@@ -64,7 +65,10 @@ class AnonpayCurrencyInputField extends StatelessWidget {
                           child: Container(
                             height: 32,
                             decoration: BoxDecoration(
-                                color: Theme.of(context).primaryTextTheme.headline4!.color!,
+                                color: Theme.of(context)
+                                    .primaryTextTheme!
+                                    .headlineMedium!
+                                    .color!,
                                 borderRadius: BorderRadius.all(Radius.circular(6))),
                             child: Center(
                               child: Padding(
@@ -75,8 +79,8 @@ class AnonpayCurrencyInputField extends StatelessWidget {
                                     fontSize: 12,
                                     fontWeight: FontWeight.bold,
                                     color: Theme.of(context)
-                                        .primaryTextTheme
-                                        .headline4!
+                                        .primaryTextTheme!
+                                        .headlineMedium!
                                         .decorationColor!,
                                   ),
                                 ),
@@ -115,7 +119,10 @@ class AnonpayCurrencyInputField extends StatelessWidget {
                             placeholderTextStyle: TextStyle(
                               fontSize: 16,
                               fontWeight: FontWeight.w600,
-                              color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
+                              color: Theme.of(context)
+                                  .accentTextTheme!
+                                  .displayLarge!
+                                  .decorationColor!,
                             ),
                             validator: null,
                           ),
@@ -136,14 +143,20 @@ class AnonpayCurrencyInputField extends StatelessWidget {
                 style: TextStyle(
                     fontSize: 10,
                     height: 1.2,
-                    color: Theme.of(context).accentTextTheme.headline1!.decorationColor!),
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .displayLarge!
+                        .decorationColor!),
               ),
               SizedBox(width: 10),
               Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()),
                   style: TextStyle(
                       fontSize: 10,
                       height: 1.2,
-                      color: Theme.of(context).accentTextTheme.headline1!.decorationColor!)),
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .displayLarge!
+                          .decorationColor!)),
             ],
           ),
         )

lib/src/screens/receive/widgets/anonpay_input_form.dart

@@ -69,14 +69,17 @@ class AnonInvoiceForm extends StatelessWidget {
             BaseTextFormField(
               controller: nameController,
               focusNode: _nameFocusNode,
-              borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
+              borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
               suffixIcon: SizedBox(width: 36),
               hintText: S.of(context).optional_name,
               textInputAction: TextInputAction.next,
               placeholderTextStyle: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
-                color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
+                color: Theme.of(context)
+                    .accentTextTheme!
+                    .displayLarge!
+                    .decorationColor!,
               ),
               textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
               validator: null,
@@ -88,13 +91,16 @@ class AnonInvoiceForm extends StatelessWidget {
               controller: descriptionController,
               focusNode: _descriptionFocusNode,
               textInputAction: TextInputAction.next,
-              borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
+              borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
               suffixIcon: SizedBox(width: 36),
               hintText: S.of(context).optional_description,
               placeholderTextStyle: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
-                color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
+                color: Theme.of(context)
+                    .accentTextTheme!
+                    .displayLarge!
+                    .decorationColor!,
               ),
               textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
               validator: null,
@@ -104,14 +110,17 @@ class AnonInvoiceForm extends StatelessWidget {
               controller: emailController,
               textInputAction: TextInputAction.next,
               focusNode: _emailFocusNode,
-              borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
+              borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
               suffixIcon: SizedBox(width: 36),
               keyboardType: TextInputType.emailAddress,
               hintText: S.of(context).optional_email_hint,
               placeholderTextStyle: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
-                color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
+                color: Theme.of(context)
+                    .accentTextTheme!
+                    .displayLarge!
+                    .decorationColor!,
               ),
               textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
               validator: EmailValidator(),

lib/src/screens/receive/widgets/anonpay_status_section.dart

@@ -18,7 +18,7 @@ class AnonInvoiceStatusSection extends StatelessWidget {
       width: 200,
       padding: EdgeInsets.all(19),
       decoration: BoxDecoration(
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         borderRadius: BorderRadius.circular(30),
       ),
       child: Column(
@@ -31,13 +31,19 @@ class AnonInvoiceStatusSection extends StatelessWidget {
                 style: TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.w500,
-                  color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!,
+                  color: Theme.of(context)
+                      .primaryTextTheme!
+                      .displayLarge!
+                      .decorationColor!,
                 ),
               ),
               Container(
                 padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
                 decoration: BoxDecoration(
-                  color: Theme.of(context).accentTextTheme.headline3!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .displaySmall!
+                      .color!,
                   borderRadius: BorderRadius.circular(10),
                 ),
                 child: Row(
@@ -52,7 +58,10 @@ class AnonInvoiceStatusSection extends StatelessWidget {
                     Text(
                       invoiceInfo.status ?? '',
                       style: textSmallSemiBold(
-                        color: Theme.of(context).primaryTextTheme.headline6!.color,
+                        color: Theme.of(context)
+                            .primaryTextTheme!
+                            .titleLarge!
+                            .color,
                       ),
                     )
                   ],
@@ -69,13 +78,16 @@ class AnonInvoiceStatusSection extends StatelessWidget {
                 style: TextStyle(
                   fontSize: 14,
                   fontWeight: FontWeight.w500,
-                  color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!,
+                  color: Theme.of(context)
+                      .primaryTextTheme!
+                      .displayLarge!
+                      .decorationColor!,
                 ),
               ),
               Text(
                 invoiceInfo.invoiceId ?? '',
                 style: textSmallSemiBold(
-                  color: Theme.of(context).primaryTextTheme.headline6!.color,
+                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color,
                 ),
               ),
             ],

lib/src/screens/receive/widgets/copy_link_item.dart

@@ -14,7 +14,10 @@ class CopyLinkItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final copyImage = Image.asset('assets/images/copy_address.png',
-        color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!);
+        color: Theme.of(context)
+            .accentTextTheme!
+            .displayMedium!
+            .backgroundColor!);
 
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
@@ -22,7 +25,10 @@ class CopyLinkItem extends StatelessWidget {
         Text(
           title,
           style: textMedium(
-            color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+            color: Theme.of(context)
+                .accentTextTheme!
+                .displayMedium!
+                .backgroundColor!,
           ),
         ),
         SizedBox(width: 50),
@@ -45,7 +51,10 @@ class CopyLinkItem extends StatelessWidget {
               onPressed: () => Share.share(url),
               icon: Icon(
                 Icons.share,
-                color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+                color: Theme.of(context)
+                    .accentTextTheme!
+                    .displayMedium!
+                    .backgroundColor!,
               ),
             )
           ],

lib/src/screens/receive/widgets/currency_input_field.dart

@@ -22,7 +22,10 @@ class CurrencyInputField extends StatelessWidget {
   Widget build(BuildContext context) {
     final arrowBottomPurple = Image.asset(
       'assets/images/arrow_bottom_purple_icon.png',
-      color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+      color: Theme.of(context)
+          .accentTextTheme!
+          .displayMedium!
+          .backgroundColor!,
       height: 8,
     );
     final _width = MediaQuery.of(context).size.width;
@@ -40,13 +43,13 @@ class CurrencyInputField extends StatelessWidget {
               inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))],
               hintText: '0.000',
               placeholderTextStyle: isLight ? null : TextStyle(
-                color: Theme.of(context).primaryTextTheme.headline5!.color!,
+                color: Theme.of(context).primaryTextTheme!.headlineSmall!.color!,
                 fontWeight: FontWeight.w600,
               ),
-              borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor!,
-              textColor: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+              borderColor: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!,
+              textColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
               textStyle: TextStyle(
-                color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+                color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
               ),
               prefixIcon: Padding(
                 padding: EdgeInsets.only(
@@ -69,7 +72,7 @@ class CurrencyInputField extends StatelessWidget {
                             style: TextStyle(
                               fontWeight: FontWeight.w600,
                               fontSize: 16,
-                              color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+                              color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
                             ),
                           ),
                           if (selectedCurrency.tag != null)
@@ -77,7 +80,7 @@ class CurrencyInputField extends StatelessWidget {
                               padding: const EdgeInsets.only(right: 3.0),
                               child: Container(
                                 decoration: BoxDecoration(
-                                  color: Theme.of(context).primaryTextTheme.headline4!.color!,
+                                  color: Theme.of(context).primaryTextTheme!.headlineMedium!.color!,
                                   borderRadius: BorderRadius.all(
                                     Radius.circular(6),
                                   ),
@@ -89,8 +92,8 @@ class CurrencyInputField extends StatelessWidget {
                                       fontSize: 12,
                                       fontWeight: FontWeight.bold,
                                       color: Theme.of(context)
-                                          .primaryTextTheme
-                                          .headline4!
+                                          .primaryTextTheme!
+                                          .headlineMedium!
                                           .decorationColor!,
                                     ),
                                   ),
@@ -105,7 +108,7 @@ class CurrencyInputField extends StatelessWidget {
                                 fontWeight: FontWeight.w600,
                                 fontSize: 20,
                                 color:
-                                    Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+                                    Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
                               ),
                             ),
                           ),

lib/src/screens/receive/widgets/header_tile.dart

@@ -22,7 +22,7 @@ class HeaderTile extends StatelessWidget {
             top: 24,
             bottom: 24
         ),
-        color: Theme.of(context).textTheme!.headline3!.decorationColor!,
+        color: Theme.of(context).textTheme!.displaySmall!.decorationColor!,
         child: Row(
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -32,16 +32,17 @@ class HeaderTile extends StatelessWidget {
               style: TextStyle(
                   fontSize: 18,
                   fontWeight: FontWeight.w600,
-                  color: Theme.of(context).textTheme!.headline3!.color!
-              ),
+                  color: Theme.of(context)!.textTheme.displaySmall!.color!),
             ),
             Container(
               height: 32,
               width: 32,
               decoration: BoxDecoration(
                   shape: BoxShape.circle,
-                  color: Theme.of(context).textTheme!.headline4!.decorationColor!
-              ),
+                  color: Theme.of(context)
+                      .textTheme!
+                      .headlineMedium!
+                      .decorationColor!),
               child: icon,
             )
           ],

lib/src/screens/receive/widgets/qr_widget.dart

@@ -35,7 +35,7 @@ class QRWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final copyImage = Image.asset('assets/images/copy_address.png',
-        color: Theme.of(context).textTheme.subtitle1!.decorationColor!);
+        color: Theme.of(context).textTheme!.titleMedium!.decorationColor!);
 
     return Column(
       mainAxisSize: MainAxisSize.min,
@@ -51,7 +51,10 @@ class QRWidget extends StatelessWidget {
                 style: TextStyle(
                     fontSize: 14,
                     fontWeight: FontWeight.w500,
-                    color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
+                    color: Theme.of(context)
+                        .accentTextTheme!
+                        .displayMedium!
+                        .backgroundColor!),
               ),
             ),
             Row(
@@ -82,8 +85,10 @@ class QRWidget extends StatelessWidget {
                               decoration: BoxDecoration(
                                 border: Border.all(
                                   width: 3,
-                                  color:
-                                      Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
+                                  color: Theme.of(context)
+                                      .accentTextTheme!
+                                      .displayMedium!
+                                      .backgroundColor!,
                                 ),
                               ),
                               child: Container(
@@ -147,7 +152,10 @@ class QRWidget extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 15,
                             fontWeight: FontWeight.w500,
-                            color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
+                            color: Theme.of(context)
+                                .accentTextTheme!
+                                .displayMedium!
+                                .backgroundColor!),
                       ),
                     ),
                     Padding(

lib/src/screens/release_notes/release_notes_screen.dart

@@ -51,7 +51,10 @@ class ReleaseNotesScreen extends StatelessWidget {
                               fontSize: 24.0,
                               fontWeight: FontWeight.bold,
                               fontFamily: 'Lato',
-                              color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+                              color: Theme.of(context)
+                                  .accentTextTheme!
+                                  .displayMedium!
+                                  .backgroundColor!,
                             ),
                             child: Text(title),
                           ),
@@ -118,7 +121,10 @@ class ReleaseNotesScreen extends StatelessWidget {
               decoration: TextDecoration.none,
               fontSize: 16.0,
               fontFamily: 'Lato',
-              color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
+              color: Theme.of(context)
+                  .accentTextTheme!
+                  .displayMedium!
+                  .backgroundColor!,
             ),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,

lib/src/screens/rescan/rescan_page.dart

@@ -35,7 +35,10 @@ class RescanPage extends BasePage {
                             _blockchainHeightWidgetKey.currentState!.height);
                     Navigator.of(context).pop();
                   },
-                  color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodyLarge!
+                      .color!,
                   textColor: Colors.white,
                   isDisabled: !_rescanViewModel.isButtonEnabled,
                 ))

lib/src/screens/restore/restore_from_backup_page.dart

@@ -75,7 +75,10 @@ class RestoreFromBackupPage extends BasePage {
                           restoreFromBackupViewModel.state is IsExecutingState,
                       onPressed: () => onImportHandler(context),
                       text: S.of(context).import,
-                      color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                      color: Theme.of(context)
+                          .accentTextTheme!
+                          .bodyLarge!
+                          .color!,
                       textColor: Colors.white);
                 }))
               ])),

lib/src/screens/restore/restore_wallet_from_seed_details.dart

@@ -134,7 +134,10 @@ class _RestoreFromSeedDetailsFormState
             isLoading:
                 widget.walletRestorationFromSeedVM.state is IsExecutingState,
             text: S.of(context).restore_recover,
-            color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+            color: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
+                .color!,
             textColor: Colors.white,
             isDisabled: _nameController.text.isNotEmpty,
           );

lib/src/screens/restore/sweeping_wallet_page.dart

@@ -16,7 +16,7 @@ class SweepingWalletPage extends BasePage {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Theme.of(context).backgroundColor,
+        backgroundColor: Theme.of(context).colorScheme.background,
         resizeToAvoidBottomInset: false,
         body: body(context));
   }
@@ -82,7 +82,10 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                                 style: TextStyle(
                                   fontSize: 18,
                                   fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).accentTextTheme!.headline2!.color!,
+                                  color: Theme.of(context)
+                                      .accentTextTheme!
+                                      .displayMedium!
+                                      .color,
                                 ),
                                 textAlign: TextAlign.center,
                               ),
@@ -94,7 +97,10 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                                 style: TextStyle(
                                   fontSize: 36,
                                   fontWeight: FontWeight.bold,
-                                  color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                                  color: Theme.of(context)
+                                      .primaryTextTheme!
+                                      .titleLarge!
+                                      .color!,
                                 ),
                                 textAlign: TextAlign.center,
                               ),
@@ -106,7 +112,10 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                                 style: TextStyle(
                                   fontSize: 16,
                                   fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).accentTextTheme!.headline2!.color!,
+                                  color: Theme.of(context)
+                                      .accentTextTheme!
+                                      .displayMedium!
+                                      .color,
                                 ),
                                 textAlign: TextAlign.center,
                               ),

lib/src/screens/restore/wallet_restore_from_keys_form.dart

@@ -91,7 +91,7 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
                         'assets/images/refresh_icon.png',
                         color: Theme.of(context)
                             .primaryTextTheme!
-                            .headline4!
+                            .headlineMedium!
                             .decorationColor!,
                       ),
                     ),

lib/src/screens/restore/wallet_restore_from_seed_form.dart

@@ -95,7 +95,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                       'assets/images/refresh_icon.png',
                       color: Theme.of(context)
                           .primaryTextTheme!
-                          .headline4!
+                          .headlineMedium!
                           .decorationColor!,
                     ),
                   ),

lib/src/screens/restore/wallet_restore_page.dart

@@ -91,7 +91,8 @@ class WalletRestorePage extends BasePage {
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
                 fontFamily: 'Lato',
-                color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!),
+                color: titleColor ??
+                    Theme.of(context).primaryTextTheme!.titleLarge!.color!),
           ));
 
   final WalletRestoreViewModel walletRestoreViewModel;
@@ -138,7 +139,10 @@ class WalletRestorePage extends BasePage {
     return KeyboardActions(
       config: KeyboardActionsConfig(
         keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-        keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
+        keyboardBarColor: Theme.of(context)
+            .accentTextTheme!
+            .bodyLarge!
+            .backgroundColor!,
         nextFocus: false,
         actions: [
           KeyboardActionsItem(
@@ -149,7 +153,7 @@ class WalletRestorePage extends BasePage {
       ),
       child: Container(
         height: 0,
-        color: Theme.of(context).backgroundColor,
+        color: Theme.of(context).colorScheme.background,
         child: Center(
           child: ConstrainedBox(
             constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
@@ -190,8 +194,14 @@ class WalletRestorePage extends BasePage {
                       return LoadingPrimaryButton(
                         onPressed: _confirmForm,
                         text: S.of(context).restore_recover,
-                        color: Theme.of(context).accentTextTheme.subtitle2!.decorationColor!,
-                        textColor: Theme.of(context).accentTextTheme.headline5!.decorationColor!,
+                        color: Theme.of(context)
+                            .accentTextTheme!
+                            .titleSmall!
+                            .decorationColor!,
+                        textColor: Theme.of(context)
+                            .accentTextTheme!
+                            .headlineSmall!
+                            .decorationColor!,
                         isLoading: walletRestoreViewModel.state is IsExecutingState,
                         isDisabled: !walletRestoreViewModel.isButtonEnabled,
                       );

lib/src/screens/restore/widgets/restore_button.dart

@@ -23,8 +23,11 @@ class RestoreButton extends StatelessWidget {
         padding: EdgeInsets.all(24),
         alignment: Alignment.topLeft,
         decoration: BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(12)),
-            color: Theme.of(context).accentTextTheme!.caption!.color!,
+          borderRadius: BorderRadius.all(Radius.circular(12)),
+          color: Theme.of(context)
+              .accentTextTheme!
+              .bodySmall!
+              .color!,
         ),
         child: Row(
           mainAxisSize: MainAxisSize.max,
@@ -45,8 +48,10 @@ class RestoreButton extends StatelessWidget {
                       style: TextStyle(
                           fontSize: 16,
                           fontWeight: FontWeight.w500,
-                          color: Theme.of(context).primaryTextTheme!.headline6!.color!
-                      ),
+                          color: Theme.of(context)
+                              .primaryTextTheme!
+                              .titleLarge!
+                              .color!),
                     ),
                     Padding(
                       padding: EdgeInsets.only(top: 5),
@@ -55,8 +60,10 @@ class RestoreButton extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 14,
                             fontWeight: FontWeight.normal,
-                            color: Theme.of(context).primaryTextTheme!.overline!.color!
-                        ),
+                            color: Theme.of(context)
+                                .primaryTextTheme!
+                                .labelSmall!
+                                .color!),
                       ),
                     )
                   ],

lib/src/screens/seed/pre_seed_page.dart

@@ -62,7 +62,7 @@ class PreSeedPage extends BasePage {
                                 fontWeight: FontWeight.normal,
                                 color: Theme.of(context)
                                     .primaryTextTheme!
-                                    .caption!
+                                    .bodySmall!
                                     .color!),
                           ),
                         ),
@@ -70,7 +70,10 @@ class PreSeedPage extends BasePage {
                             onPressed: () => Navigator.of(context)
                                 .popAndPushNamed(Routes.seed, arguments: true),
                             text: S.of(context).pre_seed_button_text,
-                            color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+                            color: Theme.of(context)
+                                .accentTextTheme!
+                                .bodyLarge!
+                                .color!,
                             textColor: Colors.white)
                       ],
                     ))

lib/src/screens/seed/wallet_seed_page.dart

@@ -67,7 +67,10 @@ class WalletSeedPage extends BasePage {
               margin: EdgeInsets.only(left: 10),
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.all(Radius.circular(16)),
-                  color: Theme.of(context).accentTextTheme!.caption!.color!),
+                  color: Theme.of(context)
+                      .accentTextTheme!
+                      .bodySmall!
+                      .color!),
               child: Text(
                 S.of(context).seed_language_next,
                 style: TextStyle(
@@ -115,7 +118,7 @@ class WalletSeedPage extends BasePage {
                                     fontWeight: FontWeight.w600,
                                     color: Theme.of(context)
                                         .primaryTextTheme!
-                                        .headline6!
+                                        .titleLarge!
                                         .color!),
                               ),
                               Padding(
@@ -129,7 +132,7 @@ class WalletSeedPage extends BasePage {
                                       fontWeight: FontWeight.normal,
                                       color: Theme.of(context)
                                           .primaryTextTheme!
-                                          .caption!
+                                          .bodySmall!
                                           .color!),
                                 ),
                               )
@@ -151,7 +154,7 @@ class WalletSeedPage extends BasePage {
                                         fontWeight: FontWeight.normal,
                                         color: Theme.of(context)
                                             .primaryTextTheme!
-                                            .overline!
+                                            .labelSmall!
                                             .color!),
                                   ),
                                 )
@@ -187,7 +190,7 @@ class WalletSeedPage extends BasePage {
                                         text: S.of(context).copy,
                                         color: Theme.of(context)
                                             .accentTextTheme!
-                                            .bodyText2!
+                                            .bodyMedium!
                                             .color!,
                                         textColor: Colors.white)),
                               ))

lib/src/screens/seed_language/seed_language_page.dart

@@ -66,7 +66,8 @@ class SeedLanguageFormState extends State<SeedLanguageForm> {
                 style: TextStyle(
                     fontSize: 16.0,
                     fontWeight: FontWeight.w500,
-                    color: Theme.of(context).primaryTextTheme!.headline6!.color!),
+                    color:
+                        Theme.of(context).primaryTextTheme!.titleLarge!.color!),
               ),
             ),
             Padding(

lib/src/screens/send/send_page.dart

@@ -192,10 +192,10 @@ class SendPage extends BasePage {
                                     dotWidth: 6.0,
                                     dotHeight: 6.0,
                                     dotColor: Theme.of(context)
-                                        .primaryTextTheme.headline3!
+                                        .primaryTextTheme!.displaySmall!
                                         .backgroundColor!,
                                     activeDotColor: Theme.of(context)
-                                        .primaryTextTheme.headline2!
+                                        .primaryTextTheme!.displayMedium!
                                         .backgroundColor!),
                               )
                             : Offstage();
@@ -294,7 +294,7 @@ class SendPage extends BasePage {
                       text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})',
                       color: Colors.transparent,
                       textColor: Theme.of(context)
-                          .accentTextTheme.headline3!
+                          .accentTextTheme!.displaySmall!
                           .decorationColor!,
                     )
                   )
@@ -312,11 +312,11 @@ class SendPage extends BasePage {
                       text: S.of(context).add_receiver,
                       color: Colors.transparent,
                       textColor: Theme.of(context)
-                          .accentTextTheme.headline3!
+                          .accentTextTheme!.displaySmall!
                           .decorationColor!,
                       isDottedBorder: true,
                       borderColor: Theme.of(context)
-                          .primaryTextTheme.headline3!
+                          .primaryTextTheme!.displaySmall!
                           .decorationColor!,
                     )),
               Observer(
@@ -345,7 +345,7 @@ class SendPage extends BasePage {
 
                     },
                     text: S.of(context).send,
-                    color: Theme.of(context).accentTextTheme.bodyText1!.color!,
+                    color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
                     textColor: Colors.white,
                     isLoading: sendViewModel.state is IsExecutingState ||
                         sendViewModel.state is TransactionCommitting,

lib/src/screens/send/send_template_page.dart

@@ -50,8 +50,10 @@ class SendTemplatePage extends BasePage {
     return KeyboardActions(
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor:
-                Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
+            keyboardBarColor: Theme.of(context)
+                .accentTextTheme!
+                .bodyLarge!
+                .backgroundColor!,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -65,7 +67,7 @@ class SendTemplatePage extends BasePage {
             ]),
         child: Container(
           height: 0,
-          color: Theme.of(context).backgroundColor,
+          color: Theme.of(context).colorScheme.background,
           child: ScrollableWithBottomSection(
             contentPadding: EdgeInsets.only(bottom: 24),
             content: Container(
@@ -75,8 +77,11 @@ class SendTemplatePage extends BasePage {
                   bottomRight: Radius.circular(24),
                 ),
                 gradient: LinearGradient(colors: [
-                  Theme.of(context).primaryTextTheme!.subtitle1!.color!,
-                  Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
+                  Theme.of(context).primaryTextTheme!.titleMedium!.color!,
+                  Theme.of(context)
+                      .primaryTextTheme!
+                      .titleMedium!
+                      .decorationColor!,
                 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
               ),
               child: Form(
@@ -92,7 +97,7 @@ class SendTemplatePage extends BasePage {
                             hintText: S.of(context).send_name,
                             borderColor: Theme.of(context)
                                 .primaryTextTheme!
-                                .headline5!
+                                .headlineSmall!
                                 .color!,
                             textStyle: TextStyle(
                                 fontSize: 14,
@@ -101,7 +106,7 @@ class SendTemplatePage extends BasePage {
                             placeholderTextStyle: TextStyle(
                                 color: Theme.of(context)
                                     .primaryTextTheme!
-                                    .headline5!
+                                    .headlineSmall!
                                     .decorationColor!,
                                 fontWeight: FontWeight.w500,
                                 fontSize: 14),
@@ -123,11 +128,11 @@ class SendTemplatePage extends BasePage {
                               ],
                               buttonColor: Theme.of(context)
                                   .primaryTextTheme!
-                                  .headline4!
+                                  .headlineMedium!
                                   .color!,
                               borderColor: Theme.of(context)
                                   .primaryTextTheme!
-                                  .headline5!
+                                  .headlineSmall!
                                   .color!,
                               textStyle: TextStyle(
                                   fontSize: 14,
@@ -138,7 +143,7 @@ class SendTemplatePage extends BasePage {
                                   fontWeight: FontWeight.w500,
                                   color: Theme.of(context)
                                       .primaryTextTheme!
-                                      .headline5!
+                                      .headlineSmall!
                                       .decorationColor!),
                             ),
                           ),
@@ -170,7 +175,7 @@ class SendTemplatePage extends BasePage {
                                   hintText: '0.0000',
                                   borderColor: Theme.of(context)
                                       .primaryTextTheme!
-                                      .headline5!
+                                      .headlineSmall!
                                       .color!,
                                   textStyle: TextStyle(
                                       fontSize: 14,
@@ -179,7 +184,7 @@ class SendTemplatePage extends BasePage {
                                   placeholderTextStyle: TextStyle(
                                       color: Theme.of(context)
                                           .primaryTextTheme!
-                                          .headline5!
+                                          .headlineSmall!
                                           .decorationColor!,
                                       fontWeight: FontWeight.w500,
                                       fontSize: 14),
@@ -212,7 +217,7 @@ class SendTemplatePage extends BasePage {
                                 hintText: '0.00',
                                 borderColor: Theme.of(context)
                                     .primaryTextTheme!
-                                    .headline5!
+                                    .headlineSmall!
                                     .color!,
                                 textStyle: TextStyle(
                                     fontSize: 14,
@@ -221,7 +226,7 @@ class SendTemplatePage extends BasePage {
                                 placeholderTextStyle: TextStyle(
                                     color: Theme.of(context)
                                         .primaryTextTheme!
-                                        .headline5!
+                                        .headlineSmall!
                                         .decorationColor!,
                                     fontWeight: FontWeight.w500,
                                     fontSize: 14),

lib/src/screens/send/widgets/choose_yat_address_alert.dart

@@ -66,7 +66,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
         Container(
             width: 300,
             height: 158,
-            color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!,
+            color: Theme.of(context).accentTextTheme!.bodyMedium!.backgroundColor!,
             child: ListView.separated(
                 controller: controller,
                 padding: EdgeInsets.all(0),
@@ -95,7 +95,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
                                     fontSize: 15,
                                     fontWeight: FontWeight.w600,
                                     fontFamily: 'Lato',
-                                    color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                                    color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                                     decoration: TextDecoration.none,
                                   ),
                                 )

lib/src/screens/send/widgets/confirm_sending_alert.dart

@@ -206,7 +206,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                 fontWeight: FontWeight.normal,
                                 fontFamily: 'Lato',
                                 color: Theme.of(context).primaryTextTheme!
-                                    .headline6!.color!,
+                                    .titleLarge!.color!,
                                 decoration: TextDecoration.none,
                               ),
                             ),
@@ -220,7 +220,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                     fontWeight: FontWeight.w600,
                                     fontFamily: 'Lato',
                                     color: Theme.of(context).primaryTextTheme!
-                                        .headline6!.color!,
+                                        .titleLarge!.color!,
                                     decoration: TextDecoration.none,
                                   ),
                                 ),
@@ -242,7 +242,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                             fontFamily: 'Lato',
                             color: Theme.of(context)
                                 .primaryTextTheme!
-                                .headline6!
+                                .titleLarge!
                                 .color!,
                             decoration: TextDecoration.none,
                           ),
@@ -258,7 +258,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                 fontFamily: 'Lato',
                                 color: Theme.of(context)
                                     .primaryTextTheme!
-                                    .headline6!
+                                    .titleLarge!
                                     .color,
                                 decoration: TextDecoration.none,
                               ),
@@ -290,7 +290,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                 fontSize: 16,
                                 fontWeight: FontWeight.normal,
                                 fontFamily: 'Lato',
-                                color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                                color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                                 decoration: TextDecoration.none,
                               ),
                             ),
@@ -303,7 +303,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                                     fontSize: 18,
                                     fontWeight: FontWeight.w600,
                                     fontFamily: 'Lato',
-                                    color: Theme.of(context).primaryTextTheme!.headline6!.color!,
+                                    color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
                                     decoration: TextDecoration.none,
                                   ),
                                 ),
@@ -334,7 +334,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                               fontFamily: 'Lato',
                               color: Theme.of(context)
                                   .primaryTextTheme!
-                                  .headline6!
+                                  .titleLarge!
                                   .color!,
                               decoration: TextDecoration.none,
                             ),