diff --git a/app/build.gradle b/app/build.gradle
index 78fef982f..42982e2ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     // General
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.activity:activity-ktx:1.2.0-rc01'
-    implementation 'androidx.fragment:fragment-ktx:1.3.0-beta01' // Outdated to fix "no event down from INITIALIZED" error
+    implementation 'androidx.fragment:fragment-ktx:1.3.0-rc02'
 
     // Layout
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
@@ -72,7 +72,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
     // Navigation
-    def navigation_version = "2.3.2"
+    def navigation_version = "2.3.3"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
diff --git a/app/src/main/res/layout-land/fragment_compact_playback.xml b/app/src/main/res/layout-land/fragment_compact_playback.xml
index be2383c04..573ce6b57 100644
--- a/app/src/main/res/layout-land/fragment_compact_playback.xml
+++ b/app/src/main/res/layout-land/fragment_compact_playback.xml
@@ -66,8 +66,8 @@
             android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textAlignment="viewStart"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
             app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index 93ebc3d31..3eea1ea56 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -70,13 +70,13 @@
                 android:id="@+id/playback_song"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:textAlignment="viewStart"
                 android:ellipsize="marquee"
                 android:fontFamily="@font/inter_semibold"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
                 android:singleLine="true"
                 android:text="@{song.name}"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
                 tools:text="Song Name" />
 
@@ -91,8 +91,8 @@
             android:ellipsize="end"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
             android:singleLine="true"
-            android:textAlignment="viewStart"
             android:text="@{song.album.artist.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/playback_album"
@@ -108,10 +108,10 @@
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:ellipsize="end"
-            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
             android:text="@{song.album.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
diff --git a/app/src/main/res/layout-large-land/fragment_playback.xml b/app/src/main/res/layout-large-land/fragment_playback.xml
index 7e0ce23e7..7a4a26018 100644
--- a/app/src/main/res/layout-large-land/fragment_playback.xml
+++ b/app/src/main/res/layout-large-land/fragment_playback.xml
@@ -73,12 +73,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="marquee"
-                android:textAlignment="viewStart"
                 android:fontFamily="@font/inter_semibold"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
                 android:singleLine="true"
                 android:text="@{song.name}"
+                android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
                 tools:text="Song Name" />
 
@@ -91,10 +91,10 @@
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:ellipsize="end"
-            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
             android:singleLine="true"
             android:text="@{song.album.artist.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/playback_album"
@@ -110,10 +110,10 @@
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:ellipsize="end"
-            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
             android:text="@{song.album.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index a146393f8..517f0d6a4 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -113,8 +113,8 @@
                 android:padding="@dimen/padding_medium"
                 android:text="@string/label_code"
                 android:textAlignment="viewStart"
-                app:drawableStartCompat="@drawable/ic_code"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                app:drawableStartCompat="@drawable/ic_code"
                 app:layout_constraintBottom_toTopOf="@+id/about_faq"
                 app:layout_constraintTop_toBottomOf="@+id/version_container" />
 
@@ -170,12 +170,12 @@
                 android:layout_height="wrap_content"
                 android:drawablePadding="@dimen/padding_medium"
                 android:padding="@dimen/padding_medium"
+                android:text="@string/label_author"
                 android:textAlignment="viewStart"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 app:drawableStartCompat="@drawable/ic_author"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/about_song_count"
-                android:text="@string/label_author" />
+                app:layout_constraintTop_toBottomOf="@+id/about_song_count" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index c2a77e924..36c10ad30 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -58,8 +58,8 @@
             android:fontFamily="@font/inter_semibold"
             android:singleLine="true"
             android:text="@{song.name}"
-            android:textAppearance="@style/TextAppearance.SmallHeader"
             android:textAlignment="viewStart"
+            android:textAppearance="@style/TextAppearance.SmallHeader"
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -75,8 +75,8 @@
             android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textAlignment="viewStart"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 0898fc729..6fa5e9023 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -15,7 +15,6 @@
             style="@style/Toolbar.Style"
             android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
-            android:theme="@style/Toolbar.Style.Search"
             app:menu="@menu/menu_library"
             app:title="@string/label_library" />
 
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 6a0e725c2..7a38d5af7 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -51,9 +51,9 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_small"
             android:fontFamily="@font/inter"
+            android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="?android:attr/textColorPrimary"
-            android:textAlignment="center"
             app:layout_constraintBottom_toTopOf="@+id/loading_retry_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index e7c38f0b5..11645e05f 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -82,8 +82,8 @@
             android:ellipsize="end"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
             android:singleLine="true"
-            android:textAlignment="viewStart"
             android:text="@{song.album.artist.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/playback_album"
@@ -99,10 +99,10 @@
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:layout_marginBottom="@dimen/margin_medium"
             android:ellipsize="end"
-            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
             android:text="@{song.album.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
diff --git a/app/src/main/res/layout/fragment_songs.xml b/app/src/main/res/layout/fragment_songs.xml
index aa715ce9a..0a05b159a 100644
--- a/app/src/main/res/layout/fragment_songs.xml
+++ b/app/src/main/res/layout/fragment_songs.xml
@@ -12,10 +12,9 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/song_toolbar"
-            style="@style/Toolbar.Style.Search"
+            style="@style/Toolbar.Style"
             android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
-            android:theme="@style/Toolbar.Style.Search"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_songs"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 799be6bfc..4dee34200 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -66,7 +66,7 @@
     <string name="setting_show_covers">Albumcover anzeigen</string>
     <string name="setting_show_covers_desc">Ausschalten zu Speicherverbrauch sparen</string>
     <string name="setting_quality_covers">MediaStore Cover ignorieren</string>
-    <string name="setting_quality_covers_desc">Verbesst die Albumcover Qualität, jedoch die Ladezeit und höher Speicherverbrauch beeinträchtigt</string>
+    <string name="setting_quality_covers_desc">Verbesst die Albumcover Qualität, jedoch länger Ladezeit und höher Speicherverbrauch beeinträchtigt</string>
     <string name="setting_use_alt_action">Ändere Aktionstaste verwenden</string>
     <string name="setting_use_alt_loop">Wiederholen-Aktionstaste Vorziehen</string>
     <string name="setting_use_alt_shuffle">Zufällig-Aktionstaste Vorziehen</string>
@@ -80,9 +80,9 @@
     <string name="setting_behavior">Verhalten</string>
     <string name="setting_behavior_song_playback_mode">Wenn ein Lied ausgewählt hat</string>
     <string name="setting_behavior_at_end">Wenn eine Abspielliste zu Ende ist</string>
+    <string name="setting_behavior_end_loop_pause">Weiderholen und Pausieren</string>
     <string name="setting_behavior_end_loop">Weiderholen</string>
     <string name="setting_behavior_end_stop">Halten</string>
-    <string name="setting_behavior_end_loop_pause">Weiderholen und Pausieren</string>
     <string name="setting_behavior_keep_shuffle">Shuffle-Einstellung merken</string>
     <string name="setting_behavior_keep_shuffle_desc">Lassen Zufällig an, wenn ein neues Lied anspielen</string>
     <string name="setting_behavior_rewind_prev">Zurückspulen, bevor zurück springen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cd1518174..3d2cc52d9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -57,9 +57,9 @@
     <string name="setting_audio_plug_mgt">Conexión de auriculares</string>
 
     <string name="setting_behavior">Funcionamiento</string>
+    <string name="setting_behavior_end_loop_pause">Continuar y Pausar</string>
     <string name="setting_behavior_end_stop">Detener</string>
     <string name="setting_behavior_end_loop">Continuar</string>
-    <string name="setting_behavior_end_loop_pause">Continuar y Pausar</string>
     <string name="setting_behavior_keep_shuffle">Recordar aleatorio</string>
 
     <!-- Error Namespace | Error Labels -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4a59935c1..58c6e952e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -58,9 +58,9 @@
     <string name="setting_audio_plug_mgt">Branchement du casque</string>
 
     <string name="setting_behavior">Comportement</string>
+    <string name="setting_behavior_end_loop_pause">Continuer et Pause</string>
     <string name="setting_behavior_end_stop">Arrêter</string>
     <string name="setting_behavior_end_loop">Continuer</string>
-    <string name="setting_behavior_end_loop_pause">Continuer et Pause</string>
 
     <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Pas de musique trouvée</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5efd302b5..fa6726b6b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -57,9 +57,9 @@
     <string name="setting_audio_plug_mgt">Inserimento cuffie</string>
 
     <string name="setting_behavior">Comportamento</string>
+    <string name="setting_behavior_end_loop_pause">Continua e Pause</string>
     <string name="setting_behavior_end_loop">Continua</string>
     <string name="setting_behavior_end_stop">Ferma</string>
-    <string name="setting_behavior_end_loop_pause">Continua e Pause</string>
     <string name="setting_behavior_keep_shuffle">Ricorda casuale</string>
 
     <!-- Error Namespace | Error Labels -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b99753f79..338b15fdf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -58,9 +58,9 @@
     <string name="setting_audio_plug_mgt">Headset-pluggen</string>
 
     <string name="setting_behavior">Gedrag</string>
+    <string name="setting_behavior_end_loop_pause">Herhalen en Pauzeren</string>
     <string name="setting_behavior_end_loop">Herhalen</string>
     <string name="setting_behavior_end_stop">Stoppen</string>
-    <string name="setting_behavior_end_loop_pause">Herhalen en Pauzeren</string>
 
     <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Geen muziek aangetroffen</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5ff9ca58d..0765a9b65 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -46,7 +46,7 @@
     <dimen name="text_size_detail_header_max">26sp</dimen>
     <dimen name="text_size_thumb">18sp</dimen>
     <dimen name="text_size_header">19sp</dimen>
-    <dimen name="text_size_material_button">16sp</dimen>
+    <dimen name="text_size_material_button">15sp</dimen>
     <dimen name="text_size_toolbar_header">20sp</dimen>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 666c27e22..081cb210c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,9 +80,9 @@
     <string name="setting_behavior">Behavior</string>
     <string name="setting_behavior_song_playback_mode">When a song is selected</string>
     <string name="setting_behavior_at_end">When a playlist ends</string>
+    <string name="setting_behavior_end_loop_pause">Loop and Pause</string>
     <string name="setting_behavior_end_loop">Loop</string>
     <string name="setting_behavior_end_stop">Stop</string>
-    <string name="setting_behavior_end_loop_pause">Loop and Pause</string>
     <string name="setting_behavior_keep_shuffle">Remember shuffle</string>
     <string name="setting_behavior_keep_shuffle_desc">Keep shuffle on when playing a new song</string>
     <string name="setting_behavior_rewind_prev">Rewind before skipping back</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 59bc16446..1d8e06657 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Master parent theme based off of Theme.AppCompat.Daynight.NoActionBar [TODO: Switch to material?] -->
+    <!-- Master parent theme based off of Theme.AppCompat.DayNight.NoActionBar -->
     <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" />
@@ -34,6 +34,7 @@
         <item name="popupTheme">@style/AppThemeOverlay.ToolbarPopup</item>
 
         <item name="titleTextAppearance">@style/TextAppearance.Toolbar.Header</item>
+        <item name="titleTextColor">?attr/colorPrimary</item>
     </style>
 
     <!-- Toolbar sub-style with a nav icon -->
@@ -42,11 +43,6 @@
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
 
-    <!-- Toolbar sub-style with a fix for an odd search style -->
-    <style name="Toolbar.Style.Search" parent="Toolbar.Style">
-        <item name="android:searchViewStyle">@style/Widget.AppCompat.SearchView</item>
-    </style>
-
     <!-- Toolbar popup menu -->
     <style name="AppThemeOverlay.ToolbarPopup" parent="ThemeOverlay.AppCompat.DayNight">
         <item name="android:colorBackground">@color/background</item>
@@ -56,7 +52,6 @@
     <!-- Toolbar Title EntryNames -->
     <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:fontFamily">@font/inter_black</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
         <item name="android:textSize">@dimen/text_size_toolbar_header</item>
     </style>
 
@@ -200,6 +195,7 @@
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="textAllCaps">false</item>
         <item name="cornerRadius">0dp</item>
+        
     </style>
 
     <!-- An "Unimportant" material button, used for the "Play" button -->
diff --git a/info/ADDITIONS.md b/info/ADDITIONS.md
index 400698270..a63445141 100644
--- a/info/ADDITIONS.md
+++ b/info/ADDITIONS.md
@@ -12,7 +12,11 @@ While I do like adding new behavior/UI customizations, these will be looked at m
 
 ## Feature Addtions and UI Changes
 
-These arent as likely to be accepted. As I said, I do not want Auxio to become overly bloated with features that are rarely used, therefore **I tend to only accept changes like these if I think they benefit everyone's usage of Auxio, including my own.** This does not rule out these additions, but they are not accepted as often as others. I will also hold off adding features until I'm able to implement them without disruption or strange behaviors.
+These arent as likely to be accepted. As I said, I do not want Auxio to become overly bloated with features that are rarely used, therefore I only tend to accept features that:
+
+- Benefit **my own** usage
+- Are in line with Auxio's purpose as a music player
+
+This does not rule out these additions, but they are not accepted as often as others. I will also hold off adding features until I'm able to implement them without disruption or strange behaviors.
 
 Feel free to fork Auxio to add your own feature set however.
-
diff --git a/info/FAQ.md b/info/FAQ.md
index ba029804f..4e6b255d5 100644
--- a/info/FAQ.md
+++ b/info/FAQ.md
@@ -22,11 +22,11 @@ ExoPlayer is far more flexible than the native MediaPlayer API, which allows Aux
 
 ## Why is there no black mode?
 
-Android does not support a black mode directly, only dark and light. Therefore I have to implement the mode myself, which will take some time. **I do plan to add it however.**
+Android does not support a black mode directly, only dark and light. Therefore I have to implement the mode myself, which will take some time. I plan to add it however.
 
 ## Why cant I have a custom accent?
 
-Custom accents would require some changes to the accent system in the app, which will take some time. **I do plan to add them however.**
+Custom accents would require some changes to the accent system in the app, which will take some time. I plan to add them however.
 
 ## Why are accents lighter/less saturated in dark mode?
 
@@ -42,7 +42,7 @@ I could possibly extend edge-to-edge support to earlier versions, but it would t
 
 ## Why doesnt edge-to-edge work when my phone is in landscape?
 
-The way insets work when a *phone* (Not a tablet) is in landscape mode is somewhat broken, making it extremely hard (if not impossible) to get edge-to-edge working. Therefore its mostly disabled.
+When a *phone* [Not a tablet] is in landscape, the insets meant to make the UI fit dont work properly, therefore the feature is mostly disabled.
 
 ## How can I contribute/report issues?