diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
index 900493b50b..62ede7b291 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.notificationManager
 import uy.kohesive.injekt.injectLazy
 import java.io.File
-import java.util.concurrent.TimeUnit
+import java.util.concurrent.*
 
 class BackupNotifier(private val context: Context) {
 
@@ -82,7 +82,7 @@ class BackupNotifier(private val context: Context) {
         val builder = with(progressNotificationBuilder) {
             setContentTitle(context.getString(R.string.restoring_backup))
 
-            if (!preferences.hideNotificationContent()) {
+            if (!preferences.hideNotificationContent().get()) {
                 setContentText(content)
             }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt
index cb38eb7bcb..3296c64647 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt
@@ -79,7 +79,7 @@ class DownloadJob(val context: Context, workerParams: WorkerParameters) : Corout
     private fun checkConnectivity(): Boolean {
         return with(applicationContext) {
             if (isOnline()) {
-                val noWifi = preferences.downloadOnlyOverWifi() && !isConnectedToWifi()
+                val noWifi = preferences.downloadOnlyOverWifi().get() && !isConnectedToWifi()
                 if (noWifi) {
                     downloadManager.stopDownloads(applicationContext.getString(R.string.no_wifi_connection))
                 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
index 5795670f98..99a0ea7cc2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
@@ -87,7 +87,7 @@ internal class DownloadNotifier(private val context: Context) {
                 )
             }
 
-            if (download != null && !preferences.hideNotificationContent()) {
+            if (download != null && !preferences.hideNotificationContent().get()) {
                 val title = download.manga.title.chop(15)
                 val quotedTitle = Pattern.quote(title)
                 val name = download.chapter.preferredChapterName(context, download.manga, preferences)
@@ -138,7 +138,7 @@ internal class DownloadNotifier(private val context: Context) {
                 context.localeContext.getString(R.string.downloading_progress)
                     .format(download.downloadedImages, download.pages!!.size)
 
-            if (preferences.hideNotificationContent()) {
+            if (preferences.hideNotificationContent().get()) {
                 setContentTitle(downloadingProgressText)
             } else {
                 val title = download.manga.title.chop(15)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
index 164e8bf11a..aa58b46cd8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
@@ -84,7 +84,7 @@ class LibraryUpdateNotifier(private val context: Context) {
             Notifications.ID_LIBRARY_PROGRESS,
             progressNotificationBuilder
                 .setContentTitle("${context.getString(R.string.updating_library)} (${current + 1}/$total)")
-                .setContentText(if (preferences.hideNotificationContent()) null else manga.title)
+                .setContentText(if (preferences.hideNotificationContent().get()) null else manga.title)
                 .setProgress(total, current, false)
                 .build(),
         )
@@ -176,7 +176,7 @@ class LibraryUpdateNotifier(private val context: Context) {
         val updates = newUpdates.toMap()
         GlobalScope.launch {
             val notifications = ArrayList<Pair<Notification, Int>>()
-            if (!preferences.hideNotificationContent()) {
+            if (!preferences.hideNotificationContent().get()) {
                 updates.forEach {
                     val manga = it.key
                     val chapters = it.value
@@ -272,7 +272,7 @@ class LibraryUpdateNotifier(private val context: Context) {
                                     updates.size,
                                 ),
                             )
-                            if (!preferences.hideNotificationContent()) {
+                            if (!preferences.hideNotificationContent().get()) {
                                 setStyle(
                                     NotificationCompat.BigTextStyle()
                                         .bigText(
@@ -282,7 +282,7 @@ class LibraryUpdateNotifier(private val context: Context) {
                                         ),
                                 )
                             }
-                        } else if (!preferences.hideNotificationContent()) {
+                        } else if (!preferences.hideNotificationContent().get()) {
                             setContentText(updates.keys.first().title.chop(45))
                         }
                         priority = NotificationCompat.PRIORITY_HIGH
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
index 2fc0cca8b1..b46c2655d4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@@ -211,7 +211,7 @@ class NotificationReceiver : BroadcastReceiver() {
             val chapter = db.getChapter(it, mangaId).executeAsBlocking() ?: return
             chapter.read = true
             db.updateChapterProgress(chapter).executeAsBlocking()
-            if (preferences.removeAfterMarkedAsRead()) {
+            if (preferences.removeAfterMarkedAsRead().get()) {
                 val sourceManager: SourceManager = Injekt.get()
                 val source = sourceManager.get(manga.source) ?: return
                 downloadManager.deleteChapters(listOf(chapter), manga, source)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 6d3dda4436..9da3d5bd27 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.data.preference
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.PreferenceManager
 import com.google.android.material.color.DynamicColors
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.core.preference.Preference
@@ -57,9 +56,6 @@ operator fun <T> Preference<Set<T>>.minusAssign(item: Collection<T>) {
 
 class PreferencesHelper(val context: Context, val preferenceStore: PreferenceStore) {
 
-    @Deprecated("Use [preferenceStore] instead")
-    private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-
     fun getInt(key: String, default: Int) = preferenceStore.getInt(key, default)
     fun getStringPref(key: String, default: String = "") = preferenceStore.getString(key, default)
     fun getStringSet(key: String, default: Set<String>) = preferenceStore.getStringSet(key, default)
@@ -71,8 +67,6 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun hasDeniedA11FilePermission() = preferenceStore.getBoolean(Keys.deniedA11FilePermission, false)
 
-    fun clear() = prefs.edit().clear().apply()
-
     fun nightMode() = preferenceStore.getInt(Keys.nightMode, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
 
     fun themeDarkAmoled() = preferenceStore.getBoolean(Keys.themeDarkAmoled, false)
@@ -101,7 +95,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun colorFilterMode() = preferenceStore.getInt(Keys.colorFilterMode, 0)
 
-    fun defaultReadingMode() = prefs.getInt(Keys.defaultReadingMode, ReadingModeType.RIGHT_TO_LEFT.flagValue)
+    fun defaultReadingMode() = preferenceStore.getInt(Keys.defaultReadingMode, ReadingModeType.RIGHT_TO_LEFT.flagValue)
 
     fun defaultOrientationType() = preferenceStore.getInt(Keys.defaultOrientationType, OrientationType.FREE.flagValue)
 
@@ -164,9 +158,9 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun preloadSize() = preferenceStore.getInt(Keys.preloadSize, 6)
 
-    fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true)
+    fun autoUpdateTrack() = preferenceStore.getBoolean(Keys.autoUpdateTrack, true)
 
-    fun trackMarkedAsRead() = prefs.getBoolean(Keys.trackMarkedAsRead, false)
+    fun trackMarkedAsRead() = preferenceStore.getBoolean(Keys.trackMarkedAsRead, false)
 
     fun trackingsToAddOnline() = preferenceStore.getStringSet(Keys.trackingsToAddOnline, emptySet())
 
@@ -200,7 +194,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun appLanguage() = preferenceStore.getString("app_language", "")
 
-    fun downloadOnlyOverWifi() = prefs.getBoolean(Keys.downloadOnlyOverWifi, true)
+    fun downloadOnlyOverWifi() = preferenceStore.getBoolean(Keys.downloadOnlyOverWifi, true)
 
     fun folderPerManga() = preferenceStore.getBoolean("create_folder_per_manga", false)
 
@@ -215,7 +209,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
     fun backupInterval() = preferenceStore.getInt(Keys.backupInterval, 0)
     fun removeAfterReadSlots() = preferenceStore.getInt(Keys.removeAfterReadSlots, -1)
 
-    fun removeAfterMarkedAsRead() = prefs.getBoolean(Keys.removeAfterMarkedAsRead, false)
+    fun removeAfterMarkedAsRead() = preferenceStore.getBoolean(Keys.removeAfterMarkedAsRead, false)
 
     fun libraryUpdateInterval() = preferenceStore.getInt(Keys.libraryUpdateInterval, 24)
 
@@ -287,11 +281,11 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun autoDownloadWhileReading() = preferenceStore.getInt("auto_download_while_reading", 0)
 
-    fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -2)
+    fun defaultCategory() = preferenceStore.getInt(Keys.defaultCategory, -2)
 
-    fun skipRead() = prefs.getBoolean(Keys.skipRead, false)
+    fun skipRead() = preferenceStore.getBoolean(Keys.skipRead, false)
 
-    fun skipFiltered() = prefs.getBoolean(Keys.skipFiltered, true)
+    fun skipFiltered() = preferenceStore.getBoolean(Keys.skipFiltered, true)
 
     fun skipDupe() = preferenceStore.getBoolean("skip_dupe", false)
 
@@ -301,7 +295,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun secureScreen() = preferenceStore.getEnum("secure_screen_v2", Values.SecureScreenMode.INCOGNITO)
 
-    fun hideNotificationContent() = prefs.getBoolean(Keys.hideNotificationContent, false)
+    fun hideNotificationContent() = preferenceStore.getBoolean(Keys.hideNotificationContent, false)
 
     fun removeArticles() = preferenceStore.getBoolean(Keys.removeArticles, false)
 
@@ -395,13 +389,13 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
     // TODO: SourcePref
     fun showNsfwSources() = preferenceStore.getBoolean(Keys.showNsfwSource, true)
 
-    fun themeMangaDetails() = prefs.getBoolean(Keys.themeMangaDetails, true)
+    fun themeMangaDetails() = preferenceStore.getBoolean(Keys.themeMangaDetails, true)
 
     fun useLargeToolbar() = preferenceStore.getBoolean("use_large_toolbar", true)
 
-    fun showSeriesInShortcuts() = prefs.getBoolean(Keys.showSeriesInShortcuts, true)
-    fun showSourcesInShortcuts() = prefs.getBoolean(Keys.showSourcesInShortcuts, true)
-    fun openChapterInShortcuts() = prefs.getBoolean(Keys.openChapterInShortcuts, true)
+    fun showSeriesInShortcuts() = preferenceStore.getBoolean(Keys.showSeriesInShortcuts, true)
+    fun showSourcesInShortcuts() = preferenceStore.getBoolean(Keys.showSourcesInShortcuts, true)
+    fun openChapterInShortcuts() = preferenceStore.getBoolean(Keys.openChapterInShortcuts, true)
 
     fun incognitoMode() = preferenceStore.getBoolean(Keys.incognitoMode, false)
 
@@ -409,10 +403,10 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun sideNavMode() = preferenceStore.getInt(Keys.sideNavMode, 0)
 
-    fun appShouldAutoUpdate() = prefs.getInt(Keys.shouldAutoUpdate, AppDownloadInstallJob.ONLY_ON_UNMETERED)
+    fun appShouldAutoUpdate() = preferenceStore.getInt(Keys.shouldAutoUpdate, AppDownloadInstallJob.ONLY_ON_UNMETERED)
 
     // TODO: SourcePref
-    fun autoUpdateExtensions() = prefs.getInt(Keys.autoUpdateExtensions, AppDownloadInstallJob.ONLY_ON_UNMETERED)
+    fun autoUpdateExtensions() = preferenceStore.getInt(Keys.autoUpdateExtensions, AppDownloadInstallJob.ONLY_ON_UNMETERED)
 
     fun filterChapterByRead() = preferenceStore.getInt(Keys.defaultChapterFilterByRead, Manga.SHOW_ALL)
 
@@ -426,7 +420,7 @@ class PreferencesHelper(val context: Context, val preferenceStore: PreferenceSto
 
     fun chaptersDescAsDefault() = preferenceStore.getBoolean(Keys.chaptersDescAsDefault, true)
 
-    fun sortChapterByAscendingOrDescending() = prefs.getInt(Keys.defaultChapterSortByAscendingOrDescending, Manga.CHAPTER_SORT_DESC)
+    fun sortChapterByAscendingOrDescending() = preferenceStore.getInt(Keys.defaultChapterSortByAscendingOrDescending, Manga.CHAPTER_SORT_DESC)
 
     fun coverRatios() = preferenceStore.getStringSet(Keys.coverRatios, emptySet())
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppDownloadInstallJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppDownloadInstallJob.kt
index 5e96794c41..f9be9e0cb2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppDownloadInstallJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppDownloadInstallJob.kt
@@ -84,7 +84,7 @@ class AppDownloadInstallJob(private val context: Context, workerParams: WorkerPa
             ) {
                 return Result.failure()
             }
-            if (preferences.appShouldAutoUpdate() == ONLY_ON_UNMETERED &&
+            if (preferences.appShouldAutoUpdate().get() == ONLY_ON_UNMETERED &&
                 context.connectivityManager.isActiveNetworkMetered
             ) {
                 return Result.retry()
@@ -262,7 +262,7 @@ class AppDownloadInstallJob(private val context: Context, workerParams: WorkerPa
                 .apply {
                     if (waitUntilIdle) {
                         data.putBoolean(IDLE_RUN, true)
-                        val shouldAutoUpdate = Injekt.get<PreferencesHelper>().appShouldAutoUpdate()
+                        val shouldAutoUpdate = Injekt.get<PreferencesHelper>().appShouldAutoUpdate().get()
                         val constraints = Constraints.Builder()
                             .setRequiredNetworkType(
                                 if (shouldAutoUpdate == ALWAYS) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
index 88a4ee5904..1ee4855567 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
@@ -76,7 +76,7 @@ class AppUpdateChecker(
             }
             if (doExtrasAfterNewUpdate && result is AppUpdateResult.NewUpdate) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-                    preferences.appShouldAutoUpdate() != AppDownloadInstallJob.NEVER
+                    preferences.appShouldAutoUpdate().get() != AppDownloadInstallJob.NEVER
                 ) {
                     AppDownloadInstallJob.start(context, null, false, waitUntilIdle = true)
                 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallerJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallerJob.kt
index a6f7f0b849..ba02302aca 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallerJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallerJob.kt
@@ -129,7 +129,7 @@ class ExtensionInstallerJob(val context: Context, workerParams: WorkerParameters
         }
 
         if (showUpdatedNotification && installedExtensions.size > 0) {
-            notifier.showUpdatedNotification(installedExtensions, preferences.hideNotificationContent())
+            notifier.showUpdatedNotification(installedExtensions, preferences.hideNotificationContent().get())
         }
         if (reRunUpdateCheck || installedExtensions.size != list.size) {
             ExtensionUpdateJob.runJobAgain(context, NetworkType.CONNECTED, false)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt
index 45e29886a0..695020163e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt
@@ -84,7 +84,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam
         }
         if (ExtensionManager.canAutoInstallUpdates(true) &&
             inputData.getBoolean(RUN_AUTO, true) &&
-            preferences.autoUpdateExtensions() != AppDownloadInstallJob.NEVER &&
+            preferences.autoUpdateExtensions().get() != AppDownloadInstallJob.NEVER &&
             !ExtensionInstallerJob.isRunning(context) &&
             extensionsInstalledByApp.isNotEmpty()
         ) {
@@ -92,7 +92,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam
             val libraryServiceRunning = LibraryUpdateJob.isRunning(context)
             if (
                 (
-                    preferences.autoUpdateExtensions() == AppDownloadInstallJob.ALWAYS ||
+                    preferences.autoUpdateExtensions().get() == AppDownloadInstallJob.ALWAYS ||
                         !cm.isActiveNetworkMetered
                     ) && !libraryServiceRunning
             ) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 679329b341..7c55e5d5d8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -1665,7 +1665,7 @@ class LibraryPresenter(
         mangaList: HashMap<Manga, List<Chapter>>,
         markRead: Boolean,
     ) {
-        if (preferences.removeAfterMarkedAsRead() && markRead) {
+        if (preferences.removeAfterMarkedAsRead().get() && markRead) {
             mangaList.forEach { (manga, oldChapters) ->
                 deleteChapters(manga, oldChapters)
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt
index 991fd9c22d..994ced682e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt
@@ -152,7 +152,7 @@ class SearchActivity : MainActivity() {
             }
             SHORTCUT_MANGA, SHORTCUT_MANGA_BACK -> {
                 val extras = intent.extras ?: return false
-                if (intent.action == SHORTCUT_MANGA_BACK && preferences.openChapterInShortcuts()) {
+                if (intent.action == SHORTCUT_MANGA_BACK && preferences.openChapterInShortcuts().get()) {
                     val mangaId = extras.getLong(MangaDetailsController.MANGA_EXTRA)
                     if (mangaId != 0L) {
                         val db = Injekt.get<DatabaseHelper>()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
index 5e19f16af0..50119916d8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
@@ -249,7 +249,7 @@ class MangaDetailsController :
         binding.swipeRefresh.isRefreshing = presenter.isLoading
         binding.swipeRefresh.setOnRefreshListener { presenter.refreshAll() }
         updateToolbarTitleAlpha()
-        if (presenter.preferences.themeMangaDetails()) {
+        if (presenter.preferences.themeMangaDetails().get()) {
             setItemColors()
         }
     }
@@ -257,7 +257,7 @@ class MangaDetailsController :
     private fun setAccentColorValue(colorToUse: Int? = null) {
         val context = view?.context ?: return
         setCoverColorValue(colorToUse)
-        accentColor = if (presenter.preferences.themeMangaDetails()) {
+        accentColor = if (presenter.preferences.themeMangaDetails().get()) {
             (colorToUse ?: manga?.vibrantCoverColor)?.let {
                 val luminance = ColorUtils.calculateLuminance(it).toFloat()
                 if (if (!context.isInNightMode()) luminance > 0.4 else luminance <= 0.6) {
@@ -281,7 +281,7 @@ class MangaDetailsController :
         val colorBack = context.getResourceColor(R.attr.background)
         coverColor =
             (
-                if (presenter.preferences.themeMangaDetails()) {
+                if (presenter.preferences.themeMangaDetails().get()) {
                     (colorToUse ?: manga?.vibrantCoverColor)
                 } else {
                     ColorUtils.blendARGB(
@@ -306,7 +306,7 @@ class MangaDetailsController :
 
     private fun setRefreshStyle() {
         with(binding.swipeRefresh) {
-            if (presenter.preferences.themeMangaDetails() && accentColor != null && headerColor != null) {
+            if (presenter.preferences.themeMangaDetails().get() && accentColor != null && headerColor != null) {
                 val newColor = makeColorFrom(
                     hueOf = accentColor!!,
                     satAndLumOf = context.getResourceColor(R.attr.actionBarTintColor),
@@ -321,7 +321,7 @@ class MangaDetailsController :
 
     private fun setHeaderColorValue(colorToUse: Int? = null) {
         val context = view?.context ?: return
-        headerColor = if (presenter.preferences.themeMangaDetails()) {
+        headerColor = if (presenter.preferences.themeMangaDetails().get()) {
             (colorToUse ?: manga?.vibrantCoverColor)?.let { color ->
                 val newColor =
                     makeColorFrom(color, context.getResourceColor(R.attr.colorPrimaryVariant))
@@ -591,7 +591,7 @@ class MangaDetailsController :
                     if (bitmap != null) {
                         Palette.from(bitmap).generate {
                             if (it == null) return@generate
-                            if (presenter.preferences.themeMangaDetails()) {
+                            if (presenter.preferences.themeMangaDetails().get()) {
                                 launchUI {
                                     view.context.getResourceColor(R.attr.colorSecondary)
                                     val vibrantColor = it.getBestColor() ?: return@launchUI
@@ -1023,7 +1023,7 @@ class MangaDetailsController :
                     override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
                         super.onDismissed(transientBottomBar, event)
                         if (!undoing && !read) {
-                            if (preferences.removeAfterMarkedAsRead()) {
+                            if (preferences.removeAfterMarkedAsRead().get()) {
                                 presenter.deleteChapters(listOf(item))
                             }
                             updateTrackChapterMarkedAsRead(db, preferences, chapter, manga?.id) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
index e0040d5fbc..44977b8df2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
@@ -536,7 +536,7 @@ class MangaDetailsPresenter(
                 }
             }
             db.updateChaptersProgress(selectedChapters).executeAsBlocking()
-            if (read && deleteNow && preferences.removeAfterMarkedAsRead()) {
+            if (read && deleteNow && preferences.removeAfterMarkedAsRead().get()) {
                 deleteChapters(selectedChapters, false)
             }
             getChapters()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
index 023c2e5f92..505ea780a9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
@@ -302,7 +302,7 @@ class MangaHeaderHolder(
                 chapterBinding.chaptersTitle.text =
                     itemView.resources.getQuantityString(R.plurals.chapters_plural, count, count)
                 chapterBinding.filtersText.text = presenter.currentFilters()
-                if (adapter.preferences.themeMangaDetails()) {
+                if (adapter.preferences.themeMangaDetails().get()) {
                     val accentColor = adapter.delegate.accentColor() ?: return
                     chapterBinding.filterButton.imageTintList = ColorStateList.valueOf(accentColor)
                 }
@@ -459,7 +459,7 @@ class MangaHeaderHolder(
 
         if (!manga.initialized) return
         updateCover(manga)
-        if (adapter.preferences.themeMangaDetails()) {
+        if (adapter.preferences.themeMangaDetails().get()) {
             updateColors(false)
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index f485612190..2a755eb28e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -1224,7 +1224,7 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
         }
 
         if (noDefault && viewModel.manga?.readingModeType!! > 0 &&
-            viewModel.manga?.readingModeType!! != preferences.defaultReadingMode()
+            viewModel.manga?.readingModeType!! != preferences.defaultReadingMode().get()
         ) {
             snackbar = binding.readerLayout.snack(
                 getString(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
index acd4c3eba8..b190042d40 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
@@ -667,7 +667,7 @@ class ReaderViewModel(
      * Returns the viewer position used by this manga or the default one.
      */
     fun getMangaReadingMode(): Int {
-        val default = preferences.defaultReadingMode()
+        val default = preferences.defaultReadingMode().get()
         val manga = manga ?: return default
         val readerType = manga.defaultReaderType()
         if (manga.viewer_flags == -1) {
@@ -955,7 +955,7 @@ class ReaderViewModel(
      * will run in a background thread and errors are ignored.
      */
     private fun updateTrackChapterAfterReading(readerChapter: ReaderChapter) {
-        if (!preferences.autoUpdateTrack()) return
+        if (!preferences.autoUpdateTrack().get()) return
 
         launchIO {
             val newChapterRead = readerChapter.chapter.chapter_number
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
index 4171c25c66..7e4b851f8f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
@@ -870,7 +870,7 @@ class RecentsController(bundle: Bundle? = null) :
                     override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
                         super.onDismissed(transientBottomBar, event)
                         if (!undoing && !wasRead) {
-                            if (preferences.removeAfterMarkedAsRead()) {
+                            if (preferences.removeAfterMarkedAsRead().get()) {
                                 lastChapterId = chapter.id
                                 presenter.deleteChapter(chapter, manga)
                             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt
index f8f0107387..539c91bc02 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt
@@ -113,11 +113,11 @@ class SettingsLibraryController : SettingsLegacyController() {
                     when (catId) {
                         -2 -> context.getString(R.string.last_used)
                         -1 -> context.getString(R.string.always_ask)
-                        else -> categories.find { it.id == preferences.defaultCategory() }?.name
+                        else -> categories.find { it.id == preferences.defaultCategory().get() }?.name
                             ?: context.getString(R.string.last_used)
                     }
                 }
-                summary = categoryName(preferences.defaultCategory())
+                summary = categoryName(preferences.defaultCategory().get())
                 onChange { newValue ->
                     summary = categoryName(newValue as Int)
                     true
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
index c3ef6d7768..54a4ae2052 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
@@ -182,7 +182,7 @@ fun Manga.addOrRemoveToFavorites(
         }
 
         val categories = db.getCategories().executeAsBlocking()
-        val defaultCategoryId = preferences.defaultCategory()
+        val defaultCategoryId = preferences.defaultCategory().get()
         val defaultCategory = categories.find { it.id == defaultCategoryId }
         val lastUsedCategories = Category.lastCategoriesAddedTo.mapNotNull { catId ->
             categories.find { it.id == catId }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterFilter.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterFilter.kt
index ba5ef6c351..cda26c078f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterFilter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterFilter.kt
@@ -42,14 +42,14 @@ class ChapterFilter(val preferences: PreferencesHelper = Injekt.get(), val downl
     fun <T : Chapter> filterChaptersForReader(chapters: List<T>, manga: Manga, selectedChapter: T? = null): List<T> {
         var filteredChapters = chapters
         // if filter prefs aren't enabled don't even filter
-        if (!preferences.skipRead() && !preferences.skipFiltered() && !preferences.skipDupe().get()) {
+        if (!preferences.skipRead().get() && !preferences.skipFiltered().get() && !preferences.skipDupe().get()) {
             return filteredChapters
         }
 
-        if (preferences.skipRead()) {
+        if (preferences.skipRead().get()) {
             filteredChapters = filteredChapters.filter { !it.read }
         }
-        if (preferences.skipFiltered()) {
+        if (preferences.skipFiltered().get()) {
             filteredChapters = filterChapters(filteredChapters, manga)
         }
         if (preferences.skipDupe().get()) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt
index e673baf30a..bdadedf78d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt
@@ -62,7 +62,7 @@ fun updateTrackChapterMarkedAsRead(
     delay: Long = 3000,
     fetchTracks: (suspend () -> Unit)? = null,
 ) {
-    if (!preferences.trackMarkedAsRead()) return
+    if (!preferences.trackMarkedAsRead().get()) return
     mangaId ?: return
 
     val newChapterRead = newLastChapter?.chapter_number ?: 0f
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt
index f7289ed3d6..644cb676a7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt
@@ -39,19 +39,19 @@ class MangaShortcutManager(
         launchIO {
             with(TachiyomiWidgetManager()) { context.init() }
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1) {
-                if (!preferences.showSeriesInShortcuts() && !preferences.showSourcesInShortcuts()) {
+                if (!preferences.showSeriesInShortcuts().get() && !preferences.showSourcesInShortcuts().get()) {
                     val shortcutManager = context.getSystemService(ShortcutManager::class.java)
                     shortcutManager.removeAllDynamicShortcuts()
                     return@launchIO
                 }
                 val shortcutManager = context.getSystemService(ShortcutManager::class.java)
 
-                val recentManga = if (preferences.showSeriesInShortcuts()) {
+                val recentManga = if (preferences.showSeriesInShortcuts().get()) {
                     RecentsPresenter.getRecentManga()
                 } else {
                     emptyList()
                 }
-                val recentSources = if (preferences.showSourcesInShortcuts()) {
+                val recentSources = if (preferences.showSourcesInShortcuts().get()) {
                     preferences.lastUsedSources().get().mapNotNull {
                         val splitS = it.split(":")
                         splitS.first().toLongOrNull()?.let { id ->