diff --git a/app/build.gradle b/app/build.gradle
index bd0ead80..3ca65076 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -183,7 +183,11 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:1.7.1"
     implementation "androidx.constraintlayout:constraintlayout:2.2.1"
-    implementation 'com.google.android.material:material:1.14.0'
+    implementation('com.google.android.material:material:1.10.0') {
+        version {
+            strictly '1.10.0'
+        }
+    }
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
diff --git a/app/src/main/java/com/deniscerri/ytdl/services/BgUtilsPoTokenGeneratorService.kt b/app/src/main/java/com/deniscerri/ytdl/services/BgUtilsPoTokenGeneratorService.kt
index decffc09..2cc44993 100644
--- a/app/src/main/java/com/deniscerri/ytdl/services/BgUtilsPoTokenGeneratorService.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/services/BgUtilsPoTokenGeneratorService.kt
@@ -21,6 +21,7 @@ import com.deniscerri.ytdl.util.BgUtilsPoTokenGeneratorUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.io.File
 
@@ -42,6 +43,7 @@ class BgUtilsPoTokenGeneratorService : Service() {
 
     override fun onDestroy() {
         RuntimeManager.getInstance().destroyProcessById(currentRunningProcess)
+        serviceScope.cancel()
         super.onDestroy()
     }
 
@@ -64,6 +66,7 @@ class BgUtilsPoTokenGeneratorService : Service() {
 
         if (intent?.action == "ACTION_EXIT") {
             runtimeManager.destroyProcessById(currentRunningProcess)
+            stopForeground(STOP_FOREGROUND_REMOVE)
             stopSelf()
             return super.onStartCommand(intent, flags, startId)
         }
@@ -104,7 +107,7 @@ class BgUtilsPoTokenGeneratorService : Service() {
             }
         }
 
-        return START_STICKY
+        return START_NOT_STICKY
     }
 
     private fun createNotification(description: String = ""): Notification {
diff --git a/app/src/main/res/layout/active_download_card.xml b/app/src/main/res/layout/active_download_card.xml
index e3495ef0..ba9d02cf 100644
--- a/app/src/main/res/layout/active_download_card.xml
+++ b/app/src/main/res/layout/active_download_card.xml
@@ -34,14 +34,11 @@
             <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/progress"
                 android:layout_width="match_parent"
+                app:trackColor="#000"
                 android:layout_height="match_parent"
                 android:layout_gravity="bottom"
                 android:alpha="0.3"
-                app:trackThickness="300dp"
-                app:trackCornerRadius="0dp"
-                app:trackColor="#000"
-                app:indicatorTrackGapSize="0dp"
-                app:trackStopIndicatorSize="0dp" />
+                android:scaleY="200"/>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/command_template_list.xml b/app/src/main/res/layout/command_template_list.xml
index 53709adc..97963d5c 100644
--- a/app/src/main/res/layout/command_template_list.xml
+++ b/app/src/main/res/layout/command_template_list.xml
@@ -47,7 +47,6 @@
             <Button
                 android:id="@+id/command_ok"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/configure_download_bottom_sheet.xml b/app/src/main/res/layout/configure_download_bottom_sheet.xml
index b4271a07..10ae0f34 100644
--- a/app/src/main/res/layout/configure_download_bottom_sheet.xml
+++ b/app/src/main/res/layout/configure_download_bottom_sheet.xml
@@ -48,7 +48,6 @@
             <Button
                 android:id="@+id/bottom_sheet_ok"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/cookie_bottom_sheet.xml b/app/src/main/res/layout/cookie_bottom_sheet.xml
index 531b0946..3b6585a0 100644
--- a/app/src/main/res/layout/cookie_bottom_sheet.xml
+++ b/app/src/main/res/layout/cookie_bottom_sheet.xml
@@ -148,7 +148,6 @@
             <Button
                 android:id="@+id/getCookiesBtn"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/create_command_template.xml b/app/src/main/res/layout/create_command_template.xml
index 5b21aac5..3de7c74c 100644
--- a/app/src/main/res/layout/create_command_template.xml
+++ b/app/src/main/res/layout/create_command_template.xml
@@ -51,7 +51,6 @@
                 <Button
                     android:id="@+id/template_create"
                     style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                    android:backgroundTint="?colorSecondaryContainer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:autoLink="all"
diff --git a/app/src/main/res/layout/cut_video_sheet.xml b/app/src/main/res/layout/cut_video_sheet.xml
index 97266648..cbb89332 100644
--- a/app/src/main/res/layout/cut_video_sheet.xml
+++ b/app/src/main/res/layout/cut_video_sheet.xml
@@ -340,7 +340,6 @@
                 <Button
                     android:id="@+id/new_cut"
                     style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                    android:backgroundTint="?colorSecondaryContainer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:autoLink="all"
diff --git a/app/src/main/res/layout/download_bottom_sheet.xml b/app/src/main/res/layout/download_bottom_sheet.xml
index 70a01a75..51a085f4 100644
--- a/app/src/main/res/layout/download_bottom_sheet.xml
+++ b/app/src/main/res/layout/download_bottom_sheet.xml
@@ -117,7 +117,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:elevation="0dp"
                 android:outlineProvider="none"
                 android:stateListAnimator="@null"
@@ -214,7 +213,6 @@
             <Button
                 android:id="@+id/update_item"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/download_multiple_bottom_sheet.xml b/app/src/main/res/layout/download_multiple_bottom_sheet.xml
index ce9968db..f25344b4 100644
--- a/app/src/main/res/layout/download_multiple_bottom_sheet.xml
+++ b/app/src/main/res/layout/download_multiple_bottom_sheet.xml
@@ -125,7 +125,6 @@
             <Button
                 android:id="@+id/bottomsheet_download_button"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
@@ -175,7 +174,6 @@
             <Button
                 android:id="@+id/bottomsheet_ok_button"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/extra_commands_bottom_sheet.xml b/app/src/main/res/layout/extra_commands_bottom_sheet.xml
index f585ac64..1b28a471 100644
--- a/app/src/main/res/layout/extra_commands_bottom_sheet.xml
+++ b/app/src/main/res/layout/extra_commands_bottom_sheet.xml
@@ -113,7 +113,6 @@
             <Button
                 android:id="@+id/okButton"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/format_select_bottom_sheet.xml b/app/src/main/res/layout/format_select_bottom_sheet.xml
index 80793d3c..611a2ffc 100644
--- a/app/src/main/res/layout/format_select_bottom_sheet.xml
+++ b/app/src/main/res/layout/format_select_bottom_sheet.xml
@@ -74,7 +74,6 @@
                 <Button
                     android:id="@+id/format_refresh"
                     style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                    android:backgroundTint="?colorSecondaryContainer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:autoLink="all"
@@ -92,7 +91,6 @@
                     android:id="@+id/format_ok"
                     android:visibility="gone"
                     style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                    android:backgroundTint="?colorSecondaryContainer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/fragment_already_exists_dialog.xml b/app/src/main/res/layout/fragment_already_exists_dialog.xml
index 39aa3ec2..ae2199ce 100644
--- a/app/src/main/res/layout/fragment_already_exists_dialog.xml
+++ b/app/src/main/res/layout/fragment_already_exists_dialog.xml
@@ -46,7 +46,6 @@
             <Button
                 android:id="@+id/bottomsheet_download_button"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/fragment_generate_youtube_po_token.xml b/app/src/main/res/layout/fragment_generate_youtube_po_token.xml
index 482d0828..46068934 100644
--- a/app/src/main/res/layout/fragment_generate_youtube_po_token.xml
+++ b/app/src/main/res/layout/fragment_generate_youtube_po_token.xml
@@ -96,7 +96,6 @@
                         <Button
                             android:id="@+id/redownload_bgutils"
                             style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                            android:backgroundTint="?colorSecondaryContainer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="end"
@@ -382,7 +381,6 @@
                         <Button
                             android:id="@+id/regenerate_webview_potokens"
                             style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                            android:backgroundTint="?colorSecondaryContainer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="end"
diff --git a/app/src/main/res/layout/generate_po_token_url_bottom_sheet.xml b/app/src/main/res/layout/generate_po_token_url_bottom_sheet.xml
index ee36bedb..adaef30b 100644
--- a/app/src/main/res/layout/generate_po_token_url_bottom_sheet.xml
+++ b/app/src/main/res/layout/generate_po_token_url_bottom_sheet.xml
@@ -39,7 +39,6 @@
             <Button
                 android:id="@+id/getPoTokenBtn"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/history_item_details_bottom_sheet.xml b/app/src/main/res/layout/history_item_details_bottom_sheet.xml
index 8b83330d..32a930bf 100644
--- a/app/src/main/res/layout/history_item_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/history_item_details_bottom_sheet.xml
@@ -239,7 +239,6 @@
 
             <Button
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:id="@+id/bottomsheet_open_file_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -253,7 +252,6 @@
             <Button
                 android:id="@+id/bottomsheet_redownload_button"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
diff --git a/app/src/main/res/layout/observe_sources_bottom_sheet.xml b/app/src/main/res/layout/observe_sources_bottom_sheet.xml
index 10c1320c..664bebec 100644
--- a/app/src/main/res/layout/observe_sources_bottom_sheet.xml
+++ b/app/src/main/res/layout/observe_sources_bottom_sheet.xml
@@ -48,7 +48,6 @@
             <Button
                 android:id="@+id/okButton"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/observe_sources_details_bottom_sheet.xml b/app/src/main/res/layout/observe_sources_details_bottom_sheet.xml
index ea15d9e3..995aac32 100644
--- a/app/src/main/res/layout/observe_sources_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/observe_sources_details_bottom_sheet.xml
@@ -175,7 +175,6 @@
             <Button
                 android:id="@+id/edit_button"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/edit"
diff --git a/app/src/main/res/layout/select_playlist_items.xml b/app/src/main/res/layout/select_playlist_items.xml
index 154a5dbe..0333bd27 100644
--- a/app/src/main/res/layout/select_playlist_items.xml
+++ b/app/src/main/res/layout/select_playlist_items.xml
@@ -133,7 +133,6 @@
             <Button
                 android:id="@+id/bottomsheet_ok_button"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/layout/webview_activity.xml b/app/src/main/res/layout/webview_activity.xml
index 2314d176..5597dd5f 100644
--- a/app/src/main/res/layout/webview_activity.xml
+++ b/app/src/main/res/layout/webview_activity.xml
@@ -30,7 +30,6 @@
             <Button
                 android:id="@+id/generate"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/app/src/main/res/layout/webview_potoken_activity.xml b/app/src/main/res/layout/webview_potoken_activity.xml
index 1cd6ffce..80429fde 100644
--- a/app/src/main/res/layout/webview_potoken_activity.xml
+++ b/app/src/main/res/layout/webview_potoken_activity.xml
@@ -30,7 +30,6 @@
             <Button
                 android:id="@+id/generate"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/app/src/main/res/layout/youtube_player_client_create_bottom_sheet.xml b/app/src/main/res/layout/youtube_player_client_create_bottom_sheet.xml
index 18fd1101..a58ce219 100644
--- a/app/src/main/res/layout/youtube_player_client_create_bottom_sheet.xml
+++ b/app/src/main/res/layout/youtube_player_client_create_bottom_sheet.xml
@@ -66,7 +66,6 @@
                 <Button
                     android:id="@+id/client_create"
                     style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                    android:backgroundTint="?colorSecondaryContainer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:autoLink="all"
diff --git a/app/src/main/res/layout/ytdlp_sources_list.xml b/app/src/main/res/layout/ytdlp_sources_list.xml
index f2dd6046..1f2739e4 100644
--- a/app/src/main/res/layout/ytdlp_sources_list.xml
+++ b/app/src/main/res/layout/ytdlp_sources_list.xml
@@ -46,7 +46,6 @@
             <Button
                 android:id="@+id/add"
                 style="@style/Widget.Material3.Button.ElevatedButton.Icon"
-                android:backgroundTint="?colorSecondaryContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 57e0d6c1..74db48df 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -39,17 +39,7 @@
         <item name="colorOnSurface">@color/red_md_theme_dark_onSurface</item>
         <item name="colorSurfaceVariant">@color/red_md_theme_dark_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/red_md_theme_dark_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/red_md_theme_dark_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/red_md_theme_dark_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/red_md_theme_dark_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/red_md_theme_dark_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/red_md_theme_dark_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/red_md_theme_dark_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/red_md_theme_dark_surfaceContainerHighest</item>
         <item name="colorOutline">@color/red_md_theme_dark_outline</item>
-        <item name="colorOutlineVariant">@color/red_md_theme_dark_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/red_md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/red_md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/red_md_theme_dark_inversePrimary</item>
@@ -58,54 +48,29 @@
 
     <style name="Theme.Blue" parent="BaseTheme">
 
-        <!-- Primary -->
         <item name="colorPrimary">@color/blue_md_theme_dark_primary</item>
         <item name="colorOnPrimary">@color/blue_md_theme_dark_onPrimary</item>
         <item name="colorPrimaryContainer">@color/blue_md_theme_dark_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/blue_md_theme_dark_onPrimaryContainer</item>
-
-        <!-- Secondary -->
         <item name="colorSecondary">@color/blue_md_theme_dark_secondary</item>
         <item name="colorOnSecondary">@color/blue_md_theme_dark_onSecondary</item>
         <item name="colorSecondaryContainer">@color/blue_md_theme_dark_secondaryContainer</item>
         <item name="colorOnSecondaryContainer">@color/blue_md_theme_dark_onSecondaryContainer</item>
-
-        <!-- Tertiary -->
         <item name="colorTertiary">@color/blue_md_theme_dark_tertiary</item>
         <item name="colorOnTertiary">@color/blue_md_theme_dark_onTertiary</item>
         <item name="colorTertiaryContainer">@color/blue_md_theme_dark_tertiaryContainer</item>
         <item name="colorOnTertiaryContainer">@color/blue_md_theme_dark_onTertiaryContainer</item>
-
-        <!-- Error -->
         <item name="colorError">@color/blue_md_theme_dark_error</item>
-        <item name="colorOnError">@color/blue_md_theme_dark_onError</item>
         <item name="colorErrorContainer">@color/blue_md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/blue_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/blue_md_theme_dark_onErrorContainer</item>
-
-        <!-- Background -->
         <item name="android:colorBackground">@color/blue_md_theme_dark_background</item>
         <item name="colorOnBackground">@color/blue_md_theme_dark_onBackground</item>
-
-        <!-- Surface -->
         <item name="colorSurface">@color/blue_md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/blue_md_theme_dark_onSurface</item>
         <item name="colorSurfaceVariant">@color/blue_md_theme_dark_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/blue_md_theme_dark_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/blue_md_theme_dark_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/blue_md_theme_dark_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/blue_md_theme_dark_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/blue_md_theme_dark_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/blue_md_theme_dark_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/blue_md_theme_dark_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/blue_md_theme_dark_surfaceContainerHighest</item>
-
-        <!-- Outline -->
         <item name="colorOutline">@color/blue_md_theme_dark_outline</item>
-        <item name="colorOutlineVariant">@color/blue_md_theme_dark_outlineVariant</item>
-
-        <!-- Inverse -->
         <item name="colorOnSurfaceInverse">@color/blue_md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/blue_md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/blue_md_theme_dark_inversePrimary</item>
@@ -136,17 +101,7 @@
         <item name="colorOnSurface">@color/yellow_md_theme_dark_onSurface</item>
         <item name="colorSurfaceVariant">@color/yellow_md_theme_dark_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/yellow_md_theme_dark_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/yellow_md_theme_dark_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/yellow_md_theme_dark_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/yellow_md_theme_dark_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/yellow_md_theme_dark_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/yellow_md_theme_dark_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/yellow_md_theme_dark_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/yellow_md_theme_dark_surfaceContainerHighest</item>
         <item name="colorOutline">@color/yellow_md_theme_dark_outline</item>
-        <item name="colorOutlineVariant">@color/yellow_md_theme_dark_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/yellow_md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/yellow_md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/yellow_md_theme_dark_inversePrimary</item>
@@ -178,17 +133,7 @@
         <item name="colorOnSurface">@color/green_md_theme_dark_onSurface</item>
         <item name="colorSurfaceVariant">@color/green_md_theme_dark_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/green_md_theme_dark_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/green_md_theme_dark_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/green_md_theme_dark_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/green_md_theme_dark_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/green_md_theme_dark_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/green_md_theme_dark_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/green_md_theme_dark_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/green_md_theme_dark_surfaceContainerHighest</item>
         <item name="colorOutline">@color/green_md_theme_dark_outline</item>
-        <item name="colorOutlineVariant">@color/green_md_theme_dark_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/green_md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/green_md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/green_md_theme_dark_inversePrimary</item>
@@ -220,17 +165,7 @@
         <item name="colorOnSurface">@color/purple_md_theme_dark_onSurface</item>
         <item name="colorSurfaceVariant">@color/purple_md_theme_dark_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/purple_md_theme_dark_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/purple_md_theme_dark_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/purple_md_theme_dark_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/purple_md_theme_dark_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/purple_md_theme_dark_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/purple_md_theme_dark_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/purple_md_theme_dark_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/purple_md_theme_dark_surfaceContainerHighest</item>
         <item name="colorOutline">@color/purple_md_theme_dark_outline</item>
-        <item name="colorOutlineVariant">@color/purple_md_theme_dark_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/purple_md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/purple_md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/purple_md_theme_dark_inversePrimary</item>
@@ -293,17 +228,7 @@
         <item name="colorOnSurface">@color/orange_md_theme_dark_onSurface</item>
         <item name="colorSurfaceVariant">@color/orange_md_theme_dark_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/orange_md_theme_dark_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/orange_md_theme_dark_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/orange_md_theme_dark_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/orange_md_theme_dark_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/orange_md_theme_dark_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/orange_md_theme_dark_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/orange_md_theme_dark_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/orange_md_theme_dark_surfaceContainerHighest</item>
         <item name="colorOutline">@color/orange_md_theme_dark_outline</item>
-        <item name="colorOutlineVariant">@color/orange_md_theme_dark_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/orange_md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/orange_md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/orange_md_theme_dark_inversePrimary</item>
@@ -311,31 +236,9 @@
 
     <style name="Pure">
 
-        <!-- Base Canvas (Pure Black Background & Cards) -->
         <item name="android:colorBackground">@android:color/black</item>
         <item name="colorSurface">@android:color/black</item>
 
-        <!-- Bottom Sheets, Dialogs & Base Containers (Pure Black) -->
-        <item name="colorSurfaceDim">@android:color/black</item>
-        <item name="colorSurfaceContainerLowest">@android:color/black</item>
-        <item name="colorSurfaceContainerLow">@android:color/black</item>
-        <item name="colorSurfaceContainer">@android:color/black</item>
-
-        <!-- Interactive Inputs & High-Priority Components (Dark Grays) -->
-        <!-- Used by Chips, Elevated Buttons, and Search Bars -->
-        <item name="colorSurfaceContainerHigh">#1E1E1E</item>
-        <!-- Used by Filled TextFields (TextInputLayout) -->
-        <item name="colorSurfaceContainerHighest">#252525</item>
-        <item name="colorSurfaceBright">#2C2C2C</item>
-
-        <!-- Outlines & Borders (Critical for Outlined Inputs & Unfilled Chips) -->
-        <item name="colorOutline">#79747E</item>
-        <item name="colorOutlineVariant">#49454F</item>
-
-        <!-- Disables automatic elevation white tint so pure black stays black -->
-        <item name="elevationOverlayColor">@android:color/transparent</item>
-        <item name="elevationOverlayEnabled">false</item>
-
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2fb20902..cb1f37e6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,8 +4,9 @@
     <color name="black">#000000</color>
     <color name="grey">#323232</color>
     <color name="light_grey">#A6A6A6</color>
-	<color name="icon_bg">#FFFFFF</color>
-	<color name="icon_fg">#db2e2e</color>
+    <color name="icon_bg">#FFFFFF</color>
+    <color name="icon_fg">#db2e2e</color>
+
 
     <color name="blue_md_theme_light_primary">#0058CB</color>
     <color name="blue_md_theme_light_onPrimary">#FFFFFF</color>
@@ -33,14 +34,6 @@
     <color name="blue_md_theme_light_inverseOnSurface">#F2F0F4</color>
     <color name="blue_md_theme_light_inverseSurface">#303034</color>
     <color name="blue_md_theme_light_inversePrimary">#B0C6FF</color>
-    <color name="blue_md_theme_light_surfaceDim">#DFDEE4</color>
-    <color name="blue_md_theme_light_surfaceBright">#FEFBFF</color>
-    <color name="blue_md_theme_light_surfaceContainerLowest">#FFFFFF</color>
-    <color name="blue_md_theme_light_surfaceContainerLow">#F7F5FA</color>
-    <color name="blue_md_theme_light_surfaceContainer">#F1F0F5</color>
-    <color name="blue_md_theme_light_surfaceContainerHigh">#EBE9EE</color>
-    <color name="blue_md_theme_light_surfaceContainerHighest">#E5E3E8</color>
-    <color name="blue_md_theme_light_outlineVariant">#C5C6D0</color>
     <color name="blue_md_theme_dark_primary">#B0C6FF</color>
     <color name="blue_md_theme_dark_onPrimary">#002D6F</color>
     <color name="blue_md_theme_dark_primaryContainer">#00429B</color>
@@ -67,14 +60,6 @@
     <color name="blue_md_theme_dark_inverseOnSurface">#1B1B1F</color>
     <color name="blue_md_theme_dark_inverseSurface">#E3E2E6</color>
     <color name="blue_md_theme_dark_inversePrimary">#0058CB</color>
-    <color name="blue_md_theme_dark_surfaceDim">#1B1B1F</color>
-    <color name="blue_md_theme_dark_surfaceBright">#414047</color>
-    <color name="blue_md_theme_dark_surfaceContainerLowest">#151419</color>
-    <color name="blue_md_theme_dark_surfaceContainerLow">#232227</color>
-    <color name="blue_md_theme_dark_surfaceContainer">#27262B</color>
-    <color name="blue_md_theme_dark_surfaceContainerHigh">#312F34</color>
-    <color name="blue_md_theme_dark_surfaceContainerHighest">#3B393F</color>
-    <color name="blue_md_theme_dark_outlineVariant">#44464F</color>
 
     <color name="red_md_theme_light_primary">#9F4034</color>
     <color name="red_md_theme_light_onPrimary">#FFFFFF</color>
@@ -102,14 +87,6 @@
     <color name="red_md_theme_light_inverseOnSurface">#FBEEEC</color>
     <color name="red_md_theme_light_inverseSurface">#362F2E</color>
     <color name="red_md_theme_light_inversePrimary">#FFB4A9</color>
-    <color name="red_md_theme_light_surfaceDim">#DED0CD</color>
-    <color name="red_md_theme_light_surfaceBright">#FFFBFF</color>
-    <color name="red_md_theme_light_surfaceContainerLowest">#FFFFFF</color>
-    <color name="red_md_theme_light_surfaceContainerLow">#F8F1EF</color>
-    <color name="red_md_theme_light_surfaceContainer">#F2EBE9</color>
-    <color name="red_md_theme_light_surfaceContainerHigh">#ECE5E3</color>
-    <color name="red_md_theme_light_surfaceContainerHighest">#E6DFDD</color>
-    <color name="red_md_theme_light_outlineVariant">#D8C2BE</color>
     <color name="red_md_theme_dark_primary">#FFB4A9</color>
     <color name="red_md_theme_dark_onPrimary">#61120C</color>
     <color name="red_md_theme_dark_primaryContainer">#7F291F</color>
@@ -136,14 +113,6 @@
     <color name="red_md_theme_dark_inverseOnSurface">#201A19</color>
     <color name="red_md_theme_dark_inverseSurface">#EDE0DE</color>
     <color name="red_md_theme_dark_inversePrimary">#9F4034</color>
-    <color name="red_md_theme_dark_surfaceDim">#201A19</color>
-    <color name="red_md_theme_dark_surfaceBright">#463F3D</color>
-    <color name="red_md_theme_dark_surfaceContainerLowest">#15100F</color>
-    <color name="red_md_theme_dark_surfaceContainerLow">#282220</color>
-    <color name="red_md_theme_dark_surfaceContainer">#2C2624</color>
-    <color name="red_md_theme_dark_surfaceContainerHigh">#362F2D</color>
-    <color name="red_md_theme_dark_surfaceContainerHighest">#413A38</color>
-    <color name="red_md_theme_dark_outlineVariant">#534341</color>
 
     <color name="yellow_md_theme_light_primary">#cf9b02</color>
     <color name="yellow_md_theme_light_onPrimary">#FFFFFF</color>
@@ -171,14 +140,6 @@
     <color name="yellow_md_theme_light_inverseOnSurface">#F7F0E7</color>
     <color name="yellow_md_theme_light_inverseSurface">#33302A</color>
     <color name="yellow_md_theme_light_inversePrimary">#EBC248</color>
-    <color name="yellow_md_theme_light_surfaceDim">#DED9D0</color>
-    <color name="yellow_md_theme_light_surfaceBright">#FFFBFF</color>
-    <color name="yellow_md_theme_light_surfaceContainerLowest">#FFFFFF</color>
-    <color name="yellow_md_theme_light_surfaceContainerLow">#F8F5EF</color>
-    <color name="yellow_md_theme_light_surfaceContainer">#F2EFE9</color>
-    <color name="yellow_md_theme_light_surfaceContainerHigh">#ECE9E3</color>
-    <color name="yellow_md_theme_light_surfaceContainerHighest">#E6E3DD</color>
-    <color name="yellow_md_theme_light_outlineVariant">#CFC5B4</color>
     <color name="yellow_md_theme_dark_primary">#EBC248</color>
     <color name="yellow_md_theme_dark_onPrimary">#3D2F00</color>
     <color name="yellow_md_theme_dark_primaryContainer">#584400</color>
@@ -205,14 +166,6 @@
     <color name="yellow_md_theme_dark_inverseOnSurface">#1E1B16</color>
     <color name="yellow_md_theme_dark_inverseSurface">#E8E1D9</color>
     <color name="yellow_md_theme_dark_inversePrimary">#745B00</color>
-    <color name="yellow_md_theme_dark_surfaceDim">#1E1B16</color>
-    <color name="yellow_md_theme_dark_surfaceBright">#464139</color>
-    <color name="yellow_md_theme_dark_surfaceContainerLowest">#14120D</color>
-    <color name="yellow_md_theme_dark_surfaceContainerLow">#28251F</color>
-    <color name="yellow_md_theme_dark_surfaceContainer">#2C2923</color>
-    <color name="yellow_md_theme_dark_surfaceContainerHigh">#37332C</color>
-    <color name="yellow_md_theme_dark_surfaceContainerHighest">#423E36</color>
-    <color name="yellow_md_theme_dark_outlineVariant">#4C4639</color>
 
     <color name="green_md_theme_light_primary">#3E6A00</color>
     <color name="green_md_theme_light_onPrimary">#FFFFFF</color>
@@ -240,14 +193,6 @@
     <color name="green_md_theme_light_inverseOnSurface">#F2F1E9</color>
     <color name="green_md_theme_light_inverseSurface">#30312C</color>
     <color name="green_md_theme_light_inversePrimary">#9ED75B</color>
-    <color name="green_md_theme_light_surfaceDim">#DFE0D8</color>
-    <color name="green_md_theme_light_surfaceBright">#FDFCF5</color>
-    <color name="green_md_theme_light_surfaceContainerLowest">#FFFFFF</color>
-    <color name="green_md_theme_light_surfaceContainerLow">#F7F7F0</color>
-    <color name="green_md_theme_light_surfaceContainer">#F1F1EA</color>
-    <color name="green_md_theme_light_surfaceContainerHigh">#EBEBE4</color>
-    <color name="green_md_theme_light_surfaceContainerHighest">#E5E5DE</color>
-    <color name="green_md_theme_light_outlineVariant">#C5C8BA</color>
     <color name="green_md_theme_dark_primary">#9ED75B</color>
     <color name="green_md_theme_dark_onPrimary">#1E3700</color>
     <color name="green_md_theme_dark_primaryContainer">#2E4F00</color>
@@ -274,14 +219,6 @@
     <color name="green_md_theme_dark_inverseOnSurface">#1B1C18</color>
     <color name="green_md_theme_dark_inverseSurface">#E3E3DB</color>
     <color name="green_md_theme_dark_inversePrimary">#3E6A00</color>
-    <color name="green_md_theme_dark_surfaceDim">#1B1C18</color>
-    <color name="green_md_theme_dark_surfaceBright">#41423C</color>
-    <color name="green_md_theme_dark_surfaceContainerLowest">#141510</color>
-    <color name="green_md_theme_dark_surfaceContainerLow">#23241F</color>
-    <color name="green_md_theme_dark_surfaceContainer">#272823</color>
-    <color name="green_md_theme_dark_surfaceContainerHigh">#32332D</color>
-    <color name="green_md_theme_dark_surfaceContainerHighest">#3C3D37</color>
-    <color name="green_md_theme_dark_outlineVariant">#44483D</color>
 
     <color name="purple_md_theme_light_primary">#9B3489</color>
     <color name="purple_md_theme_light_onPrimary">#FFFFFF</color>
@@ -309,14 +246,6 @@
     <color name="purple_md_theme_light_inverseOnSurface">#F8EEF1</color>
     <color name="purple_md_theme_light_inverseSurface">#342F32</color>
     <color name="purple_md_theme_light_inversePrimary">#FFACE7</color>
-    <color name="purple_md_theme_light_surfaceDim">#DED9DC</color>
-    <color name="purple_md_theme_light_surfaceBright">#FFFBFF</color>
-    <color name="purple_md_theme_light_surfaceContainerLowest">#FFFFFF</color>
-    <color name="purple_md_theme_light_surfaceContainerLow">#F8F3F6</color>
-    <color name="purple_md_theme_light_surfaceContainer">#F2EDF0</color>
-    <color name="purple_md_theme_light_surfaceContainerHigh">#ECE7EA</color>
-    <color name="purple_md_theme_light_surfaceContainerHighest">#E6E1E4</color>
-    <color name="purple_md_theme_light_outlineVariant">#D2C2CA</color>
     <color name="purple_md_theme_dark_primary">#FFACE7</color>
     <color name="purple_md_theme_dark_onPrimary">#5E0052</color>
     <color name="purple_md_theme_dark_primaryContainer">#7E186F</color>
@@ -343,14 +272,7 @@
     <color name="purple_md_theme_dark_inverseOnSurface">#1F1A1D</color>
     <color name="purple_md_theme_dark_inverseSurface">#EAE0E3</color>
     <color name="purple_md_theme_dark_inversePrimary">#9B3489</color>
-    <color name="purple_md_theme_dark_surfaceDim">#1F1A1D</color>
-    <color name="purple_md_theme_dark_surfaceBright">#453E42</color>
-    <color name="purple_md_theme_dark_surfaceContainerLowest">#151013</color>
-    <color name="purple_md_theme_dark_surfaceContainerLow">#272226</color>
-    <color name="purple_md_theme_dark_surfaceContainer">#2B262A</color>
-    <color name="purple_md_theme_dark_surfaceContainerHigh">#352F33</color>
-    <color name="purple_md_theme_dark_surfaceContainerHighest">#403A3E</color>
-    <color name="purple_md_theme_dark_outlineVariant">#4F444A</color>
+
 
     <color name="orange_md_theme_light_primary">#855400</color>
     <color name="orange_md_theme_light_onPrimary">#FFFFFF</color>
@@ -378,14 +300,6 @@
     <color name="orange_md_theme_light_inverseOnSurface">#F9EFE7</color>
     <color name="orange_md_theme_light_inverseSurface">#352F2A</color>
     <color name="orange_md_theme_light_inversePrimary">#FFB95C</color>
-    <color name="orange_md_theme_light_surfaceDim">#E0D9D2</color>
-    <color name="orange_md_theme_light_surfaceBright">#FFFBFF</color>
-    <color name="orange_md_theme_light_surfaceContainerLowest">#FFFFFF</color>
-    <color name="orange_md_theme_light_surfaceContainerLow">#F8F4EE</color>
-    <color name="orange_md_theme_light_surfaceContainer">#F2EEE8</color>
-    <color name="orange_md_theme_light_surfaceContainerHigh">#ECE8E2</color>
-    <color name="orange_md_theme_light_surfaceContainerHighest">#E6E2DC</color>
-    <color name="orange_md_theme_light_outlineVariant">#D4C4B5</color>
     <color name="orange_md_theme_dark_primary">#FFB95C</color>
     <color name="orange_md_theme_dark_onPrimary">#462A00</color>
     <color name="orange_md_theme_dark_primaryContainer">#653E00</color>
@@ -412,14 +326,6 @@
     <color name="orange_md_theme_dark_inverseOnSurface">#1F1B16</color>
     <color name="orange_md_theme_dark_inverseSurface">#EBE1D9</color>
     <color name="orange_md_theme_dark_inversePrimary">#855400</color>
-    <color name="orange_md_theme_dark_surfaceDim">#1B1B1B</color>
-    <color name="orange_md_theme_dark_surfaceBright">#414141</color>
-    <color name="orange_md_theme_dark_surfaceContainerLowest">#141414</color>
-    <color name="orange_md_theme_dark_surfaceContainerLow">#232323</color>
-    <color name="orange_md_theme_dark_surfaceContainer">#272727</color>
-    <color name="orange_md_theme_dark_surfaceContainerHigh">#313131</color>
-    <color name="orange_md_theme_dark_surfaceContainerHighest">#3B3B3B</color>
-    <color name="orange_md_theme_dark_outlineVariant">#504539</color>
 
     // Colors without comments seem to be not used
     <color name="monochrome_theme_light_primary">#616161</color>
@@ -500,4 +406,5 @@
     <color name="monochrome_theme_dark_inverseOnSurface">#404040</color>
     <color name="monochrome_theme_dark_inverseSurface">#C3C3C3</color>
     <color name="monochrome_theme_dark_inversePrimary">#707070</color>
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 97d9005e..73a4c235 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -37,17 +37,7 @@
         <item name="colorOnSurface">@color/red_md_theme_light_onSurface</item>
         <item name="colorSurfaceVariant">@color/red_md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/red_md_theme_light_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/red_md_theme_light_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/red_md_theme_light_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/red_md_theme_light_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/red_md_theme_light_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/red_md_theme_light_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/red_md_theme_light_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/red_md_theme_light_surfaceContainerHighest</item>
         <item name="colorOutline">@color/red_md_theme_light_outline</item>
-        <item name="colorOutlineVariant">@color/red_md_theme_light_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/red_md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/red_md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/red_md_theme_light_inversePrimary</item>
@@ -79,17 +69,7 @@
         <item name="colorOnSurface">@color/blue_md_theme_light_onSurface</item>
         <item name="colorSurfaceVariant">@color/blue_md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/blue_md_theme_light_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/blue_md_theme_light_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/blue_md_theme_light_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/blue_md_theme_light_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/blue_md_theme_light_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/blue_md_theme_light_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/blue_md_theme_light_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/blue_md_theme_light_surfaceContainerHighest</item>
         <item name="colorOutline">@color/blue_md_theme_light_outline</item>
-        <item name="colorOutlineVariant">@color/blue_md_theme_light_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/blue_md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/blue_md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/blue_md_theme_light_inversePrimary</item>
@@ -122,17 +102,7 @@
         <item name="colorOnSurface">@color/yellow_md_theme_light_onSurface</item>
         <item name="colorSurfaceVariant">@color/yellow_md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/yellow_md_theme_light_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/yellow_md_theme_light_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/yellow_md_theme_light_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/yellow_md_theme_light_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/yellow_md_theme_light_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/yellow_md_theme_light_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/yellow_md_theme_light_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/yellow_md_theme_light_surfaceContainerHighest</item>
         <item name="colorOutline">@color/yellow_md_theme_light_outline</item>
-        <item name="colorOutlineVariant">@color/yellow_md_theme_light_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/yellow_md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/yellow_md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/yellow_md_theme_light_inversePrimary</item>
@@ -164,17 +134,7 @@
         <item name="colorOnSurface">@color/green_md_theme_light_onSurface</item>
         <item name="colorSurfaceVariant">@color/green_md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/green_md_theme_light_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/green_md_theme_light_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/green_md_theme_light_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/green_md_theme_light_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/green_md_theme_light_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/green_md_theme_light_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/green_md_theme_light_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/green_md_theme_light_surfaceContainerHighest</item>
         <item name="colorOutline">@color/green_md_theme_light_outline</item>
-        <item name="colorOutlineVariant">@color/green_md_theme_light_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/green_md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/green_md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/green_md_theme_light_inversePrimary</item>
@@ -207,17 +167,7 @@
         <item name="colorOnSurface">@color/purple_md_theme_light_onSurface</item>
         <item name="colorSurfaceVariant">@color/purple_md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/purple_md_theme_light_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/purple_md_theme_light_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/purple_md_theme_light_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/purple_md_theme_light_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/purple_md_theme_light_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/purple_md_theme_light_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/purple_md_theme_light_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/purple_md_theme_light_surfaceContainerHighest</item>
         <item name="colorOutline">@color/purple_md_theme_light_outline</item>
-        <item name="colorOutlineVariant">@color/purple_md_theme_light_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/purple_md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/purple_md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/purple_md_theme_light_inversePrimary</item>
@@ -280,17 +230,7 @@
         <item name="colorOnSurface">@color/orange_md_theme_light_onSurface</item>
         <item name="colorSurfaceVariant">@color/orange_md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/orange_md_theme_light_onSurfaceVariant</item>
-
-        <!-- Expanded Material 3 surface roles -->
-        <item name="colorSurfaceDim">@color/orange_md_theme_light_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/orange_md_theme_light_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/orange_md_theme_light_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/orange_md_theme_light_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/orange_md_theme_light_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/orange_md_theme_light_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/orange_md_theme_light_surfaceContainerHighest</item>
         <item name="colorOutline">@color/orange_md_theme_light_outline</item>
-        <item name="colorOutlineVariant">@color/orange_md_theme_light_outlineVariant</item>
         <item name="colorOnSurfaceInverse">@color/orange_md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/orange_md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/orange_md_theme_light_inversePrimary</item>
@@ -302,4 +242,5 @@
         <item name="colorSurface">@android:color/white</item>
 
     </style>
+
 </resources>
\ No newline at end of file