diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index 1f52179e4..ac08b310c 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -17,7 +17,6 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.Button
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index cbed8e9de..67099caf3 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -13,8 +13,6 @@
         <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:textColor">@color/black</item>
-        <item name="colorControlNormal">#101042</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -22,7 +20,7 @@
 
     </style>
 
-    <style name="Theme.Blue" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -34,8 +32,6 @@
         <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:textColor">@color/black</item>
-        <item name="android:colorButtonNormal">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -43,7 +39,7 @@
 
     </style>
 
-    <style name="Theme.Yellow" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -55,7 +51,6 @@
         <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:textColor">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -63,7 +58,7 @@
 
     </style>
 
-    <style name="Theme.Green" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -75,15 +70,13 @@
         <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:textColor">@color/black</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.Dark.NoActionBar">
+    <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
@@ -95,7 +88,6 @@
         <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:textColor">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 168885492..e0f8efdcd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,14 +12,11 @@
         <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:textColor">@color/black</item>
-        <item name="android:colorButtonNormal">@color/black</item>
-
 
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="Theme.Blue" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -31,14 +28,12 @@
         <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:textColor">@color/black</item>
-        <item name="android:colorButtonNormal">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
 
     </style>
 
-    <style name="Theme.Yellow" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -50,13 +45,12 @@
         <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:textColor">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
 
     </style>
 
-    <style name="Theme.Green" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -68,13 +62,12 @@
         <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:textColor">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
 
     </style>
 
-    <style name="Theme.Purple" parent="Theme.Material3.Dark.NoActionBar">
+    <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
@@ -86,7 +79,6 @@
         <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:textColor">@color/black</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>