diff --git a/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt b/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt
index 68eba99..1ee266e 100644
--- a/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt
@@ -203,7 +203,7 @@ class TimerService : Service() {
 
                         if (totalTime - time < lastSavedDuration)
                             lastSavedDuration =
-                                0 // Sanity check, prevents errors if service is force closed
+                                0 // Sanity check, prevents bugs if service is force closed
                         if (totalTime - time - lastSavedDuration > 60000)
                             saveTimeToDb()
                     }
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
index 12b4c37..6d35c5b 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
@@ -21,6 +21,7 @@ import android.content.Intent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.SharedTransitionLayout
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.expandHorizontally
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -89,6 +90,7 @@ import org.nsh07.pomodoro.ui.settingsScreen.SettingsScreenRoot
 import org.nsh07.pomodoro.ui.statsScreen.StatsScreenRoot
 import org.nsh07.pomodoro.ui.timerScreen.AlarmDialog
 import org.nsh07.pomodoro.ui.timerScreen.TimerScreen
+import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerMode
 import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerViewModel
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -138,6 +140,20 @@ fun AppScreen(
                         WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND
                     )
                 }
+
+                val primary by animateColorAsState(
+                    if (uiState.timerMode == TimerMode.FOCUS) colorScheme.primary else colorScheme.tertiary
+                )
+                val onPrimary by animateColorAsState(
+                    if (uiState.timerMode == TimerMode.FOCUS) colorScheme.onPrimary else colorScheme.onTertiary
+                )
+                val primaryContainer by animateColorAsState(
+                    if (uiState.timerMode == TimerMode.FOCUS) colorScheme.primaryContainer else colorScheme.tertiaryContainer
+                )
+                val onPrimaryContainer by animateColorAsState(
+                    if (uiState.timerMode == TimerMode.FOCUS) colorScheme.onPrimaryContainer else colorScheme.onTertiaryContainer
+                )
+
                 Box(
                     Modifier
                         .fillMaxWidth()
@@ -151,8 +167,8 @@ fun AppScreen(
                         expanded = true,
                         scrollBehavior = toolbarScrollBehavior,
                         colors = FloatingToolbarDefaults.vibrantFloatingToolbarColors(
-                            toolbarContainerColor = colorScheme.primary,
-                            toolbarContentColor = colorScheme.onPrimary
+                            toolbarContainerColor = primary,
+                            toolbarContentColor = onPrimary
                         ),
                         modifier = Modifier
                             .padding(
@@ -183,10 +199,10 @@ fun AppScreen(
                                         { if (backStack.size > 1) backStack.removeAt(1) }
                                     },
                                     colors = ToggleButtonDefaults.toggleButtonColors(
-                                        containerColor = colorScheme.primary,
-                                        contentColor = colorScheme.onPrimary,
-                                        checkedContainerColor = colorScheme.primaryContainer,
-                                        checkedContentColor = colorScheme.onPrimaryContainer
+                                        containerColor = primary,
+                                        contentColor = onPrimary,
+                                        checkedContainerColor = primaryContainer,
+                                        checkedContentColor = onPrimaryContainer
                                     ),
                                     shapes = ToggleButtonDefaults.shapes(
                                         CircleShape,