diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 17470b3c..4fc02689 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -56,5 +56,10 @@
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:/$USER_HOME$/.m2/repository/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 15546642..842bbdcb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 57
-        versionName "5.0-beta4"
+        versionName "5.0-beta5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -63,7 +63,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC-HOTFIX1"
+    //implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
+    implementation 'androidx.core:core:1.3.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.preference:preference:1.1.1'
@@ -96,10 +97,10 @@ dependencies {
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
     //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
     implementation "ru.noties.markwon:core:3.1.0"
-    implementation ("xyz.quaver:libpupil:1.3") {
+    implementation ("xyz.quaver:libpupil:1.4") {
         exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
     }
-    implementation "xyz.quaver:documentfilex:0.2.14-alpha2"
+    implementation "xyz.quaver:documentfilex:0.2.14"
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:rules:1.3.0'
diff --git a/app/libs/kotlinx-serialization-core-1.0.0-RC.jar b/app/libs/kotlinx-serialization-core-1.0.0-RC.jar
new file mode 100644
index 00000000..f4abfe48
Binary files /dev/null and b/app/libs/kotlinx-serialization-core-1.0.0-RC.jar differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a4e83a1d..435a6fc1 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -21,6 +21,7 @@
 #-renamesourcefileattribute SourceFile
 
 -dontobfuscate
+-dontoptimize
 
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep class * extends com.bumptech.glide.module.AppGlideModule {
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 03250439..d84cb238 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "5.0-beta4",
+      "versionName": "5.0-beta5",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
index f1389ee9..1ad37c1d 100644
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -97,7 +97,7 @@ class Pupil : Application() {
 
         try {
             Preferences.get<String>("download_folder").also {
-                if (Build.VERSION.SDK_INT > 19)
+                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
                     contentResolver.takePersistableUriPermission(
                         Uri.parse(it),
                         Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
diff --git a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
index 6bed712b..a43c321c 100644
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -314,6 +314,12 @@ class DownloadService : Service() {
             progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
         }
 
+        if (isCompleted(galleryID)) {
+            notificationManager.cancel(galleryID)
+            startId?.let { stopSelf(it) }
+            return@launch
+        }
+
         notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
         notify(galleryID)
 
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
index 8ad9e5ed..2b3a7240 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -981,7 +981,7 @@ class MainActivity : AppCompatActivity() {
 
         if (query.isNotEmpty() && mode != Mode.SEARCH) {
             Snackbar.make(this@MainActivity.main_recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
-                setAction(android.R.string.yes) {
+                setAction(android.R.string.ok) {
                     cancelFetch()
                     clearGalleries()
                     currentPage = 0
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index 3a9ecb0d..c82112d5 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -196,8 +196,8 @@ class ReaderActivity : AppCompatActivity() {
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when(item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when(item.itemId) {
             R.id.reader_menu_page_indicator -> {
                 val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
                 with(view.dialog_number_picker) {
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
index 131e4db9..a6b278d2 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -68,8 +68,8 @@ class SettingsActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             android.R.id.home -> onBackPressed()
         }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
index 13feb403..8dce8389 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
@@ -74,11 +74,11 @@ class LockSettingsFragment : PreferenceFragmentCompat() {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_lock_remove_message)
 
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             lockManager.remove(Lock.Type.PATTERN)
                             onResume()
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 } else {
                     val intent = Intent(requireContext(), LockActivity::class.java).apply {
@@ -107,11 +107,11 @@ class LockSettingsFragment : PreferenceFragmentCompat() {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_lock_remove_message)
 
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             lockManager.remove(Lock.Type.PIN)
                             onResume()
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 } else {
                     val intent = Intent(requireContext(), LockActivity::class.java).apply {
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
index 2364f76e..9afdb6eb 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
@@ -57,7 +57,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             if (dir.exists())
                                 dir.deleteRecursively()
 
@@ -74,7 +74,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                 }
                             }
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
                 "delete_downloads" -> {
@@ -83,7 +83,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             CoroutineScope(Dispatchers.IO).launch {
                                 job?.cancel()
                                 launch(Dispatchers.Main) {
@@ -109,18 +109,18 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                 }
                             }
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
                 "clear_history" -> {
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             histories.clear()
                             summary = context.getString(R.string.settings_clear_history_summary, histories.size)
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
                 else -> return false
diff --git a/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt b/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
index f1b30b4a..46e7b8e7 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
@@ -41,6 +41,7 @@ import java.io.FileOutputStream
 import java.io.InputStream
 import java.net.URL
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache instead")
 class Cache(context: Context) : ContextWrapper(context) {
 
diff --git a/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt b/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
index 8ff8582a..e6efcb5c 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
@@ -48,6 +48,7 @@ import java.io.File
 import java.io.IOException
 import java.util.concurrent.LinkedBlockingQueue
 
+@Suppress("DEPRECATION")
 @Deprecated("Use DownloadService instead")
 @OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
diff --git a/app/src/main/java/xyz/quaver/pupil/util/download/Metadata.kt b/app/src/main/java/xyz/quaver/pupil/util/download/Metadata.kt
index c86ffb6f..8dead901 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/download/Metadata.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/Metadata.kt
@@ -22,6 +22,7 @@ import kotlinx.serialization.Serializable
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache.Metadata instead")
 @Serializable
 data class Metadata(
diff --git a/app/src/main/java/xyz/quaver/pupil/util/file.kt b/app/src/main/java/xyz/quaver/pupil/util/file.kt
index 3dbc6bd1..7579f986 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -27,6 +27,7 @@ import java.io.FileOutputStream
 import java.lang.reflect.Array
 import java.net.URL
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache instead")
 fun getCachedGallery(context: Context, galleryID: Int) =
     File(getDownloadDirectory(context), galleryID.toString()).let {
@@ -36,6 +37,7 @@ fun getCachedGallery(context: Context, galleryID: Int) =
             File(context.cacheDir, "imageCache/$galleryID")
     }
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache instead")
 fun getDownloadDirectory(context: Context) =
     Preferences.get<String>("dl_location").let {
@@ -45,6 +47,7 @@ fun getDownloadDirectory(context: Context) =
             context.getExternalFilesDir(null)!!
     }
 
+@Suppress("DEPRECATION")
 @Deprecated("Use FileX instead")
 fun File.isParentOf(another: File) =
     another.absolutePath.startsWith(this.absolutePath)
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/util/update.kt b/app/src/main/java/xyz/quaver/pupil/util/update.kt
index 2bbb38c2..b28278fb 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -158,7 +158,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
             setTitle(R.string.update_title)
             val msg = extractReleaseNote(update, Locale.getDefault())
             setMessage(Markwon.create(context).toMarkdown(msg))
-            setPositiveButton(android.R.string.yes) { _, _ ->
+            setPositiveButton(android.R.string.ok) { _, _ ->
 
                 val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
 
@@ -181,7 +181,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
                     Preferences["update_download_id"] = it
                 }
             }
-            setNegativeButton(if (force) android.R.string.no else R.string.ignore_update) { _, _ ->
+            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
                 if (!force)
                     preferences.edit()
                         .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)