diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
index de374d160..5db250994 100644
--- a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
@@ -1,7 +1,6 @@
 package org.oxycblt.auxio
 
 import android.app.Application
-import androidx.appcompat.app.AppCompatDelegate
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.request.CachePolicy
@@ -14,9 +13,7 @@ class AuxioApp : Application(), ImageLoaderFactory {
 
         // Init SettingsManager here so that there aren't any race conditions
         // [e.g Service gets SettingsManager before activity can init SettingsManager]
-        val settingsManager = SettingsManager.init(applicationContext)
-
-        AppCompatDelegate.setDefaultNightMode(settingsManager.theme)
+        SettingsManager.init(applicationContext)
     }
 
     override fun newImageLoader(): ImageLoader {
diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index ec6145bcd..9e1f69e71 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.WindowInsets
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.databinding.DataBindingUtil
 import org.oxycblt.auxio.databinding.ActivityMainBinding
 import org.oxycblt.auxio.playback.PlaybackService
@@ -27,6 +28,8 @@ class MainActivity : AppCompatActivity() {
 
         val settingsManager = SettingsManager.getInstance()
 
+        AppCompatDelegate.setDefaultNightMode(settingsManager.theme)
+
         accent = settingsManager.accent
 
         // Apply the theme
diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index 5ff509205..0c74b57b5 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -20,6 +20,7 @@ import org.oxycblt.auxio.music.processing.MusicLoader
 /**
  * An intermediary [Fragment] that asks for the READ_EXTERNAL_STORAGE permission and runs
  * the music loading process in the background.
+ * FIXME: Leak that occurs when skipping load
  * @author OxygenCobalt
  */
 class LoadingFragment : Fragment(R.layout.fragment_loading) {
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
index 3bc0d6877..5d845a932 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
@@ -133,6 +133,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
 
         // Set up callback for system events
         systemReceiver = SystemEventReceiver()
+
         IntentFilter().apply {
             addAction(NotificationUtils.ACTION_LOOP)
             addAction(NotificationUtils.ACTION_SHUFFLE)