diff --git a/lib/res/theme.dart b/lib/res/theme.dart
index 52e0e92..99c44fd 100644
--- a/lib/res/theme.dart
+++ b/lib/res/theme.dart
@@ -30,7 +30,8 @@ ThemeData themeFrom(Color primaryColor, Brightness brightness) {
     colorScheme: scheme,
     appBarTheme: AppBarTheme(
       elevation: 4,
-      color: scheme.surface,
+      color: scheme.background,
+      foregroundColor: scheme.onBackground,
       surfaceTintColor: scheme.surfaceTint,
     ),
     cardTheme: CardTheme(
@@ -58,7 +59,7 @@ ThemeData themeFrom(Color primaryColor, Brightness brightness) {
       iconColor: scheme.onSurface,
       textColor: scheme.onSurface,
     ),
-    scaffoldBackgroundColor: scheme.surface,
+    scaffoldBackgroundColor: scheme.background,
   );
   return theme.copyWith(
     listTileTheme: ListTileThemeData(
diff --git a/lib/screens/metering/screen_metering.dart b/lib/screens/metering/screen_metering.dart
index 2cd828c..12f910d 100644
--- a/lib/screens/metering/screen_metering.dart
+++ b/lib/screens/metering/screen_metering.dart
@@ -24,7 +24,6 @@ class MeteringScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return _InheritedListeners(
       child: Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.background,
         body: Column(
           children: [
             Expanded(
diff --git a/lib/screens/timer/screen_timer.dart b/lib/screens/timer/screen_timer.dart
index b76899a..ab72679 100644
--- a/lib/screens/timer/screen_timer.dart
+++ b/lib/screens/timer/screen_timer.dart
@@ -66,7 +66,6 @@ class TimerScreenState extends State<TimerScreen> with TickerProviderStateMixin
       listenWhen: (previous, current) => previous.runtimeType != current.runtimeType,
       listener: (context, state) => _updateAnimations(state),
       child: Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.background,
         body: Center(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,