diff --git a/Android.bp b/Android.bp
index aa1b8f700378cf2d63e04f36b7cf3ea13e959059..0e49ab5f160147d6f108c38fcef555772022b1af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,7 @@
 android_app {
     name: "DeskClock",
     resource_dirs: ["res"],
-
+    sdk_version: "current",
     overrides: ["AlarmClock"],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
@@ -10,7 +10,6 @@ android_app {
         "src/**/*.java",
         "gen/**/*.java",
     ],
-    platform_apis: true,
     product_specific: true,
     static_libs: [
         "androidx.annotation_annotation",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b33e6dbbded2d5f640fad21b0552012e39339df2..7a8d193cc3d6f30c2e82e99e51d2d8a1cb95b824 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,7 +150,7 @@
             android:excludeFromRecents="true"
             android:resizeableActivity="false"
             android:showOnLockScreen="true"
-	        android:showWhenLocked="true"
+	    android:showWhenLocked="true"
             android:taskAffinity=""
             android:windowSoftInputMode="stateAlwaysHidden" />
 
diff --git a/res/drawable/ic_pause_24dp.xml b/res/drawable/ic_pause_24dp.xml
index 4bd070e32a108f1f91470f405cb29fad451e1746..3cbad0245c8ccb8d9937d052ff593bde627f92d7 100644
--- a/res/drawable/ic_pause_24dp.xml
+++ b/res/drawable/ic_pause_24dp.xml
@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
     android:tint="@android:color/white"
-    >
+    android:viewportWidth="24.0">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,19h-6L13,5h6v14zM15,17h2L17,7h-2v10zM11,19L5,19L5,5h6v14zM7,17h2L9,7L7,7v10z" />
diff --git a/res/drawable/ic_public.xml b/res/drawable/ic_public.xml
index 81c552e86fbf6bf3ff71a56868aee4a15f0d0b57..fa914c8fe2b4f87244cb08a1435dca4137e0f1e4 100644
--- a/res/drawable/ic_public.xml
+++ b/res/drawable/ic_public.xml
@@ -15,12 +15,11 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="@android:color/white"
-    >
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="@android:color/white"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2 0 .68.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68.07-1.35.16-2h4.68c.09.65.16 1.32.16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2 0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z" />
diff --git a/res/drawable/ic_start_24dp.xml b/res/drawable/ic_start_24dp.xml
index 6c8e44777dccbf058bfbebea9def9d9af10b2234..785468461b158119b12acd874a964fa5950e9047 100644
--- a/res/drawable/ic_start_24dp.xml
+++ b/res/drawable/ic_start_24dp.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
     android:tint="@android:color/white"
-    >
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M8.5,8.64L13.77,12L8.5,15.36V8.64M6.5,5V19L17.5,12" />
diff --git a/res/drawable/ic_tab_alarm_static.xml b/res/drawable/ic_tab_alarm_static.xml
index 6abb09f5affa60cfa747b530e238104fca81b0c5..b55d4af4cb16653e38029682a1041b05c823c80e 100644
--- a/res/drawable/ic_tab_alarm_static.xml
+++ b/res/drawable/ic_tab_alarm_static.xml
@@ -19,10 +19,8 @@
         android:height="24dp"
         android:tint="@color/tab_tint_color"
         android:viewportHeight="24.0"
-        android:viewportWidth="24.0"
-
-    >
+        android:viewportWidth="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml b/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml
index 1ca72180cf005ab9dfa615fa129f7f0b941400fa..cb94b1a3d0f5d0ce2aab5eac0f77501c7e8d8319 100644
--- a/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml
+++ b/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml
@@ -32,8 +32,8 @@
     <com.android.deskclock.stopwatch.StopwatchLandscapeLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="@integer/guttered_content_width_percent"
-        android:background="@color/default_background" >
+        android:background="@color/default_background"
+        android:layout_weight="@integer/guttered_content_width_percent">
 
         <com.android.deskclock.TimerCircleFrameLayout
             android:id="@+id/stopwatch_time_wrapper"
@@ -46,9 +46,9 @@
             <!-- Sufficient space exists to include the bounding stopwatch circle. -->
             <com.android.deskclock.stopwatch.StopwatchCircleView
                 android:id="@+id/stopwatch_circle"
+                android:background="@color/default_background"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/default_background" />
+                android:layout_height="match_parent" />
 
             <include layout="@layout/stopwatch_time" />
 
diff --git a/res/layout/alarm_activity.xml b/res/layout/alarm_activity.xml
index f4dbdb83ecc716f5dc84bd90077034a83176349c..579fc4f5f38134e748bdca2f3d17745afe3d85b1 100644
--- a/res/layout/alarm_activity.xml
+++ b/res/layout/alarm_activity.xml
@@ -143,8 +143,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:textAppearance="@style/alarm_lockscreen_thin"
-            android:background="@color/default_background"
-            android:textColor="@color/color_default_primary_text" />
+            android:textColor="@color/color_default_primary_text"
+            android:background="@color/default_background" />
 
         <TextView
             android:id="@+id/alert_info"
diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml
index 5dde9826e3b7a20879a8df79f7c3708c11359d10..8e7e8c91e1fbac4394a45c5fc55030189deb3922 100644
--- a/res/layout/alarm_time_collapsed.xml
+++ b/res/layout/alarm_time_collapsed.xml
@@ -36,7 +36,6 @@
         app:layout_gravity="center_vertical"
         app:layout_row="0" />
 
-    <!--android:theme="@style/ThemeOverlay.Control.Accent"-->
     <Switch
         android:id="@+id/onoff"
         android:layout_width="wrap_content"
diff --git a/res/layout/alarm_time_expanded.xml b/res/layout/alarm_time_expanded.xml
index 69b33e04526a8f1a5485dbb8a6f96e0e6c3e3f89..d82ed74e40f736dba4dff8c1825f81ffda483638 100644
--- a/res/layout/alarm_time_expanded.xml
+++ b/res/layout/alarm_time_expanded.xml
@@ -36,7 +36,6 @@
         app:layout_gravity="center_vertical"
         app:layout_row="0" />
 
-    <!-- android:theme="@style/ThemeOverlay.Control.Accent"-->
     <Switch
         android:id="@+id/onoff"
         android:layout_width="wrap_content"
diff --git a/res/layout/alarm_time_summary.xml b/res/layout/alarm_time_summary.xml
index e815e8cea1e6a4097b2b82a8fa9a90f9c17ea814..98e430f10637de7f585d7ea5ed7e30b09f59d05d 100644
--- a/res/layout/alarm_time_summary.xml
+++ b/res/layout/alarm_time_summary.xml
@@ -18,6 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/digital_clock"
     style="@style/display_time"
-    android:background="@android:color/transparent"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent"/>
diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml
index 9fd7e1d5350f65d2edce2e2aee56d538c5b7a015..96796ad25f576643da837aa983ee98558d5bdfe7 100644
--- a/res/layout/city_list_item.xml
+++ b/res/layout/city_list_item.xml
@@ -27,10 +27,10 @@
         android:layout_width="74dip"
         android:layout_height="match_parent"
         android:gravity="center"
+        android:background="@color/default_background"
         android:textStyle="bold"
         android:textSize="@dimen/label_text_size"
-        android:textColor="@color/color_default_primary_text"
-        android:background="@color/default_background" />
+        android:textColor="@color/color_default_primary_text" />
     <CheckBox
         android:id="@+id/city_onoff"
         android:layout_height="wrap_content"
diff --git a/res/layout/day_button.xml b/res/layout/day_button.xml
index 1eac9e12f4100ad85087b4aeef1323546684f6c0..f9a71c5f6d8e8e0230b832d0cc1902afeba39317 100644
--- a/res/layout/day_button.xml
+++ b/res/layout/day_button.xml
@@ -26,6 +26,6 @@
         android:background="@drawable/toggle_circle"
         android:button="@null"
         android:gravity="center"
-        android:textColor="@color/color_default_view_on_accent"
+        android:textColor="@color/color_default_primary_text"
         android:textSize="@dimen/day_button_font_size" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index 7988e67dd89f94f6899374193a9fbe4a3762e64e..54526042f28e3fa54b166332be7a2e6c5710559c 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -1,4 +1,5 @@
-<?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");
@@ -14,15 +15,16 @@
   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:background="@color/color_default_primary_dark"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    app:statusBarBackground="@color/color_default_primary_dark">
+    app:statusBarBackground="@color/color_default_primary_dark"
+    android:background="@color/color_default_primary_dark">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -35,17 +37,17 @@
             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">
+            tools:ignore="RtlSymmetry"
+            android:gravity="center">
 
             <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" />
+                android:background="@color/color_default_primary_dark"
+                style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
 
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
@@ -54,15 +56,15 @@
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:background="@color/default_background"
-        app:statusBarBackground="@color/default_background">
+        app:statusBarBackground="@color/default_background"
+        android:layout_weight="1">
 
         <FrameLayout
             android:id="@+id/fragment_container"
+            android:background="@color/default_background"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/default_background" />
+            android:layout_height="match_parent"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -74,11 +76,11 @@
             app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
 
             <FrameLayout
+                android:background="@color/default_background"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="start|center_vertical"
-                android:layout_weight="1"
-                android:background="@color/default_background">
+                android:layout_weight="1">
 
                 <Button
                     android:id="@+id/left_button"
@@ -100,11 +102,11 @@
                 app:elevation="@dimen/fab_elevation" />
 
             <FrameLayout
+                android:background="@color/default_background"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="end|center_vertical"
-                android:layout_weight="1"
-                android:background="@color/default_background">
+                android:layout_weight="1">
 
                 <Button
                     android:id="@+id/right_button"
@@ -126,12 +128,12 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/content"
         android:background="@color/color_default_primary_dark"
+        app:menu="@menu/bottom_navigation_menu"
         app:itemBackground="@null"
         app:itemIconTint="@color/tab_tint_color"
+        app:itemTextColor="@color/tab_tint_color"
         app:itemTextAppearanceActive="@style/navText"
         app:itemTextAppearanceInactive="@style/navText"
-        app:itemTextColor="@color/tab_tint_color"
-        app:labelVisibilityMode="labeled"
-        app:menu="@menu/bottom_navigation_menu" />
+        app:labelVisibilityMode="labeled" />
 
 </LinearLayout>
diff --git a/src/com/android/deskclock/BaseActivity.java b/src/com/android/deskclock/BaseActivity.java
index d11e854cf3c73ca02ebcda71a71e29200b076e59..60db117a19159e40ad9881026ce21fc0b16c7bfa 100644
--- a/src/com/android/deskclock/BaseActivity.java
+++ b/src/com/android/deskclock/BaseActivity.java
@@ -46,24 +46,11 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        // Allow the content to layout behind the status and navigation bars.
-        /*getWindow().getDecorView().setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);*/
-
-        //final @ColorInt int color = ThemeUtils.resolveColor(this, android.R.attr.windowBackground);
-        //adjustAppColor(color, false /* animate */);
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-
-        // Ensure the app window color is up-to-date.
-        //final @ColorInt int color = ThemeUtils.resolveColor(this, android.R.attr.windowBackground);
-        //adjustAppColor(color, false /* animate */);
     }
 
     /**
diff --git a/src/com/android/deskclock/DeskClockApplication.java b/src/com/android/deskclock/DeskClockApplication.java
index 3f2afb32a29baff2e7529bc023b080f967393e51..d275a90ef1f12288f6965c846e4c3eea2db43e41 100644
--- a/src/com/android/deskclock/DeskClockApplication.java
+++ b/src/com/android/deskclock/DeskClockApplication.java
@@ -23,13 +23,13 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 import com.android.deskclock.controller.Controller;
 import com.android.deskclock.data.DataModel;
 import com.android.deskclock.events.LogEventTracker;
 import com.android.deskclock.uidata.UiDataModel;
 
-import androidx.appcompat.app.AppCompatDelegate;
-
 public class DeskClockApplication extends Application {
 
     @Override
@@ -66,4 +66,4 @@ public class DeskClockApplication extends Application {
         }
         return PreferenceManager.getDefaultSharedPreferences(storageContext);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
index f6db75ac764e549a048675186e773424df850dd2..59fdaef584ddd298b42078e36910552931c955e9 100644
--- a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
+++ b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
@@ -101,7 +101,7 @@ public final class ExpandedAlarmViewHolder extends AlarmItemViewHolder {
             final int weekday = weekdays.get(i);
             dayButton.setText(UiDataModel.getUiDataModel().getShortWeekday(weekday));
             dayButton.setContentDescription(UiDataModel.getUiDataModel().getLongWeekday(weekday));
-            dayButton.setTextColor(context.getApplicationContext().getResources().getColor(R.color.color_default_view_on_accent));
+            dayButton.setTextColor(ContextCompat.getColor(context, R.color.color_default_primary_text));
             repeatDays.addView(dayButtonFrame);
             dayButtons[i] = dayButton;
         }
@@ -222,10 +222,10 @@ public final class ExpandedAlarmViewHolder extends AlarmItemViewHolder {
             final CompoundButton dayButton = dayButtons[i];
             if (alarm.daysOfWeek.isBitOn(weekdays.get(i))) {
                 dayButton.setChecked(true);
-                dayButton.setTextColor(context.getApplicationContext().getResources().getColor(R.color.color_default_view_on_accent));
+                dayButton.setTextColor(ContextCompat.getColor(context, R.color.color_default_view_on_accent));
             } else {
                 dayButton.setChecked(false);
-                dayButton.setTextColor(context.getApplicationContext().getResources().getColor(R.color.color_default_view_on_accent));
+                dayButton.setTextColor(ContextCompat.getColor(context, R.color.color_default_primary_text));
             }
         }
         if (alarm.daysOfWeek.isRepeating()) {
diff --git a/src/com/android/deskclock/settings/SettingsActivity.java b/src/com/android/deskclock/settings/SettingsActivity.java
index e879b74a89df5cf0fa81c408c4ffb7e21cb01f97..adf134b52d3f9ca928c75531849966a5e28eb517 100644
--- a/src/com/android/deskclock/settings/SettingsActivity.java
+++ b/src/com/android/deskclock/settings/SettingsActivity.java
@@ -16,7 +16,6 @@
 
 package com.android.deskclock.settings;
 
-import androidx.appcompat.widget.Toolbar;
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.Sensor;