diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 036992245..65983e430 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -11,23 +11,13 @@
     <style name="Theme.Red" parent="Theme.Material3.Dark.NoActionBar">
 
         <item name="colorPrimary">@color/red_dark_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/red_dark_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/red_dark_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/red_dark_accentLight</item>
-        //
         <item name="colorSecondary">@color/red_dark_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/red_dark_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/red_dark_accentDark</item>
-        // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/red_dark_background</item> --> // navbar
-        icon fill
         <item name="android:colorBackground">@color/red_dark_background</item>
-        // background
         <item name="colorOnBackground">@color/red_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -39,23 +29,13 @@
     <style name="Theme.Blue" parent="Theme.Material3.Dark.NoActionBar">
 
         <item name="colorPrimary">@color/blue_dark_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/blue_dark_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/blue_dark_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/blue_dark_accentLight</item>
-        //
         <item name="colorSecondary">@color/blue_dark_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/blue_dark_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/blue_dark_accentDark</item>
-        // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/blue_dark_background</item> --> // navbar
-        icon fill
         <item name="android:colorBackground">@color/blue_dark_background</item>
-        // background
         <item name="colorOnBackground">@color/blue_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -67,23 +47,13 @@
     <style name="Theme.Yellow" parent="Theme.Material3.Dark.NoActionBar">
 
         <item name="colorPrimary">@color/yellow_dark_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/yellow_dark_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/yellow_dark_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/yellow_dark_accentLight</item>
-        //
         <item name="colorSecondary">@color/yellow_dark_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/yellow_dark_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/yellow_dark_accentDark</item>
-        // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/yellow_dark_background</item> --> //
-        navbar icon fill
         <item name="android:colorBackground">@color/yellow_dark_background</item>
-        // background
         <item name="colorOnBackground">@color/yellow_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -95,23 +65,13 @@
     <style name="Theme.Green" parent="Theme.Material3.Dark.NoActionBar">
 
         <item name="colorPrimary">@color/green_dark_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/green_dark_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/green_dark_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/green_dark_accentLight</item>
-        //
         <item name="colorSecondary">@color/green_dark_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/green_dark_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/green_dark_accentDark</item>
-        // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/green_dark_background</item> --> //
-        navbar icon fill
         <item name="android:colorBackground">@color/green_dark_background</item>
-        // background
         <item name="colorOnBackground">@color/green_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
@@ -123,23 +83,13 @@
     <style name="Theme.Purple" parent="Theme.Material3.Dark.NoActionBar">
 
         <item name="colorPrimary">@color/purple_dark_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/purple_dark_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/purple_dark_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/purple_dark_accentLight</item>
-        //
         <item name="colorSecondary">@color/purple_dark_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/purple_dark_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/purple_dark_accentDark</item>
-        // navbar surround
-        <!-- <item name="colorOnSecondaryContainer">@color/purple_dark_background</item> --> //
-        navbar icon fill
         <item name="android:colorBackground">@color/purple_dark_background</item>
-        // background
         <item name="colorOnBackground">@color/purple_dark_background</item>
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
deleted file mode 100644
index 6a771a909..000000000
--- a/app/src/main/res/values-v23/themes.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="MaterialYou">
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
-    <style name="Theme.Red" parent="Theme.Material3.Light.NoActionBar">
-
-        <item name="colorPrimary">@color/red_light_accentLight</item>
-        // container
-        <item name="colorOnPrimary">@color/red_light_accentDark</item>
-        // title
-        <item name="colorPrimaryContainer">@color/red_light_accentLight</item>
-        //
-        <item name="colorOnPrimaryContainer">@color/red_light_accentLight</item>
-        //
-        <item name="colorSecondary">@color/red_light_accentLight</item>
-        // Settings Categories
-        <item name="colorOnSecondary">@color/red_light_accentDark</item>
-        //
-        <item name="colorSecondaryContainer">@color/red_light_accentDark</item>
-        // navbar surround
-        <item name="colorOnSecondaryContainer">@color/red_light_background</item>
-        // navbar icon fill
-        <item name="android:colorBackground">@color/red_light_background</item>
-        // background
-        <item name="colorOnBackground">@color/red_light_background</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
-    <style name="Theme.Blue" parent="Theme.Material3.Light.NoActionBar">
-
-        <item name="colorPrimary">@color/blue_light_accentLight</item>
-        // container
-        <item name="colorOnPrimary">@color/blue_light_accentDark</item>
-        // title
-        <item name="colorPrimaryContainer">@color/blue_light_accentLight</item>
-        //
-        <item name="colorOnPrimaryContainer">@color/blue_light_accentLight</item>
-        //
-        <item name="colorSecondary">@color/blue_light_accentLight</item>
-        // Settings Categories
-        <item name="colorOnSecondary">@color/blue_light_accentDark</item>
-        //
-        <item name="colorSecondaryContainer">@color/blue_light_accentDark</item>
-        // navbar surround
-        <item name="colorOnSecondaryContainer">@color/blue_light_background</item>
-        // navbar icon fill
-        <item name="android:colorBackground">@color/blue_light_background</item>
-        // background
-        <item name="colorOnBackground">@color/blue_light_background</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
-    <style name="Theme.Yellow" parent="Theme.Material3.Light.NoActionBar">
-
-        <item name="colorPrimary">@color/yellow_light_accentLight</item>
-        // container
-        <item name="colorOnPrimary">@color/yellow_light_accentDark</item>
-        // title
-        <item name="colorPrimaryContainer">@color/yellow_light_accentLight</item>
-        //
-        <item name="colorOnPrimaryContainer">@color/yellow_light_accentLight</item>
-        //
-        <item name="colorSecondary">@color/yellow_light_accentLight</item>
-        // Settings Categories
-        <item name="colorOnSecondary">@color/yellow_light_accentDark</item>
-        //
-        <item name="colorSecondaryContainer">@color/yellow_light_accentDark</item>
-        // navbar surround
-        <item name="colorOnSecondaryContainer">@color/yellow_light_background</item>
-        // navbar icon fill
-        <item name="android:colorBackground">@color/yellow_light_background</item>
-        // background
-        <item name="colorOnBackground">@color/yellow_light_background</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
-    <style name="Theme.Green" parent="Theme.Material3.Light.NoActionBar">
-
-        <item name="colorPrimary">@color/green_light_accentLight</item>
-        // container
-        <item name="colorOnPrimary">@color/green_light_accentDark</item>
-        // title
-        <item name="colorPrimaryContainer">@color/green_light_accentLight</item>
-        //
-        <item name="colorOnPrimaryContainer">@color/green_light_accentLight</item>
-        //
-        <item name="colorSecondary">@color/green_light_accentLight</item>
-        // Settings Categories
-        <item name="colorOnSecondary">@color/green_light_accentDark</item>
-        //
-        <item name="colorSecondaryContainer">@color/green_light_accentDark</item>
-        // navbar surround
-        <item name="colorOnSecondaryContainer">@color/green_light_background</item>
-        // navbar icon fill
-        <item name="android:colorBackground">@color/green_light_background</item>
-        // background
-        <item name="colorOnBackground">@color/green_light_background</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
-    <style name="Theme.Purple" parent="Theme.Material3.Light.NoActionBar">
-
-        <item name="colorPrimary">@color/purple_light_accentLight</item>
-        // container
-        <item name="colorOnPrimary">@color/purple_light_accentDark</item>
-        // title
-        <item name="colorPrimaryContainer">@color/purple_light_accentLight</item>
-        //
-        <item name="colorOnPrimaryContainer">@color/purple_light_accentLight</item>
-        //
-        <item name="colorSecondary">@color/purple_light_accentLight</item>
-        // Settings Categories
-        <item name="colorOnSecondary">@color/purple_light_accentDark</item>
-        //
-        <item name="colorSecondaryContainer">@color/purple_light_accentDark</item>
-        // navbar surround
-        <item name="colorOnSecondaryContainer">@color/purple_light_background</item>
-        // navbar icon fill
-        <item name="android:colorBackground">@color/purple_light_background</item>
-        // background
-        <item name="colorOnBackground">@color/purple_light_background</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
-</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 216073e05..1fe185fca 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,131 +1,105 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="MaterialYou">
+
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+    </style>
 
     <style name="Theme.Red" parent="Theme.Material3.Light.NoActionBar">
 
         <item name="colorPrimary">@color/red_light_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/red_light_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/red_light_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/red_light_accentLight</item>
-        //
         <item name="colorSecondary">@color/red_light_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/red_light_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/red_light_accentDark</item>
-        // navbar surround
         <item name="colorOnSecondaryContainer">@color/red_light_background</item>
-        // navbar icon fill
         <item name="android:colorBackground">@color/red_light_background</item>
-        // background
         <item name="colorOnBackground">@color/red_light_background</item>
 
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+
     </style>
 
     <style name="Theme.Blue" parent="Theme.Material3.Light.NoActionBar">
 
         <item name="colorPrimary">@color/blue_light_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/blue_light_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/blue_light_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/blue_light_accentLight</item>
-        //
         <item name="colorSecondary">@color/blue_light_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/blue_light_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/blue_light_accentDark</item>
-        // navbar surround
         <item name="colorOnSecondaryContainer">@color/blue_light_background</item>
-        // navbar icon fill
         <item name="android:colorBackground">@color/blue_light_background</item>
-        // background
         <item name="colorOnBackground">@color/blue_light_background</item>
 
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
     </style>
 
     <style name="Theme.Yellow" parent="Theme.Material3.Light.NoActionBar">
 
         <item name="colorPrimary">@color/yellow_light_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/yellow_light_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/yellow_light_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/yellow_light_accentLight</item>
-        //
         <item name="colorSecondary">@color/yellow_light_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/yellow_light_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/yellow_light_accentDark</item>
-        // navbar surround
         <item name="colorOnSecondaryContainer">@color/yellow_light_background</item>
-        // navbar icon fill
         <item name="android:colorBackground">@color/yellow_light_background</item>
-        // background
         <item name="colorOnBackground">@color/yellow_light_background</item>
 
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
     </style>
 
     <style name="Theme.Green" parent="Theme.Material3.Light.NoActionBar">
 
         <item name="colorPrimary">@color/green_light_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/green_light_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/green_light_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/green_light_accentLight</item>
-        //
         <item name="colorSecondary">@color/green_light_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/green_light_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/green_light_accentDark</item>
-        // navbar surround
         <item name="colorOnSecondaryContainer">@color/green_light_background</item>
-        // navbar icon fill
         <item name="android:colorBackground">@color/green_light_background</item>
-        // background
         <item name="colorOnBackground">@color/green_light_background</item>
 
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
     </style>
 
     <style name="Theme.Purple" parent="Theme.Material3.Light.NoActionBar">
 
         <item name="colorPrimary">@color/purple_light_accentLight</item>
-        // container
         <item name="colorOnPrimary">@color/purple_light_accentDark</item>
-        // title
         <item name="colorPrimaryContainer">@color/purple_light_accentLight</item>
-        //
         <item name="colorOnPrimaryContainer">@color/purple_light_accentLight</item>
-        //
         <item name="colorSecondary">@color/purple_light_accentLight</item>
-        // Settings Categories
         <item name="colorOnSecondary">@color/purple_light_accentDark</item>
-        //
         <item name="colorSecondaryContainer">@color/purple_light_accentDark</item>
-        // navbar surround
         <item name="colorOnSecondaryContainer">@color/purple_light_background</item>
-        // navbar icon fill
         <item name="android:colorBackground">@color/purple_light_background</item>
-        // background
         <item name="colorOnBackground">@color/purple_light_background</item>
 
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
     </style>