diff --git a/app/Android.bp b/app/Android.bp
index 7850206e9cefbba211eae8d46c7102de50bb6fdf..5db5fd2804a074a25563f0efc58d15c056f2d509 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -80,6 +80,7 @@ android_app {
         "kotlin-stdlib",
         "kotlinx_coroutines_guava",
         "kotlinx_serialization_json",
+        "elib",
     ],
 
     optimize: {
diff --git a/app/src/main/java/org/lineageos/twelve/ui/views/SortingChip.kt b/app/src/main/java/org/lineageos/twelve/ui/views/SortingChip.kt
index e4692b03384005958fe04dc4b1170fdd75c8d341..983e3a37b0d3f65fc37d085f69dad361b6840150 100644
--- a/app/src/main/java/org/lineageos/twelve/ui/views/SortingChip.kt
+++ b/app/src/main/java/org/lineageos/twelve/ui/views/SortingChip.kt
@@ -43,10 +43,7 @@ class SortingChip @JvmOverloads constructor(
     }
 
     init {
-        chipBackgroundColor = MaterialColors.getColorStateListOrNull(
-            context,
-            com.google.android.material.R.attr.colorPrimaryContainer
-        )
+        setChipBackgroundColorResource(R.color.e_floating_background_variant)
         chipStrokeWidth = 0f
 
         setText(R.string.sort_by_unknown)
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_background.png b/app/src/main/res/drawable-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..81a2dd3ec5d5510f7b8b22d21a3d2a78f5fa7eae
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9b91eac962345b85ba1f015fe82d4064f14a4b6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_background.png b/app/src/main/res/drawable-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec448828a5f949d4aadeb4fe8fb293b1cc550e0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..1faa459d60d008884f0790de289b1ceec85ce8d2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_background.png b/app/src/main/res/drawable-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..103d35d4af08fbb810d11cda6ffc66e6dd63e793
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..072cce2ebb1758106a96c2a27093c79a808c613b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9a92be1bea6ac15dd4ee94e5487379065f3f56b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a7ab03a8abcb7a0e17218ff69c96a2b3878e3a5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6c4f103d9943b8f4afa050a4faff156103b7bd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d2016f24666c480a8e700b62b752fb41ec8e9b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 7cf5d7ed040253af81833e081ea58b9b1b0a1308..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#A92D63"
-        android:fillType="evenOdd"
-        android:pathData="M45,44V55.515C43.57,54.558 41.85,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72C44.971,72 49,67.971 49,63V48C49,45.791 50.791,44 53,44H67C69.209,44 71,45.791 71,48V55.515C69.57,54.558 67.85,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72C70.971,72 75,67.971 75,63V44C75,39.582 71.418,36 67,36H53C48.582,36 45,39.582 45,44ZM71,63C71,60.239 68.761,58 66,58C63.239,58 61,60.239 61,63C61,65.761 63.239,68 66,68C68.761,68 71,65.761 71,63ZM40,68C42.761,68 45,65.761 45,63C45,60.239 42.761,58 40,58C37.239,58 35,60.239 35,63C35,65.761 37.239,68 40,68Z" />
-    <path
-        android:fillColor="#521E35"
-        android:fillType="evenOdd"
-        android:pathData="M40,68C42.761,68 45,65.761 45,63C45,60.239 42.761,58 40,58C37.239,58 35,60.239 35,63C35,65.761 37.239,68 40,68ZM66,68C68.761,68 71,65.761 71,63C71,60.239 68.761,58 66,58C63.239,58 61,60.239 61,63C61,65.761 63.239,68 66,68Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 9b0a35885763e82bcfc1c2868f8f4afbec994f1e..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group>
-        <clip-path android:pathData="M0,0h108v108h-108z" />
-        <path
-            android:fillColor="#F73487"
-            android:fillType="evenOdd"
-            android:pathData="M40,72C44.971,72 49,67.971 49,63C49,58.029 44.971,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72ZM66,72C70.971,72 75,67.971 75,63C75,58.029 70.971,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72Z" />
-        <path
-            android:fillAlpha="0.6"
-            android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:centerX="28.54"
-                    android:centerY="28.54"
-                    android:gradientRadius="72"
-                    android:type="radial">
-                    <item
-                        android:color="#19FFFFFF"
-                        android:offset="0" />
-                    <item
-                        android:color="#00FFFFFF"
-                        android:offset="1" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index 6f0f08987c25c0d20b1be31cdee2aca6f69169a2..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#ffffffff"
-        android:fillType="evenOdd"
-        android:pathData="M45,44V55.515C43.57,54.558 41.85,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72C44.971,72 49,67.971 49,63V48C49,45.791 50.791,44 53,44H67C69.209,44 71,45.791 71,48V55.515C69.57,54.558 67.85,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72C70.971,72 75,67.971 75,63V44C75,39.582 71.418,36 67,36H53C48.582,36 45,39.582 45,44Z" />
-</vector>
diff --git a/app/src/main/res/layout-land/fragment_album.xml b/app/src/main/res/layout-land/fragment_album.xml
index 73bf231c8fd9954b17f4ff58bcd66209598c4818..f908af33d614a6a8d28fcecc45624ea2f2b9e2c3 100644
--- a/app/src/main/res/layout-land/fragment_album.xml
+++ b/app/src/main/res/layout-land/fragment_album.xml
@@ -20,7 +20,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:title="Sweet Revenge" />
+            tools:title="Sweet Revenge"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_artist.xml b/app/src/main/res/layout-land/fragment_artist.xml
index ec1bad78a5f44e87ef9ec13136ba2f2b5482f007..66c8b2db4ef332bbb2e5362bf055ee88205ccb0b 100644
--- a/app/src/main/res/layout-land/fragment_artist.xml
+++ b/app/src/main/res/layout-land/fragment_artist.xml
@@ -20,7 +20,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:title="Ryuichi Sakamoto" />
+            tools:title="Ryuichi Sakamoto"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_genre.xml b/app/src/main/res/layout-land/fragment_genre.xml
index 2b66a202921daa2ba4641da8975380e44fa38d9d..9a29f1f1521656f29a60d6fbb253f15f326201cf 100644
--- a/app/src/main/res/layout-land/fragment_genre.xml
+++ b/app/src/main/res/layout-land/fragment_genre.xml
@@ -20,7 +20,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:title="Rock" />
+            tools:title="Rock"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_main.xml b/app/src/main/res/layout-land/fragment_main.xml
index 57de0574d069f4702d199250730daede2d0f266c..302648cf0dbd578f36f253faa4a09d28cea84583 100644
--- a/app/src/main/res/layout-land/fragment_main.xml
+++ b/app/src/main/res/layout-land/fragment_main.xml
@@ -22,7 +22,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:title="@string/app_name">
+            tools:title="@string/app_name"
+            style="@style/Widget.App.Toolbar">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/settingsMaterialButton"
diff --git a/app/src/main/res/layout-land/fragment_now_playing.xml b/app/src/main/res/layout-land/fragment_now_playing.xml
index 7d056c5c07faeda89b60a2d3b080b3b40a212880..4d0c10569e891206fda210d37baad9ffd3ca0e16 100644
--- a/app/src/main/res/layout-land/fragment_now_playing.xml
+++ b/app/src/main/res/layout-land/fragment_now_playing.xml
@@ -23,7 +23,8 @@
             app:navigationIconTint="?attr/colorOnSurface"
             app:titleCentered="true"
             app:titleTextAppearance="?attr/textAppearanceTitleMedium"
-            tools:title="Eyes shut, mouth still">
+            tools:title="Eyes shut, mouth still"
+            style="@style/Widget.App.Toolbar">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/fileTypeMaterialCardView"
@@ -33,7 +34,7 @@
                 android:layout_gravity="end"
                 android:layout_marginHorizontal="16dp"
                 android:visibility="gone"
-                app:cardBackgroundColor="?attr/colorPrimaryContainer"
+                app:cardBackgroundColor="@color/e_accent"
                 app:cardCornerRadius="4dp"
                 app:contentPaddingLeft="4dp"
                 app:contentPaddingRight="4dp"
@@ -46,7 +47,7 @@
                     android:gravity="center"
                     android:textAlignment="gravity"
                     android:textAppearance="?attr/textAppearanceLabelMedium"
-                    android:textColor="?attr/colorOnPrimaryContainer"
+                    android:textColor="@color/e_background"
                     tools:text="FLAC" />
 
             </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout-land/fragment_playlist.xml b/app/src/main/res/layout-land/fragment_playlist.xml
index bf8bbc9d88a08daeab8f459f301b26eaa4a38612..52c3b23fa00787f77ee2e2d2c6d379652777b5cd 100644
--- a/app/src/main/res/layout-land/fragment_playlist.xml
+++ b/app/src/main/res/layout-land/fragment_playlist.xml
@@ -20,7 +20,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:title="Eyes shut, mouth still" />
+            tools:title="Eyes shut, mouth still"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 4b81aac08e81448b0e0186dea8f103d78ba412ff..bd4440ca9214fa2e9659eb66fafbbc011b2f8f05 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -20,6 +20,7 @@
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             style="?attr/collapsingToolbarLayoutLargeStyle"
+            android:background="@color/e_action_bar"
             android:layout_width="match_parent"
             android:layout_height="179dp"
             app:expandedTitleMarginBottom="31dp"
@@ -34,6 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize"
                 android:elevation="0dp"
+                style="@style/Widget.App.Toolbar"
                 app:layout_collapseMode="pin" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/activity_view.xml b/app/src/main/res/layout/activity_view.xml
index f3f7d8a2ceda93b85cf88861136c11e57b78e5c5..b7f1ed7a2cd3b83f319656b6211fe43ab462b261 100644
--- a/app/src/main/res/layout/activity_view.xml
+++ b/app/src/main/res/layout/activity_view.xml
@@ -9,7 +9,7 @@
     style="@style/Widget.Material3.CardView.Filled"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:cardBackgroundColor="?attr/colorSurface"
+    app:cardBackgroundColor="@color/e_floating_background"
     app:cardCornerRadius="28dp"
     app:contentPadding="24dp">
 
diff --git a/app/src/main/res/layout/fragment_add_or_remove_from_playlists.xml b/app/src/main/res/layout/fragment_add_or_remove_from_playlists.xml
index c644beff7c9c61119c2f161cb9cc2e1a96a5cb96..bed7123143dbf67e666821d13e47926726802a47 100644
--- a/app/src/main/res/layout/fragment_add_or_remove_from_playlists.xml
+++ b/app/src/main/res/layout/fragment_add_or_remove_from_playlists.xml
@@ -17,7 +17,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
index 0fbf119ff57d1ed8b845fa7fc4d89ba85ac26e04..be53f9471b521e9a1bb58a314c408142f4275fc7 100644
--- a/app/src/main/res/layout/fragment_album.xml
+++ b/app/src/main/res/layout/fragment_album.xml
@@ -19,6 +19,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:contentScrim="@color/e_action_bar"
             app:expandedTitleTextColor="@android:color/transparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:maxLines="3">
diff --git a/app/src/main/res/layout/fragment_artist.xml b/app/src/main/res/layout/fragment_artist.xml
index ace152960bfe204cc26da6a6e342b22cbc685609..9d0da20ea4d59b31a4a3a0a96bb698e6d3d633de 100644
--- a/app/src/main/res/layout/fragment_artist.xml
+++ b/app/src/main/res/layout/fragment_artist.xml
@@ -20,6 +20,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:contentScrim="@color/e_action_bar"
             app:expandedTitleTextColor="@android:color/transparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:maxLines="3">
diff --git a/app/src/main/res/layout/fragment_genre.xml b/app/src/main/res/layout/fragment_genre.xml
index e6d1508b67452b556cc967acdaed88c4266936fb..d14fcf0f5d876a6cdba7a624534c9d00e4281fb7 100644
--- a/app/src/main/res/layout/fragment_genre.xml
+++ b/app/src/main/res/layout/fragment_genre.xml
@@ -20,6 +20,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:contentScrim="@color/e_action_bar"
             app:expandedTitleTextColor="@android:color/transparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:maxLines="3">
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index 095b2738589ff8c249a3915300c61750ddda6f84..585f4c2aba9a204e6ea88b465b802dde5373e6c5 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -17,7 +17,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 0ea443afd0cf8a6a935339025c124da7738e3dc3..c39d00ae640395a54fcf1576be01dc9e800e6c72 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -22,6 +22,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            style="@style/Widget.App.Toolbar"
             tools:title="@string/app_name">
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_manage_provider.xml b/app/src/main/res/layout/fragment_manage_provider.xml
index 6eb90606ce235130001c7c4c3281ad22bdda96ab..1c9b18f9d86fea8f6582ee6c3650c78cd8b0ba6d 100644
--- a/app/src/main/res/layout/fragment_manage_provider.xml
+++ b/app/src/main/res/layout/fragment_manage_provider.xml
@@ -17,7 +17,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            style="@style/Widget.App.Toolbar">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/confirmMaterialButton"
diff --git a/app/src/main/res/layout/fragment_now_playing.xml b/app/src/main/res/layout/fragment_now_playing.xml
index fa60c2b8b885f32d0e2044684b7b3b13300e473f..2a0bd2667cfcc4f3a824479c4aea5f2ef9dbfc06 100644
--- a/app/src/main/res/layout/fragment_now_playing.xml
+++ b/app/src/main/res/layout/fragment_now_playing.xml
@@ -18,6 +18,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            style="@style/Widget.App.Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_arrow_down"
             app:navigationIconTint="?attr/colorOnSurface"
             app:titleCentered="true"
@@ -32,7 +33,7 @@
                 android:layout_gravity="end"
                 android:layout_marginHorizontal="16dp"
                 android:visibility="gone"
-                app:cardBackgroundColor="?attr/colorPrimaryContainer"
+                app:cardBackgroundColor="@color/e_accent"
                 app:cardCornerRadius="4dp"
                 app:contentPaddingLeft="4dp"
                 app:contentPaddingRight="4dp"
@@ -45,7 +46,7 @@
                     android:gravity="center"
                     android:textAlignment="gravity"
                     android:textAppearance="?attr/textAppearanceLabelMedium"
-                    android:textColor="?attr/colorOnPrimaryContainer"
+                    android:textColor="@color/e_background"
                     tools:text="FLAC" />
 
             </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index 0a997f24f3e518944274fa692e49fa32b2c3db38..2dddda8a5ed9b6f21aba1b035f2bfb319e81be93 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -20,6 +20,7 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:contentScrim="@color/e_action_bar"
             app:expandedTitleTextColor="@android:color/transparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:maxLines="3">
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index da1e180a6fa2e72b43671713ae664a8d4c28f999..ea470b0cd26cef85f1e8890e8c3a0bca0805a440 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -17,7 +17,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            style="@style/Widget.App.Toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/now_playing_bar.xml b/app/src/main/res/layout/now_playing_bar.xml
index bd1258817a79b156676592bde32624610d5e7c4a..6dd646d628cd63c60e507714fe91d4865f80e9f7 100644
--- a/app/src/main/res/layout/now_playing_bar.xml
+++ b/app/src/main/res/layout/now_playing_bar.xml
@@ -10,7 +10,7 @@
     style="@style/Theme.Twelve.NowPlayingBar.CardView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:cardBackgroundColor="?attr/colorSurfaceContainer">
+    app:cardBackgroundColor="@color/e_floating_background_variant">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/now_playing_bottom_bar.xml b/app/src/main/res/layout/now_playing_bottom_bar.xml
index 4886e631179c7bb4e88247ff6e1792d94685996a..6ef44ea08c072a330de07b56545122dfe10f533b 100644
--- a/app/src/main/res/layout/now_playing_bottom_bar.xml
+++ b/app/src/main/res/layout/now_playing_bottom_bar.xml
@@ -9,7 +9,7 @@
     style="@style/Widget.Material3.CardView.Filled"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:cardBackgroundColor="?attr/colorSecondaryContainer"
+    app:cardBackgroundColor="@color/e_floating_background_variant"
     app:cardCornerRadius="12dp">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/settingslib_switch.xml b/app/src/main/res/layout/settingslib_switch.xml
index 5020013c28f5bbe86cbaca0cba3e3adb1ddcc134..eb1de4d0664f52487713f733dbb983e0d7aa18c1 100644
--- a/app/src/main/res/layout/settingslib_switch.xml
+++ b/app/src/main/res/layout/settingslib_switch.xml
@@ -3,7 +3,7 @@
      SPDX-FileCopyrightText: 2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
-<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+<Switch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/switch_widget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settingslib_switch_compat.xml b/app/src/main/res/layout/settingslib_switch_compat.xml
index 2815d87f3e55111d9d283c11408ac19a92584e48..855ef01533fea68f7dc712f268439ff69f6a49d9 100644
--- a/app/src/main/res/layout/settingslib_switch_compat.xml
+++ b/app/src/main/res/layout/settingslib_switch_compat.xml
@@ -3,7 +3,7 @@
      SPDX-FileCopyrightText: 2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
-<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+<Switch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/switchWidget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/navigation_bar_view_fragment_main.xml b/app/src/main/res/menu/navigation_bar_view_fragment_main.xml
index b0801b55dc6928620f64143d57cb5b1b475deb6d..b40556289d32873e48eeecb3d055b844cbd4c361 100644
--- a/app/src/main/res/menu/navigation_bar_view_fragment_main.xml
+++ b/app/src/main/res/menu/navigation_bar_view_fragment_main.xml
@@ -10,18 +10,18 @@
         android:id="@+id/activityFragment"
         android:icon="@drawable/ic_home"
         android:title="@string/main_fragment_section_activity"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="@color/e_secondary_text_color" />
 
     <item
         android:id="@+id/searchFragment"
         android:icon="@drawable/ic_search"
         android:title="@string/main_fragment_section_search"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="@color/e_secondary_text_color" />
 
     <item
         android:id="@+id/libraryFragment"
         android:icon="@drawable/ic_lineage_library"
         android:title="@string/main_fragment_section_library"
-        app:tint="?attr/colorOnSurface" />
+        app:tint="@color/e_secondary_text_color" />
 
 </menu>
diff --git a/app/src/main/res/mipmap/ic_launcher.xml b/app/src/main/res/mipmap/ic_launcher.xml
index aa76129b862c09f0ca54ee0f1aae2e5b1e3d1fc2..dad8633ba7354b60719dc4a02342992a013d6a42 100644
--- a/app/src/main/res/mipmap/ic_launcher.xml
+++ b/app/src/main/res/mipmap/ic_launcher.xml
@@ -6,5 +6,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d2de211f5c6a837dc69c28e01d3ee3b3fcecb050..f79e27f0962915746796bd6de8c24d24e65a6d00 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,6 +9,13 @@
         <item name="android:enforceNavigationBarContrast">true</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="enableEdgeToEdge">true</item>
+        <item name="bottomNavigationStyle">@style/Widget.App.BottomNavigationView</item>
+        <item name="android:windowBackground">@color/e_background</item>
+        <item name="elevationOverlayEnabled">false</item>
+        <item name="colorAccent">@color/e_accent</item>
+        <item name="statusBarForeground">@color/e_action_bar</item>
+        <item name="materialSearchViewStyle">@style/Widget.App.SearchView</item>
+        <item name="tabStyle">@style/Widget.App.TabLayout</item>
     </style>
 
     <style name="Theme.Twelve.Dialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -105,14 +112,49 @@
         <item name="android:layout_height">48dp</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:padding">0dp</item>
-        <item name="android:textColor">?attr/colorOnSecondaryContainer</item>
+        <item name="android:textColor">@color/e_secondary_text_color</item>
         <item name="iconGravity">textStart</item>
         <item name="iconSize">24dp</item>
-        <item name="iconTint">?attr/colorOnSecondaryContainer</item>
+        <item name="iconTint">@color/e_secondary_text_color</item>
     </style>
 
     <!-- App widget -->
     <style name="Theme.Twelve.AppWidgetContainer" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="appWidgetRadius">28dp</item>
     </style>
+
+    <style name="Widget.App.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.BottomNavigationView</item>
+    </style>
+
+    <style name="ThemeOverlay.App.BottomNavigationView" parent="">
+        <item name="colorSurface">@color/e_action_bar</item>
+        <item name="colorSurfaceContainer">@color/e_action_bar</item>
+        <item name="colorOnSecondaryContainer">@color/e_accent</item>
+        <item name="colorSecondaryContainer">@android:color/transparent</item>
+        <item name="elevationOverlayEnabled">false</item>
+        <item name="colorOnSurface">@color/e_accent</item>
+    </style>
+
+    <style name="Widget.App.Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Toolbar</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Toolbar" parent="">
+        <item name="android:background">@color/e_action_bar</item>
+
+    </style>
+
+    <style name="Widget.App.SearchView" parent="Widget.Material3.SearchView">
+        <item name="backgroundTint">@color/e_background</item>
+    </style>
+
+    <style name="Widget.App.TabLayout" parent="Widget.Material3.TabLayout">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.TabLayout</item>
+    </style>
+
+    <style name="ThemeOverlay.App.TabLayout" parent="">
+        <item name="android:background">@color/e_action_bar</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/themes_settingslib.xml b/app/src/main/res/values/themes_settingslib.xml
index ce225b877ed84373360717372fd8becfeaa67153..5ba45360028a9e077b3b16bf7ed5f54d88dd962b 100644
--- a/app/src/main/res/values/themes_settingslib.xml
+++ b/app/src/main/res/values/themes_settingslib.xml
@@ -11,6 +11,8 @@
         <item name="alertDialogTheme">@style/Theme.SettingsLib.AlertDialog</item>
         <item name="materialAlertDialogTheme">@style/Theme.SettingsLib.AlertDialog</item>
         <item name="preferenceTheme">@style/Theme.SettingsLib.PreferenceTheme</item>
+        <item name="android:windowBackground">@color/e_background</item>
+        <item name="statusBarForeground">@color/e_action_bar</item>
     </style>
 
     <!-- Settings alert dialog theme. -->