diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a52d9523e11a5977618946471c95a0ad793f76d1
--- /dev/null
+++ b/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/theme_accent"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/res/drawable/ic_menu_preferences.xml b/res/drawable/ic_menu_preferences.xml
index cfa9a7cd6cdc03e77edf860fb73de3ee5deeb133..20dd67a73b39e43e3b47b5a28d4bdbfb976a32e6 100644
--- a/res/drawable/ic_menu_preferences.xml
+++ b/res/drawable/ic_menu_preferences.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/inverted"
+        android:fillColor="@color/theme_accent"
         android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/res/drawable/ic_menu_refresh.xml b/res/drawable/ic_menu_refresh.xml
index 05a578d55b9571efcd5989a95e5f51e687addd8c..3b47058a39f5f65c3407dc5f4d06353df2aea908 100644
--- a/res/drawable/ic_menu_refresh.xml
+++ b/res/drawable/ic_menu_refresh.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/inverted"
+        android:fillColor="@color/theme_accent"
         android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
 </vector>
diff --git a/res/drawable/ic_pause.xml b/res/drawable/ic_pause.xml
index 3b2d509ca01cde0012fe9436ae42408730828935..620beef0379661fb6f09e880a931e7ce2581e2a2 100644
--- a/res/drawable/ic_pause.xml
+++ b/res/drawable/ic_pause.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/theme_accent"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml
index ecaaabbb19c4c5f743113c4dbd37fd7e31cc6647..3daa577ca74dc6976932a40b48dea47c74be8070 100644
--- a/res/drawable/ic_system_update.xml
+++ b/res/drawable/ic_system_update.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/inverted"
+        android:fillColor="@color/theme_accent"
         android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
 </vector>
diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml
index d9dba639f15d376e2bedd97a216f41dbda95fb01..c49f5513c65332efba8b3ceeca3b5dc21388dc28 100644
--- a/res/layout/activity_updates.xml
+++ b/res/layout/activity_updates.xml
@@ -41,7 +41,7 @@
                     android:fontFamily="sans-serif-light"
                     android:paddingBottom="16dp"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="56sp" />
+                    android:textSize="30sp" />
 
                 <TextView
                     android:id="@+id/header_build_version"
diff --git a/res/layout/preferences_dialog.xml b/res/layout/preferences_dialog.xml
index d78f873235410bf07d41efe04776dc1700591854..438f120f51292a11c34b37f47bd2fb85b741fcdd 100644
--- a/res/layout/preferences_dialog.xml
+++ b/res/layout/preferences_dialog.xml
@@ -8,6 +8,7 @@
     android:paddingTop="16dp">
 
     <LinearLayout
+        android:background="@lineageos.platform:color/color_default_background"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
deleted file mode 100644
index 4470f73c5c4cc1961e7684df44a5a91a1f8a0aff..0000000000000000000000000000000000000000
--- a/res/values-night/colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="theme_primary">#212121</color>
-    <color name="theme_primary_dark">#1c1c1c</color>
-    <color name="theme_accent">@*android:color/accent_device_default_dark</color>
-
-    <color name="inverted">#f5f5f5</color>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 608dd9bbf3a381c333393f2b8b9a2851b142ce30..b22786fc66bd56606b78eab0deecc1e2c1c34895 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="theme_primary">#f5f5f5</color>
-    <color name="theme_primary_dark">#e0e0e0</color>
-    <color name="theme_accent">@*android:color/accent_device_default_light</color>
+    <color name="theme_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="theme_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="theme_accent">@lineageos.platform:color/color_default_accent</color>
     <color name="tv_background">#FF0E0E0F</color>
     <color name="tv_card_background">#222222</color>
 
-    <color name="inverted">#212121</color>
+    <color name="inverted">@lineageos.platform:color/color_default_primary_text</color>
     <color name="ic_background">#333333</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e87f58c02159c90c387f7aff4ab5b7ac9558f969..1b1aafe724e4738ebc3f922fbc9a679d3cc7edfd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -7,14 +7,23 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowLightStatusBar">@bool/theme_is_light</item>
         <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
+        <item name="android:colorBackground">@lineageos.platform:color/color_default_background</item>
+        <item name="android:windowBackground">@lineageos.platform:color/color_default_background</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="alertDialogTheme">@style/CustomAlertDialog</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="snackbarStyle">@style/snackbar_style</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/theme_primary_dark</item>
+        <item name="android:navigationBarColor">@color/theme_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/theme_primary_dark</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar" />
@@ -31,4 +40,17 @@
         <item name="android:dropDownVerticalOffset">8dp</item>
         <item name="android:dropDownHorizontalOffset">-16dp</item>
     </style>
+
+    <style name="CustomAlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="android:background">@lineageos.platform:color/color_default_background</item>
+    </style>
+
+    <style name="customOverFlow" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@color/theme_accent</item>
+    </style>
+
+    <style name="snackbar_style" parent="Widget.Design.Snackbar">
+        <item name="android:background">@lineageos.platform:color/color_default_background</item>
+    </style>
+
 </resources>