diff --git a/Android.bp b/Android.bp
index ffafc993a7a8d3ee74e1dd3fcede0ab6f19ad82a..8ddec550201bc3a314334072d9f62f5f1925d4cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,7 +21,7 @@ android_app {
         "androidx.collection_collection",
         "androidx.arch.core_core-common",
         "androidx.lifecycle_lifecycle-common",
-        "com.google.android.material_material",
+        
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.transition_transition",
         "androidx.core_core",
@@ -30,7 +30,8 @@ android_app {
         "androidx.appcompat_appcompat",
         "androidx.gridlayout_gridlayout",
         "androidx.recyclerview_recyclerview",
-        "androidx-constraintlayout_constraintlayout"
+        "androidx-constraintlayout_constraintlayout",
+        "elib",
     ],
     required: [
         "com.android.deskclock_allowlist",
diff --git a/res/color/checkbox_color.xml b/res/color/checkbox_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..852841877b6eed37552ff677488b301a74272689
--- /dev/null
+++ b/res/color/checkbox_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/e_alpha_base_dark" android:alpha="0.38" />
+    <item android:state_checked="false" android:color="@color/e_alpha_base_dark" android:alpha="0.6" />
+    <item android:color="@color/e_accent_dark" />
+</selector>
diff --git a/res/drawable/digit_background.xml b/res/drawable/digit_background.xml
index 95d91de47c67a925f13af222634a1b1cc22051e0..f276dad829c51f50bfc137d376e1f19d7024b51e 100644
--- a/res/drawable/digit_background.xml
+++ b/res/drawable/digit_background.xml
@@ -3,5 +3,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/default_background_lighter" />
+    <solid android:color="@android:color/transparent" />
 </shape>
diff --git a/res/drawable/ic_caret_down.xml b/res/drawable/ic_caret_down.xml
index a5c8e69adb81af3c7cd1e08e7ad5ddd796c75ef7..fa6581c45bf41ffecc53e5dbd720cede6f058229 100644
--- a/res/drawable/ic_caret_down.xml
+++ b/res/drawable/ic_caret_down.xml
@@ -22,7 +22,7 @@
         android:bottom="8dp">
         <shape android:shape="oval" >
             <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/system_neutral2_500" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
diff --git a/res/drawable/ic_caret_up.xml b/res/drawable/ic_caret_up.xml
index 93a947407626158aea2423f093cc1f14d7bd668a..f7285890f581f71d9b1bec66e53120f6c6fe2620 100644
--- a/res/drawable/ic_caret_up.xml
+++ b/res/drawable/ic_caret_up.xml
@@ -22,7 +22,7 @@
         android:bottom="8dp">
         <shape android:shape="oval" >
             <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/system_neutral2_500" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml
index 66ef3597c8c8fe6a6b676ed3c9f29ded8e54973f..9582aacd32031f4dd3e144c97cccf38bf67795b2 100644
--- a/res/drawable/popup_background.xml
+++ b/res/drawable/popup_background.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
 
     <corners android:radius="28dp" />
-    <solid android:color="@color/system_neutral2_700" />
+    <solid android:color="@color/e_floating_background_dark" />
 </shape>
diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml
index b8a121f3d5710b733ae9b2ed3c79d3470ee50feb..b77baf84563db041ba100208d516b097cdea3854 100644
--- a/res/layout-land/desk_clock.xml
+++ b/res/layout-land/desk_clock.xml
@@ -98,7 +98,7 @@
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
                 app:borderWidth="0dp"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -127,7 +127,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="72dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         app:menu="@menu/bottom_navigation_menu"
         app:itemIconTint="@color/tab_tint_color"
         app:itemTextColor="@color/tab_tint_color"
diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml
index 520ab328d9ca18971db3eaa2bfbecfcdc245ad30..d797251805eaa73fe09d7ef23cd1d7f33890a6f5 100644
--- a/res/layout/city_list_item.xml
+++ b/res/layout/city_list_item.xml
@@ -34,7 +34,8 @@
         android:id="@+id/city_onoff"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:clickable="false" />
+        android:clickable="false"
+        android:buttonTint="@color/checkbox_color" />
     <TextView
         android:id="@+id/city_name"
         android:layout_width="0dip"
diff --git a/res/layout/collapsing_toolbar_base_layout.xml b/res/layout/collapsing_toolbar_base_layout.xml
index b07c5f074836d0f5d2fec5779dcab1b005a1408e..4ac6ca7174784aa0fa527c1704a9f51667845cfa 100644
--- a/res/layout/collapsing_toolbar_base_layout.xml
+++ b/res/layout/collapsing_toolbar_base_layout.xml
@@ -39,7 +39,7 @@
             android:clipToPadding="false"
             app:forceApplySystemWindowInsetTop="true"
             app:extraMultilineHeightEnabled="true"
-            app:contentScrim="@android:color/system_neutral1_700"
+            app:contentScrim="@color/e_action_bar_dark"
             app:maxLines="3"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:scrimAnimationDuration="50"
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index 7cad679b3a137b41c7daa50f4e7e692954227547..1a6c03b074f7e956f55637366d5856aba0064baf 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -92,7 +92,7 @@
                 android:layout_gravity="center"
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         android:paddingTop="12dp"
         android:paddingBottom="16dp"
         app:menu="@menu/bottom_navigation_menu"
diff --git a/res/layout/timer_setup_digits.xml b/res/layout/timer_setup_digits.xml
index c433eee34f30e6d1a24fa8a39fa97ba82190e64f..a3054eca7594838ee7580eb10bb821fa176095e7 100644
--- a/res/layout/timer_setup_digits.xml
+++ b/res/layout/timer_setup_digits.xml
@@ -174,8 +174,6 @@
             android:scaleType="centerInside"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:backgroundTint="@color/accent_color2"
-            android:textColor="@color/secondary_color"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toEndOf="@id/column_1_right"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml
index 724353acc23f85ea16b7199a134869acd5b59eb4..22bd64a8a5ea18db88db532ae14dbb6b9d5327ea 100644
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -16,4 +16,5 @@
 
 <resources>
     <dimen name="big_font_size">60sp</dimen>
+    <dimen name="timer_setup_digit_font_size">60sp</dimen>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cd1ea906004640845d7a3c1fb216804832ecf5a1..cec4ad5e17ac299e7aeec933b0320890be164fbd 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,27 +28,27 @@
 
     <color name="transparent">#00000000</color>
 
-    <color name="default_background">@android:color/system_neutral1_900</color>
+    <color name="default_background">@color/e_background_dark</color>
 
-    <color name="accent_color">@android:color/system_accent3_200</color>
-    <color name="accent_color2">@android:color/system_accent2_200</color>
-    <color name="secondary_color">@android:color/system_neutral1_800</color>
-    <color name="default_background_lighter">@android:color/system_neutral2_800</color>
+    <color name="accent_color">@color/e_accent_dark</color>
+    <color name="accent_color2">@color/e_accent_dark</color>
+    <color name="secondary_color">@color/e_floating_background_dark</color>
+    <color name="default_background_lighter">@color/e_floating_background_dark</color>
 
     <!-- Material next state on color-->
-    <color name="state_on_color">@color/accent_100</color>
+    <color name="state_on_color">@color/e_switch_thumb_on</color>
 
     <!-- Material next thumb disable color-->
     <color name="thumb_disabled_color">@color/black</color>
 
     <!-- Material next thumb off color-->
-    <color name="thumb_off_color">@color/default_background</color>
+    <color name="thumb_off_color">@color/e_switch_thumb_off</color>
 
     <!-- Material next track on color-->
-    <color name="track_on_color">@color/accent_color</color>
+    <color name="track_on_color">@color/e_switch_track_on</color>
 
     <!-- Material next track off color-->
-    <color name="track_off_color">@color/system_neutral2_500</color>
+    <color name="track_off_color">@color/e_switch_track_off</color>
 
     <color name="system_neutral2_300">@android:color/system_neutral2_300</color>
     <color name="system_neutral2_500">@android:color/system_neutral2_500</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bf5128d1afe69f43f4d5b6bcd16e6718025ecc13..2e7c64982755297d8cdef49bfbd8339fdbff6c32 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,7 +51,7 @@
     <dimen name="day_button_font_size">16sp</dimen>
     <dimen name="alarm_info_font_size">36sp</dimen>
     <dimen name="no_alarm_font_size">16sp</dimen>
-    <dimen name="timer_setup_digit_font_size">72sp</dimen>
+    <dimen name="timer_setup_digit_font_size">66sp</dimen>
     <dimen name="timer_setup_top_size">120dip</dimen>
 
     <dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
@@ -129,4 +129,5 @@
     <dimen name="widget_background_corner_radius">80dp</dimen>
     <dimen name="widget_configuration_background_corner_radius">12dp</dimen>
     <dimen name="widget_padding">16dp</dimen>
+    <dimen name="fab_size">72dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 98bd74f524468b701c9794b5c3e323f565ee3962..68b17974ebcb8f1b90948c369a9ecfb0e6b96145 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -84,7 +84,8 @@
         <item name="displayOptions">showTitle|homeAsUp</item>
     </style>
 
-    <style name="Widget.ActionBar.NoTitle">
+    <style name="Widget.ActionBar.NoTitle" parent="Widget.AppCompat.ActionBar">
+        <item name="background">@color/e_action_bar_dark</item>
         <!-- Attributes from androidx.appcompat.appcompat -->
         <item name="displayOptions">homeAsUp</item>
     </style>
@@ -110,8 +111,8 @@
 
     <style name="Widget.TimePicker" parent="android:Widget.Material.TimePicker">
         <item name="android:background">@color/default_background</item>
-        <item name="android:headerBackground">@color/system_neutral2_700</item>
-        <item name="android:numbersBackgroundColor">@color/system_neutral2_700</item>
+        <item name="android:headerBackground">@color/e_action_bar_dark</item>
+        <item name="android:numbersBackgroundColor">@color/e_floating_background_dark</item>
         <item name="android:numbersSelectorColor">?attr/colorAccent</item>
     </style>
 
@@ -127,10 +128,9 @@
     <style name="DeskClock.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
         <item name="android:switchMinWidth">52dp</item>
         <item name="android:minHeight">@dimen/touch_target_min_size</item>
-        <item name="android:track">@drawable/switch_track</item>
-        <item name="track">@drawable/switch_track</item>
-        <item name="android:thumb">@drawable/switch_thumb</item>
-        <item name="thumbTint">@color/default_background</item>
+        <item name="android:track">@drawable/e_switch_track</item>
+        <item name="track">@drawable/e_switch_track</item>
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
     </style>
 
     <style name="DeskClock.SwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 98d7b634d19abcc2ca6e860539d4a745df0503af..9de87cd402f980547f9c1f8fd83b31a51db85d73 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,7 +19,7 @@
 
     <style name="Theme.DeskClock" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorBackgroundFloating">?attr/colorBackgroundFloating</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_dark</item>
         <item name="popupTheme">@style/ThemeOverlay.Popup</item>
 
         <item name="android:timePickerStyle">@style/Widget.TimePicker</item>
@@ -55,11 +55,14 @@
         <item name="switchPreferenceCompatStyle">@style/DeskClock.SwitchPreferenceCompat</item>
     </style>
 
-    <style name="Theme.DeskClock.CitySelection">
+    <style name="Theme.DeskClock.CitySelection" parent="Theme.AppCompat.NoActionBar">
         <!-- Attributes from androidx.appcompat.appcompat -->
         <item name="actionBarStyle">@style/Widget.ActionBar.NoTitle</item>
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
+        <item name="colorAccent">@color/e_accent_dark</item>
+        <item name="android:statusBarColor">@color/e_action_bar_dark</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_dark</item>
     </style>
 
     <style name="ThemeOverlay.Control.Accent" parent="ThemeOverlay.AppCompat">