diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index 8b9f62f6584031d25340762ac4dfb0dc01ea02de..7988e67dd89f94f6899374193a9fbe4a3762e64e 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright (C) 2016 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,16 +14,15 @@
   limitations under the License.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/color_default_primary_dark"
-    app:statusBarBackground="@color/color_default_primary_dark"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    app:statusBarBackground="@color/color_default_primary_dark">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -34,43 +32,43 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            android:background="@color/color_default_primary_dark"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/color_default_primary_dark"
+            android:gravity="center"
             app:contentInsetStart="0dp"
-            tools:ignore="RtlSymmetry"
-            android:gravity="center">
+            tools:ignore="RtlSymmetry">
 
             <TextView
                 android:id="@+id/title_view"
+                style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:background="@color/color_default_primary_dark"
-                style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
+                android:background="@color/color_default_primary_dark" />
 
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/content"
-        app:statusBarBackground="@color/default_background"
-        android:background="@color/default_background"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:background="@color/default_background"
+        app:statusBarBackground="@color/default_background">
 
         <FrameLayout
             android:id="@+id/fragment_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/default_background"/>
+            android:background="@color/default_background" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/default_background"
             android:layout_gravity="bottom"
+            android:background="@color/default_background"
             android:baselineAligned="false"
             android:orientation="horizontal"
             app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
@@ -79,8 +77,8 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="start|center_vertical"
-                android:background="@color/default_background"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:background="@color/default_background">
 
                 <Button
                     android:id="@+id/left_button"
@@ -104,9 +102,9 @@
             <FrameLayout
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:background="@color/default_background"
                 android:layout_gravity="end|center_vertical"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:background="@color/default_background">
 
                 <Button
                     android:id="@+id/right_button"
@@ -127,12 +125,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/content"
-        app:menu="@menu/bottom_navigation_menu"
+        android:background="@color/color_default_primary_dark"
+        app:itemBackground="@null"
         app:itemIconTint="@color/tab_tint_color"
-        app:itemTextColor="@color/tab_tint_color"
         app:itemTextAppearanceActive="@style/navText"
         app:itemTextAppearanceInactive="@style/navText"
-        app:itemBackground="@null"
-        app:labelVisibilityMode="labeled" />
+        app:itemTextColor="@color/tab_tint_color"
+        app:labelVisibilityMode="labeled"
+        app:menu="@menu/bottom_navigation_menu" />
 
 </LinearLayout>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d41d154671c478f500864e18ae523c881086eefe..b2c8f682a1abf643795fa35ab8e29217b6a508b0 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,7 +41,7 @@
         <item name="android:statusBarColor">@color/color_default_primary_dark</item>
         <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
         <item name="android:timePickerStyle" tools:targetApi="21">@style/Widget.TimePicker</item>
-        <item name="android:windowBackground">@color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@color/default_background</item>
         <item name="android:windowContentOverlay">@null</item>
 
         <!-- Attributes from androidx.appcompat.appcompat -->
@@ -54,7 +54,6 @@
         <item name="popupTheme">@style/ThemeOverlay.Popup</item>
 
         <item name="android:colorPrimary">@color/color_default_primary</item>
-        <item name="android:background">@color/color_default_primary_dark</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:actionOverflowButtonStyle">@style/customOverFlow</item>
@@ -83,7 +82,6 @@
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:windowBackground">@color/default_background</item>
-        <item name="android:background">@color/default_background</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
         <item name="android:statusBarColor">@color/color_default_primary_dark</item>
@@ -109,8 +107,7 @@
         <item name="colorAccent">@color/accent_color</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
-        <item name="android:windowBackground">@color/color_default_primary</item>
-        <item name="android:background">@color/color_default_primary</item>
+        <item name="android:windowBackground">@color/default_background</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
         <item name="android:statusBarColor">@color/color_default_primary_dark</item>
@@ -136,8 +133,7 @@
         <item name="colorAccent">@color/accent_color</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
-        <item name="android:windowBackground">@color/color_default_primary_dark</item>
-        <item name="android:background">@color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@color/default_background</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
         <item name="android:statusBarColor">@color/color_default_primary_dark</item>
@@ -158,7 +154,7 @@
     </style>
 
     <style name="ThemeOverlay.Popup" parent="ThemeOverlay.AppCompat">
-        <item name="android:colorBackground">@color/default_background</item>
+        <item name="android:colorBackground">@color/color_default_foreground</item>
         <item name="android:colorPrimary">@color/color_default_primary</item>
         <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
         <item name="android:colorAccent">@color/accent_color</item>
@@ -176,7 +172,6 @@
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:windowBackground">@color/default_background</item>
-        <item name="android:background">@color/default_background</item>
         <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
         <item name="android:statusBarColor">@color/color_default_primary_dark</item>