diff --git a/example/lib/pages/debouncing_tile_update_transformer.dart b/example/lib/pages/debouncing_tile_update_transformer.dart
index cf0147d2e..f7fb002ea 100644
--- a/example/lib/pages/debouncing_tile_update_transformer.dart
+++ b/example/lib/pages/debouncing_tile_update_transformer.dart
@@ -70,7 +70,7 @@ class _DebouncingTileUpdateTransformerPageState
                   right: 16,
                   child: DecoratedBox(
                     decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.background,
+                      color: Theme.of(context).colorScheme.surface,
                       borderRadius: BorderRadius.circular(32),
                     ),
                     child: Padding(
diff --git a/example/lib/pages/polygon_perf_stress.dart b/example/lib/pages/polygon_perf_stress.dart
index 086ab727c..47d48dfed 100644
--- a/example/lib/pages/polygon_perf_stress.dart
+++ b/example/lib/pages/polygon_perf_stress.dart
@@ -96,7 +96,7 @@ class _PolygonPerfStressPageState extends State<PolygonPerfStressPage> {
                       UnconstrainedBox(
                         child: Container(
                           decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.background,
+                            color: Theme.of(context).colorScheme.surface,
                             borderRadius: BorderRadius.circular(32),
                           ),
                           padding: const EdgeInsets.symmetric(
@@ -125,7 +125,7 @@ class _PolygonPerfStressPageState extends State<PolygonPerfStressPage> {
                       UnconstrainedBox(
                         child: Container(
                           decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.background,
+                            color: Theme.of(context).colorScheme.surface,
                             borderRadius: BorderRadius.circular(32),
                           ),
                           padding: const EdgeInsets.symmetric(
diff --git a/example/lib/widgets/drawer/floating_menu_button.dart b/example/lib/widgets/drawer/floating_menu_button.dart
index 4549440dc..8865fa816 100644
--- a/example/lib/widgets/drawer/floating_menu_button.dart
+++ b/example/lib/widgets/drawer/floating_menu_button.dart
@@ -11,7 +11,7 @@ class FloatingMenuButton extends StatelessWidget {
       child: SafeArea(
         child: Container(
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             borderRadius: BorderRadius.circular(999),
           ),
           padding: const EdgeInsets.all(8),
diff --git a/example/lib/widgets/number_of_items_slider.dart b/example/lib/widgets/number_of_items_slider.dart
index ee290c0a4..45d4fa6cf 100644
--- a/example/lib/widgets/number_of_items_slider.dart
+++ b/example/lib/widgets/number_of_items_slider.dart
@@ -24,7 +24,7 @@ class NumberOfItemsSlider extends StatelessWidget {
   Widget build(BuildContext context) {
     return DecoratedBox(
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
         borderRadius: BorderRadius.circular(32),
       ),
       child: Padding(
diff --git a/example/lib/widgets/simplification_tolerance_slider.dart b/example/lib/widgets/simplification_tolerance_slider.dart
index d82da1834..6a4044bde 100644
--- a/example/lib/widgets/simplification_tolerance_slider.dart
+++ b/example/lib/widgets/simplification_tolerance_slider.dart
@@ -14,7 +14,7 @@ class SimplificationToleranceSlider extends StatelessWidget {
   Widget build(BuildContext context) {
     return DecoratedBox(
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
         borderRadius: BorderRadius.circular(32),
       ),
       child: Padding(
diff --git a/lib/src/layer/attribution_layer/rich/widget.dart b/lib/src/layer/attribution_layer/rich/widget.dart
index 1b21deb4c..8007a90cc 100644
--- a/lib/src/layer/attribution_layer/rich/widget.dart
+++ b/lib/src/layer/attribution_layer/rich/widget.dart
@@ -229,7 +229,7 @@ class _RichAttributionWidgetState extends State<RichAttributionWidget> {
               child: DecoratedBox(
                 decoration: BoxDecoration(
                   color: widget.popupBackgroundColor ??
-                      Theme.of(context).colorScheme.background,
+                      Theme.of(context).colorScheme.surface,
                   border: Border.all(width: 0, style: BorderStyle.none),
                   borderRadius: widget.popupBorderRadius ??
                       BorderRadius.only(
diff --git a/lib/src/layer/attribution_layer/simple.dart b/lib/src/layer/attribution_layer/simple.dart
index 613f46fcb..20b518b75 100644
--- a/lib/src/layer/attribution_layer/simple.dart
+++ b/lib/src/layer/attribution_layer/simple.dart
@@ -41,7 +41,7 @@ class SimpleAttributionWidget extends StatelessWidget {
   Widget build(BuildContext context) => Align(
         alignment: alignment,
         child: ColoredBox(
-          color: backgroundColor ?? Theme.of(context).colorScheme.background,
+          color: backgroundColor ?? Theme.of(context).colorScheme.surface,
           child: GestureDetector(
             onTap: onTap,
             child: Padding(