diff --git a/lib/ui/mobile/goal_planner/goal_complete_modal.dart b/lib/ui/mobile/goal_planner/goal_complete_modal.dart
index dfa068c..8af6bf7 100644
--- a/lib/ui/mobile/goal_planner/goal_complete_modal.dart
+++ b/lib/ui/mobile/goal_planner/goal_complete_modal.dart
@@ -34,7 +34,7 @@ class GoalCompleteModal extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.all(16.0),
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.background,
+          color: Theme.of(context).colorScheme.surface,
           borderRadius: BorderRadius.circular(20.0),
         ),
         child: Column(
diff --git a/lib/ui/mobile/goal_planner/goal_planner_screen.dart b/lib/ui/mobile/goal_planner/goal_planner_screen.dart
index dbaad58..16a71a2 100644
--- a/lib/ui/mobile/goal_planner/goal_planner_screen.dart
+++ b/lib/ui/mobile/goal_planner/goal_planner_screen.dart
@@ -360,7 +360,7 @@ class _GoalPlannerScreenState extends State<GoalPlannerScreen> {
           child: Container(
             padding: const EdgeInsets.only(top: 24.0),
             decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.background,
+                color: Theme.of(context).colorScheme.surface,
                 borderRadius:
                     const BorderRadius.vertical(top: Radius.circular(24.0)),
                 boxShadow: [
diff --git a/lib/ui/mobile/plus/activation_view/activation_dashboard.dart b/lib/ui/mobile/plus/activation_view/activation_dashboard.dart
index 609ba4b..5dbfb32 100644
--- a/lib/ui/mobile/plus/activation_view/activation_dashboard.dart
+++ b/lib/ui/mobile/plus/activation_view/activation_dashboard.dart
@@ -145,9 +145,9 @@ class _ActivationDashboardState extends State<ActivationDashboard> {
                     child: TextButton.icon(
                       onPressed: onManualActivation,
                       style: ButtonStyle(
-                        foregroundColor: MaterialStatePropertyAll(
+                        foregroundColor: WidgetStatePropertyAll(
                             Theme.of(context).colorScheme.secondary),
-                        overlayColor: MaterialStatePropertyAll(Theme.of(context)
+                        overlayColor: WidgetStatePropertyAll(Theme.of(context)
                             .colorScheme
                             .secondary
                             .withOpacity(.1)),
@@ -182,8 +182,8 @@ class _ActivationDashboardState extends State<ActivationDashboard> {
                 },
                 style: ButtonStyle(
                   foregroundColor:
-                      MaterialStatePropertyAll(AppColors.of(context).text),
-                  overlayColor: MaterialStatePropertyAll(
+                      WidgetStatePropertyAll(AppColors.of(context).text),
+                  overlayColor: WidgetStatePropertyAll(
                       AppColors.of(context).text.withOpacity(.1)),
                 ),
                 icon: const Icon(FeatherIcons.arrowLeft, size: 20.0),
diff --git a/lib/ui/mobile/plus/upsell.dart b/lib/ui/mobile/plus/upsell.dart
index 65294f4..b65cc01 100644
--- a/lib/ui/mobile/plus/upsell.dart
+++ b/lib/ui/mobile/plus/upsell.dart
@@ -242,10 +242,10 @@ const Map<PremiumFeature, String> _featureDescriptions = {
 //                 child: TextButton(
 //                   style: ButtonStyle(
 //                       backgroundColor:
-//                           MaterialStatePropertyAll(color.withOpacity(.25)),
-//                       foregroundColor: MaterialStatePropertyAll(color),
+//                           WidgetStatePropertyAll(color.withOpacity(.25)),
+//                       foregroundColor: WidgetStatePropertyAll(color),
 //                       overlayColor:
-//                           MaterialStatePropertyAll(color.withOpacity(.1))),
+//                           WidgetStatePropertyAll(color.withOpacity(.1))),
 //                   onPressed: () {
 //                     Navigator.of(context, rootNavigator: true)
 //                         .push(MaterialPageRoute(builder: (context) {