diff --git a/app/Android.bp b/app/Android.bp
index a370fb09daefabcd05103193bba77700557eccc7..063266c6b50fab8ea1c8d10d8c4587bade4d69b5 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -36,6 +36,7 @@ android_app {
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "com.google.android.material_material",
+        "elib",
     ],
 
     optimize: {
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
index 58078344ed2a0f5bca663d2c6fb6ead229aec327..561b63d54dd74c7ee3c4559a4c36b00d44326575 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
@@ -56,6 +56,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;
@@ -542,7 +543,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
 
     @Override
     public void showSnackbar(int stringId, int duration) {
-        Snackbar.make(findViewById(R.id.main_container), stringId, duration).show();
+        Snackbar.make(findViewById(R.id.main_container), stringId, duration).setTextColor(ContextCompat.getColor(this, R.color.e_background)).show();
     }
 
     private void refreshAnimationStart() {
diff --git a/app/src/main/res/layout/activity_updates.xml b/app/src/main/res/layout/activity_updates.xml
index 677282f4b8c22ef694d4f4083e2e7f8bdee578d6..a7fac51f3396f7788f7e381ec1804d693ab858ab 100644
--- a/app/src/main/res/layout/activity_updates.xml
+++ b/app/src/main/res/layout/activity_updates.xml
@@ -15,7 +15,7 @@
         android:fitsSystemWindows="true"
         android:outlineAmbientShadowColor="@android:color/transparent"
         android:outlineSpotShadowColor="@android:color/transparent"
-        android:background="?android:attr/colorPrimary"
+        android:background="@color/toolbar_collapsed"
         android:theme="@style/Theme.CollapsingToolbar.Settings">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c8a48427221ebdfed2d798b07e4a7f4db1ce2db5..aa2cf345d875ee06041f44e40439f1512d473a79 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,9 +2,5 @@
 <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="background">@android:color/system_neutral1_900</color>
-    <color name="toolbar_collapsed">@android:color/system_neutral1_700</color>
-
     <color name="inverted">#f5f5f5</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3f37f9c9c45e507b322ca72961fdea577ad2f43e..d62fee5558f1f0e4bcd07e5967fd84e2058c149d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,9 +2,9 @@
 <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="background">@android:color/system_neutral1_50</color>
-    <color name="toolbar_collapsed">@android:color/system_neutral1_100</color>
+    <color name="theme_accent">@color/e_accent</color>
+    <color name="background">@color/e_background</color>
+    <color name="toolbar_collapsed">@color/e_action_bar</color>
     <color name="tv_background">#FF0E0E0F</color>
     <color name="tv_card_background">#222222</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d7338570d4cab4d0927e33e1b7e067ddbf57e559..aa72c1a2ff2a4b489a517f75dfc4b5a2b121ef17 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,7 +8,9 @@
         <item name="android:windowLightStatusBar">@bool/theme_is_light</item>
         <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
         <item name="android:windowBackground">@color/background</item>
-        <item name="alertDialogTheme">@style/AppTheme.AlertDialogTheme</item>
+        <item name="alertDialogTheme">@style/Dialog</item>
+        <item name="snackbarStyle">@style/Snackbar</item>
+        <item name="switchStyle">@style/Switch</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -37,4 +39,16 @@
     <style name="AppTheme.AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="dialogCornerRadius">16dp</item>
     </style>
+    <style name="Dialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="android:background">@color/e_floating_background</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+    </style>
+    <style name="Switch" parent="Widget.AppCompat.CompoundButton.Switch">
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
+        <item name="track">@drawable/e_switch_track</item>
+    </style>
+    <style name="Snackbar" parent="Widget.Design.Snackbar">
+        <item name="android:background">@color/e_background_inverse</item>
+    </style>
+
 </resources>