diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5c2d75f35..799be6bfc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Info namespace | App labels -->
-    <string name="info_app_desc">Ein einfacher und flexibeler Musik-Player für Android</string>
+    <string name="info_app_desc">Ein einfacher und flexibeler Musik-Player für Android.</string>
     <string name="info_channel_name">Musikwiedergabe</string>
     <string name="info_service_desc">der Musikwiedergabe-Service von Auxio</string>
 
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index a842e8fcc..26a1b5a43 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base theme -->
-    <style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowBackground">@color/background</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textCursorDrawable">@drawable/ui_cursor</item>
-        <item name="android:scrollbars">none</item>
-        <item name="android:windowIsFloating">false</item>
-
+    <!-- Template theme that handles edge-to-edge on other styles variants -->
+    <style name="Theme.Template" parent="Theme.Master">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@color/nav_color</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
-
-        <item name="popupMenuStyle">@style/Widget.CustomPopup</item>
-        <item name="colorControlNormal">@color/control_color</item>
-        <item name="alertDialogTheme">@style/Theme.CustomDialog</item>
-        <item name="indicatorFastScrollerStyle">@style/FastScrollTheme</item>
-        <item name="colorControlHighlight">@color/selection_color</item>
-        <item name="colorControlActivated">?attr/colorPrimary</item>
-        <item name="cornerRadius">0dp</item>
-
-        <item name="md_background_color">@color/background</item>
-        <item name="md_corner_radius">0dp</item>
-        <item name="md_color_button_text">@color/control_color</item>
-        <item name="md_font_title">@font/inter_black</item>
     </style>
 
     <style name="Theme.BottomSheetFix" parent="@style/Theme.Design.BottomSheetDialog">
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 3cf0c4b40..5821e4039 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base theme -->
-    <style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowBackground">@color/background</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textCursorDrawable">@drawable/ui_cursor</item>
-        <item name="android:scrollbars">none</item>
-        <item name="android:windowIsFloating">false</item>
-
+    <!-- Template theme that handles edge-to-edge on other styles variants -->
+    <style name="Theme.Template" parent="Theme.Master">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@color/nav_color</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
-
-        <item name="popupMenuStyle">@style/Widget.CustomPopup</item>
-        <item name="colorControlNormal">@color/control_color</item>
-        <item name="alertDialogTheme">@style/Theme.CustomDialog</item>
-        <item name="indicatorFastScrollerStyle">@style/FastScrollTheme</item>
-        <item name="colorControlHighlight">@color/selection_color</item>
-        <item name="colorControlActivated">?attr/colorPrimary</item>
-        <item name="cornerRadius">0dp</item>
-
-        <item name="md_background_color">@color/background</item>
-        <item name="md_corner_radius">0dp</item>
-        <item name="md_color_button_text">@color/control_color</item>
-        <item name="md_font_title">@font/inter_black</item>
     </style>
 
     <style name="Theme.BottomSheetFix" parent="@style/Theme.Design.BottomSheetDialog">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d69fd299..666c27e22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Info namespace | App labels -->
-    <string name="info_app_desc">A sensible and customizable music player for Android</string>
+    <string name="info_app_desc">A sensible and customizable music player for Android.</string>
     <string name="info_channel_name">Music Playback</string>
     <string name="info_service_desc">The music playback service for Auxio</string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8bbdc871a..59bc16446 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Master parent theme based off of Theme.AppCompat.Daynight.NoActionBar [TODO: Switch to material?] -->
+    <style name="Theme.Master" parent="Theme.AppCompat.DayNight.NoActionBar" />
+    <!-- Template theme that handles edge-to-edge on other styles variants -->
+    <style name="Theme.Template" parent="Theme.Master" />
+
     <!-- Base theme -->
-    <style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Theme.Base" parent="Theme.Template">
         <item name="android:windowBackground">@color/background</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:textCursorDrawable">@drawable/ui_cursor</item>