diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
index 376609cd9..13a0fdc6b 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt
@@ -30,7 +30,8 @@ import org.oxycblt.auxio.util.queryAll
 /**
  * A SQLite database for managing the persistent playback state and queue.
  * Yes. I know Room exists. But that would needlessly bloat my app and has crippling bugs.
- * TODO: Improve the boundary between this and [PlaybackStateManager]
+ * TODO: Improve the boundary between this and [PlaybackStateManager]. This would be more
+ *  efficient.
  * @author OxygenCobalt
  */
 class PlaybackStateDatabase(context: Context) :
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0a9894b7d..eb545fcfe 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -5,6 +5,7 @@
     tools:context=".home.HomeFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_home_list.xml b/app/src/main/res/layout/fragment_home_list.xml
index 13c5f46f4..5f9f30419 100644
--- a/app/src/main/res/layout/fragment_home_list.xml
+++ b/app/src/main/res/layout/fragment_home_list.xml
@@ -7,6 +7,7 @@
         android:id="@+id/home_recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_artist" />
diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml
index 0e7b88446..6eb45fd77 100644
--- a/app/src/main/res/menu/menu_home.xml
+++ b/app/src/main/res/menu/menu_home.xml
@@ -38,5 +38,5 @@
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_settings"
         android:title="@string/set_title"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1361eb966..71bd78af5 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -6,7 +6,6 @@
     <color name="inactive">#404040</color>
     <color name="control">#ffffff</color>
     <color name="nav_bar">#01151515</color>
-    <color name="secondary_text">#bebebe</color>
 
     <!--
     Base color set derived from Music Player GO.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8f03c8fdb..fa79c0fdc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,32 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--
-    Sometimes we need to use the surface colors for modes that aren't the current one.
-    Colors are kept here just in case
-    -->
-    <color name="surface_day">#fffafafa</color>
-    <color name="surface_night">#ff121212</color>
-    <color name="surface_black">#ff000000</color>
+    <color name="surface_day">#fafafa</color>
+    <color name="surface_night">#202124</color>
+    <color name="surface_black">@android:color/black</color>
 
-    <!--
-    By default, colorOnSurface when applied sticks out like a sore thumb, so we
-    darken it a little so it lines up with our dark mode backgrounds.
-    Yes, this is a flagrant violation of material, but they also say that #121212 is
-    the recommended black dark color so they have no right to an opinion here.
-    -->
-    <color name="on_surface">#606060</color>
-    <color name="on_surface_black">#CDCDCD</color>
-
-    <!--
-    Typical UI colors.
-    -->
     <color name="surface">@color/surface_day</color>
     <color name="selection">#cbcbcb</color>
     <color name="control">#202020</color>
     <color name="divider">#cbcbcb</color>
     <color name="inactive">#c4c4c4</color>
     <color name="nav_bar">#01fafafa</color>
-    <color name="secondary_text">#546e7a</color>
 
     <!--
     Base color set derived from Music Player GO.
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index 13a850385..2f2d62a61 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -12,7 +12,6 @@
         <!-- Colors -->
         <item name="colorSurface">@color/surface</item>
         <item name="colorAccent">@color/design_default_color_primary</item>
-        <item name="colorOnSurface">@color/on_surface</item>
 
         <item name="colorPrimary">?attr/colorAccent</item>
         <item name="colorSecondary">?attr/colorAccent</item>
@@ -47,7 +46,6 @@
     <!-- The basic black theme derived in all black accents. -->
     <style name="Theme.Base.Black" parent="Theme.Base">
         <item name="colorSurface">@color/surface_black</item>
-        <item name="colorOnSurface">@color/on_surface_black</item>
         <item name="materialAlertDialogTheme">@style/Theme.CustomDialog.Black</item>
     </style>
 
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot0.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot0.png
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot2.png
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot3.png
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot4.png
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot5.png
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot6.png
old mode 100755
new mode 100644
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755