diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..725796fd3
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Base.V21.LightTheme" parent="Base.V7.LightTheme">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Base.LightTheme" parent="Base.V21.LightTheme" />
+
+    <style name="Base.V21.DarkTheme" parent="Base.V7.DarkTheme">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
+
+    <style name="Base.V21.BlackTheme" parent="Base.V7.BlackTheme">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
+
+</resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 3817d9c4f..316be849d 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Base.V27.DarkTheme" parent="Base.V7.DarkTheme">
-        <item name="android:navigationBarColor">@color/dark_background_color</item>
+    <style name="Base.V27.LightTheme" parent="Base.V21.LightTheme">
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="Base.LightTheme" parent="Base.V27.LightTheme" />
+
+    <style name="Base.V27.DarkTheme" parent="Base.V21.DarkTheme">
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="Base.DarkTheme" parent="Base.V27.DarkTheme" />
 
-    <style name="Base.V27.BlackTheme" parent="Base.V7.BlackTheme">
-        <item name="android:navigationBarColor">@android:color/black</item>
+    <style name="Base.V27.BlackTheme" parent="Base.V21.BlackTheme">
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="Base.BlackTheme" parent="Base.V27.BlackTheme" />
+
 </resources>
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/styles.xml
similarity index 52%
rename from app/src/main/res/values-v29/themes.xml
rename to app/src/main/res/values-v29/styles.xml
index bcbbe1bbf..2ba8a1339 100644
--- a/app/src/main/res/values-v29/themes.xml
+++ b/app/src/main/res/values-v29/styles.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Base.V29.LightTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+    <style name="Base.V29.LightTheme" parent="Base.V27.LightTheme">
         <item name="android:enforceNavigationBarContrast">false</item>
     </style>
 
     <style name="Base.LightTheme" parent="Base.V29.LightTheme" />
 
-    <style name="Base.V29.DarkTheme" parent="Base.V7.DarkTheme">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+    <style name="Base.V29.DarkTheme" parent="Base.V27.DarkTheme">
         <item name="android:enforceNavigationBarContrast">false</item>
     </style>
 
     <style name="Base.DarkTheme" parent="Base.V29.DarkTheme" />
 
-    <style name="Base.V29.BlackTheme" parent="Base.V7.BlackTheme">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+    <style name="Base.V29.BlackTheme" parent="Base.V27.BlackTheme">
         <item name="android:enforceNavigationBarContrast">false</item>
     </style>
 
     <style name="Base.BlackTheme" parent="Base.V29.BlackTheme" />
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d02924958..55cdc5936 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,9 @@
     </style>
 
     <!-- Base themes -->
-    <style name="Base.LightTheme" parent="Theme.AppCompat.DayNight.DarkActionBar" />
+    <style name="Base.V7.LightTheme" parent="Theme.AppCompat.DayNight.NoActionBar" />
+
+    <style name="Base.LightTheme" parent="Base.V7.LightTheme" />
 
     <style name="LightTheme" parent="Base.LightTheme">
         <item name="colorPrimary">@color/light_youtube_primary_color</item>