Release v0.12.0

Remove janky tracker icon UI
Fix RTL support
2025-06-26 11:07:51 +02:00 · 2021-08-06 15:37:42 -04:00 · 2021-08-06 14:55:45 -04:00 · 2021-08-06 14:50:51 -04:00 · 2021-08-06 14:43:33 -04:00 · 2021-08-06 14:22:04 -04:00
561 changed files with 13917 additions and 9263 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -3,7 +3,7 @@
 I acknowledge that:

 - I have updated:
-  - To the latest version of the app (stable is v0.10.12)
+  - To the latest version of the app (stable is v0.11.1)
  - All extensions
 - I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,44 +0,0 @@
---
-name: "🐞 Bug report"
-about: Report a bug
-title: "[Bug] <Write short description here>"
-labels: "bug"
---
-
-**PLEASE READ THIS**
-
-I acknowledge that:
-
- I have updated:
-  - To the latest version of the app (stable is v0.10.12)
-  - All extensions
- I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue
- I will fill out the title and the information in this template
-
-Note that the issue will be automatically closed if you do not fill out the title or requested information.
-
-**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
-
---
-
-## Device information
-* Tachiyomi version: ?
-* Android version: ?
-* Device: ?
-
-## Steps to reproduce
-1. First step
-2. Second step
-
-### Expected behavior
-This should happen.
-
-### Actual behavior
-This happened instead.
-
-## Other details
-Additional details and attachments.
-
-If you're experiencing crashes, share the crash logs from More → Settings → Advanced → Dump crash logs.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Tachiyomi help website
+  - name: ⚠️ Extension/source issue
+    url: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
+    about: Issues and requests for extensions and sources should be opened in the tachiyomi-extensions repository instead
+  - name: 📦 Tachiyomi extensions
+    url: https://tachiyomi.org/extensions
+    about: List of all available extensions with download links
+  - name: 🖥️ Tachiyomi website
    url: https://tachiyomi.org/help/
-    about: Common questions are answered here.
-  - name: Tachiyomi extensions GitHub repository
-    url: https://github.com/tachiyomiorg/tachiyomi-extensions
-    about: Issues about an extension/source/catalogue should be opened here instead.
+    about: Guides, troubleshooting, and answers to common questions
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,29 +0,0 @@
---
-name: "🌟 Feature request"
-about: Suggest a feature to improve Tachiyomi
-title: "[Feature Request] <Write short description here>"
-labels: "feature"
---
-
-**PLEASE READ THIS**
-
-I acknowledge that:
-
- I have updated:
-  - To the latest version of the app (stable is v0.10.12)
-  - All extensions
- If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue
- I will fill out the title and the information in this template
-
-Note that the issue will be automatically closed if you do not fill out the title or requested information.
-
-**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
-
---
-
-## Why/User Benefit/User Problem
-(explain why this feature should be added)
-
-## What/Requirements
-(explain how this feature would behave)
--- a/.github/ISSUE_TEMPLATE/report_issue.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@ -0,0 +1,106 @@
+name: 🐞 Issue report
+description: Report an issue in Tachiyomi
+labels: [Bug]
+body:
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
+          required: true
+        - label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
+          required: true
+        - label: I have updated the app to version **[0.11.1](https://github.com/tachiyomiorg/tachiyomi/releases/tag/v0.11.1)**.
+          required: true
+        - label: I have updated all installed extensions.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true
+
+  - type: input
+    id: tachiyomi-version
+    attributes:
+      label: Tachiyomi version
+      description: You can find your Tachiyomi version in **More → About**.
+      placeholder: |
+        Example: "0.11.1"
+    validations:
+      required: true
+
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: You can find this somewhere in your Android settings.
+      placeholder: |
+        Example: "Android 11"
+    validations:
+      required: true
+
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      description: List your device and model.
+      placeholder: |
+        Example: "Google Pixel 5"
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide an example of the issue.
+      placeholder: |
+        Example:
+          1. First step
+          2. Second step
+          3. Issue here
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: Explain what you should expect to happen.
+      placeholder: |
+        Example:
+          "This should happen..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: Explain what actually happens.
+      placeholder: |
+        Example: 
+          "This happened instead..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: crash-logs
+    attributes:
+      label: Crash logs
+      description: |
+        If you're experiencing crashes, share the crash logs from **More → Settings → Advanced** then press **Dump crash logs**.
+      placeholder: |
+        You can paste the crash logs in pure text or upload it as an attachment.
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@ -0,0 +1,39 @@
+name: ⭐ Feature request
+description: Suggest a feature to improve Tachiyomi
+labels: [Feature request]
+body:
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
+          required: true
+        - label: I have updated the app to version **[0.11.1](https://github.com/tachiyomiorg/tachiyomi/releases/tag/v0.11.1)**.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe your suggested feature
+      description: How can Tachiyomi be improved?
+      placeholder: |
+        Example:
+          "It should work like this..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
--- a/.github/ISSUE_TEMPLATE/source_issue.md
+++ b/.github/ISSUE_TEMPLATE/source_issue.md
@ -1,8 +0,0 @@
---
-name: "Extension/source/catalogue issue"
-about: "Do not open an issue here. See https://github.com/tachiyomiorg/tachiyomi-extensions"
-title: "THIS ISSUE IS IN THE WRONG REPO; SEE https://github.com/tachiyomiorg/tachiyomi-extensions"
-labels: "catalog, invalid"
---
-
-DO NOT OPEN AN ISSUE IN THIS REPO. SEE https://github.com/tachiyomiorg/tachiyomi-extensions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -22,7 +22,6 @@ jobs:
  build:
    name: Build app
    needs: check_wrapper
-    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
    runs-on: ubuntu-latest

    steps:
@ -61,6 +60,8 @@ jobs:
          set -x
          echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV

+      # TODO: need to support multiple APKs
+
      - name: Sign APK
        if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
        uses: r0adkll/sign-android-release@v1
--- a/.github/workflows/issue_closer.yml
+++ b/.github/workflows/issue_closer.yml
@ -8,21 +8,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Autoclose issues
-        uses: arkon/issue-closer-action@v3.1
+        uses: arkon/issue-closer-action@v3.4
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          rules: |
            [
-              {
-                "type": "title",
-                "regex": ".*THIS ISSUE IS IN THE WRONG REPO.*",
-                "message": "It was not opened in the correct repo, as the template mentioned."
-              },
-              {
-                "type": "title",
-                "regex": ".*<Write short description here>*",
-                "message": "The description in the title was not filled out."
-              },
              {
                "type": "body",
                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
@ -32,5 +22,11 @@ jobs:
                "type": "body",
                "regex": ".*\\* (Tachiyomi version|Android version|Device): \\?.*",
                "message": "Requested information in the template was not filled out."
+              },
+              {
+                "type": "both",
+                "regex": ".*(aniyomi|anime).*",
+                "ignoreCase": true,
+                "message": "Tachiyomi does not support anime, and has no plans to support anime. In addition Tachiyomi is not affiliated with Aniyomi https://github.com/jmir1/aniyomi"
              }
            ]
--- a/.github/workflows/issue_moderator.yml
+++ b/.github/workflows/issue_moderator.yml
@ -0,0 +1,14 @@
+name: Issue moderator
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  moderate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Moderate issues
+        uses: tachiyomiorg/issue-moderator-action@v1.1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -26,7 +26,7 @@ When creating a fork, remember to:
 - To avoid confusion with the main app:
    - Change the app name
    - Change the app icon
-    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt)
+    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubUpdateChecker.kt)
 - To avoid installation conflicts:
    - Change the `applicationId` in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts)
 - To avoid having your data polluting the main app's analytics and crash report services:
--- a/README.md
+++ b/README.md
@ -1,20 +1,20 @@
 | Build | Stable | Weekly Preview | Contribute | Support Server |
 |-------|----------|---------|------------|---------|
-| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest weekly build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) |
+| ![CI](https://github.com/tachiyomiorg/tachiyomi/workflows/CI/badge.svg?branch=dev&event=push) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest preview build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) |


 # ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
-Tachiyomi is a free and open source manga reader for Android 5.0 and above.
+Tachiyomi is a free and open source manga reader for Android 6.0 and above.

 ![screenshots of app](./.github/readme-images/screens.png)

 ## Features

 Features include:
-* Online reading from [a variety of sources](https://github.com/tachiyomiorg/tachiyomi-extensions)
-* Local reading of downloaded manga
+* Online reading from a variety of sources
+* Local reading of downloaded content
 * A configurable reader with multiple viewers, reading directions and other settings.
-* [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/) support
+* Tracker support: [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [Kitsu](https://kitsu.io/), [Shikimori](https://shikimori.one), and [Bangumi](https://bgm.tv/)
 * Categories to organize your library
 * Light and dark themes
 * Schedule updating your library for new chapters
@ -23,7 +23,7 @@ Features include:
 ## Download
 Get the app from our [releases page](https://github.com/tachiyomiorg/tachiyomi/releases).

-If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/android-app-preview/releases).
+If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/tachiyomiorg/tachiyomi-preview/releases).

 ## Issues, Feature Requests and Contributing

@ -44,7 +44,6 @@ Please make sure to read the full guidelines. Your issue may be closed without w
 * Include steps to reproduce (if not obvious from description)
 * Include screenshot (if needed)
 * If it could be device-dependent, try reproducing on another device (if possible)
-* For large logs use http://pastebin.com/ (or similar)
 * Don't group unrelated requests into one issue

 DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -8,7 +8,6 @@ plugins {
    id("com.android.application")
    id("com.mikepenz.aboutlibraries.plugin")
    kotlin("android")
-    kotlin("kapt")
    kotlin("plugin.serialization")
    id("com.github.zellius.shortcut-helper")
 }
@ -19,18 +18,19 @@ if (gradle.startParameter.taskRequests.toString().contains("Standard")) {

 shortcutHelper.setFilePath("./shortcuts.xml")

+val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86")
+
 android {
-    compileSdkVersion(AndroidConfig.compileSdk)
-    buildToolsVersion(AndroidConfig.buildTools)
+    compileSdk = AndroidConfig.compileSdk
    ndkVersion = AndroidConfig.ndk

    defaultConfig {
        applicationId = "eu.kanade.tachiyomi"
-        minSdkVersion(AndroidConfig.minSdk)
-        targetSdkVersion(AndroidConfig.targetSdk)
+        minSdk = AndroidConfig.minSdk
+        targetSdk = AndroidConfig.targetSdk
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        versionCode = 59
-        versionName = "0.10.12"
+        versionCode = 66
+        versionName = "0.12.0"

        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
        buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@ -40,35 +40,45 @@ android {
        // Please disable ACRA or use your own instance in forked versions of the project
        buildConfigField("String", "ACRA_URI", "\"https://tachiyomi.kanade.eu/crash_report\"")

-        multiDexEnabled = true
-
        ndk {
-            abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86")
+            abiFilters += SUPPORTED_ABIS
        }
    }

-    buildFeatures {
-        viewBinding = true
+    splits {
+        abi {
+            isEnable = false
+            reset()
+            include(*SUPPORTED_ABIS.toTypedArray())
+            isUniversalApk = true
+        }
    }

    buildTypes {
        named("debug") {
            versionNameSuffix = "-${getCommitCount()}"
            applicationIdSuffix = ".debug"
+
+            isShrinkResources = true
+            isMinifyEnabled = true
+            proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
+        }
+        create("debugFull") { // Debug without R8
+            initWith(getByName("debug"))
+            isShrinkResources = false
+            isMinifyEnabled = false
        }
        named("release") {
-            /*named("postprocessing") {
-                postprocessing {
-                    isObfuscate = false
-                    isOptimizeCode = true
-                    isRemoveUnusedCode = false
-                    isRemoveUnusedResources = true
-                }
-                setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
-            }*/
+            isShrinkResources = true
+            isMinifyEnabled = true
+            proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
        }
    }

+    sourceSets {
+        getByName("debugFull").res.srcDirs("src/debug/res")
+    }
+
    flavorDimensions("default")

    productFlavors {
@ -76,9 +86,6 @@ android {
            buildConfigField("boolean", "INCLUDE_UPDATER", "true")
            dimension = "default"
        }
-        create("fdroid") {
-            dimension = "default"
-        }
        create("dev") {
            resConfigs("en", "xxhdpi")
            dimension = "default"
@ -98,7 +105,11 @@ android {
        includeInApk = false
    }

-    lintOptions {
+    buildFeatures {
+        viewBinding = true
+    }
+
+    lint {
        disable("MissingTranslation", "ExtraTranslation")
        isAbortOnError = false
        isCheckReleaseBuilds = false
@ -116,35 +127,41 @@ android {

 dependencies {

+    implementation(kotlin("reflect", version = BuildPluginsVersion.KOTLIN))
+
+    val coroutinesVersion = "1.5.1"
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
+
    // Source models and interfaces from Tachiyomi 1.x
-    implementation("tachiyomi.sourceapi:source-api:1.1")
+    implementation("org.tachiyomi:source-api:1.1")

    // AndroidX libraries
    implementation("androidx.annotation:annotation:1.3.0-alpha01")
-    implementation("androidx.appcompat:appcompat:1.3.0-rc01")
+    implementation("androidx.appcompat:appcompat:1.4.0-alpha03")
    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03")
    implementation("androidx.browser:browser:1.3.0")
    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta01")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.0")
    implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
-    implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.multidex:multidex:2.0.1")
+    implementation("androidx.core:core-ktx:1.7.0-alpha01")
+    implementation("androidx.core:core-splashscreen:1.0.0-alpha01")
    implementation("androidx.preference:preference-ktx:1.1.1")
-    implementation("androidx.recyclerview:recyclerview:1.2.0")
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")

-    val lifecycleVersion = "2.3.0"
+    val lifecycleVersion = "2.4.0-alpha01"
    implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
    implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion")
    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")

    // Job scheduling
-    implementation("androidx.work:work-runtime-ktx:2.5.0")
+    implementation("androidx.work:work-runtime-ktx:2.6.0-beta01")

    // UI library
-    implementation("com.google.android.material:material:1.3.0")
+    implementation("com.google.android.material:material:1.5.0-alpha01")

-    "standardImplementation"("com.google.firebase:firebase-core:18.0.3")
+    "standardImplementation"("com.google.firebase:firebase-core:19.0.0")

    // ReactiveX
    implementation("io.reactivex:rxandroid:1.2.1")
@ -160,13 +177,13 @@ dependencies {
    implementation("com.squareup.okio:okio:2.10.0")

    // TLS 1.3 support for Android < 10
-    implementation("org.conscrypt:conscrypt-android:2.5.1")
+    implementation("org.conscrypt:conscrypt-android:2.5.2")

    // JSON
-    val kotlinSerializationVersion = "1.1.0"
+    val kotlinSerializationVersion = "1.2.2"
    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
    implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
-    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("com.google.code.gson:gson:2.8.7")
    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")

    // JavaScript engine
@ -178,16 +195,16 @@ dependencies {
    implementation("com.github.junrar:junrar:7.4.0")

    // HTML parser
-    implementation("org.jsoup:jsoup:1.13.1")
+    implementation("org.jsoup:jsoup:1.14.1")

    // Database
    implementation("androidx.sqlite:sqlite-ktx:2.1.0")
    implementation("com.github.inorichi.storio:storio-common:8be19de@aar")
    implementation("com.github.inorichi.storio:storio-sqlite:8be19de@aar")
-    implementation("io.requery:sqlite-android:3.33.0")
+    implementation("com.github.requery:sqlite-android:3.36.0")

    // Preferences
-    implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.3.4")
+    implementation("com.github.tfcporciuncula.flow-preferences:flow-preferences:1.4.0")

    // Model View Presenter
    val nucleusVersion = "3.0.0"
@ -198,47 +215,41 @@ dependencies {
    implementation("com.github.inorichi.injekt:injekt-core:65b0440")

    // Image library
-    val glideVersion = "4.12.0"
-    implementation("com.github.bumptech.glide:glide:$glideVersion")
-    implementation("com.github.bumptech.glide:okhttp3-integration:$glideVersion")
-    kapt("com.github.bumptech.glide:compiler:$glideVersion")
+    val coilVersion = "1.3.2"
+    implementation("io.coil-kt:coil:$coilVersion")
+    implementation("io.coil-kt:coil-gif:$coilVersion")

-    implementation("com.github.tachiyomiorg:subsampling-scale-image-view:547d9c0")
+    implementation("com.github.tachiyomiorg:subsampling-scale-image-view:846abe0") {
+        exclude(module = "image-decoder")
+    }
+    implementation("com.github.tachiyomiorg:image-decoder:7481a4a")

    // Logging
    implementation("com.jakewharton.timber:timber:4.7.1")

    // Crash reports
-    implementation("ch.acra:acra-http:5.7.0")
+    implementation("ch.acra:acra-http:5.8.1")

    // Sort
    implementation("com.github.gpanther:java-nat-sort:natural-comparator-1.1")

    // UI
-    implementation("com.dmitrymalkovich.android:material-design-dimens:1.4")
    implementation("com.github.dmytrodanylyk.android-process-button:library:1.0.4")
    implementation("eu.davidea:flexible-adapter:5.1.0")
    implementation("eu.davidea:flexible-adapter-ui:1.0.0")
    implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0")
    implementation("com.github.chrisbanes:PhotoView:2.3.0")
    implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0")
-    implementation("dev.chrisbanes.insetter:insetter:0.5.0")
-
-    // 3.2.0+ introduces weird UI blinking or cut off issues on some devices
-    val materialDialogsVersion = "3.1.1"
-    implementation("com.afollestad.material-dialogs:core:$materialDialogsVersion")
-    implementation("com.afollestad.material-dialogs:input:$materialDialogsVersion")
-    implementation("com.afollestad.material-dialogs:datetime:$materialDialogsVersion")
+    implementation("dev.chrisbanes.insetter:insetter:0.6.0")

    // Conductor
-    implementation("com.bluelinelabs:conductor:2.1.5")
-    implementation("com.bluelinelabs:conductor-support:2.1.5") {
-        exclude(group = "com.android.support")
-    }
-    implementation("com.github.tachiyomiorg:conductor-support-preference:2.0.1")
+    val conductorVersion = "3.0.0"
+    implementation("com.bluelinelabs:conductor:$conductorVersion")
+    implementation("com.bluelinelabs:conductor-viewpager:$conductorVersion")
+    implementation("com.github.tachiyomiorg:conductor-support-preference:$conductorVersion")

    // FlowBinding
-    val flowbindingVersion = "0.12.0"
+    val flowbindingVersion = "1.2.0"
    implementation("io.github.reactivecircus.flowbinding:flowbinding-android:$flowbindingVersion")
    implementation("io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowbindingVersion")
    implementation("io.github.reactivecircus.flowbinding:flowbinding-recyclerview:$flowbindingVersion")
@ -255,15 +266,8 @@ dependencies {

    val robolectricVersion = "3.1.4"
    testImplementation("org.robolectric:robolectric:$robolectricVersion")
-    testImplementation("org.robolectric:shadows-multidex:$robolectricVersion")
    testImplementation("org.robolectric:shadows-play-services:$robolectricVersion")

-    implementation(kotlin("reflect", version = BuildPluginsVersion.KOTLIN))
-
-    val coroutinesVersion = "1.4.3"
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
-
    // For detecting memory leaks; see https://square.github.io/leakcanary/
    // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7")
 }
@ -278,7 +282,8 @@ tasks {
            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
            "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.serialization.ExperimentalSerializationApi"
+            "-Xuse-experimental=kotlinx.serialization.ExperimentalSerializationApi",
+            "-Xuse-experimental=coil.annotation.ExperimentalCoilApi",
        )
    }

--- a/app/proguard-android-optimize.txt
+++ b/app/proguard-android-optimize.txt
@ -0,0 +1,34 @@
+-allowaccessmodification
+-dontusemixedcaseclassnames
+-verbose
+
+-keepattributes *Annotation*
+
+-keepclasseswithmembernames,includedescriptorclasses class * {
+    native <methods>;
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+  public static final ** CREATOR;
+}
+
+-keep class androidx.annotation.Keep
+
+-keep @androidx.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+    @androidx.annotation.Keep <methods>;
+}
+
+-keepclasseswithmembers class * {
+    @androidx.annotation.Keep <fields>;
+}
+
+-keepclasseswithmembers class * {
+    @androidx.annotation.Keep <init>(...);
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -1,29 +1,20 @@
 -dontobfuscate

-# Extensions may require methods unused in the core app
-dontwarn eu.kanade.tachiyomi.**
-keep class eu.kanade.tachiyomi.** { public protected private *; }
+# Keep extension's common dependencies
+-keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
+-keep,allowoptimization class androidx.preference.** { *; }
+-keep,allowoptimization class kotlin.** { public protected *; }
+-keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
+-keep,allowoptimization class okhttp3.** { public protected *; }
+-keep,allowoptimization class okio.** { public protected *; }
+-keep,allowoptimization class rx.** { public protected *; }
+-keep,allowoptimization class org.jsoup.** { public protected *; }
+-keep,allowoptimization class com.google.gson.** { public protected *; }
+-keep,allowoptimization class com.github.salomonbrys.kotson.** { public protected *; }
+-keep,allowoptimization class com.squareup.duktape.** { public protected *; }
+-keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }

-keep class org.jsoup.** { *; }
-keep class kotlin.** { *; }
-keep class okhttp3.** { *; }
-keep class com.google.gson.** { *; }
-keep class com.github.salomonbrys.kotson.** { *; }
-keep class com.squareup.duktape.** { *; }
-
-# Design library
-dontwarn com.google.android.material.**
-keep class com.google.android.material.** { *; }
-keep interface com.google.android.material.** { *; }
-keep public class com.google.android.material.R$* { *; }
-
-keep class com.hippo.image.** { *; }
-keep interface com.hippo.image.** { *; }
-keepclassmembers class * extends nucleus.presenter.Presenter {
-    <init>();
-}
-
-# RxJava 1.1.0
+##---------------Begin: proguard configuration for RxJava 1.x  ----------
 -dontwarn sun.misc.**

 -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
@ -39,30 +30,38 @@
    rx.internal.util.atomic.LinkedQueueNode consumerNode;
 }

-# ReactiveNetwork
-dontwarn com.github.pwittchen.reactivenetwork.**
-
-## GSON ##
+-dontnote rx.internal.util.PlatformDependent
+##---------------End: proguard configuration for RxJava 1.x  ----------

+##---------------Begin: proguard configuration for Gson  ----------
 # Gson uses generic type information stored in a class file when working with fields. Proguard
 # removes such information by default, so configure it to keep all of it.
 -keepattributes Signature

-# Gson specific classes
-keep class sun.misc.Unsafe { *; }
+# For using GSON @Expose annotation
+-keepattributes *Annotation*

-# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# Gson specific classes
+-dontwarn sun.misc.**
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
 -keep class * implements com.google.gson.TypeAdapterFactory
 -keep class * implements com.google.gson.JsonSerializer
 -keep class * implements com.google.gson.JsonDeserializer

+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+##---------------End: proguard configuration for Gson  ----------

-## kotlinx.serialization ##
-
+##---------------Begin: proguard configuration for kotlinx.serialization  ----------
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations

+# kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
 -keepclassmembers class kotlinx.serialization.json.** {
    *** Companion;
 }
@ -77,3 +76,9 @@
 -keepclasseswithmembers class eu.kanade.tachiyomi.** {
    kotlinx.serialization.KSerializer serializer(...);
 }
+
+-keep class kotlinx.serialization.**
+-keepclassmembers class kotlinx.serialization.** {
+    <methods>;
+}
+##---------------End: proguard configuration for kotlinx.serialization  ----------
--- a/app/shortcuts.xml
+++ b/app/shortcuts.xml
@ -17,7 +17,7 @@
        android:shortcutDisabledMessage="@string/app_not_available"
        android:shortcutId="show_recently_updated"
        android:shortcutLongLabel="@string/label_recent_updates"
-        android:shortcutShortLabel="@string/short_recent_updates">
+        android:shortcutShortLabel="@string/label_recent_updates">
        <intent
            android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
--- a/app/src/debug/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/debug/res/drawable/ic_launcher_foreground.xml
@ -1,34 +1,27 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="108.0"
-        android:viewportHeight="108.0">
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108.0"
+    android:viewportHeight="108.0">
    <path
        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
-        android:fillType="evenOdd"
        android:fillColor="#000"/>
    <path
        android:pathData="M14.5,7L86.5,7A7,7 0,0 1,93.5 14L93.5,95A7,7 0,0 1,86.5 102L14.5,102A7,7 0,0 1,7.5 95L7.5,14A7,7 0,0 1,14.5 7z"
-        android:fillType="evenOdd"
        android:fillColor="#455A64"/>
    <path
        android:pathData="M7.5,12.01C7.5,9.24 9.74,7 12.5,7L17.5,7L17.5,102L12.5,102C9.74,102 7.5,99.77 7.5,96.99L7.5,12.01Z"
-        android:fillType="evenOdd"
        android:fillColor="#607D8B"/>
    <path
        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
-        android:fillType="evenOdd"
        android:fillColor="#000"/>
    <path
        android:pathData="M54,54.5m-25.5,0a25.5,25.5 0,1 1,51 0a25.5,25.5 0,1 1,-51 0"
-        android:fillType="evenOdd"
        android:fillColor="#CE2828"/>
    <path
        android:pathData="M54,54.5m-19.94,0a19.94,19.94 0,1 1,39.87 0a19.94,19.94 0,1 1,-39.87 0"
-        android:fillType="evenOdd"
        android:fillColor="#FFF"/>
    <path
        android:pathData="M52.04,46.3L47.42,46.3C46.14,46.3 44.93,46.23 44.2,46.14L44.2,49.76C45,49.65 46.16,49.6 47.42,49.6L60.58,49.6C61.86,49.6 63.02,49.65 63.82,49.76L63.82,46.14C63.09,46.23 61.86,46.3 60.58,46.3L55.69,46.3L55.69,45.07C55.69,44.43 55.73,43.95 55.82,43.45L51.9,43.45C51.99,44 52.04,44.43 52.04,45.07L52.04,46.3ZM46.78,60.68C45.46,60.68 44.29,60.63 43.45,60.52L43.45,64.14C44.34,64.03 45.46,63.98 46.78,63.98L61.29,63.98C62.57,63.98 63.71,64.03 64.57,64.14L64.57,60.52C63.73,60.63 62.57,60.68 61.29,60.68L58.24,60.68C59.33,58.06 59.99,56.23 60.7,53.91C61.34,51.81 61.34,51.81 61.56,51.13L57.58,50.06C57.51,50.93 57.37,51.52 56.89,53.41C56.19,56.14 55.32,58.74 54.5,60.68L46.78,60.68ZM46.48,51.36C47.55,54.02 48.28,56.53 49.03,60.15L52.66,58.9C51.65,54.98 50.92,52.66 49.94,50.11L46.48,51.36Z"
-        android:fillType="evenOdd"
        android:fillColor="#000"/>
 </vector>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -23,8 +23,7 @@

    <application
        android:name=".App"
-        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
+        android:allowBackup="false"
        android:hardwareAccelerated="true"
        android:hasFragileUserData="true"
        android:icon="@mipmap/ic_launcher"
@ -32,12 +31,15 @@
        android:largeHeap="true"
        android:requestLegacyExternalStorage="true"
        android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Theme.Base"
+        android:theme="@style/Theme.Tachiyomi"
+        android:supportsRtl="true"
        android:networkSecurityConfig="@xml/network_security_config">
+
        <activity
            android:name=".ui.main.MainActivity"
            android:launchMode="singleTop"
-            android:theme="@style/Theme.Splash">
+            android:theme="@style/Theme.Tachiyomi.SplashScreen"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
@ -51,7 +53,8 @@
            android:name=".ui.main.DeepLinkActivity"
            android:launchMode="singleTask"
            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/action_global_search">
+            android:label="@string/action_global_search"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.SEARCH" />
                <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
@ -72,9 +75,11 @@
                android:name="android.app.searchable"
                android:resource="@xml/searchable" />
        </activity>
+
        <activity
            android:name=".ui.reader.ReaderActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="false">
            <intent-filter>
                <action android:name="com.samsung.android.support.REMOTE_ACTION" />
            </intent-filter>
@ -82,15 +87,26 @@
            <meta-data android:name="com.samsung.android.support.REMOTE_ACTION"
                android:resource="@xml/s_pen_actions"/>
        </activity>
+
        <activity
-            android:name=".ui.security.BiometricUnlockActivity"
-            android:theme="@style/Theme.Base" />
+            android:name=".ui.security.UnlockActivity"
+            android:theme="@style/Theme.Tachiyomi"
+            android:exported="false" />
+
        <activity
            android:name=".ui.webview.WebViewActivity"
-            android:configChanges="uiMode|orientation|screenSize" />
+            android:configChanges="uiMode|orientation|screenSize"
+            android:exported="false" />
+
+        <activity
+            android:name=".extension.util.ExtensionInstallActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="false" />
+
        <activity
            android:name=".ui.setting.track.AnilistLoginActivity"
-            android:label="Anilist">
+            android:label="Anilist"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@ -104,7 +120,8 @@
        </activity>
        <activity
            android:name=".ui.setting.track.MyAnimeListLoginActivity"
-            android:label="MyAnimeList">
+            android:label="MyAnimeList"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@ -118,7 +135,8 @@
        </activity>
        <activity
            android:name=".ui.setting.track.ShikimoriLoginActivity"
-            android:label="Shikimori">
+            android:label="Shikimori"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@ -132,7 +150,8 @@
        </activity>
        <activity
            android:name=".ui.setting.track.BangumiLoginActivity"
-            android:label="Bangumi">
+            android:label="Bangumi"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@ -145,20 +164,6 @@
            </intent-filter>
        </activity>

-        <activity
-            android:name=".extension.util.ExtensionInstallActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
        <receiver
            android:name=".data.notification.NotificationReceiver"
            android:exported="false" />
@ -183,6 +188,16 @@
            android:name=".data.backup.BackupRestoreService"
            android:exported="false" />

+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
    </application>

 </manifest>
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@ -1,40 +1,54 @@
 package eu.kanade.tachiyomi

+import android.app.ActivityManager
 import android.app.Application
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.res.Configuration
+import android.content.Intent
+import android.content.IntentFilter
 import android.os.Build
+import android.webkit.WebView
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.getSystemService
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.multidex.MultiDex
+import androidx.lifecycle.lifecycleScope
+import coil.ImageLoader
+import coil.ImageLoaderFactory
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import eu.kanade.tachiyomi.data.coil.ByteBufferFetcher
+import eu.kanade.tachiyomi.data.coil.MangaCoverFetcher
+import eu.kanade.tachiyomi.data.coil.TachiyomiImageDecoder
 import eu.kanade.tachiyomi.data.notification.Notifications
+import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.asImmediateFlow
+import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
-import eu.kanade.tachiyomi.util.system.LocaleHelper
-import org.acra.ACRA
-import org.acra.annotation.AcraCore
-import org.acra.annotation.AcraHttpSender
+import eu.kanade.tachiyomi.util.system.notification
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.acra.config.httpSender
+import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
 import org.conscrypt.Conscrypt
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.security.Security

-@AcraCore(
-    buildConfigClass = BuildConfig::class,
-    excludeMatchingSharedPreferencesKeys = [".*username.*", ".*password.*", ".*token.*"]
-)
-@AcraHttpSender(
-    uri = BuildConfig.ACRA_URI,
-    httpMethod = HttpSender.Method.PUT
-)
-open class App : Application(), LifecycleObserver {
+open class App : Application(), LifecycleObserver, ImageLoaderFactory {

    private val preferences: PreferencesHelper by injectLazy()

+    private val disableIncognitoReceiver = DisableIncognitoReceiver()
+
    override fun onCreate() {
        super.onCreate()
        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
@ -44,27 +58,75 @@ open class App : Application(), LifecycleObserver {
            Security.insertProviderAt(Conscrypt.newProvider(), 1)
        }

+        // Avoid potential crashes
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val process = getProcessName()
+            if (packageName != process) WebView.setDataDirectorySuffix(process)
+        }
+
        Injekt.importModule(AppModule(this))

        setupAcra()
        setupNotificationChannels()

-        LocaleHelper.updateConfiguration(this, resources.configuration)
-
        ProcessLifecycleOwner.get().lifecycle.addObserver(this)

-        // Reset Incognito Mode on relaunch
-        preferences.incognitoMode().set(false)
+        // Show notification to disable Incognito Mode when it's enabled
+        preferences.incognitoMode().asFlow()
+            .onEach { enabled ->
+                val notificationManager = NotificationManagerCompat.from(this)
+                if (enabled) {
+                    disableIncognitoReceiver.register()
+                    val notification = notification(Notifications.CHANNEL_INCOGNITO_MODE) {
+                        setContentTitle(getString(R.string.pref_incognito_mode))
+                        setContentText(getString(R.string.notification_incognito_text))
+                        setSmallIcon(R.drawable.ic_glasses_24dp)
+                        setOngoing(true)
+
+                        val pendingIntent = PendingIntent.getBroadcast(
+                            this@App,
+                            0,
+                            Intent(ACTION_DISABLE_INCOGNITO_MODE),
+                            PendingIntent.FLAG_ONE_SHOT
+                        )
+                        setContentIntent(pendingIntent)
+                    }
+                    notificationManager.notify(Notifications.ID_INCOGNITO_MODE, notification)
+                } else {
+                    disableIncognitoReceiver.unregister()
+                    notificationManager.cancel(Notifications.ID_INCOGNITO_MODE)
+                }
+            }
+            .launchIn(ProcessLifecycleOwner.get().lifecycleScope)
+
+        preferences.themeMode()
+            .asImmediateFlow {
+                AppCompatDelegate.setDefaultNightMode(
+                    when (it) {
+                        PreferenceValues.ThemeMode.light -> AppCompatDelegate.MODE_NIGHT_NO
+                        PreferenceValues.ThemeMode.dark -> AppCompatDelegate.MODE_NIGHT_YES
+                        PreferenceValues.ThemeMode.system -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+                    }
+                )
+            }.launchIn(ProcessLifecycleOwner.get().lifecycleScope)
    }

-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        LocaleHelper.updateConfiguration(this, newConfig, true)
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(this).apply {
+            componentRegistry {
+                add(TachiyomiImageDecoder(this@App.resources))
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    add(ImageDecoderDecoder(this@App))
+                } else {
+                    add(GifDecoder())
+                }
+                add(ByteBufferFetcher())
+                add(MangaCoverFetcher())
+            }
+            okHttpClient(Injekt.get<NetworkHelper>().coilClient)
+            crossfade(300)
+            allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
+        }.build()
    }

    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
@ -77,11 +139,45 @@ open class App : Application(), LifecycleObserver {

    protected open fun setupAcra() {
        if (BuildConfig.FLAVOR != "dev") {
-            ACRA.init(this)
+            initAcra {
+                buildConfigClass = BuildConfig::class.java
+                excludeMatchingSharedPreferencesKeys = arrayOf(".*username.*", ".*password.*", ".*token.*")
+
+                httpSender {
+                    uri = BuildConfig.ACRA_URI
+                    httpMethod = HttpSender.Method.PUT
+                }
+            }
        }
    }

    protected open fun setupNotificationChannels() {
        Notifications.createChannels(this)
    }
+
+    private inner class DisableIncognitoReceiver : BroadcastReceiver() {
+        private var registered = false
+
+        override fun onReceive(context: Context, intent: Intent) {
+            preferences.incognitoMode().set(false)
+        }
+
+        fun register() {
+            if (!registered) {
+                registerReceiver(this, IntentFilter(ACTION_DISABLE_INCOGNITO_MODE))
+                registered = true
+            }
+        }
+
+        fun unregister() {
+            if (registered) {
+                unregisterReceiver(this)
+                registered = false
+            }
+        }
+    }
+
+    companion object {
+        private const val ACTION_DISABLE_INCOGNITO_MODE = "tachi.action.DISABLE_INCOGNITO_MODE"
+    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
@ -1,8 +1,7 @@
 package eu.kanade.tachiyomi

 import android.app.Application
-import android.os.Handler
-import com.google.gson.Gson
+import androidx.core.content.ContextCompat
 import eu.kanade.tachiyomi.data.cache.ChapterCache
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@ -42,12 +41,10 @@ class AppModule(val app: Application) : InjektModule {

        addSingletonFactory { TrackManager(app) }

-        addSingletonFactory { Gson() }
-
        addSingletonFactory { Json { ignoreUnknownKeys = true } }

        // Asynchronously init expensive components for a faster cold start
-        Handler().post {
+        ContextCompat.getMainExecutor(app).execute {
            get<PreferencesHelper>()

            get<NetworkHelper>()
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@ -12,6 +12,9 @@ import eu.kanade.tachiyomi.data.updater.UpdaterJob
 import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
 import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
 import eu.kanade.tachiyomi.ui.library.LibrarySort
+import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
+import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
 import uy.kohesive.injekt.Injekt
@ -95,9 +98,15 @@ object Migrations {
            }
            if (oldVersion < 44) {
                // Reset sorting preference if using removed sort by source
+                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+
+                val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
+
                @Suppress("DEPRECATION")
-                if (preferences.librarySortingMode().get() == LibrarySort.SOURCE) {
-                    preferences.librarySortingMode().set(LibrarySort.ALPHA)
+                if (oldSortingMode == LibrarySort.SOURCE) {
+                    prefs.edit {
+                        putInt(PreferenceKeys.librarySortingMode, LibrarySort.ALPHA)
+                    }
                }
            }
            if (oldVersion < 52) {
@ -142,13 +151,92 @@ object Migrations {
            }
            if (oldVersion < 59) {
                // Reset rotation to Free after replacing Lock
-                preferences.rotation().set(1)
+                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+                if (prefs.contains("pref_rotation_type_key")) {
+                    prefs.edit {
+                        putInt("pref_rotation_type_key", 1)
+                    }
+                }

                // Disable update check for Android 5.x users
                if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
                    UpdaterJob.cancelTask(context)
                }
            }
+            if (oldVersion < 60) {
+                // Re-enable update check that was prevously accidentally disabled for M
+                if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
+                    UpdaterJob.setupTask(context)
+                }
+
+                // Migrate Rotation and Viewer values to default values for viewer_flags
+                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+                val newOrientation = when (prefs.getInt("pref_rotation_type_key", 1)) {
+                    1 -> OrientationType.FREE.flagValue
+                    2 -> OrientationType.PORTRAIT.flagValue
+                    3 -> OrientationType.LANDSCAPE.flagValue
+                    4 -> OrientationType.LOCKED_PORTRAIT.flagValue
+                    5 -> OrientationType.LOCKED_LANDSCAPE.flagValue
+                    else -> OrientationType.FREE.flagValue
+                }
+
+                // Reading mode flag and prefValue is the same value
+                val newReadingMode = prefs.getInt("pref_default_viewer_key", 1)
+
+                prefs.edit {
+                    putInt("pref_default_orientation_type_key", newOrientation)
+                    remove("pref_rotation_type_key")
+                    putInt("pref_default_reading_mode_key", newReadingMode)
+                    remove("pref_default_viewer_key")
+                }
+            }
+            if (oldVersion < 61) {
+                // Handle removed every 1 or 2 hour library updates
+                val updateInterval = preferences.libraryUpdateInterval().get()
+                if (updateInterval == 1 || updateInterval == 2) {
+                    preferences.libraryUpdateInterval().set(3)
+                    LibraryUpdateJob.setupTask(context, 3)
+                }
+            }
+            if (oldVersion < 64) {
+                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+
+                val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
+                val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true)
+
+                @Suppress("DEPRECATION")
+                val newSortingMode = when (oldSortingMode) {
+                    LibrarySort.ALPHA -> SortModeSetting.ALPHABETICAL
+                    LibrarySort.LAST_READ -> SortModeSetting.LAST_READ
+                    LibrarySort.LAST_CHECKED -> SortModeSetting.LAST_CHECKED
+                    LibrarySort.UNREAD -> SortModeSetting.UNREAD
+                    LibrarySort.TOTAL -> SortModeSetting.TOTAL_CHAPTERS
+                    LibrarySort.LATEST_CHAPTER -> SortModeSetting.LATEST_CHAPTER
+                    LibrarySort.CHAPTER_FETCH_DATE -> SortModeSetting.DATE_FETCHED
+                    LibrarySort.DATE_ADDED -> SortModeSetting.DATE_ADDED
+                    else -> SortModeSetting.ALPHABETICAL
+                }
+
+                val newSortingDirection = when (oldSortingDirection) {
+                    true -> SortDirectionSetting.ASCENDING
+                    else -> SortDirectionSetting.DESCENDING
+                }
+
+                prefs.edit(commit = true) {
+                    remove(PreferenceKeys.librarySortingMode)
+                    remove(PreferenceKeys.librarySortingDirection)
+                }
+
+                prefs.edit {
+                    putString(PreferenceKeys.librarySortingMode, newSortingMode.name)
+                    putString(PreferenceKeys.librarySortingDirection, newSortingDirection.name)
+                }
+            }
+            if (oldVersion < 65) {
+                if (preferences.lang().get() in listOf("en-US", "en-GB")) {
+                    preferences.lang().set("en")
+                }
+            }
            return true
        }

--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt
@ -8,7 +8,6 @@ object BackupConst {
    const val EXTRA_URI = "$ID.$NAME.EXTRA_URI"
    const val EXTRA_FLAGS = "$ID.$NAME.EXTRA_FLAGS"
    const val EXTRA_MODE = "$ID.$NAME.EXTRA_MODE"
-    const val EXTRA_TYPE = "$ID.$NAME.EXTRA_TYPE"

    const val BACKUP_TYPE_LEGACY = 0
    const val BACKUP_TYPE_FULL = 1
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
@ -10,7 +10,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.backup.full.FullBackupManager
-import eu.kanade.tachiyomi.data.backup.legacy.LegacyBackupManager
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.isServiceRunning
@ -48,12 +47,11 @@ class BackupCreateService : Service() {
         * @param uri path of Uri
         * @param flags determines what to backup
         */
-        fun start(context: Context, uri: Uri, flags: Int, type: Int) {
+        fun start(context: Context, uri: Uri, flags: Int) {
            if (!isRunning(context)) {
                val intent = Intent(context, BackupCreateService::class.java).apply {
                    putExtra(BackupConst.EXTRA_URI, uri)
                    putExtra(BackupConst.EXTRA_FLAGS, flags)
-                    putExtra(BackupConst.EXTRA_TYPE, type)
                }
                ContextCompat.startForegroundService(context, intent)
            }
@ -101,17 +99,11 @@ class BackupCreateService : Service() {
        if (intent == null) return START_NOT_STICKY

        try {
-            val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)
+            val uri = intent.getParcelableExtra<Uri>(BackupConst.EXTRA_URI)!!
            val backupFlags = intent.getIntExtra(BackupConst.EXTRA_FLAGS, 0)
-            val backupType = intent.getIntExtra(BackupConst.EXTRA_TYPE, BackupConst.BACKUP_TYPE_LEGACY)
-            val backupManager = when (backupType) {
-                BackupConst.BACKUP_TYPE_FULL -> FullBackupManager(this)
-                else -> LegacyBackupManager(this)
-            }
-
-            val backupFileUri = backupManager.createBackup(uri, backupFlags, false)?.toUri()
+            val backupFileUri = FullBackupManager(this).createBackup(uri, backupFlags, false)?.toUri()
            val unifile = UniFile.fromUri(this, backupFileUri)
-            notifier.showBackupComplete(unifile, backupType == BackupConst.BACKUP_TYPE_LEGACY)
+            notifier.showBackupComplete(unifile)
        } catch (e: Exception) {
            notifier.showBackupError(e.message)
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt
@ -8,7 +8,6 @@ import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import eu.kanade.tachiyomi.data.backup.full.FullBackupManager
-import eu.kanade.tachiyomi.data.backup.legacy.LegacyBackupManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -23,9 +22,6 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
        val flags = BackupCreateService.BACKUP_ALL
        return try {
            FullBackupManager(context).createBackup(uri, flags, true)
-            if (preferences.createLegacyBackup().get()) {
-                LegacyBackupManager(context).createBackup(uri, flags, true)
-            }
            Result.success()
        } catch (e: Exception) {
            Result.failure()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
@ -60,7 +60,7 @@ class BackupNotifier(private val context: Context) {
        }
    }

-    fun showBackupComplete(unifile: UniFile, isLegacyFormat: Boolean) {
+    fun showBackupComplete(unifile: UniFile) {
        context.notificationManager.cancel(Notifications.ID_BACKUP_PROGRESS)

        with(completeNotificationBuilder) {
@ -73,7 +73,7 @@ class BackupNotifier(private val context: Context) {
            addAction(
                R.drawable.ic_share_24dp,
                context.getString(R.string.action_share),
-                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, isLegacyFormat, Notifications.ID_BACKUP_COMPLETE)
+                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE)
            )

            show(Notifications.ID_BACKUP_COMPLETE)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@ -96,7 +96,7 @@ class BackupRestoreService : Service() {

    private fun destroyJob() {
        backupRestore?.job?.cancel()
-        ioScope?.cancel()
+        ioScope.cancel()
        if (wakeLock.isHeld) {
            wakeLock.release()
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
@ -25,7 +25,7 @@ data class BackupManga(
    // @ProtoNumber(11) val lastUpdate: Long = 0, 1.x value, not used in 0.x
    // @ProtoNumber(12) val lastInit: Long = 0, 1.x value, not used in 0.x
    @ProtoNumber(13) var dateAdded: Long = 0,
-    @ProtoNumber(14) var viewer: Int = 0,
+    @ProtoNumber(14) var viewer: Int = 0, // Replaced by viewer_flags
    // @ProtoNumber(15) val flags: Int = 0, 1.x value, not used in 0.x
    @ProtoNumber(16) var chapters: List<BackupChapter> = emptyList(),
    @ProtoNumber(17) var categories: List<Int> = emptyList(),
@ -34,6 +34,7 @@ data class BackupManga(
    @ProtoNumber(100) var favorite: Boolean = true,
    @ProtoNumber(101) var chapterFlags: Int = 0,
    @ProtoNumber(102) var history: List<BackupHistory> = emptyList(),
+    @ProtoNumber(103) var viewer_flags: Int? = null
 ) {
    fun getMangaImpl(): MangaImpl {
        return MangaImpl().apply {
@ -48,7 +49,7 @@ data class BackupManga(
            favorite = this@BackupManga.favorite
            source = this@BackupManga.source
            date_added = this@BackupManga.dateAdded
-            viewer = this@BackupManga.viewer
+            viewer_flags = this@BackupManga.viewer_flags ?: this@BackupManga.viewer
            chapter_flags = this@BackupManga.chapterFlags
        }
    }
@ -79,7 +80,8 @@ data class BackupManga(
                favorite = manga.favorite,
                source = manga.source,
                dateAdded = manga.date_added,
-                viewer = manga.viewer,
+                viewer = manga.readingModeType,
+                viewer_flags = manga.viewer_flags,
                chapterFlags = manga.chapter_flags
            )
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
@ -2,65 +2,52 @@ package eu.kanade.tachiyomi.data.backup.legacy

 import android.content.Context
 import android.net.Uri
-import com.github.salomonbrys.kotson.fromJson
-import com.github.salomonbrys.kotson.registerTypeAdapter
-import com.github.salomonbrys.kotson.registerTypeHierarchyAdapter
-import com.github.salomonbrys.kotson.set
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.backup.AbstractBackupManager
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CATEGORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_CHAPTER_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_HISTORY_MASK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK
-import eu.kanade.tachiyomi.data.backup.BackupCreateService.Companion.BACKUP_TRACK_MASK
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CATEGORIES
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CHAPTERS
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.CURRENT_VERSION
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.EXTENSIONS
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.HISTORY
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MANGA
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.TRACK
+import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.Companion.CURRENT_VERSION
 import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaTypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackTypeAdapter
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.CategoryTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.ChapterTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.HistoryTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.MangaTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackImplTypeSerializer
+import eu.kanade.tachiyomi.data.backup.legacy.serializer.TrackTypeSerializer
+import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
 import eu.kanade.tachiyomi.data.database.models.History
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
 import eu.kanade.tachiyomi.data.database.models.toMangaInfo
-import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.toSManga
-import timber.log.Timber
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.contextual
 import kotlin.math.max

 class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : AbstractBackupManager(context) {

-    val parser: Gson = when (version) {
-        2 -> GsonBuilder()
-            .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
-            .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
-            .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
-            .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
-            .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
-            .create()
+    val parser: Json = when (version) {
+        2 -> Json {
+            // Forks may have added items to backup
+            ignoreUnknownKeys = true
+
+            // Register custom serializers
+            serializersModule = SerializersModule {
+                contextual(MangaTypeSerializer)
+                contextual(MangaImplTypeSerializer)
+                contextual(ChapterTypeSerializer)
+                contextual(ChapterImplTypeSerializer)
+                contextual(CategoryTypeSerializer)
+                contextual(CategoryImplTypeSerializer)
+                contextual(TrackTypeSerializer)
+                contextual(TrackImplTypeSerializer)
+                contextual(HistoryTypeSerializer)
+            }
+        }
        else -> throw Exception("Unknown backup version")
    }

@ -70,161 +57,8 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
     * @param uri path of Uri
     * @param isJob backup called from job
     */
-    override fun createBackup(uri: Uri, flags: Int, isJob: Boolean): String? {
-        // Create root object
-        val root = JsonObject()
-
-        // Create manga array
-        val mangaEntries = JsonArray()
-
-        // Create category array
-        val categoryEntries = JsonArray()
-
-        // Create extension ID/name mapping
-        val extensionEntries = JsonArray()
-
-        // Add value's to root
-        root[Backup.VERSION] = CURRENT_VERSION
-        root[Backup.MANGAS] = mangaEntries
-        root[CATEGORIES] = categoryEntries
-        root[EXTENSIONS] = extensionEntries
-
-        databaseHelper.inTransaction {
-            val mangas = getFavoriteManga()
-
-            val extensions: MutableSet<String> = mutableSetOf()
-
-            // Backup library manga and its dependencies
-            mangas.forEach { manga ->
-                mangaEntries.add(backupMangaObject(manga, flags))
-
-                // Maintain set of extensions/sources used (excludes local source)
-                if (manga.source != LocalSource.ID) {
-                    sourceManager.get(manga.source)?.let {
-                        extensions.add("${manga.source}:${it.name}")
-                    }
-                }
-            }
-
-            // Backup categories
-            if ((flags and BACKUP_CATEGORY_MASK) == BACKUP_CATEGORY) {
-                backupCategories(categoryEntries)
-            }
-
-            // Backup extension ID/name mapping
-            backupExtensionInfo(extensionEntries, extensions)
-        }
-
-        try {
-            val file: UniFile = (
-                if (isJob) {
-                    // Get dir of file and create
-                    var dir = UniFile.fromUri(context, uri)
-                    dir = dir.createDirectory("automatic")
-
-                    // Delete older backups
-                    val numberOfBackups = numberOfBackups()
-                    val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.json""")
-                    dir.listFiles { _, filename -> backupRegex.matches(filename) }
-                        .orEmpty()
-                        .sortedByDescending { it.name }
-                        .drop(numberOfBackups - 1)
-                        .forEach { it.delete() }
-
-                    // Create new file to place backup
-                    dir.createFile(Backup.getDefaultFilename())
-                } else {
-                    UniFile.fromUri(context, uri)
-                }
-                )
-                ?: throw Exception("Couldn't create backup file")
-
-            file.openOutputStream().bufferedWriter().use {
-                parser.toJson(root, it)
-            }
-            return file.uri.toString()
-        } catch (e: Exception) {
-            Timber.e(e)
-            throw e
-        }
-    }
-
-    private fun backupExtensionInfo(root: JsonArray, extensions: Set<String>) {
-        extensions.sorted().forEach {
-            root.add(it)
-        }
-    }
-
-    /**
-     * Backup the categories of library
-     *
-     * @param root root of categories json
-     */
-    internal fun backupCategories(root: JsonArray) {
-        val categories = databaseHelper.getCategories().executeAsBlocking()
-        categories.forEach { root.add(parser.toJsonTree(it)) }
-    }
-
-    /**
-     * Convert a manga to Json
-     *
-     * @param manga manga that gets converted
-     * @return [JsonElement] containing manga information
-     */
-    internal fun backupMangaObject(manga: Manga, options: Int): JsonElement {
-        // Entry for this manga
-        val entry = JsonObject()
-
-        // Backup manga fields
-        entry[MANGA] = parser.toJsonTree(manga)
-
-        // Check if user wants chapter information in backup
-        if (options and BACKUP_CHAPTER_MASK == BACKUP_CHAPTER) {
-            // Backup all the chapters
-            val chapters = databaseHelper.getChapters(manga).executeAsBlocking()
-            if (chapters.isNotEmpty()) {
-                val chaptersJson = parser.toJsonTree(chapters)
-                if (chaptersJson.asJsonArray.size() > 0) {
-                    entry[CHAPTERS] = chaptersJson
-                }
-            }
-        }
-
-        // Check if user wants category information in backup
-        if (options and BACKUP_CATEGORY_MASK == BACKUP_CATEGORY) {
-            // Backup categories for this manga
-            val categoriesForManga = databaseHelper.getCategoriesForManga(manga).executeAsBlocking()
-            if (categoriesForManga.isNotEmpty()) {
-                val categoriesNames = categoriesForManga.map { it.name }
-                entry[CATEGORIES] = parser.toJsonTree(categoriesNames)
-            }
-        }
-
-        // Check if user wants track information in backup
-        if (options and BACKUP_TRACK_MASK == BACKUP_TRACK) {
-            val tracks = databaseHelper.getTracks(manga).executeAsBlocking()
-            if (tracks.isNotEmpty()) {
-                entry[TRACK] = parser.toJsonTree(tracks)
-            }
-        }
-
-        // Check if user wants history information in backup
-        if (options and BACKUP_HISTORY_MASK == BACKUP_HISTORY) {
-            val historyForManga = databaseHelper.getHistoryByMangaId(manga.id!!).executeAsBlocking()
-            if (historyForManga.isNotEmpty()) {
-                val historyData = historyForManga.mapNotNull { history ->
-                    val url = databaseHelper.getChapter(history.chapter_id).executeAsBlocking()?.url
-                    url?.let { DHistory(url, history.last_read) }
-                }
-                val historyJson = parser.toJsonTree(historyData)
-                if (historyJson.asJsonArray.size() > 0) {
-                    entry[HISTORY] = historyJson
-                }
-            }
-        }
-
-        return entry
-    }
+    override fun createBackup(uri: Uri, flags: Int, isJob: Boolean) =
+        throw IllegalStateException("Legacy backup creation is not supported")

    fun restoreMangaNoFetch(manga: Manga, dbManga: Manga) {
        manga.id = dbManga.id
@ -253,12 +87,11 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab
    /**
     * Restore the categories from Json
     *
-     * @param jsonCategories array containing categories
+     * @param backupCategories array containing categories
     */
-    internal fun restoreCategories(jsonCategories: JsonArray) {
+    internal fun restoreCategories(backupCategories: List<Category>) {
        // Get categories from file and from db
        val dbCategories = databaseHelper.getCategories().executeAsBlocking()
-        val backupCategories = parser.fromJson<List<CategoryImpl>>(jsonCategories)

        // Iterate over them
        backupCategories.forEach { category ->
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
@ -2,88 +2,80 @@ package eu.kanade.tachiyomi.data.backup.legacy

 import android.content.Context
 import android.net.Uri
-import com.github.salomonbrys.kotson.fromJson
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import com.google.gson.stream.JsonReader
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupRestore
 import eu.kanade.tachiyomi.data.backup.BackupNotifier
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
-import eu.kanade.tachiyomi.data.backup.legacy.models.Backup.MANGAS
 import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
+import eu.kanade.tachiyomi.data.backup.legacy.models.MangaObject
+import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Chapter
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
 import eu.kanade.tachiyomi.source.Source
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.decodeFromJsonElement
+import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.jsonPrimitive
+import okio.buffer
+import okio.source
 import java.util.Date

 class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore<LegacyBackupManager>(context, notifier) {

    override suspend fun performRestore(uri: Uri): Boolean {
-        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
-        val json = JsonParser.parseReader(reader).asJsonObject
+        // Read the json and create a Json Object,
+        // cannot use the backupManager json deserializer one because its not initialized yet
+        val backupObject = Json.decodeFromString<JsonObject>(
+            context.contentResolver.openInputStream(uri)!!.source().buffer().use { it.readUtf8() }
+        )

-        val version = json.get(Backup.VERSION)?.asInt ?: 1
+        // Get parser version
+        val version = backupObject["version"]?.jsonPrimitive?.intOrNull ?: 1
+
+        // Initialize manager
        backupManager = LegacyBackupManager(context, version)

-        val mangasJson = json.get(MANGAS).asJsonArray
-        restoreAmount = mangasJson.size() + 1 // +1 for categories
+        // Decode the json object to a Backup object
+        val backup = backupManager.parser.decodeFromJsonElement<Backup>(backupObject)
+
+        restoreAmount = backup.mangas.size + 1 // +1 for categories

        // Restore categories
-        json.get(Backup.CATEGORIES)?.let { restoreCategories(it) }
+        backup.categories?.let { restoreCategories(it) }

        // Store source mapping for error messages
-        sourceMapping = LegacyBackupRestoreValidator.getSourceMapping(json)
+        sourceMapping = LegacyBackupRestoreValidator.getSourceMapping(backup.extensions ?: emptyList())

        // Restore individual manga
-        mangasJson.forEach {
+        backup.mangas.forEach {
            if (job?.isActive != true) {
                return false
            }

-            restoreManga(it.asJsonObject)
+            restoreManga(it)
        }

        return true
    }

-    private fun restoreCategories(categoriesJson: JsonElement) {
+    private fun restoreCategories(categoriesJson: List<Category>) {
        db.inTransaction {
-            backupManager.restoreCategories(categoriesJson.asJsonArray)
+            backupManager.restoreCategories(categoriesJson)
        }

        restoreProgress += 1
        showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories))
    }

-    private suspend fun restoreManga(mangaJson: JsonObject) {
-        val manga = backupManager.parser.fromJson<MangaImpl>(
-            mangaJson.get(
-                Backup.MANGA
-            )
-        )
-        val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
-            mangaJson.get(Backup.CHAPTERS)
-                ?: JsonArray()
-        )
-        val categories = backupManager.parser.fromJson<List<String>>(
-            mangaJson.get(Backup.CATEGORIES)
-                ?: JsonArray()
-        )
-        val history = backupManager.parser.fromJson<List<DHistory>>(
-            mangaJson.get(Backup.HISTORY)
-                ?: JsonArray()
-        )
-        val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
-            mangaJson.get(Backup.TRACK)
-                ?: JsonArray()
-        )
+    private suspend fun restoreManga(mangaJson: MangaObject) {
+        val manga = mangaJson.manga
+        val chapters = mangaJson.chapters ?: emptyList()
+        val categories = mangaJson.categories ?: emptyList()
+        val history = mangaJson.history ?: emptyList()
+        val tracks = mangaJson.track ?: emptyList()

        val source = backupManager.sourceManager.get(manga.source)
        val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt
@ -2,12 +2,12 @@ package eu.kanade.tachiyomi.data.backup.legacy

 import android.content.Context
 import android.net.Uri
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import com.google.gson.stream.JsonReader
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.AbstractBackupRestoreValidator
 import eu.kanade.tachiyomi.data.backup.legacy.models.Backup
+import kotlinx.serialization.decodeFromString
+import okio.buffer
+import okio.source

 class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
    /**
@ -17,30 +17,30 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
     * @return List of missing sources or missing trackers.
     */
    override fun validate(context: Context, uri: Uri): Results {
-        val reader = JsonReader(context.contentResolver.openInputStream(uri)!!.bufferedReader())
-        val json = JsonParser.parseReader(reader).asJsonObject
+        val backupManager = LegacyBackupManager(context)

-        val version = json.get(Backup.VERSION)
-        val mangasJson = json.get(Backup.MANGAS)
-        if (version == null || mangasJson == null) {
+        val backup = backupManager.parser.decodeFromString<Backup>(
+            context.contentResolver.openInputStream(uri)!!.source().buffer().use { it.readUtf8() }
+        )
+
+        if (backup.version == null) {
            throw Exception(context.getString(R.string.invalid_backup_file_missing_data))
        }

-        val mangas = mangasJson.asJsonArray
-        if (mangas.size() == 0) {
+        if (backup.mangas.isEmpty()) {
            throw Exception(context.getString(R.string.invalid_backup_file_missing_manga))
        }

-        val sources = getSourceMapping(json)
+        val sources = getSourceMapping(backup.extensions ?: emptyList())
        val missingSources = sources
            .filter { sourceManager.get(it.key) == null }
            .values
            .sorted()

-        val trackers = mangas
-            .filter { it.asJsonObject.has("track") }
-            .flatMap { it.asJsonObject["track"].asJsonArray }
-            .map { it.asJsonObject["s"].asInt }
+        val trackers = backup.mangas
+            .filterNot { it.track.isNullOrEmpty() }
+            .flatMap { it.track ?: emptyList() }
+            .map { it.sync_id }
            .distinct()
        val missingTrackers = trackers
            .mapNotNull { trackManager.getService(it) }
@ -52,12 +52,10 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
    }

    companion object {
-        fun getSourceMapping(json: JsonObject): Map<Long, String> {
-            val extensionsMapping = json.get(Backup.EXTENSIONS) ?: return emptyMap()
-
-            return extensionsMapping.asJsonArray
+        fun getSourceMapping(extensionsMapping: List<String>): Map<Long, String> {
+            return extensionsMapping
                .map {
-                    val items = it.asString.split(":")
+                    val items = it.split(":")
                    items[0].toLong() to items[1]
                }
                .toMap()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt
@ -1,25 +1,37 @@
 package eu.kanade.tachiyomi.data.backup.legacy.models

+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.Track
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale

-/**
- * Json values
- */
-object Backup {
-    const val CURRENT_VERSION = 2
-    const val MANGA = "manga"
-    const val MANGAS = "mangas"
-    const val TRACK = "track"
-    const val CHAPTERS = "chapters"
-    const val CATEGORIES = "categories"
-    const val EXTENSIONS = "extensions"
-    const val HISTORY = "history"
-    const val VERSION = "version"
+@Serializable
+data class Backup(
+    val version: Int? = null,
+    var mangas: MutableList<MangaObject> = mutableListOf(),
+    var categories: List<@Contextual Category>? = null,
+    var extensions: List<String>? = null
+) {
+    companion object {
+        const val CURRENT_VERSION = 2

-    fun getDefaultFilename(): String {
-        val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
-        return "tachiyomi_$date.json"
+        fun getDefaultFilename(): String {
+            val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
+            return "tachiyomi_$date.json"
+        }
    }
 }
+
+@Serializable
+data class MangaObject(
+    var manga: @Contextual Manga,
+    var chapters: List<@Contextual Chapter>? = null,
+    var categories: List<String>? = null,
+    var track: List<@Contextual Track>? = null,
+    var history: List<@Contextual DHistory>? = null
+)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeAdapter.kt
@ -1,31 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.database.models.CategoryImpl
-
-/**
- * JSON Serializer used to write / read [CategoryImpl] to / from json
- */
-object CategoryTypeAdapter {
-
-    fun build(): TypeAdapter<CategoryImpl> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.name)
-                value(it.order)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                val category = CategoryImpl()
-                category.name = nextString()
-                category.order = nextInt()
-                endArray()
-                category
-            }
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt
@ -0,0 +1,49 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.CategoryImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+
+/**
+ * JSON Serializer used to write / read [CategoryImpl] to / from json
+ */
+open class CategoryBaseSerializer<T : Category> : KSerializer<T> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Category")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.name)
+                add(value.order)
+            }
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a category impl and cast as T so that the serializer accepts it
+        return CategoryImpl().apply {
+            decoder as JsonDecoder
+            val array = decoder.decodeJsonElement().jsonArray
+            name = array[0].jsonPrimitive.content
+            order = array[1].jsonPrimitive.int
+        } as T
+    }
+}
+
+// Allow for serialization of a category and category impl
+object CategoryTypeSerializer : CategoryBaseSerializer<Category>()
+
+object CategoryImplTypeSerializer : CategoryBaseSerializer<CategoryImpl>()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeAdapter.kt
@ -1,59 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonToken
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
-
-/**
- * JSON Serializer used to write / read [ChapterImpl] to / from json
- */
-object ChapterTypeAdapter {
-
-    private const val URL = "u"
-    private const val READ = "r"
-    private const val BOOKMARK = "b"
-    private const val LAST_READ = "l"
-
-    fun build(): TypeAdapter<ChapterImpl> {
-        return typeAdapter {
-            write {
-                if (it.read || it.bookmark || it.last_page_read != 0) {
-                    beginObject()
-                    name(URL)
-                    value(it.url)
-                    if (it.read) {
-                        name(READ)
-                        value(1)
-                    }
-                    if (it.bookmark) {
-                        name(BOOKMARK)
-                        value(1)
-                    }
-                    if (it.last_page_read != 0) {
-                        name(LAST_READ)
-                        value(it.last_page_read)
-                    }
-                    endObject()
-                }
-            }
-
-            read {
-                val chapter = ChapterImpl()
-                beginObject()
-                while (hasNext()) {
-                    if (peek() == JsonToken.NAME) {
-                        when (nextName()) {
-                            URL -> chapter.url = nextString()
-                            READ -> chapter.read = nextInt() == 1
-                            BOOKMARK -> chapter.bookmark = nextInt() == 1
-                            LAST_READ -> chapter.last_page_read = nextInt()
-                        }
-                    }
-                }
-                endObject()
-                chapter
-            }
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt
@ -0,0 +1,66 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.ChapterImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.put
+
+/**
+ * JSON Serializer used to write / read [ChapterImpl] to / from json
+ */
+open class ChapterBaseSerializer<T : Chapter> : KSerializer<T> {
+
+    override val descriptor = buildClassSerialDescriptor("Chapter")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonObject {
+                put(URL, value.url)
+                if (value.read) {
+                    put(READ, 1)
+                }
+                if (value.bookmark) {
+                    put(BOOKMARK, 1)
+                }
+                if (value.last_page_read != 0) {
+                    put(LAST_READ, value.last_page_read)
+                }
+            }
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a chapter impl and cast as T so that the serializer accepts it
+        return ChapterImpl().apply {
+            decoder as JsonDecoder
+            val jsonObject = decoder.decodeJsonElement().jsonObject
+            url = jsonObject[URL]!!.jsonPrimitive.content
+            read = jsonObject[READ]?.jsonPrimitive?.intOrNull == 1
+            bookmark = jsonObject[BOOKMARK]?.jsonPrimitive?.intOrNull == 1
+            last_page_read = jsonObject[LAST_READ]?.jsonPrimitive?.intOrNull ?: last_page_read
+        } as T
+    }
+
+    companion object {
+        private const val URL = "u"
+        private const val READ = "r"
+        private const val BOOKMARK = "b"
+        private const val LAST_READ = "l"
+    }
+}
+
+// Allow for serialization of a chapter and chapter impl
+object ChapterTypeSerializer : ChapterBaseSerializer<Chapter>()
+
+object ChapterImplTypeSerializer : ChapterBaseSerializer<ChapterImpl>()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeAdapter.kt
@ -1,32 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
-
-/**
- * JSON Serializer used to write / read [DHistory] to / from json
- */
-object HistoryTypeAdapter {
-
-    fun build(): TypeAdapter<DHistory> {
-        return typeAdapter {
-            write {
-                if (it.lastRead != 0L) {
-                    beginArray()
-                    value(it.url)
-                    value(it.lastRead)
-                    endArray()
-                }
-            }
-
-            read {
-                beginArray()
-                val url = nextString()
-                val lastRead = nextLong()
-                endArray()
-                DHistory(url, lastRead)
-            }
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt
@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.backup.legacy.models.DHistory
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+
+/**
+ * JSON Serializer used to write / read [DHistory] to / from json
+ */
+object HistoryTypeSerializer : KSerializer<DHistory> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("History")
+
+    override fun serialize(encoder: Encoder, value: DHistory) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.url)
+                add(value.lastRead)
+            }
+        )
+    }
+
+    override fun deserialize(decoder: Decoder): DHistory {
+        decoder as JsonDecoder
+        val array = decoder.decodeJsonElement().jsonArray
+        return DHistory(
+            url = array[0].jsonPrimitive.content,
+            lastRead = array[1].jsonPrimitive.long
+        )
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeAdapter.kt
@ -1,37 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
-
-/**
- * JSON Serializer used to write / read [MangaImpl] to / from json
- */
-object MangaTypeAdapter {
-
-    fun build(): TypeAdapter<MangaImpl> {
-        return typeAdapter {
-            write {
-                beginArray()
-                value(it.url)
-                value(it.title)
-                value(it.source)
-                value(it.viewer)
-                value(it.chapter_flags)
-                endArray()
-            }
-
-            read {
-                beginArray()
-                val manga = MangaImpl()
-                manga.url = nextString()
-                manga.title = nextString()
-                manga.source = nextLong()
-                manga.viewer = nextInt()
-                manga.chapter_flags = nextInt()
-                endArray()
-                manga
-            }
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt
@ -0,0 +1,56 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.add
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+
+/**
+ * JSON Serializer used to write / read [MangaImpl] to / from json
+ */
+open class MangaBaseSerializer<T : Manga> : KSerializer<T> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Manga")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonArray {
+                add(value.url)
+                add(value.title)
+                add(value.source)
+                add(value.viewer_flags)
+                add(value.chapter_flags)
+            }
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a manga impl and cast as T so that the serializer accepts it
+        return MangaImpl().apply {
+            decoder as JsonDecoder
+            val array = decoder.decodeJsonElement().jsonArray
+            url = array[0].jsonPrimitive.content
+            title = array[1].jsonPrimitive.content
+            source = array[2].jsonPrimitive.long
+            viewer_flags = array[3].jsonPrimitive.int
+            chapter_flags = array[4].jsonPrimitive.int
+        } as T
+    }
+}
+
+// Allow for serialization of a manga and manga impl
+object MangaTypeSerializer : MangaBaseSerializer<Manga>()
+
+object MangaImplTypeSerializer : MangaBaseSerializer<MangaImpl>()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeAdapter.kt
@ -1,59 +0,0 @@
-package eu.kanade.tachiyomi.data.backup.legacy.serializer
-
-import com.github.salomonbrys.kotson.typeAdapter
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonToken
-import eu.kanade.tachiyomi.data.database.models.TrackImpl
-
-/**
- * JSON Serializer used to write / read [TrackImpl] to / from json
- */
-object TrackTypeAdapter {
-
-    private const val SYNC = "s"
-    private const val MEDIA = "r"
-    private const val LIBRARY = "ml"
-    private const val TITLE = "t"
-    private const val LAST_READ = "l"
-    private const val TRACKING_URL = "u"
-
-    fun build(): TypeAdapter<TrackImpl> {
-        return typeAdapter {
-            write {
-                beginObject()
-                name(TITLE)
-                value(it.title)
-                name(SYNC)
-                value(it.sync_id)
-                name(MEDIA)
-                value(it.media_id)
-                name(LIBRARY)
-                value(it.library_id)
-                name(LAST_READ)
-                value(it.last_chapter_read)
-                name(TRACKING_URL)
-                value(it.tracking_url)
-                endObject()
-            }
-
-            read {
-                val track = TrackImpl()
-                beginObject()
-                while (hasNext()) {
-                    if (peek() == JsonToken.NAME) {
-                        when (nextName()) {
-                            TITLE -> track.title = nextString()
-                            SYNC -> track.sync_id = nextInt()
-                            MEDIA -> track.media_id = nextInt()
-                            LIBRARY -> track.library_id = nextLong()
-                            LAST_READ -> track.last_chapter_read = nextInt()
-                            TRACKING_URL -> track.tracking_url = nextString()
-                        }
-                    }
-                }
-                endObject()
-                track
-            }
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt
@ -0,0 +1,67 @@
+package eu.kanade.tachiyomi.data.backup.legacy.serializer
+
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.models.TrackImpl
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+import kotlinx.serialization.json.put
+
+/**
+ * JSON Serializer used to write / read [TrackImpl] to / from json
+ */
+open class TrackBaseSerializer<T : Track> : KSerializer<T> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Track")
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder as JsonEncoder
+        encoder.encodeJsonElement(
+            buildJsonObject {
+                put(TITLE, value.title)
+                put(SYNC, value.sync_id)
+                put(MEDIA, value.media_id)
+                put(LIBRARY, value.library_id)
+                put(LAST_READ, value.last_chapter_read)
+                put(TRACKING_URL, value.tracking_url)
+            }
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun deserialize(decoder: Decoder): T {
+        // make a track impl and cast as T so that the serializer accepts it
+        return TrackImpl().apply {
+            decoder as JsonDecoder
+            val jsonObject = decoder.decodeJsonElement().jsonObject
+            title = jsonObject[TITLE]!!.jsonPrimitive.content
+            sync_id = jsonObject[SYNC]!!.jsonPrimitive.int
+            media_id = jsonObject[MEDIA]!!.jsonPrimitive.int
+            library_id = jsonObject[LIBRARY]!!.jsonPrimitive.long
+            last_chapter_read = jsonObject[LAST_READ]!!.jsonPrimitive.int
+            tracking_url = jsonObject[TRACKING_URL]!!.jsonPrimitive.content
+        } as T
+    }
+
+    companion object {
+        private const val SYNC = "s"
+        private const val MEDIA = "r"
+        private const val LIBRARY = "ml"
+        private const val TITLE = "t"
+        private const val LAST_READ = "l"
+        private const val TRACKING_URL = "u"
+    }
+}
+
+// Allow for serialization of a track and track impl
+object TrackTypeSerializer : TrackBaseSerializer<Track>()
+
+object TrackImplTypeSerializer : TrackBaseSerializer<TrackImpl>()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.cache

 import android.content.Context
+import coil.imageLoader
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import java.io.File
@ -99,6 +100,13 @@ class CoverCache(private val context: Context) {
        }
    }

+    /**
+     * Clear coil's memory cache.
+     */
+    fun clearMemoryCache() {
+        context.imageLoader.memoryCache.clear()
+    }
+
    private fun getCacheDir(dir: String): File {
        return context.getExternalFilesDir(dir)
            ?: File(context.filesDir, dir).also { it.mkdirs() }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/ByteBufferFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/ByteBufferFetcher.kt
@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.data.coil
+
+import coil.bitmap.BitmapPool
+import coil.decode.DataSource
+import coil.decode.Options
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.fetch.SourceResult
+import coil.size.Size
+import okio.buffer
+import okio.source
+import java.io.ByteArrayInputStream
+import java.nio.ByteBuffer
+
+class ByteBufferFetcher : Fetcher<ByteBuffer> {
+    override suspend fun fetch(pool: BitmapPool, data: ByteBuffer, size: Size, options: Options): FetchResult {
+        return SourceResult(
+            source = ByteArrayInputStream(data.array()).source().buffer(),
+            mimeType = null,
+            dataSource = DataSource.MEMORY
+        )
+    }
+
+    override fun key(data: ByteBuffer): String? = null
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt
@ -0,0 +1,167 @@
+package eu.kanade.tachiyomi.data.coil
+
+import coil.bitmap.BitmapPool
+import coil.decode.DataSource
+import coil.decode.Options
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.fetch.SourceResult
+import coil.network.HttpException
+import coil.request.get
+import coil.size.Size
+import eu.kanade.tachiyomi.data.cache.CoverCache
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.HttpSource
+import okhttp3.CacheControl
+import okhttp3.Call
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okio.buffer
+import okio.sink
+import okio.source
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+import java.io.File
+
+/**
+ * Coil component that fetches [Manga] cover while using the cached file in disk when available.
+ *
+ * Available request parameter:
+ * - [USE_CUSTOM_COVER]: Use custom cover if set by user, default is true
+ */
+class MangaCoverFetcher : Fetcher<Manga> {
+    private val coverCache: CoverCache by injectLazy()
+    private val sourceManager: SourceManager by injectLazy()
+    private val defaultClient = Injekt.get<NetworkHelper>().coilClient
+
+    override fun key(data: Manga): String? {
+        if (data.thumbnail_url.isNullOrBlank()) return null
+        return data.thumbnail_url!!
+    }
+
+    override suspend fun fetch(pool: BitmapPool, data: Manga, size: Size, options: Options): FetchResult {
+        // Use custom cover if exists
+        val useCustomCover = options.parameters[USE_CUSTOM_COVER] as? Boolean ?: true
+        val customCoverFile = coverCache.getCustomCoverFile(data)
+        if (useCustomCover && customCoverFile.exists()) {
+            return fileLoader(customCoverFile)
+        }
+
+        val cover = data.thumbnail_url
+        return when (getResourceType(cover)) {
+            Type.URL -> httpLoader(data, options)
+            Type.File -> fileLoader(data)
+            null -> error("Invalid image")
+        }
+    }
+
+    private suspend fun httpLoader(manga: Manga, options: Options): FetchResult {
+        // Only cache separately if it's a library item
+        val coverCacheFile = if (manga.favorite) {
+            coverCache.getCoverFile(manga) ?: error("No cover specified")
+        } else {
+            null
+        }
+
+        if (coverCacheFile?.exists() == true && options.diskCachePolicy.readEnabled) {
+            return fileLoader(coverCacheFile)
+        }
+
+        val (response, body) = awaitGetCall(manga, options)
+        if (!response.isSuccessful) {
+            body.close()
+            throw HttpException(response)
+        }
+
+        if (coverCacheFile != null && options.diskCachePolicy.writeEnabled) {
+            @Suppress("BlockingMethodInNonBlockingContext")
+            response.peekBody(Long.MAX_VALUE).source().use { input ->
+                coverCacheFile.parentFile?.mkdirs()
+                if (coverCacheFile.exists()) {
+                    coverCacheFile.delete()
+                }
+                coverCacheFile.sink().buffer().use { output ->
+                    output.writeAll(input)
+                }
+            }
+        }
+
+        return SourceResult(
+            source = body.source(),
+            mimeType = "image/*",
+            dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK
+        )
+    }
+
+    private suspend fun awaitGetCall(manga: Manga, options: Options): Pair<Response, ResponseBody> {
+        val call = getCall(manga, options)
+        val response = call.await()
+        return response to checkNotNull(response.body) { "Null response source" }
+    }
+
+    private fun getCall(manga: Manga, options: Options): Call {
+        val source = sourceManager.get(manga.source) as? HttpSource
+        val request = Request.Builder().url(manga.thumbnail_url!!).also {
+            if (source != null) {
+                it.headers(source.headers)
+            }
+
+            val networkRead = options.networkCachePolicy.readEnabled
+            val diskRead = options.diskCachePolicy.readEnabled
+            when {
+                !networkRead && diskRead -> {
+                    it.cacheControl(CacheControl.FORCE_CACHE)
+                }
+                networkRead && !diskRead -> if (options.diskCachePolicy.writeEnabled) {
+                    it.cacheControl(CacheControl.FORCE_NETWORK)
+                } else {
+                    it.cacheControl(CACHE_CONTROL_FORCE_NETWORK_NO_CACHE)
+                }
+                !networkRead && !diskRead -> {
+                    // This causes the request to fail with a 504 Unsatisfiable Request.
+                    it.cacheControl(CACHE_CONTROL_NO_NETWORK_NO_CACHE)
+                }
+            }
+        }.build()
+
+        val client = source?.client?.newBuilder()?.cache(defaultClient.cache)?.build() ?: defaultClient
+        return client.newCall(request)
+    }
+
+    private fun fileLoader(manga: Manga): FetchResult {
+        return fileLoader(File(manga.thumbnail_url!!.substringAfter("file://")))
+    }
+
+    private fun fileLoader(file: File): FetchResult {
+        return SourceResult(
+            source = file.source().buffer(),
+            mimeType = "image/*",
+            dataSource = DataSource.DISK
+        )
+    }
+
+    private fun getResourceType(cover: String?): Type? {
+        return when {
+            cover.isNullOrEmpty() -> null
+            cover.startsWith("http", true) || cover.startsWith("Custom-", true) -> Type.URL
+            cover.startsWith("/") || cover.startsWith("file://") -> Type.File
+            else -> null
+        }
+    }
+
+    private enum class Type {
+        File, URL
+    }
+
+    companion object {
+        const val USE_CUSTOM_COVER = "use_custom_cover"
+
+        private val CACHE_CONTROL_FORCE_NETWORK_NO_CACHE = CacheControl.Builder().noCache().noStore().build()
+        private val CACHE_CONTROL_NO_NETWORK_NO_CACHE = CacheControl.Builder().noCache().onlyIfCached().build()
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt
@ -0,0 +1,53 @@
+package eu.kanade.tachiyomi.data.coil
+
+import android.content.res.Resources
+import android.os.Build
+import androidx.core.graphics.drawable.toDrawable
+import coil.bitmap.BitmapPool
+import coil.decode.DecodeResult
+import coil.decode.Decoder
+import coil.decode.Options
+import coil.size.Size
+import eu.kanade.tachiyomi.util.system.ImageUtil
+import okio.BufferedSource
+import tachiyomi.decoder.ImageDecoder
+
+/**
+ * A [Decoder] that uses built-in [ImageDecoder] to decode images that is not supported by the system.
+ */
+class TachiyomiImageDecoder(private val resources: Resources) : Decoder {
+
+    override fun handles(source: BufferedSource, mimeType: String?): Boolean {
+        val type = source.peek().inputStream().use {
+            ImageUtil.findImageType(it)
+        }
+        return when (type) {
+            ImageUtil.ImageType.AVIF, ImageUtil.ImageType.JXL -> true
+            ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+            else -> false
+        }
+    }
+
+    override suspend fun decode(
+        pool: BitmapPool,
+        source: BufferedSource,
+        size: Size,
+        options: Options
+    ): DecodeResult {
+        val decoder = source.use {
+            ImageDecoder.newInstance(it.inputStream())
+        }
+
+        check(decoder != null && decoder.width > 0 && decoder.height > 0) { "Failed to initialize decoder." }
+
+        val bitmap = decoder.decode(rgb565 = options.allowRgb565)
+        decoder.recycle()
+
+        check(bitmap != null) { "Failed to decode image." }
+
+        return DecodeResult(
+            drawable = bitmap.toDrawable(resources),
+            isSampled = false
+        )
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
@ -20,7 +20,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
        /**
         * Version of the database.
         */
-        const val DATABASE_VERSION = 11
+        const val DATABASE_VERSION = 12
    }

    override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@ -82,6 +82,9 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
            db.execSQL(MangaTable.addDateAdded)
            db.execSQL(MangaTable.backfillDateAdded)
        }
+        if (oldVersion < 12) {
+            db.execSQL(MangaTable.addNextUpdateCol)
+        }
    }

    override fun onConfigure(db: SupportSQLiteDatabase) {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
@ -22,6 +22,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_GENRE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_ID
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_INITIALIZED
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_LAST_UPDATE
+import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_NEXT_UPDATE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_SOURCE
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_STATUS
 import eu.kanade.tachiyomi.data.database.tables.MangaTable.COL_THUMBNAIL_URL
@ -62,8 +63,9 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
            COL_THUMBNAIL_URL to obj.thumbnail_url,
            COL_FAVORITE to obj.favorite,
            COL_LAST_UPDATE to obj.last_update,
+            COL_NEXT_UPDATE to obj.next_update,
            COL_INITIALIZED to obj.initialized,
-            COL_VIEWER to obj.viewer,
+            COL_VIEWER to obj.viewer_flags,
            COL_CHAPTER_FLAGS to obj.chapter_flags,
            COL_COVER_LAST_MODIFIED to obj.cover_last_modified,
            COL_DATE_ADDED to obj.date_added
@ -84,8 +86,9 @@ interface BaseMangaGetResolver {
        thumbnail_url = cursor.getString(cursor.getColumnIndex(COL_THUMBNAIL_URL))
        favorite = cursor.getInt(cursor.getColumnIndex(COL_FAVORITE)) == 1
        last_update = cursor.getLong(cursor.getColumnIndex(COL_LAST_UPDATE))
+        next_update = cursor.getLong(cursor.getColumnIndex(COL_NEXT_UPDATE))
        initialized = cursor.getInt(cursor.getColumnIndex(COL_INITIALIZED)) == 1
-        viewer = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
+        viewer_flags = cursor.getInt(cursor.getColumnIndex(COL_VIEWER))
        chapter_flags = cursor.getInt(cursor.getColumnIndex(COL_CHAPTER_FLAGS))
        cover_last_modified = cursor.getLong(cursor.getColumnIndex(COL_COVER_LAST_MODIFIED))
        date_added = cursor.getLong(cursor.getColumnIndex(COL_DATE_ADDED))
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
@ -1,5 +1,8 @@
 package eu.kanade.tachiyomi.data.database.models

+import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
 import java.io.Serializable

 interface Category : Serializable {
@ -12,6 +15,22 @@ interface Category : Serializable {

    var flags: Int

+    private fun setFlags(flag: Int, mask: Int) {
+        flags = flags and mask.inv() or (flag and mask)
+    }
+
+    var displayMode: Int
+        get() = flags and DisplayModeSetting.MASK
+        set(mode) = setFlags(mode, DisplayModeSetting.MASK)
+
+    var sortMode: Int
+        get() = flags and SortModeSetting.MASK
+        set(mode) = setFlags(mode, SortModeSetting.MASK)
+
+    var sortDirection: Int
+        get() = flags and SortDirectionSetting.MASK
+        set(mode) = setFlags(mode, SortDirectionSetting.MASK)
+
    companion object {

        fun create(name: String): Category = CategoryImpl().apply {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@ -1,6 +1,8 @@
 package eu.kanade.tachiyomi.data.database.models

 import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
+import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import tachiyomi.source.model.MangaInfo

 interface Manga : SManga {
@ -11,82 +13,98 @@ interface Manga : SManga {

    var favorite: Boolean

+    // last time the chapter list changed in any way
    var last_update: Long

+    // predicted next update time based on latest (by date) 4 chapters' deltas
+    var next_update: Long
+
    var date_added: Long

-    var viewer: Int
+    var viewer_flags: Int

    var chapter_flags: Int

    var cover_last_modified: Long

    fun setChapterOrder(order: Int) {
-        setFlags(order, SORT_MASK)
+        setChapterFlags(order, CHAPTER_SORT_MASK)
    }

    fun sortDescending(): Boolean {
-        return chapter_flags and SORT_MASK == SORT_DESC
+        return chapter_flags and CHAPTER_SORT_MASK == CHAPTER_SORT_DESC
    }

    fun getGenres(): List<String>? {
        return genre?.split(", ")?.map { it.trim() }
    }

-    private fun setFlags(flag: Int, mask: Int) {
+    private fun setChapterFlags(flag: Int, mask: Int) {
        chapter_flags = chapter_flags and mask.inv() or (flag and mask)
    }

+    private fun setViewerFlags(flag: Int, mask: Int) {
+        viewer_flags = viewer_flags and mask.inv() or (flag and mask)
+    }
+
    // Used to display the chapter's title one way or another
    var displayMode: Int
-        get() = chapter_flags and DISPLAY_MASK
-        set(mode) = setFlags(mode, DISPLAY_MASK)
+        get() = chapter_flags and CHAPTER_DISPLAY_MASK
+        set(mode) = setChapterFlags(mode, CHAPTER_DISPLAY_MASK)

    var readFilter: Int
-        get() = chapter_flags and READ_MASK
-        set(filter) = setFlags(filter, READ_MASK)
+        get() = chapter_flags and CHAPTER_READ_MASK
+        set(filter) = setChapterFlags(filter, CHAPTER_READ_MASK)

    var downloadedFilter: Int
-        get() = chapter_flags and DOWNLOADED_MASK
-        set(filter) = setFlags(filter, DOWNLOADED_MASK)
+        get() = chapter_flags and CHAPTER_DOWNLOADED_MASK
+        set(filter) = setChapterFlags(filter, CHAPTER_DOWNLOADED_MASK)

    var bookmarkedFilter: Int
-        get() = chapter_flags and BOOKMARKED_MASK
-        set(filter) = setFlags(filter, BOOKMARKED_MASK)
+        get() = chapter_flags and CHAPTER_BOOKMARKED_MASK
+        set(filter) = setChapterFlags(filter, CHAPTER_BOOKMARKED_MASK)

    var sorting: Int
-        get() = chapter_flags and SORTING_MASK
-        set(sort) = setFlags(sort, SORTING_MASK)
+        get() = chapter_flags and CHAPTER_SORTING_MASK
+        set(sort) = setChapterFlags(sort, CHAPTER_SORTING_MASK)
+
+    var readingModeType: Int
+        get() = viewer_flags and ReadingModeType.MASK
+        set(readingMode) = setViewerFlags(readingMode, ReadingModeType.MASK)
+
+    var orientationType: Int
+        get() = viewer_flags and OrientationType.MASK
+        set(rotationType) = setViewerFlags(rotationType, OrientationType.MASK)

    companion object {

-        const val SORT_DESC = 0x00000000
-        const val SORT_ASC = 0x00000001
-        const val SORT_MASK = 0x00000001
-
        // Generic filter that does not filter anything
        const val SHOW_ALL = 0x00000000

-        const val SHOW_UNREAD = 0x00000002
-        const val SHOW_READ = 0x00000004
-        const val READ_MASK = 0x00000006
+        const val CHAPTER_SORT_DESC = 0x00000000
+        const val CHAPTER_SORT_ASC = 0x00000001
+        const val CHAPTER_SORT_MASK = 0x00000001

-        const val SHOW_DOWNLOADED = 0x00000008
-        const val SHOW_NOT_DOWNLOADED = 0x00000010
-        const val DOWNLOADED_MASK = 0x00000018
+        const val CHAPTER_SHOW_UNREAD = 0x00000002
+        const val CHAPTER_SHOW_READ = 0x00000004
+        const val CHAPTER_READ_MASK = 0x00000006

-        const val SHOW_BOOKMARKED = 0x00000020
-        const val SHOW_NOT_BOOKMARKED = 0x00000040
-        const val BOOKMARKED_MASK = 0x00000060
+        const val CHAPTER_SHOW_DOWNLOADED = 0x00000008
+        const val CHAPTER_SHOW_NOT_DOWNLOADED = 0x00000010
+        const val CHAPTER_DOWNLOADED_MASK = 0x00000018

-        const val SORTING_SOURCE = 0x00000000
-        const val SORTING_NUMBER = 0x00000100
-        const val SORTING_UPLOAD_DATE = 0x00000200
-        const val SORTING_MASK = 0x00000300
+        const val CHAPTER_SHOW_BOOKMARKED = 0x00000020
+        const val CHAPTER_SHOW_NOT_BOOKMARKED = 0x00000040
+        const val CHAPTER_BOOKMARKED_MASK = 0x00000060

-        const val DISPLAY_NAME = 0x00000000
-        const val DISPLAY_NUMBER = 0x00100000
-        const val DISPLAY_MASK = 0x00100000
+        const val CHAPTER_SORTING_SOURCE = 0x00000000
+        const val CHAPTER_SORTING_NUMBER = 0x00000100
+        const val CHAPTER_SORTING_UPLOAD_DATE = 0x00000200
+        const val CHAPTER_SORTING_MASK = 0x00000300
+
+        const val CHAPTER_DISPLAY_NAME = 0x00000000
+        const val CHAPTER_DISPLAY_NUMBER = 0x00100000
+        const val CHAPTER_DISPLAY_MASK = 0x00100000

        fun create(source: Long): Manga = MangaImpl().apply {
            this.source = source
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
@ -26,11 +26,13 @@ open class MangaImpl : Manga {

    override var last_update: Long = 0

+    override var next_update: Long = 0
+
    override var date_added: Long = 0

    override var initialized: Boolean = false

-    override var viewer: Int = 0
+    override var viewer_flags: Int = 0

    override var chapter_flags: Int = 0

--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
@ -1,18 +1,13 @@
 package eu.kanade.tachiyomi.data.database.queries

+import com.pushtorefresh.storio.sqlite.operations.get.PreparedGetListOfObjects
 import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
 import com.pushtorefresh.storio.sqlite.queries.Query
 import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaCoverLastModifiedPutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaFavoritePutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaLastUpdatedPutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaTitlePutResolver
-import eu.kanade.tachiyomi.data.database.resolvers.MangaViewerPutResolver
+import eu.kanade.tachiyomi.data.database.resolvers.*
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
@ -20,15 +15,6 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable

 interface MangaQueries : DbProvider {

-    fun getMangas() = db.get()
-        .listOfObjects(Manga::class.java)
-        .withQuery(
-            Query.builder()
-                .table(MangaTable.TABLE)
-                .build()
-        )
-        .prepare()
-
    fun getLibraryMangas() = db.get()
        .listOfObjects(LibraryManga::class.java)
        .withQuery(
@ -40,17 +26,21 @@ interface MangaQueries : DbProvider {
        .withGetResolver(LibraryMangaGetResolver.INSTANCE)
        .prepare()

-    fun getFavoriteMangas() = db.get()
-        .listOfObjects(Manga::class.java)
-        .withQuery(
-            Query.builder()
-                .table(MangaTable.TABLE)
-                .where("${MangaTable.COL_FAVORITE} = ?")
-                .whereArgs(1)
-                .orderBy(MangaTable.COL_TITLE)
-                .build()
-        )
-        .prepare()
+    fun getFavoriteMangas(sortByTitle: Boolean = true): PreparedGetListOfObjects<Manga> {
+        var queryBuilder = Query.builder()
+            .table(MangaTable.TABLE)
+            .where("${MangaTable.COL_FAVORITE} = ?")
+            .whereArgs(1)
+
+        if (sortByTitle) {
+            queryBuilder = queryBuilder.orderBy(MangaTable.COL_TITLE)
+        }
+
+        return db.get()
+            .listOfObjects(Manga::class.java)
+            .withQuery(queryBuilder.build())
+            .prepare()
+    }

    fun getManga(url: String, sourceId: Long) = db.get()
        .`object`(Manga::class.java)
@ -78,14 +68,29 @@ interface MangaQueries : DbProvider {

    fun insertMangas(mangas: List<Manga>) = db.put().objects(mangas).prepare()

-    fun updateFlags(manga: Manga) = db.put()
+    fun updateChapterFlags(manga: Manga) = db.put()
        .`object`(manga)
-        .withPutResolver(MangaFlagsPutResolver())
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_CHAPTER_FLAGS, Manga::chapter_flags))
        .prepare()

-    fun updateFlags(mangas: List<Manga>) = db.put()
-        .objects(mangas)
-        .withPutResolver(MangaFlagsPutResolver(true))
+    fun updateChapterFlags(manga: List<Manga>) = db.put()
+        .objects(manga)
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_CHAPTER_FLAGS, Manga::chapter_flags, true))
+        .prepare()
+
+    fun updateViewerFlags(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags))
+        .prepare()
+
+    fun updateViewerFlags(manga: List<Manga>) = db.put()
+        .objects(manga)
+        .withPutResolver(MangaFlagsPutResolver(MangaTable.COL_VIEWER, Manga::viewer_flags, true))
+        .prepare()
+
+    fun updateNextUpdated(manga: Manga) = db.put()
+        .`object`(manga)
+        .withPutResolver(MangaNextUpdatedPutResolver())
        .prepare()

    fun updateLastUpdated(manga: Manga) = db.put()
@ -98,11 +103,6 @@ interface MangaQueries : DbProvider {
        .withPutResolver(MangaFavoritePutResolver())
        .prepare()

-    fun updateMangaViewer(manga: Manga) = db.put()
-        .`object`(manga)
-        .withPutResolver(MangaViewerPutResolver())
-        .prepare()
-
    fun updateMangaTitle(manga: Manga) = db.put()
        .`object`(manga)
        .withPutResolver(MangaTitlePutResolver())
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt
@ -8,8 +8,9 @@ import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
 import eu.kanade.tachiyomi.data.database.inTransactionReturn
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
+import kotlin.reflect.KProperty1

-class MangaFlagsPutResolver(private val updateAll: Boolean = false) : PutResolver<Manga>() {
+class MangaFlagsPutResolver(private val colName: String, private val fieldGetter: KProperty1<Manga, Int>, private val updateAll: Boolean = false) : PutResolver<Manga>() {

    override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
        val updateQuery = mapToUpdateQuery(manga)
@ -37,6 +38,6 @@ class MangaFlagsPutResolver(private val updateAll: Boolean = false) : PutResolve

    fun mapToContentValues(manga: Manga) =
        contentValuesOf(
-            MangaTable.COL_CHAPTER_FLAGS to manga.chapter_flags
+            colName to fieldGetter.get(manga)
        )
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaNextUpdatedPutResolver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaNextUpdatedPutResolver.kt
@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.resolvers

-import androidx.core.content.contentValuesOf
+import android.content.ContentValues
 import com.pushtorefresh.storio.sqlite.StorIOSQLite
 import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult
@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.data.database.inTransactionReturn
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable

-class MangaViewerPutResolver : PutResolver<Manga>() {
+class MangaNextUpdatedPutResolver : PutResolver<Manga>() {

    override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
        val updateQuery = mapToUpdateQuery(manga)
@ -25,8 +25,7 @@ class MangaViewerPutResolver : PutResolver<Manga>() {
        .whereArgs(manga.id)
        .build()

-    fun mapToContentValues(manga: Manga) =
-        contentValuesOf(
-            MangaTable.COL_VIEWER to manga.viewer
-        )
+    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+        put(MangaTable.COL_NEXT_UPDATE, manga.next_update)
+    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt
@ -28,6 +28,8 @@ object MangaTable {

    const val COL_LAST_UPDATE = "last_update"

+    const val COL_NEXT_UPDATE = "next_update"
+
    const val COL_DATE_ADDED = "date_added"

    const val COL_INITIALIZED = "initialized"
@ -57,6 +59,7 @@ object MangaTable {
            $COL_THUMBNAIL_URL TEXT,
            $COL_FAVORITE INTEGER NOT NULL,
            $COL_LAST_UPDATE LONG,
+            $COL_NEXT_UPDATE LONG,
            $COL_INITIALIZED BOOLEAN NOT NULL,
            $COL_VIEWER INTEGER NOT NULL,
            $COL_CHAPTER_FLAGS INTEGER NOT NULL,
@ -86,4 +89,7 @@ object MangaTable {
            "FROM $TABLE INNER JOIN ${ChapterTable.TABLE} " +
            "ON $TABLE.$COL_ID = ${ChapterTable.TABLE}.${ChapterTable.COL_MANGA_ID} " +
            "GROUP BY $TABLE.$COL_ID)"
+
+    val addNextUpdateCol: String
+        get() = "ALTER TABLE $TABLE ADD COLUMN $COL_NEXT_UPDATE LONG DEFAULT 0"
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@ -95,6 +95,23 @@ class DownloadManager(private val context: Context) {
        downloader.clearQueue(isNotification)
    }

+    fun startDownloadNow(chapter: Chapter) {
+        val download = downloader.queue.find { it.chapter.id == chapter.id } ?: return
+        val queue = downloader.queue.toMutableList()
+        queue.remove(download)
+        queue.add(0, download)
+        reorderQueue(queue)
+        if (isPaused()) {
+            if (DownloadService.isRunning(context)) {
+                downloader.start()
+            } else {
+                DownloadService.start(context)
+            }
+        }
+    }
+
+    fun isPaused() = downloader.isPaused()
+
    /**
     * Reorders the download queue.
     *
@ -203,6 +220,15 @@ class DownloadManager(private val context: Context) {
        deleteChapters(listOf(download.chapter), download.manga, download.source)
    }

+    fun deletePendingDownloads(vararg downloads: Download) {
+        val downloadsByManga = downloads.groupBy { it.manga.id }
+        downloadsByManga.map { entry ->
+            val manga = entry.value.first().manga
+            val source = entry.value.first().source
+            deleteChapters(entry.value.map { it.chapter }, manga, source)
+        }
+    }
+
    /**
     * Deletes the directories of a list of downloaded chapters.
     *
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt
@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.util.lang.plusAssign
 import eu.kanade.tachiyomi.util.system.acquireWakeLock
 import eu.kanade.tachiyomi.util.system.connectivityManager
+import eu.kanade.tachiyomi.util.system.isServiceRunning
 import eu.kanade.tachiyomi.util.system.notification
 import eu.kanade.tachiyomi.util.system.toast
 import rx.android.schedulers.AndroidSchedulers
@ -58,6 +59,16 @@ class DownloadService : Service() {
        fun stop(context: Context) {
            context.stopService(Intent(context, DownloadService::class.java))
        }
+
+        /**
+         * Returns the status of the service.
+         *
+         * @param context the application context.
+         * @return true if the service is running, false otherwise.
+         */
+        fun isRunning(context: Context): Boolean {
+            return context.isServiceRunning(DownloadService::class.java)
+        }
    }

    private val downloadManager: DownloadManager by injectLazy()
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
@ -157,6 +157,11 @@ class Downloader(
        notifier.paused = true
    }

+    /**
+     * Check if downloader is paused
+     */
+    fun isPaused() = !isRunning
+
    /**
     * Removes everything from the queue.
     *
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt
@ -1,60 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import android.content.ContentValues.TAG
-import android.util.Log
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.data.DataFetcher
-import timber.log.Timber
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileNotFoundException
-import java.io.IOException
-import java.io.InputStream
-
-open class FileFetcher(private val filePath: String = "") : DataFetcher<InputStream> {
-
-    private var data: InputStream? = null
-
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        loadFromFile(callback)
-    }
-
-    private fun loadFromFile(callback: DataFetcher.DataCallback<in InputStream>) {
-        loadFromFile(File(filePath), callback)
-    }
-
-    protected fun loadFromFile(file: File, callback: DataFetcher.DataCallback<in InputStream>) {
-        try {
-            data = FileInputStream(file)
-        } catch (e: FileNotFoundException) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Timber.d(e, "Failed to open file")
-            }
-            callback.onLoadFailed(e)
-            return
-        }
-
-        callback.onDataReady(data)
-    }
-
-    override fun cleanup() {
-        try {
-            data?.close()
-        } catch (e: IOException) {
-            // Ignored.
-        }
-    }
-
-    override fun cancel() {
-        // Do nothing.
-    }
-
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
-
-    override fun getDataSource(): DataSource {
-        return DataSource.LOCAL
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaCustomCoverFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaCustomCoverFetcher.kt
@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.data.DataFetcher
-import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.io.File
-import java.io.InputStream
-import java.lang.Exception
-
-open class LibraryMangaCustomCoverFetcher(
-    private val manga: Manga,
-    private val coverCache: CoverCache
-) : FileFetcher() {
-
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        getCustomCoverFile()?.let {
-            loadFromFile(it, callback)
-        } ?: callback.onLoadFailed(Exception("Custom cover file not found"))
-    }
-
-    protected fun getCustomCoverFile(): File? {
-        return coverCache.getCustomCoverFile(manga).takeIf { it.exists() }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaUrlFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaUrlFetcher.kt
@ -1,86 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.data.DataFetcher
-import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.InputStream
-
-/**
- * A [DataFetcher] for loading a cover of a library manga.
- * It tries to load the cover from our custom cache, and if it's not found, it fallbacks to network
- * and copies the result to the cache.
- *
- * @param networkFetcher the network fetcher for this cover.
- * @param manga the manga of the cover to load.
- * @param file the file where this cover should be. It may exists or not.
- */
-class LibraryMangaUrlFetcher(
-    private val networkFetcher: DataFetcher<InputStream>,
-    private val manga: Manga,
-    private val coverCache: CoverCache
-) : LibraryMangaCustomCoverFetcher(manga, coverCache) {
-
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        getCustomCoverFile()?.let {
-            loadFromFile(it, callback)
-            return
-        }
-
-        val cover = coverCache.getCoverFile(manga)
-        if (cover == null) {
-            callback.onLoadFailed(Exception("Null thumbnail url"))
-            return
-        }
-
-        if (!cover.exists()) {
-            networkFetcher.loadData(
-                priority,
-                object : DataFetcher.DataCallback<InputStream> {
-                    override fun onDataReady(data: InputStream?) {
-                        if (data != null) {
-                            val tmpFile = File(cover.path + ".tmp")
-                            try {
-                                // Retrieve destination stream, create parent folders if needed.
-                                val output = try {
-                                    tmpFile.outputStream()
-                                } catch (e: FileNotFoundException) {
-                                    tmpFile.parentFile!!.mkdirs()
-                                    tmpFile.outputStream()
-                                }
-
-                                // Copy the file and rename to the original.
-                                data.use { output.use { data.copyTo(output) } }
-                                tmpFile.renameTo(cover)
-                                loadFromFile(cover, callback)
-                            } catch (e: Exception) {
-                                tmpFile.delete()
-                                callback.onLoadFailed(e)
-                            }
-                        } else {
-                            callback.onLoadFailed(Exception("Null data"))
-                        }
-                    }
-
-                    override fun onLoadFailed(e: Exception) {
-                        callback.onLoadFailed(e)
-                    }
-                }
-            )
-        } else {
-            loadFromFile(cover, callback)
-        }
-    }
-
-    override fun cleanup() {
-        super.cleanup()
-        networkFetcher.cleanup()
-    }
-
-    override fun cancel() {
-        super.cancel()
-        networkFetcher.cancel()
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaThumbnail.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaThumbnail.kt
@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.load.Key
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.security.MessageDigest
-
-data class MangaThumbnail(val manga: Manga, val coverLastModified: Long) : Key {
-    val key = manga.url + coverLastModified
-
-    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-        messageDigest.update(key.toByteArray(Key.CHARSET))
-    }
-}
-
-fun Manga.toMangaThumbnail() = MangaThumbnail(this, cover_last_modified)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaThumbnailModelLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaThumbnailModelLoader.kt
@ -1,134 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher
-import com.bumptech.glide.load.Options
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.load.model.Headers
-import com.bumptech.glide.load.model.LazyHeaders
-import com.bumptech.glide.load.model.ModelLoader
-import com.bumptech.glide.load.model.ModelLoaderFactory
-import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.online.HttpSource
-import eu.kanade.tachiyomi.util.isLocal
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import java.io.InputStream
-
-/**
- * A class for loading a cover associated with a [Manga] that can be present in our own cache.
- * Coupled with [LibraryMangaUrlFetcher], this class allows to implement the following flow:
- *
- * - Check in RAM LRU.
- * - Check in disk LRU.
- * - Check in this module.
- * - Fetch from the network connection.
- *
- * @param context the application context.
- */
-class MangaThumbnailModelLoader : ModelLoader<MangaThumbnail, InputStream> {
-
-    /**
-     * Cover cache where persistent covers are stored.
-     */
-    private val coverCache: CoverCache by injectLazy()
-
-    /**
-     * Source manager.
-     */
-    private val sourceManager: SourceManager by injectLazy()
-
-    /**
-     * Default network client.
-     */
-    private val defaultClient = Injekt.get<NetworkHelper>().client
-
-    /**
-     * Map where request headers are stored for a source.
-     */
-    private val cachedHeaders = hashMapOf<Long, LazyHeaders>()
-
-    /**
-     * Factory class for creating [MangaThumbnailModelLoader] instances.
-     */
-    class Factory : ModelLoaderFactory<MangaThumbnail, InputStream> {
-
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<MangaThumbnail, InputStream> {
-            return MangaThumbnailModelLoader()
-        }
-
-        override fun teardown() {}
-    }
-
-    override fun handles(model: MangaThumbnail): Boolean {
-        return true
-    }
-
-    /**
-     * Returns a fetcher for the given manga or null if the url is empty.
-     *
-     * @param mangaThumbnail the model.
-     * @param width the width of the view where the resource will be loaded.
-     * @param height the height of the view where the resource will be loaded.
-     */
-    override fun buildLoadData(
-        mangaThumbnail: MangaThumbnail,
-        width: Int,
-        height: Int,
-        options: Options
-    ): ModelLoader.LoadData<InputStream>? {
-        val manga = mangaThumbnail.manga
-        val url = manga.thumbnail_url
-
-        if (url.isNullOrEmpty()) {
-            return if (!manga.favorite || manga.isLocal()) {
-                null
-            } else {
-                ModelLoader.LoadData(mangaThumbnail, LibraryMangaCustomCoverFetcher(manga, coverCache))
-            }
-        }
-
-        if (url.startsWith("http", true)) {
-            val source = sourceManager.get(manga.source) as? HttpSource
-            val glideUrl = GlideUrl(url, getHeaders(manga, source))
-
-            // Get the resource fetcher for this request url.
-            val networkFetcher = OkHttpStreamFetcher(source?.client ?: defaultClient, glideUrl)
-
-            if (!manga.favorite) {
-                return ModelLoader.LoadData(glideUrl, networkFetcher)
-            }
-
-            val libraryFetcher = LibraryMangaUrlFetcher(networkFetcher, manga, coverCache)
-
-            // Return an instance of the fetcher providing the needed elements.
-            return ModelLoader.LoadData(mangaThumbnail, libraryFetcher)
-        } else {
-            // Return an instance of the fetcher providing the needed elements.
-            return ModelLoader.LoadData(mangaThumbnail, FileFetcher(url.removePrefix("file://")))
-        }
-    }
-
-    /**
-     * Returns the request headers for a source copying its OkHttp headers and caching them.
-     *
-     * @param manga the model.
-     */
-    private fun getHeaders(manga: Manga, source: HttpSource?): Headers {
-        if (source == null) return LazyHeaders.DEFAULT
-
-        return cachedHeaders.getOrPut(manga.source) {
-            LazyHeaders.Builder().apply {
-                val nullStr: String? = null
-                setHeader("User-Agent", nullStr)
-                for ((key, value) in source.headers.toMultimap()) {
-                    addHeader(key, value[0])
-                }
-            }.build()
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/PassthroughModelLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/PassthroughModelLoader.kt
@ -1,72 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.Options
-import com.bumptech.glide.load.data.DataFetcher
-import com.bumptech.glide.load.model.ModelLoader
-import com.bumptech.glide.load.model.ModelLoaderFactory
-import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import com.bumptech.glide.signature.ObjectKey
-import java.io.IOException
-import java.io.InputStream
-
-class PassthroughModelLoader : ModelLoader<InputStream, InputStream> {
-
-    override fun buildLoadData(
-        model: InputStream,
-        width: Int,
-        height: Int,
-        options: Options
-    ): ModelLoader.LoadData<InputStream>? {
-        return ModelLoader.LoadData(ObjectKey(model), Fetcher(model))
-    }
-
-    override fun handles(model: InputStream): Boolean {
-        return true
-    }
-
-    class Fetcher(private val stream: InputStream) : DataFetcher<InputStream> {
-
-        override fun getDataClass(): Class<InputStream> {
-            return InputStream::class.java
-        }
-
-        override fun cleanup() {
-            try {
-                stream.close()
-            } catch (e: IOException) {
-                // Do nothing
-            }
-        }
-
-        override fun getDataSource(): DataSource {
-            return DataSource.LOCAL
-        }
-
-        override fun cancel() {
-            // Do nothing
-        }
-
-        override fun loadData(
-            priority: Priority,
-            callback: DataFetcher.DataCallback<in InputStream>
-        ) {
-            callback.onDataReady(stream)
-        }
-    }
-
-    /**
-     * Factory class for creating [PassthroughModelLoader] instances.
-     */
-    class Factory : ModelLoaderFactory<InputStream, InputStream> {
-
-        override fun build(
-            multiFactory: MultiModelLoaderFactory
-        ): ModelLoader<InputStream, InputStream> {
-            return PassthroughModelLoader()
-        }
-
-        override fun teardown() {}
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/glide/TachiGlideModule.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/glide/TachiGlideModule.kt
@ -1,55 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import com.bumptech.glide.Glide
-import com.bumptech.glide.GlideBuilder
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.DecodeFormat
-import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
-import com.bumptech.glide.module.AppGlideModule
-import com.bumptech.glide.request.RequestOptions
-import eu.kanade.tachiyomi.network.NetworkHelper
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.io.InputStream
-
-/**
- * Class used to update Glide module settings
- */
-@GlideModule
-class TachiGlideModule : AppGlideModule() {
-
-    override fun applyOptions(context: Context, builder: GlideBuilder) {
-        builder.setDiskCache(InternalCacheDiskCacheFactory(context, 50 * 1024 * 1024))
-        builder.setDefaultRequestOptions(RequestOptions().format(DecodeFormat.PREFER_RGB_565))
-        builder.setDefaultTransitionOptions(
-            Drawable::class.java,
-            DrawableTransitionOptions.withCrossFade()
-        )
-    }
-
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        val networkFactory = OkHttpUrlLoader.Factory(Injekt.get<NetworkHelper>().client)
-
-        registry.replace(
-            GlideUrl::class.java,
-            InputStream::class.java,
-            networkFactory
-        )
-        registry.append(
-            MangaThumbnail::class.java,
-            InputStream::class.java,
-            MangaThumbnailModelLoader.Factory()
-        )
-        registry.append(
-            InputStream::class.java,
-            InputStream::class.java,
-            PassthroughModelLoader.Factory()
-        )
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
@ -8,7 +8,9 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import eu.kanade.tachiyomi.data.preference.CHARGING
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.UNMETERED_NETWORK
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.concurrent.TimeUnit
@ -31,9 +33,9 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
            val preferences = Injekt.get<PreferencesHelper>()
            val interval = prefInterval ?: preferences.libraryUpdateInterval().get()
            if (interval > 0) {
-                val restrictions = preferences.libraryUpdateRestriction()!!
-                val acRestriction = "ac" in restrictions
-                val wifiRestriction = if ("wifi" in restrictions) {
+                val restrictions = preferences.libraryUpdateRestriction().get()
+                val acRestriction = CHARGING in restrictions
+                val wifiRestriction = if (UNMETERED_NETWORK in restrictions) {
                    NetworkType.UNMETERED
                } else {
                    NetworkType.CONNECTED
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
@ -6,19 +6,22 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.bumptech.glide.Glide
+import coil.imageLoader
+import coil.request.ImageRequest
+import coil.transform.CircleCropTransformation
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.lang.chop
+import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.notification
 import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.notificationManager
@ -61,21 +64,25 @@ class LibraryUpdateNotifier(private val context: Context) {
    /**
     * Shows the notification containing the currently updating manga and the progress.
     *
-     * @param manga the manga that's being updated.
+     * @param manga the manga that are being updated.
     * @param current the current progress.
     * @param total the total progress.
     */
-    fun showProgressNotification(manga: Manga, current: Int, total: Int) {
-        val title = if (preferences.hideNotificationContent()) {
-            context.getString(R.string.notification_check_updates)
+    fun showProgressNotification(manga: List<Manga>, current: Int, total: Int) {
+        if (preferences.hideNotificationContent()) {
+            progressNotificationBuilder
+                .setContentTitle(context.getString(R.string.notification_check_updates))
+                .setContentText("($current/$total)")
        } else {
-            manga.title
+            val updatingText = manga.joinToString("\n") { it.title.chop(40) }
+            progressNotificationBuilder
+                .setContentTitle(context.getString(R.string.notification_updating, current, total))
+                .setStyle(NotificationCompat.BigTextStyle().bigText(updatingText))
        }

        context.notificationManager.notify(
            Notifications.ID_LIBRARY_PROGRESS,
            progressNotificationBuilder
-                .setContentTitle(title)
                .setProgress(total, current, false)
                .build()
        )
@ -165,14 +172,17 @@ class LibraryUpdateNotifier(private val context: Context) {

            // Per-manga notification
            if (!preferences.hideNotificationContent()) {
-                updates.forEach { (manga, chapters) ->
-                    notify(manga.id.hashCode(), createNewChaptersNotification(manga, chapters))
+                launchUI {
+                    updates.forEach { (manga, chapters) ->
+                        notify(manga.id.hashCode(), createNewChaptersNotification(manga, chapters))
+                    }
                }
            }
        }
    }

-    private fun createNewChaptersNotification(manga: Manga, chapters: Array<Chapter>): Notification {
+    private suspend fun createNewChaptersNotification(manga: Manga, chapters: Array<Chapter>): Notification {
+        val icon = getMangaIcon(manga)
        return context.notification(Notifications.CHANNEL_NEW_CHAPTERS) {
            setContentTitle(manga.title)

@ -182,7 +192,6 @@ class LibraryUpdateNotifier(private val context: Context) {

            setSmallIcon(R.drawable.ic_tachi)

-            val icon = getMangaIcon(manga)
            if (icon != null) {
                setLargeIcon(icon)
            }
@ -197,7 +206,7 @@ class LibraryUpdateNotifier(private val context: Context) {

            // Mark chapters as read action
            addAction(
-                R.drawable.ic_glasses_black_24dp,
+                R.drawable.ic_glasses_24dp,
                context.getString(R.string.action_mark_as_read),
                NotificationReceiver.markAsReadPendingBroadcast(
                    context,
@ -226,23 +235,14 @@ class LibraryUpdateNotifier(private val context: Context) {
        context.notificationManager.cancel(Notifications.ID_LIBRARY_PROGRESS)
    }

-    private fun getMangaIcon(manga: Manga): Bitmap? {
-        return try {
-            Glide.with(context)
-                .asBitmap()
-                .load(manga.toMangaThumbnail())
-                .dontTransform()
-                .centerCrop()
-                .circleCrop()
-                .override(
-                    NOTIF_ICON_SIZE,
-                    NOTIF_ICON_SIZE
-                )
-                .submit()
-                .get()
-        } catch (e: Exception) {
-            null
-        }
+    private suspend fun getMangaIcon(manga: Manga): Bitmap? {
+        val request = ImageRequest.Builder(context)
+            .data(manga)
+            .transformations(CircleCropTransformation())
+            .size(NOTIF_ICON_SIZE)
+            .build()
+        val drawable = context.imageLoader.execute(request).drawable
+        return (drawable as? BitmapDrawable)?.bitmap
    }

    private fun getNewChaptersDescription(chapters: Array<Chapter>): String {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateRanker.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateRanker.kt
@ -1,6 +1,9 @@
 package eu.kanade.tachiyomi.data.library

 import eu.kanade.tachiyomi.data.database.models.Manga
+import java.util.Collections
+import kotlin.Comparator
+import kotlin.math.abs

 /**
 * This class will provide various functions to rank manga to efficiently schedule manga to update.
@ -9,9 +12,26 @@ object LibraryUpdateRanker {

    val rankingScheme = listOf(
        (this::lexicographicRanking)(),
-        (this::latestFirstRanking)()
+        (this::latestFirstRanking)(),
+        (this::nextFirstRanking)()
    )

+    /**
+     * Provides a total ordering over all the Mangas.
+     *
+     * Orders the manga based on the distance between the next expected update and now.
+     * The comparator is reversed, placing the smallest (and thus closest to updating now) first.
+     */
+    fun nextFirstRanking(): Comparator<Manga> {
+        val time = System.currentTimeMillis()
+        return Collections.reverseOrder(
+            Comparator { mangaFirst: Manga,
+                mangaSecond: Manga ->
+                compareValues(abs(mangaSecond.next_update - time), abs(mangaFirst.next_update - time))
+            }
+        )
+    }
+
    /**
     * Provides a total ordering over all the [Manga]s.
     *
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@ -20,13 +20,17 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateRanker.rankingScheme
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.track.EnhancedTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.toSChapter
 import eu.kanade.tachiyomi.source.model.toSManga
 import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
+import eu.kanade.tachiyomi.util.chapter.syncChaptersWithTrackServiceTwoWay
+import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.prepUpdateCover
 import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
 import eu.kanade.tachiyomi.util.storage.getUriCompat
@ -44,10 +48,14 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger

 /**
@ -267,45 +275,79 @@ class LibraryUpdateService(
     * @return an observable delivering the progress of each update.
     */
    suspend fun updateChapterList() {
+        val semaphore = Semaphore(5)
        val progressCount = AtomicInteger(0)
-        val newUpdates = mutableListOf<Pair<LibraryManga, Array<Chapter>>>()
-        val failedUpdates = mutableListOf<Pair<Manga, String?>>()
-        var hasDownloads = false
+        val currentlyUpdatingManga = CopyOnWriteArrayList<LibraryManga>()
+        val newUpdates = CopyOnWriteArrayList<Pair<LibraryManga, Array<Chapter>>>()
+        val failedUpdates = CopyOnWriteArrayList<Pair<Manga, String?>>()
+        val hasDownloads = AtomicBoolean(false)
+        val loggedServices by lazy { trackManager.services.filter { it.isLogged } }

-        mangaToUpdate.forEach { manga ->
-            if (updateJob?.isActive != true) {
-                return
-            }
+        withIOContext {
+            mangaToUpdate.groupBy { it.source }
+                .values
+                .map { mangaInSource ->
+                    async {
+                        semaphore.withPermit {
+                            mangaInSource.forEach { manga ->
+                                if (updateJob?.isActive != true) {
+                                    return@async
+                                }

-            notifier.showProgressNotification(manga, progressCount.andIncrement, mangaToUpdate.size)
+                                currentlyUpdatingManga.add(manga)
+                                notifier.showProgressNotification(
+                                    currentlyUpdatingManga,
+                                    progressCount.get(),
+                                    mangaToUpdate.size
+                                )

-            try {
-                val (newChapters, _) = updateManga(manga)
+                                try {
+                                    val (newChapters, _) = updateManga(manga)

-                if (newChapters.isNotEmpty()) {
-                    if (manga.shouldDownloadNewChapters(db, preferences)) {
-                        downloadChapters(manga, newChapters)
-                        hasDownloads = true
+                                    if (newChapters.isNotEmpty()) {
+                                        if (manga.shouldDownloadNewChapters(db, preferences)) {
+                                            downloadChapters(manga, newChapters)
+                                            hasDownloads.set(true)
+                                        }
+
+                                        // Convert to the manga that contains new chapters
+                                        newUpdates.add(manga to newChapters.sortedByDescending { ch -> ch.source_order }.toTypedArray())
+                                    }
+                                } catch (e: Throwable) {
+                                    val errorMessage = if (e is NoChaptersException) {
+                                        getString(R.string.no_chapters_error)
+                                    } else if (e is SourceManager.SourceNotInstalledException) {
+                                        // failedUpdates will already have the source, don't need to copy it into the message
+                                        getString(R.string.loader_not_implemented_error)
+                                    } else {
+                                        e.message
+                                    }
+                                    failedUpdates.add(manga to errorMessage)
+                                }
+
+                                if (preferences.autoUpdateTrackers()) {
+                                    updateTrackings(manga, loggedServices)
+                                }
+
+                                currentlyUpdatingManga.remove(manga)
+                                progressCount.andIncrement
+                                notifier.showProgressNotification(
+                                    currentlyUpdatingManga,
+                                    progressCount.get(),
+                                    mangaToUpdate.size
+                                )
+                            }
+                        }
                    }
-
-                    // Convert to the manga that contains new chapters
-                    newUpdates.add(manga to newChapters.sortedByDescending { ch -> ch.source_order }.toTypedArray())
                }
-            } catch (e: Throwable) {
-                val errorMessage = if (e is NoChaptersException) {
-                    getString(R.string.no_chapters_error)
-                } else {
-                    e.message
-                }
-                failedUpdates.add(manga to errorMessage)
-            }
+                .awaitAll()
        }

        notifier.cancelProgressNotification()

        if (newUpdates.isNotEmpty()) {
            notifier.showUpdateNotifications(newUpdates)
-            if (hasDownloads) {
+            if (hasDownloads.get()) {
                DownloadService.start(this)
            }
        }
@ -361,31 +403,59 @@ class LibraryUpdateService(
    }

    private suspend fun updateCovers() {
-        var progressCount = 0
+        val semaphore = Semaphore(5)
+        val progressCount = AtomicInteger(0)
+        val currentlyUpdatingManga = CopyOnWriteArrayList<LibraryManga>()

-        mangaToUpdate.forEach { manga ->
-            if (updateJob?.isActive != true) {
-                return
-            }
+        withIOContext {
+            mangaToUpdate.groupBy { it.source }
+                .values
+                .map { mangaInSource ->
+                    async {
+                        semaphore.withPermit {
+                            mangaInSource.forEach { manga ->
+                                if (updateJob?.isActive != true) {
+                                    return@async
+                                }

-            notifier.showProgressNotification(manga, progressCount++, mangaToUpdate.size)
+                                currentlyUpdatingManga.add(manga)
+                                notifier.showProgressNotification(
+                                    currentlyUpdatingManga,
+                                    progressCount.get(),
+                                    mangaToUpdate.size
+                                )

-            sourceManager.get(manga.source)?.let { source ->
-                try {
-                    val networkManga = source.getMangaDetails(manga.toMangaInfo())
-                    val sManga = networkManga.toSManga()
-                    manga.prepUpdateCover(coverCache, sManga, true)
-                    sManga.thumbnail_url?.let {
-                        manga.thumbnail_url = it
-                        db.insertManga(manga).executeAsBlocking()
+                                sourceManager.get(manga.source)?.let { source ->
+                                    try {
+                                        val networkManga =
+                                            source.getMangaDetails(manga.toMangaInfo())
+                                        val sManga = networkManga.toSManga()
+                                        manga.prepUpdateCover(coverCache, sManga, true)
+                                        sManga.thumbnail_url?.let {
+                                            manga.thumbnail_url = it
+                                            db.insertManga(manga).executeAsBlocking()
+                                        }
+                                    } catch (e: Throwable) {
+                                        // Ignore errors and continue
+                                        Timber.e(e)
+                                    }
+                                }
+
+                                currentlyUpdatingManga.remove(manga)
+                                progressCount.andIncrement
+                                notifier.showProgressNotification(
+                                    currentlyUpdatingManga,
+                                    progressCount.get(),
+                                    mangaToUpdate.size
+                                )
+                            }
+                        }
                    }
-                } catch (e: Throwable) {
-                    // Ignore errors and continue
-                    Timber.e(e)
                }
-            }
+                .awaitAll()
        }

+        coverCache.clearMemoryCache()
        notifier.cancelProgressNotification()
    }

@ -402,31 +472,38 @@ class LibraryUpdateService(
                return
            }

-            // Notify manga that will update.
-            notifier.showProgressNotification(manga, progressCount++, mangaToUpdate.size)
+            notifier.showProgressNotification(listOf(manga), progressCount++, mangaToUpdate.size)

            // Update the tracking details.
-            db.getTracks(manga).executeAsBlocking()
-                .map { track ->
-                    supervisorScope {
-                        async {
-                            val service = trackManager.getService(track.sync_id)
-                            if (service != null && service in loggedServices) {
-                                try {
-                                    val updatedTrack = service.refresh(track)
-                                    db.insertTrack(updatedTrack).executeAsBlocking()
-                                } catch (e: Throwable) {
-                                    // Ignore errors and continue
-                                    Timber.e(e)
+            updateTrackings(manga, loggedServices)
+        }
+
+        notifier.cancelProgressNotification()
+    }
+
+    private suspend fun updateTrackings(manga: LibraryManga, loggedServices: List<TrackService>) {
+        db.getTracks(manga).executeAsBlocking()
+            .map { track ->
+                supervisorScope {
+                    async {
+                        val service = trackManager.getService(track.sync_id)
+                        if (service != null && service in loggedServices) {
+                            try {
+                                val updatedTrack = service.refresh(track)
+                                db.insertTrack(updatedTrack).executeAsBlocking()
+
+                                if (service is EnhancedTrackService) {
+                                    syncChaptersWithTrackServiceTwoWay(db, db.getChapters(manga).executeAsBlocking(), track, service)
                                }
+                            } catch (e: Throwable) {
+                                // Ignore errors and continue
+                                Timber.e(e)
                            }
                        }
                    }
                }
-                .awaitAll()
-        }
-
-        notifier.cancelProgressNotification()
+            }
+            .awaitAll()
    }

    /**
@ -437,9 +514,19 @@ class LibraryUpdateService(
            if (errors.isNotEmpty()) {
                val file = createFileInCacheDir("tachiyomi_update_errors.txt")
                file.bufferedWriter().use { out ->
-                    errors.forEach { (manga, error) ->
-                        val source = sourceManager.getOrStub(manga.source)
-                        out.write("${manga.title} ($source): $error\n")
+                    // Error file format:
+                    // ! Error
+                    //   # Source
+                    //     - Manga
+                    errors.groupBy({ it.second }, { it.first }).forEach { (error, mangas) ->
+                        out.write("! ${error}\n")
+                        mangas.groupBy { it.source }.forEach { (srcId, mangas) ->
+                            val source = sourceManager.getOrStub(srcId)
+                            out.write("  # $source\n")
+                            mangas.forEach {
+                                out.write("    - ${it.title}\n")
+                            }
+                        }
                    }
                }
                return file
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@ -2,12 +2,11 @@ package eu.kanade.tachiyomi.data.notification

 import android.app.PendingIntent
 import android.content.BroadcastReceiver
-import android.content.ClipData
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import android.os.Handler
+import androidx.core.content.ContextCompat
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.BackupRestoreService
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@ -25,6 +24,7 @@ import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.storage.getUriCompat
 import eu.kanade.tachiyomi.util.system.notificationManager
+import eu.kanade.tachiyomi.util.system.toShareIntent
 import eu.kanade.tachiyomi.util.system.toast
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@ -58,22 +58,22 @@ class NotificationReceiver : BroadcastReceiver() {
            ACTION_SHARE_IMAGE ->
                shareImage(
                    context,
-                    intent.getStringExtra(EXTRA_FILE_LOCATION),
+                    intent.getStringExtra(EXTRA_FILE_LOCATION)!!,
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            // Delete image from path and dismiss notification
            ACTION_DELETE_IMAGE ->
                deleteImage(
                    context,
-                    intent.getStringExtra(EXTRA_FILE_LOCATION),
+                    intent.getStringExtra(EXTRA_FILE_LOCATION)!!,
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            // Share backup file
            ACTION_SHARE_BACKUP ->
                shareFile(
                    context,
-                    intent.getParcelableExtra(EXTRA_URI),
-                    if (intent.getBooleanExtra(EXTRA_IS_LEGACY_BACKUP, false)) "application/json" else "application/x-protobuf+gzip",
+                    intent.getParcelableExtra(EXTRA_URI)!!,
+                    "application/x-protobuf+gzip",
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
            ACTION_CANCEL_RESTORE -> cancelRestore(
@ -106,7 +106,7 @@ class NotificationReceiver : BroadcastReceiver() {
            ACTION_SHARE_CRASH_LOG ->
                shareFile(
                    context,
-                    intent.getParcelableExtra(EXTRA_URI),
+                    intent.getParcelableExtra(EXTRA_URI)!!,
                    "text/plain",
                    intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                )
@ -130,16 +130,8 @@ class NotificationReceiver : BroadcastReceiver() {
     * @param notificationId id of notification
     */
    private fun shareImage(context: Context, path: String, notificationId: Int) {
-        val intent = Intent(Intent.ACTION_SEND).apply {
-            val uri = File(path).getUriCompat(context)
-            putExtra(Intent.EXTRA_STREAM, uri)
-            clipData = ClipData.newRawUri(null, uri)
-            type = "image/*"
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
-        }
        dismissNotification(context, notificationId)
-        // Launch share activity
-        context.startActivity(intent)
+        context.startActivity(File(path).getUriCompat(context).toShareIntent(context))
    }

    /**
@ -150,16 +142,8 @@ class NotificationReceiver : BroadcastReceiver() {
     * @param notificationId id of notification
     */
    private fun shareFile(context: Context, uri: Uri, fileMimeType: String, notificationId: Int) {
-        val sendIntent = Intent(Intent.ACTION_SEND).apply {
-            putExtra(Intent.EXTRA_STREAM, uri)
-            clipData = ClipData.newRawUri(null, uri)
-            type = fileMimeType
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
-        }
-        // Dismiss notification
        dismissNotification(context, notificationId)
-        // Launch share activity
-        context.startActivity(sendIntent)
+        context.startActivity(uri.toShareIntent(context, fileMimeType))
    }

    /**
@ -208,7 +192,7 @@ class NotificationReceiver : BroadcastReceiver() {
     */
    private fun cancelRestore(context: Context, notificationId: Int) {
        BackupRestoreService.stop(context)
-        Handler().post { dismissNotification(context, notificationId) }
+        ContextCompat.getMainExecutor(context).execute { dismissNotification(context, notificationId) }
    }

    /**
@ -219,7 +203,7 @@ class NotificationReceiver : BroadcastReceiver() {
     */
    private fun cancelLibraryUpdate(context: Context, notificationId: Int) {
        LibraryUpdateService.stop(context)
-        Handler().post { dismissNotification(context, notificationId) }
+        ContextCompat.getMainExecutor(context).execute { dismissNotification(context, notificationId) }
    }

    /**
@ -281,7 +265,6 @@ class NotificationReceiver : BroadcastReceiver() {
        private const val EXTRA_MANGA_ID = "$ID.$NAME.EXTRA_MANGA_ID"
        private const val EXTRA_CHAPTER_ID = "$ID.$NAME.EXTRA_CHAPTER_ID"
        private const val EXTRA_CHAPTER_URL = "$ID.$NAME.EXTRA_CHAPTER_URL"
-        private const val EXTRA_IS_LEGACY_BACKUP = "$ID.$NAME.EXTRA_IS_LEGACY_BACKUP"

        /**
         * Returns a [PendingIntent] that resumes the download of a chapter
@ -494,11 +477,10 @@ class NotificationReceiver : BroadcastReceiver() {
         * @param notificationId id of notification
         * @return [PendingIntent]
         */
-        internal fun shareBackupPendingBroadcast(context: Context, uri: Uri, isLegacyFormat: Boolean, notificationId: Int): PendingIntent {
+        internal fun shareBackupPendingBroadcast(context: Context, uri: Uri, notificationId: Int): PendingIntent {
            val intent = Intent(context, NotificationReceiver::class.java).apply {
                action = ACTION_SHARE_BACKUP
                putExtra(EXTRA_URI, uri)
-                putExtra(EXTRA_IS_LEGACY_BACKUP, isLegacyFormat)
                putExtra(EXTRA_NOTIFICATION_ID, notificationId)
            }
            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt
@ -68,6 +68,12 @@ object Notifications {
    const val CHANNEL_CRASH_LOGS = "crash_logs_channel"
    const val ID_CRASH_LOGS = -601

+    /**
+     * Notification channel used for Incognito Mode
+     */
+    const val CHANNEL_INCOGNITO_MODE = "incognito_mode_channel"
+    const val ID_INCOGNITO_MODE = -701
+
    private val deprecatedChannels = listOf(
        "downloader_channel",
        "backup_restore_complete_channel"
@ -154,6 +160,11 @@ object Notifications {
                CHANNEL_CRASH_LOGS,
                context.getString(R.string.channel_crash_logs),
                NotificationManager.IMPORTANCE_HIGH
+            ),
+            NotificationChannel(
+                CHANNEL_INCOGNITO_MODE,
+                context.getString(R.string.pref_incognito_mode),
+                NotificationManager.IMPORTANCE_LOW
            )
        ).forEach(context.notificationManager::createNotificationChannel)

--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@ -7,15 +7,15 @@ object PreferenceKeys {

    const val themeMode = "pref_theme_mode_key"

-    const val themeLight = "pref_theme_light_key"
+    const val appTheme = "pref_app_theme"

-    const val themeDark = "pref_theme_dark_key"
+    const val themeDarkAmoled = "pref_theme_dark_amoled_key"

    const val confirmExit = "pref_confirm_exit"

-    const val hideBottomBar = "pref_hide_bottom_bar_on_scroll"
+    const val hideBottomBarOnScroll = "pref_hide_bottom_bar_on_scroll"

-    const val rotation = "pref_rotation_type_key"
+    const val sideNavIconAlignment = "pref_side_nav_icon_alignment"

    const val enableTransitions = "pref_enable_transitions_key"

@ -51,7 +51,11 @@ object PreferenceKeys {

    const val colorFilterMode = "color_filter_mode"

-    const val defaultViewer = "pref_default_viewer_key"
+    const val grayscale = "pref_grayscale"
+
+    const val defaultReadingMode = "pref_default_reading_mode_key"
+
+    const val defaultOrientationType = "pref_default_orientation_type_key"

    const val imageScaleType = "pref_image_scale_type_key"

@ -109,6 +113,8 @@ object PreferenceKeys {

    const val downloadOnlyOverWifi = "pref_download_only_over_wifi_key"

+    const val folderPerManga = "create_folder_per_manga"
+
    const val numberOfBackups = "backup_slots"

    const val backupInterval = "backup_interval"
@ -139,6 +145,7 @@ object PreferenceKeys {
    const val filterTracked = "pref_filter_library_tracked"

    const val librarySortingMode = "library_sorting_mode"
+    const val librarySortingDirection = "library_sorting_ascending"

    const val automaticExtUpdates = "automatic_ext_updates"

@ -148,7 +155,7 @@ object PreferenceKeys {

    const val startScreen = "start_screen"

-    const val useBiometricLock = "use_biometric_lock"
+    const val useAuthenticator = "use_biometric_lock"

    const val lockAppAfter = "lock_app_after"

@ -160,6 +167,8 @@ object PreferenceKeys {

    const val autoUpdateMetadata = "auto_update_metadata"

+    const val autoUpdateTrackers = "auto_update_trackers"
+
    const val showLibraryUpdateErrors = "show_library_update_errors"

    const val downloadNew = "download_new"
@ -175,6 +184,8 @@ object PreferenceKeys {

    const val defaultCategory = "default_category"

+    const val categorizedDisplay = "categorized_display"
+
    const val skipRead = "skip_read"

    const val skipFiltered = "skip_filtered"
@ -183,6 +194,8 @@ object PreferenceKeys {

    const val unreadBadge = "display_unread_badge"

+    const val localBadge = "display_local_badge"
+
    const val categoryTabs = "display_category_tabs"

    const val categoryNumberOfItems = "display_number_of_items"
@ -207,8 +220,6 @@ object PreferenceKeys {

    const val incognitoMode = "incognito_mode"

-    const val createLegacyBackup = "create_legacy_backup"
-
    fun trackUsername(syncId: Int) = "pref_mangasync_username_$syncId"

    fun trackPassword(syncId: Int) = "pref_mangasync_password_$syncId"
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
@ -1,5 +1,10 @@
 package eu.kanade.tachiyomi.data.preference

+import eu.kanade.tachiyomi.R
+
+const val UNMETERED_NETWORK = "wifi"
+const val CHARGING = "ac"
+
 /**
 * This class stores the values for the preferences in the application.
 */
@ -14,31 +19,28 @@ object PreferenceValues {
        system,
    }

-    // Keys are lowercase to match legacy string values
-    enum class LightThemeVariant {
-        default,
-        blue,
-    }
-
-    // Keys are lowercase to match legacy string values
-    enum class DarkThemeVariant {
-        default,
-        blue,
-        amoled,
-    }
-
    /* ktlint-enable experimental:enum-entry-name-case */

-    enum class DisplayMode {
-        COMPACT_GRID,
-        COMFORTABLE_GRID,
-        LIST,
+    enum class AppTheme(val titleResId: Int?) {
+        DEFAULT(R.string.theme_default),
+        MONET(R.string.theme_monet),
+        BLUE(R.string.theme_blue),
+        GREEN_APPLE(R.string.theme_greenapple),
+        MIDNIGHT_DUSK(R.string.theme_midnightdusk),
+        STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
+        TAKO(R.string.theme_tako),
+        YINYANG(R.string.theme_yinyang),
+        YOTSUBA(R.string.theme_yotsuba),
+
+        // Deprecated
+        DARK_BLUE(null),
+        HOT_PINK(null),
    }

    enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
        NONE,
        HORIZONTAL(shouldInvertHorizontal = true),
        VERTICAL(shouldInvertVertical = true),
-        BOTH(shouldInvertHorizontal = true, shouldInvertVertical = true)
+        BOTH(shouldInvertHorizontal = true, shouldInvertVertical = true),
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@ -9,9 +9,14 @@ import com.tfcporciuncula.flow.FlowSharedPreferences
 import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.preference.PreferenceValues.DisplayMode
+import eu.kanade.tachiyomi.data.preference.PreferenceValues.ThemeMode.*
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
+import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
+import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
+import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
+import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.onEach
@ -36,8 +41,9 @@ operator fun <T> Preference<Set<T>>.minusAssign(item: T) {
    set(get() - item)
 }

-fun Preference<Boolean>.toggle() {
+fun Preference<Boolean>.toggle(): Boolean {
    set(!get())
+    return get()
 }

 class PreferencesHelper(val context: Context) {
@ -61,9 +67,11 @@ class PreferencesHelper(val context: Context) {

    fun confirmExit() = prefs.getBoolean(Keys.confirmExit, false)

-    fun hideBottomBar() = flowPrefs.getBoolean(Keys.hideBottomBar, true)
+    fun hideBottomBarOnScroll() = flowPrefs.getBoolean(Keys.hideBottomBarOnScroll, true)

-    fun useBiometricLock() = flowPrefs.getBoolean(Keys.useBiometricLock, false)
+    fun sideNavIconAlignment() = flowPrefs.getInt(Keys.sideNavIconAlignment, 0)
+
+    fun useAuthenticator() = flowPrefs.getBoolean(Keys.useAuthenticator, false)

    fun lockAppAfter() = flowPrefs.getInt(Keys.lockAppAfter, 0)

@ -75,17 +83,15 @@ class PreferencesHelper(val context: Context) {

    fun autoUpdateMetadata() = prefs.getBoolean(Keys.autoUpdateMetadata, false)

-    fun showLibraryUpdateErrors() = prefs.getBoolean(Keys.showLibraryUpdateErrors, false)
+    fun autoUpdateTrackers() = prefs.getBoolean(Keys.autoUpdateTrackers, false)

-    fun clear() = prefs.edit { clear() }
+    fun showLibraryUpdateErrors() = prefs.getBoolean(Keys.showLibraryUpdateErrors, true)

-    fun themeMode() = flowPrefs.getEnum(Keys.themeMode, Values.ThemeMode.system)
+    fun themeMode() = flowPrefs.getEnum(Keys.themeMode, system)

-    fun themeLight() = flowPrefs.getEnum(Keys.themeLight, Values.LightThemeVariant.default)
+    fun appTheme() = flowPrefs.getEnum(Keys.appTheme, Values.AppTheme.DEFAULT)

-    fun themeDark() = flowPrefs.getEnum(Keys.themeDark, Values.DarkThemeVariant.default)
-
-    fun rotation() = flowPrefs.getInt(Keys.rotation, 1)
+    fun themeDarkAmoled() = flowPrefs.getBoolean(Keys.themeDarkAmoled, false)

    fun pageTransitions() = flowPrefs.getBoolean(Keys.enableTransitions, true)

@ -121,7 +127,11 @@ class PreferencesHelper(val context: Context) {

    fun colorFilterMode() = flowPrefs.getInt(Keys.colorFilterMode, 0)

-    fun defaultViewer() = prefs.getInt(Keys.defaultViewer, 2)
+    fun grayscale() = flowPrefs.getBoolean(Keys.grayscale, false)
+
+    fun defaultReadingMode() = prefs.getInt(Keys.defaultReadingMode, ReadingModeType.RIGHT_TO_LEFT.flagValue)
+
+    fun defaultOrientationType() = prefs.getInt(Keys.defaultOrientationType, OrientationType.FREE.flagValue)

    fun imageScaleType() = flowPrefs.getInt(Keys.imageScaleType, 1)

@ -173,7 +183,7 @@ class PreferencesHelper(val context: Context) {

    fun lastVersionCode() = flowPrefs.getInt("last_version_code", 0)

-    fun sourceDisplayMode() = flowPrefs.getEnum(Keys.sourceDisplayMode, DisplayMode.COMPACT_GRID)
+    fun sourceDisplayMode() = flowPrefs.getEnum(Keys.sourceDisplayMode, DisplayModeSetting.COMPACT_GRID)

    fun enabledLanguages() = flowPrefs.getStringSet(Keys.enabledLanguages, setOf("en", Locale.getDefault().language))

@ -203,6 +213,8 @@ class PreferencesHelper(val context: Context) {

    fun downloadOnlyOverWifi() = prefs.getBoolean(Keys.downloadOnlyOverWifi, true)

+    fun folderPerManga() = prefs.getBoolean(Keys.folderPerManga, false)
+
    fun numberOfBackups() = flowPrefs.getInt(Keys.numberOfBackups, 1)

    fun backupInterval() = flowPrefs.getInt(Keys.backupInterval, 0)
@ -215,17 +227,19 @@ class PreferencesHelper(val context: Context) {

    fun libraryUpdateInterval() = flowPrefs.getInt(Keys.libraryUpdateInterval, 24)

-    fun libraryUpdateRestriction() = prefs.getStringSet(Keys.libraryUpdateRestriction, setOf("wifi"))
+    fun libraryUpdateRestriction() = flowPrefs.getStringSet(Keys.libraryUpdateRestriction, setOf(UNMETERED_NETWORK))

    fun libraryUpdateCategories() = flowPrefs.getStringSet(Keys.libraryUpdateCategories, emptySet())
    fun libraryUpdateCategoriesExclude() = flowPrefs.getStringSet(Keys.libraryUpdateCategoriesExclude, emptySet())

    fun libraryUpdatePrioritization() = flowPrefs.getInt(Keys.libraryUpdatePrioritization, 0)

-    fun libraryDisplayMode() = flowPrefs.getEnum(Keys.libraryDisplayMode, DisplayMode.COMPACT_GRID)
+    fun libraryDisplayMode() = flowPrefs.getEnum(Keys.libraryDisplayMode, DisplayModeSetting.COMPACT_GRID)

    fun downloadBadge() = flowPrefs.getBoolean(Keys.downloadBadge, false)

+    fun localBadge() = flowPrefs.getBoolean(Keys.localBadge, true)
+
    fun downloadedOnly() = flowPrefs.getBoolean(Keys.downloadedOnly, false)

    fun unreadBadge() = flowPrefs.getBoolean(Keys.unreadBadge, true)
@ -242,9 +256,8 @@ class PreferencesHelper(val context: Context) {

    fun filterTracking(name: Int) = flowPrefs.getInt("${Keys.filterTracked}_$name", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)

-    fun librarySortingMode() = flowPrefs.getInt(Keys.librarySortingMode, 0)
-
-    fun librarySortingAscending() = flowPrefs.getBoolean("library_sorting_ascending", true)
+    fun librarySortingMode() = flowPrefs.getEnum(Keys.librarySortingMode, SortModeSetting.ALPHABETICAL)
+    fun librarySortingAscending() = flowPrefs.getEnum(Keys.librarySortingDirection, SortDirectionSetting.ASCENDING)

    fun automaticExtUpdates() = flowPrefs.getBoolean(Keys.automaticExtUpdates, true)

@ -267,10 +280,12 @@ class PreferencesHelper(val context: Context) {
    fun downloadNewCategories() = flowPrefs.getStringSet(Keys.downloadNewCategories, emptySet())
    fun downloadNewCategoriesExclude() = flowPrefs.getStringSet(Keys.downloadNewCategoriesExclude, emptySet())

-    fun lang() = prefs.getString(Keys.lang, "")
+    fun lang() = flowPrefs.getString(Keys.lang, "")

    fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -1)

+    fun categorisedDisplaySettings() = flowPrefs.getBoolean(Keys.categorizedDisplay, false)
+
    fun skipRead() = prefs.getBoolean(Keys.skipRead, false)

    fun skipFiltered() = prefs.getBoolean(Keys.skipFiltered, true)
@ -289,16 +304,14 @@ class PreferencesHelper(val context: Context) {

    fun filterChapterByBookmarked() = prefs.getInt(Keys.defaultChapterFilterByBookmarked, Manga.SHOW_ALL)

-    fun sortChapterBySourceOrNumber() = prefs.getInt(Keys.defaultChapterSortBySourceOrNumber, Manga.SORTING_SOURCE)
+    fun sortChapterBySourceOrNumber() = prefs.getInt(Keys.defaultChapterSortBySourceOrNumber, Manga.CHAPTER_SORTING_SOURCE)

-    fun displayChapterByNameOrNumber() = prefs.getInt(Keys.defaultChapterDisplayByNameOrNumber, Manga.DISPLAY_NAME)
+    fun displayChapterByNameOrNumber() = prefs.getInt(Keys.defaultChapterDisplayByNameOrNumber, Manga.CHAPTER_DISPLAY_NAME)

-    fun sortChapterByAscendingOrDescending() = prefs.getInt(Keys.defaultChapterSortByAscendingOrDescending, Manga.SORT_DESC)
+    fun sortChapterByAscendingOrDescending() = prefs.getInt(Keys.defaultChapterSortByAscendingOrDescending, Manga.CHAPTER_SORT_DESC)

    fun incognitoMode() = flowPrefs.getBoolean(Keys.incognitoMode, false)

-    fun createLegacyBackup() = flowPrefs.getBoolean(Keys.createLegacyBackup, true)
-
    fun setChapterSettingsDefault(manga: Manga) {
        prefs.edit {
            putInt(Keys.defaultChapterFilterByRead, manga.readFilter)
@ -306,7 +319,7 @@ class PreferencesHelper(val context: Context) {
            putInt(Keys.defaultChapterFilterByBookmarked, manga.bookmarkedFilter)
            putInt(Keys.defaultChapterSortBySourceOrNumber, manga.sorting)
            putInt(Keys.defaultChapterDisplayByNameOrNumber, manga.displayMode)
-            putInt(Keys.defaultChapterSortByAscendingOrDescending, if (manga.sortDescending()) Manga.SORT_DESC else Manga.SORT_ASC)
+            putInt(Keys.defaultChapterSortByAscendingOrDescending, if (manga.sortDescending()) Manga.CHAPTER_SORT_DESC else Manga.CHAPTER_SORT_ASC)
        }
    }
 }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/EnhancedTrackService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/EnhancedTrackService.kt
@ -0,0 +1,28 @@
+package eu.kanade.tachiyomi.data.track
+
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import eu.kanade.tachiyomi.source.Source
+
+/**
+ * An Enhanced Track Service will never prompt the user to match a manga with the remote.
+ * It is expected that such Track Service can only work with specific sources and unique IDs.
+ */
+interface EnhancedTrackService {
+    /**
+     * This TrackService will only work with the sources that are accepted by this filter function.
+     */
+    fun accept(source: Source): Boolean {
+        return source::class.qualifiedName in getAcceptedSources()
+    }
+
+    /**
+     * Fully qualified source classes that this track service is compatible with.
+     */
+    fun getAcceptedSources(): List<String>
+
+    /**
+     * match is similar to TrackService.search, but only return zero or one match.
+     */
+    suspend fun match(manga: Manga): TrackSearch?
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/NoLoginTrackService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/NoLoginTrackService.kt
@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi.data.track
+
+/**
+ * A TrackService that doesn't need explicit login.
+ */
+interface NoLoginTrackService {
+    fun loginNoop()
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
@ -4,6 +4,7 @@ import android.content.Context
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
 import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
 import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
+import eu.kanade.tachiyomi.data.track.komga.Komga
 import eu.kanade.tachiyomi.data.track.myanimelist.MyAnimeList
 import eu.kanade.tachiyomi.data.track.shikimori.Shikimori

@ -15,6 +16,7 @@ class TrackManager(context: Context) {
        const val KITSU = 3
        const val SHIKIMORI = 4
        const val BANGUMI = 5
+        const val KOMGA = 6
    }

    val myAnimeList = MyAnimeList(context, MYANIMELIST)
@ -27,7 +29,9 @@ class TrackManager(context: Context) {

    val bangumi = Bangumi(context, BANGUMI)

-    val services = listOf(myAnimeList, aniList, kitsu, shikimori, bangumi)
+    val komga = Komga(context, KOMGA)
+
+    val services = listOf(myAnimeList, aniList, kitsu, shikimori, bangumi, komga)

    fun getService(id: Int) = services.find { it.id == id }

--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
@ -36,6 +36,10 @@ abstract class TrackService(val id: Int) {

    abstract fun getStatus(status: Int): String

+    abstract fun getReadingStatus(): Int
+
+    abstract fun getRereadingStatus(): Int
+
    abstract fun getCompletionStatus(): Int

    abstract fun getScoreList(): List<String>
@ -46,11 +50,9 @@ abstract class TrackService(val id: Int) {

    abstract fun displayScore(track: Track): String

-    abstract suspend fun add(track: Track): Track
+    abstract suspend fun update(track: Track, didReadChapter: Boolean = false): Track

-    abstract suspend fun update(track: Track): Track
-
-    abstract suspend fun bind(track: Track): Track
+    abstract suspend fun bind(track: Track, hasReadChapters: Boolean = false): Track

    abstract suspend fun search(query: String): List<TrackSearch>

--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@ -72,6 +72,10 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
        }
    }

+    override fun getReadingStatus(): Int = READING
+
+    override fun getRereadingStatus(): Int = REPEATING
+
    override fun getCompletionStatus(): Int = COMPLETED

    override fun getScoreList(): List<String> {
@ -130,11 +134,11 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
        }
    }

-    override suspend fun add(track: Track): Track {
+    private suspend fun add(track: Track): Track {
        return api.addLibManga(track)
    }

-    override suspend fun update(track: Track): Track {
+    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
        // If user was using API v1 fetch library_id
        if (track.library_id == null || track.library_id!! == 0L) {
            val libManga = api.findLibManga(track, getUsername().toInt())
@ -142,18 +146,30 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
            track.library_id = libManga.library_id
        }

+        if (track.status != COMPLETED) {
+            if (track.status != REPEATING && didReadChapter) {
+                track.status = READING
+            }
+        }
+
        return api.updateLibManga(track)
    }

-    override suspend fun bind(track: Track): Track {
+    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
        val remoteTrack = api.findLibManga(track, getUsername().toInt())
        return if (remoteTrack != null) {
            track.copyPersonalFrom(remoteTrack)
            track.library_id = remoteTrack.library_id
+
+            if (track.status != COMPLETED) {
+                val isRereading = track.status == REPEATING
+                track.status = if (isRereading.not() && hasReadChapters) READING else track.status
+            }
+
            update(track)
        } else {
            // Set default fields if it's not found in the list
-            track.status = READING
+            track.status = if (hasReadChapters) READING else PLANNING
            track.score = 0F
            add(track)
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
@ -2,13 +2,11 @@ package eu.kanade.tachiyomi.data.track.anilist

 import android.net.Uri
 import androidx.core.net.toUri
-import com.afollestad.date.dayOfMonth
-import com.afollestad.date.month
-import com.afollestad.date.year
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.interceptor.RateLimitInterceptor
 import eu.kanade.tachiyomi.network.jsonMime
 import eu.kanade.tachiyomi.network.parseAs
 import eu.kanade.tachiyomi.util.lang.withIOContext
@ -27,10 +25,14 @@ import kotlinx.serialization.json.putJsonObject
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
 import java.util.Calendar
+import java.util.concurrent.TimeUnit.MINUTES

 class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {

-    private val authClient = client.newBuilder().addInterceptor(interceptor).build()
+    private val authClient = client.newBuilder()
+        .addInterceptor(interceptor)
+        .addInterceptor(RateLimitInterceptor(85, 1, MINUTES))
+        .build()

    suspend fun addLibManga(track: Track): Track {
        return withIOContext {
@ -310,9 +312,9 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) {
        val calendar = Calendar.getInstance()
        calendar.timeInMillis = dateValue
        return buildJsonObject {
-            put("year", calendar.year)
-            put("month", calendar.month + 1)
-            put("day", calendar.dayOfMonth)
+            put("year", calendar.get(Calendar.YEAR))
+            put("month", calendar.get(Calendar.MONTH) + 1)
+            put("day", calendar.get(Calendar.DAY_OF_MONTH))
        }
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
@ -31,28 +31,38 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
        return track.score.toInt().toString()
    }

-    override suspend fun add(track: Track): Track {
+    private suspend fun add(track: Track): Track {
        return api.addLibManga(track)
    }

-    override suspend fun update(track: Track): Track {
+    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
+        if (track.status != COMPLETED) {
+            if (didReadChapter) {
+                track.status = READING
+            }
+        }
+
        return api.updateLibManga(track)
    }

-    override suspend fun bind(track: Track): Track {
+    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
        val statusTrack = api.statusLibManga(track)
        val remoteTrack = api.findLibManga(track)
        return if (remoteTrack != null && statusTrack != null) {
            track.copyPersonalFrom(remoteTrack)
            track.library_id = remoteTrack.library_id
-            track.status = statusTrack.status
+
+            if (track.status != COMPLETED) {
+                track.status = if (hasReadChapters) READING else statusTrack.status
+            }
+
            track.score = statusTrack.score
            track.last_chapter_read = statusTrack.last_chapter_read
            track.total_chapters = remoteTrack.total_chapters
            refresh(track)
        } else {
            // Set default fields if it's not found in the list
-            track.status = READING
+            track.status = if (hasReadChapters) READING else PLANNING
            track.score = 0F
            add(track)
            update(track)
@ -91,6 +101,10 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
        }
    }

+    override fun getReadingStatus(): Int = READING
+
+    override fun getRereadingStatus(): Int = -1
+
    override fun getCompletionStatus(): Int = COMPLETED

    override suspend fun login(username: String, password: String) = login(password)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
@ -26,6 +26,8 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
    @StringRes
    override fun nameRes() = R.string.tracker_kitsu

+    override val supportsReadingDates: Boolean = true
+
    private val json: Json by injectLazy()

    private val interceptor by lazy { KitsuInterceptor(this) }
@ -51,6 +53,10 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
        }
    }

+    override fun getReadingStatus(): Int = READING
+
+    override fun getRereadingStatus(): Int = -1
+
    override fun getCompletionStatus(): Int = COMPLETED

    override fun getScoreList(): List<String> {
@ -67,22 +73,33 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
        return df.format(track.score)
    }

-    override suspend fun add(track: Track): Track {
+    private suspend fun add(track: Track): Track {
        return api.addLibManga(track, getUserId())
    }

-    override suspend fun update(track: Track): Track {
+    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
+        if (track.status != COMPLETED) {
+            if (didReadChapter) {
+                track.status = READING
+            }
+        }
+
        return api.updateLibManga(track)
    }

-    override suspend fun bind(track: Track): Track {
+    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
        val remoteTrack = api.findLibManga(track, getUserId())
        return if (remoteTrack != null) {
            track.copyPersonalFrom(remoteTrack)
            track.media_id = remoteTrack.media_id
+
+            if (track.status != COMPLETED) {
+                track.status = if (hasReadChapters) READING else track.status
+            }
+
            update(track)
        } else {
-            track.status = READING
+            track.status = if (hasReadChapters) READING else PLAN_TO_READ
            track.score = 0F
            add(track)
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt
@ -84,6 +84,8 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor)
                        put("status", track.toKitsuStatus())
                        put("progress", track.last_chapter_read)
                        put("ratingTwenty", track.toKitsuScore())
+                        put("startedAt", KitsuDateHelper.convert(track.started_reading_date))
+                        put("finishedAt", KitsuDateHelper.convert(track.finished_reading_date))
                    }
                }
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuDateHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuDateHelper.kt
@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.data.track.kitsu
+
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+object KitsuDateHelper {
+
+    private const val pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
+    private val formatter = SimpleDateFormat(pattern, Locale.ENGLISH)
+
+    fun convert(dateValue: Long): String? {
+        if (dateValue == 0L) return null
+
+        return formatter.format(Date(dateValue))
+    }
+
+    fun parse(dateString: String?): Long {
+        if (dateString == null) return 0L
+
+        val dateValue = formatter.parse(dateString)
+
+        return dateValue?.time ?: return 0
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuModels.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuModels.kt
@ -58,6 +58,8 @@ class KitsuLibManga(obj: JsonObject, manga: JsonObject) {
    val original = manga["attributes"]!!.jsonObject["posterImage"]!!.jsonObject["original"]!!.jsonPrimitive.content
    private val synopsis = manga["attributes"]!!.jsonObject["synopsis"]!!.jsonPrimitive.content
    private val startDate = manga["attributes"]!!.jsonObject["startDate"]?.jsonPrimitive?.contentOrNull.orEmpty()
+    private val startedAt = obj["attributes"]!!.jsonObject["startedAt"]?.jsonPrimitive?.contentOrNull
+    private val finishedAt = obj["attributes"]!!.jsonObject["finishedAt"]?.jsonPrimitive?.contentOrNull
    private val libraryId = obj["id"]!!.jsonPrimitive.int
    val status = obj["attributes"]!!.jsonObject["status"]!!.jsonPrimitive.content
    private val ratingTwenty = obj["attributes"]!!.jsonObject["ratingTwenty"]?.jsonPrimitive?.contentOrNull
@ -73,6 +75,8 @@ class KitsuLibManga(obj: JsonObject, manga: JsonObject) {
        publishing_status = this@KitsuLibManga.status
        publishing_type = type
        start_date = startDate
+        started_reading_date = KitsuDateHelper.parse(startedAt)
+        finished_reading_date = KitsuDateHelper.parse(finishedAt)
        status = toTrackStatus()
        score = ratingTwenty?.let { it.toInt() / 2f } ?: 0f
        last_chapter_read = progress
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/Komga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/Komga.kt
@ -0,0 +1,102 @@
+package eu.kanade.tachiyomi.data.track.komga
+
+import android.content.Context
+import android.graphics.Color
+import androidx.annotation.StringRes
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.EnhancedTrackService
+import eu.kanade.tachiyomi.data.track.NoLoginTrackService
+import eu.kanade.tachiyomi.data.track.TrackService
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import okhttp3.Dns
+import okhttp3.OkHttpClient
+
+class Komga(private val context: Context, id: Int) : TrackService(id), EnhancedTrackService, NoLoginTrackService {
+
+    companion object {
+        const val UNREAD = 1
+        const val READING = 2
+        const val COMPLETED = 3
+    }
+
+    override val client: OkHttpClient =
+        networkService.client.newBuilder()
+            .dns(Dns.SYSTEM) // don't use DNS over HTTPS as it breaks IP addressing
+            .build()
+
+    val api by lazy { KomgaApi(client) }
+
+    @StringRes
+    override fun nameRes() = R.string.tracker_komga
+
+    override fun getLogo() = R.drawable.ic_tracker_komga
+
+    override fun getLogoColor() = Color.rgb(51, 37, 50)
+
+    override fun getStatusList() = listOf(UNREAD, READING, COMPLETED)
+
+    override fun getStatus(status: Int): String = with(context) {
+        when (status) {
+            UNREAD -> getString(R.string.unread)
+            READING -> getString(R.string.currently_reading)
+            COMPLETED -> getString(R.string.completed)
+            else -> ""
+        }
+    }
+
+    override fun getReadingStatus(): Int = READING
+
+    override fun getRereadingStatus(): Int = -1
+
+    override fun getCompletionStatus(): Int = COMPLETED
+
+    override fun getScoreList(): List<String> = emptyList()
+
+    override fun displayScore(track: Track): String = ""
+
+    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
+        if (track.status != COMPLETED) {
+            if (didReadChapter) {
+                track.status = READING
+            }
+        }
+
+        return api.updateProgress(track)
+    }
+
+    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
+        return track
+    }
+
+    override suspend fun search(query: String): List<TrackSearch> {
+        TODO("Not yet implemented: search")
+    }
+
+    override suspend fun refresh(track: Track): Track {
+        val remoteTrack = api.getTrackSearch(track.tracking_url)
+        track.copyPersonalFrom(remoteTrack)
+        track.total_chapters = remoteTrack.total_chapters
+        return track
+    }
+
+    override suspend fun login(username: String, password: String) {
+        saveCredentials("user", "pass")
+    }
+
+    // TrackService.isLogged works by checking that credentials are saved.
+    // By saving dummy, unused credentials, we can activate the tracker simply by login/logout
+    override fun loginNoop() {
+        saveCredentials("user", "pass")
+    }
+
+    override fun getAcceptedSources() = listOf("eu.kanade.tachiyomi.extension.all.komga.Komga")
+
+    override suspend fun match(manga: Manga): TrackSearch? =
+        try {
+            api.getTrackSearch(manga.url)
+        } catch (e: Exception) {
+            null
+        }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt
@ -0,0 +1,84 @@
+package eu.kanade.tachiyomi.data.track.komga
+
+import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.parseAs
+import eu.kanade.tachiyomi.util.lang.withIOContext
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import timber.log.Timber
+import uy.kohesive.injekt.injectLazy
+
+const val READLIST_API = "/api/v1/readlists"
+
+class KomgaApi(private val client: OkHttpClient) {
+
+    private val json: Json by injectLazy()
+
+    suspend fun getTrackSearch(url: String): TrackSearch =
+        withIOContext {
+            try {
+                val track = if (url.contains(READLIST_API)) {
+                    client.newCall(GET(url))
+                        .await()
+                        .parseAs<ReadListDto>()
+                        .toTrack()
+                } else {
+                    client.newCall(GET(url))
+                        .await()
+                        .parseAs<SeriesDto>()
+                        .toTrack()
+                }
+
+                val progress = client
+                    .newCall(GET("$url/read-progress/tachiyomi"))
+                    .await()
+                    .parseAs<ReadProgressDto>()
+
+                track.apply {
+                    cover_url = "$url/thumbnail"
+                    tracking_url = url
+                    total_chapters = progress.booksCount
+                    status = when (progress.booksCount) {
+                        progress.booksUnreadCount -> Komga.UNREAD
+                        progress.booksReadCount -> Komga.COMPLETED
+                        else -> Komga.READING
+                    }
+                    last_chapter_read = progress.lastReadContinuousIndex
+                }
+            } catch (e: Exception) {
+                Timber.w(e, "Could not get item: $url")
+                throw e
+            }
+        }
+
+    suspend fun updateProgress(track: Track): Track {
+        val progress = ReadProgressUpdateDto(track.last_chapter_read)
+        val payload = json.encodeToString(progress)
+        client.newCall(
+            Request.Builder()
+                .url("${track.tracking_url}/read-progress/tachiyomi")
+                .put(payload.toRequestBody("application/json".toMediaType()))
+                .build()
+        )
+            .await()
+        return getTrackSearch(track.tracking_url)
+    }
+
+    private fun SeriesDto.toTrack(): TrackSearch = TrackSearch.create(TrackManager.KOMGA).also {
+        it.title = metadata.title
+        it.summary = metadata.summary
+        it.publishing_status = metadata.status
+    }
+
+    private fun ReadListDto.toTrack(): TrackSearch = TrackSearch.create(TrackManager.KOMGA).also {
+        it.title = name
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaModels.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaModels.kt
@ -0,0 +1,83 @@
+package eu.kanade.tachiyomi.data.track.komga
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SeriesDto(
+    val id: String,
+    val libraryId: String,
+    val name: String,
+    val created: String?,
+    val lastModified: String?,
+    val fileLastModified: String,
+    val booksCount: Int,
+    val booksReadCount: Int,
+    val booksUnreadCount: Int,
+    val booksInProgressCount: Int,
+    val metadata: SeriesMetadataDto,
+    val booksMetadata: BookMetadataAggregationDto
+)
+
+@Serializable
+data class SeriesMetadataDto(
+    val status: String,
+    val created: String?,
+    val lastModified: String?,
+    val title: String,
+    val titleSort: String,
+    val summary: String,
+    val summaryLock: Boolean,
+    val readingDirection: String,
+    val readingDirectionLock: Boolean,
+    val publisher: String,
+    val publisherLock: Boolean,
+    val ageRating: Int?,
+    val ageRatingLock: Boolean,
+    val language: String,
+    val languageLock: Boolean,
+    val genres: Set<String>,
+    val genresLock: Boolean,
+    val tags: Set<String>,
+    val tagsLock: Boolean
+)
+
+@Serializable
+data class BookMetadataAggregationDto(
+    val authors: List<AuthorDto> = emptyList(),
+    val releaseDate: String?,
+    val summary: String,
+    val summaryNumber: String,
+
+    val created: String,
+    val lastModified: String
+)
+
+@Serializable
+data class AuthorDto(
+    val name: String,
+    val role: String
+)
+
+@Serializable
+data class ReadProgressUpdateDto(
+    val lastBookRead: Int,
+)
+
+@Serializable
+data class ReadListDto(
+    val id: String,
+    val name: String,
+    val bookIds: List<String>,
+    val createdDate: String,
+    val lastModifiedDate: String,
+    val filtered: Boolean
+)
+
+@Serializable
+data class ReadProgressDto(
+    val booksCount: Int,
+    val booksReadCount: Int,
+    val booksUnreadCount: Int,
+    val booksInProgressCount: Int,
+    val lastReadContinuousIndex: Int,
+)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
@ -56,6 +56,10 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
        }
    }

+    override fun getReadingStatus(): Int = READING
+
+    override fun getRereadingStatus(): Int = REREADING
+
    override fun getCompletionStatus(): Int = COMPLETED

    override fun getScoreList(): List<String> {
@ -66,23 +70,36 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
        return track.score.toInt().toString()
    }

-    override suspend fun add(track: Track): Track {
-        track.status = READING
-        track.score = 0F
+    private suspend fun add(track: Track): Track {
        return api.updateItem(track)
    }

-    override suspend fun update(track: Track): Track {
+    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
+        if (track.status != COMPLETED) {
+            if (track.status != REREADING && didReadChapter) {
+                track.status = READING
+            }
+        }
+
        return api.updateItem(track)
    }

-    override suspend fun bind(track: Track): Track {
+    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
        val remoteTrack = api.findListItem(track)
        return if (remoteTrack != null) {
            track.copyPersonalFrom(remoteTrack)
            track.media_id = remoteTrack.media_id
+
+            if (track.status != COMPLETED) {
+                val isRereading = track.status == REREADING
+                track.status = if (isRereading.not() && hasReadChapters) READING else track.status
+            }
+
            update(track)
        } else {
+            // Set default fields if it's not found in the list
+            track.status = if (hasReadChapters) READING else PLAN_TO_READ
+            track.score = 0F
            add(track)
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
@ -40,23 +40,35 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
        return track.score.toInt().toString()
    }

-    override suspend fun add(track: Track): Track {
+    private suspend fun add(track: Track): Track {
        return api.addLibManga(track, getUsername())
    }

-    override suspend fun update(track: Track): Track {
+    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
+        if (track.status != COMPLETED) {
+            if (track.status != REPEATING && didReadChapter) {
+                track.status = READING
+            }
+        }
+
        return api.updateLibManga(track, getUsername())
    }

-    override suspend fun bind(track: Track): Track {
+    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
        val remoteTrack = api.findLibManga(track, getUsername())
        return if (remoteTrack != null) {
            track.copyPersonalFrom(remoteTrack)
            track.library_id = remoteTrack.library_id
+
+            if (track.status != COMPLETED) {
+                val isRereading = track.status == REPEATING
+                track.status = if (isRereading.not() && hasReadChapters) READING else track.status
+            }
+
            update(track)
        } else {
            // Set default fields if it's not found in the list
-            track.status = READING
+            track.status = if (hasReadChapters) READING else PLANNING
            track.score = 0F
            add(track)
        }
@ -94,6 +106,10 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
        }
    }

+    override fun getReadingStatus(): Int = READING
+
+    override fun getRereadingStatus(): Int = REPEATING
+
    override fun getCompletionStatus(): Int = COMPLETED

    override suspend fun login(username: String, password: String) = login(password)
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubRelease.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubRelease.kt
@ -1,6 +1,6 @@
-package eu.kanade.tachiyomi.data.updater.github
+package eu.kanade.tachiyomi.data.updater

-import eu.kanade.tachiyomi.data.updater.Release
+import android.os.Build
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@ -15,16 +15,25 @@ import kotlinx.serialization.Serializable
@Serializable
 class GithubRelease(
    @SerialName("tag_name") val version: String,
-    @SerialName("body") override val info: String,
+    @SerialName("body") val info: String,
    @SerialName("assets") private val assets: List<Assets>
-) : Release {
+) {

    /**
     * Get download link of latest release from the assets.
     * @return download link of latest release.
     */
-    override val downloadLink: String
-        get() = assets[0].downloadLink
+    fun getDownloadLink(): String {
+        val apkVariant = when (Build.SUPPORTED_ABIS[0]) {
+            "arm64-v8a" -> "-arm64-v8a"
+            "armeabi-v7a" -> "-armeabi-v7a"
+            "x86", "x86_64" -> "-x86"
+            else -> ""
+        }
+
+        return assets.find { it.downloadLink.contains("tachiyomi$apkVariant-") }?.downloadLink
+            ?: assets[0].downloadLink
+    }

    /**
     * Assets class containing download url.
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt
@ -1,7 +1,6 @@
-package eu.kanade.tachiyomi.data.updater.github
+package eu.kanade.tachiyomi.data.updater

 import eu.kanade.tachiyomi.BuildConfig
-import eu.kanade.tachiyomi.data.updater.UpdateResult
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.await
@ -21,7 +20,7 @@ class GithubUpdateChecker {
        }
    }

-    suspend fun checkForUpdate(): UpdateResult {
+    suspend fun checkForUpdate(): GithubUpdateResult {
        return withIOContext {
            networkService.client
                .newCall(GET("https://api.github.com/repos/$repo/releases/latest"))
@ -32,7 +31,7 @@ class GithubUpdateChecker {
                    if (isNewVersion(it.version)) {
                        GithubUpdateResult.NewUpdate(it)
                    } else {
-                        GithubUpdateResult.NoNewUpdate()
+                        GithubUpdateResult.NoNewUpdate
                    }
                }
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubUpdateResult.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubUpdateResult.kt
@ -0,0 +1,6 @@
+package eu.kanade.tachiyomi.data.updater
+
+sealed class GithubUpdateResult {
+    class NewUpdate(val release: GithubRelease) : GithubUpdateResult()
+    object NoNewUpdate : GithubUpdateResult()
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/Release.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/Release.kt
@ -1,12 +0,0 @@
-package eu.kanade.tachiyomi.data.updater
-
-interface Release {
-
-    val info: String
-
-    /**
-     * Get download link of latest release.
-     * @return download link of latest release.
-     */
-    val downloadLink: String
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateResult.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateResult.kt
@ -1,7 +0,0 @@
-package eu.kanade.tachiyomi.data.updater
-
-abstract class UpdateResult {
-
-    open class NewUpdate<T : Release>(val release: T) : UpdateResult()
-    open class NoNewUpdate : UpdateResult()
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
@ -8,7 +8,6 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import eu.kanade.tachiyomi.data.updater.github.GithubUpdateChecker
 import kotlinx.coroutines.runBlocking
 import java.util.concurrent.TimeUnit

@ -19,8 +18,8 @@ class UpdaterJob(private val context: Context, workerParams: WorkerParameters) :
        try {
            val result = GithubUpdateChecker().checkForUpdate()

-            if (result is UpdateResult.NewUpdate<*>) {
-                UpdaterNotifier(context).promptUpdate(result.release.downloadLink)
+            if (result is GithubUpdateResult.NewUpdate) {
+                UpdaterNotifier(context).promptUpdate(result.release.getDownloadLink())
            }
            Result.success()
        } catch (e: Exception) {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateResult.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateResult.kt
@ -1,9 +0,0 @@
-package eu.kanade.tachiyomi.data.updater.github
-
-import eu.kanade.tachiyomi.data.updater.UpdateResult
-
-sealed class GithubUpdateResult : UpdateResult() {
-
-    class NewUpdate(release: GithubRelease) : UpdateResult.NewUpdate<GithubRelease>(release)
-    class NoNewUpdate : UpdateResult.NoNewUpdate()
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
@ -79,9 +79,6 @@ internal class ExtensionGithubApi {
    fun getApkUrl(extension: Extension.Available): String {
        return "${REPO_URL_PREFIX}apk/${extension.apkName}"
    }
-
-    companion object {
-        const val BASE_URL = "https://raw.githubusercontent.com/"
-        const val REPO_URL_PREFIX = "${BASE_URL}tachiyomiorg/tachiyomi-extensions/repo/"
-    }
 }
+
+private const val REPO_URL_PREFIX = "https://raw.githubusercontent.com/tachiyomiorg/tachiyomi-extensions/repo/"
--- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
@ -1,8 +1,11 @@
 package eu.kanade.tachiyomi.network

 import android.content.Context
+import coil.util.CoilUtils
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@ -20,28 +23,32 @@ class NetworkHelper(context: Context) {

    val cookieManager = AndroidCookieJar()

-    val client by lazy {
-        val builder = OkHttpClient.Builder()
-            .cookieJar(cookieManager)
-            .cache(Cache(cacheDir, cacheSize))
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .addInterceptor(UserAgentInterceptor())
+    private val baseClientBuilder: OkHttpClient.Builder
+        get() {
+            val builder = OkHttpClient.Builder()
+                .cookieJar(cookieManager)
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
+                .addInterceptor(UserAgentInterceptor())

-        if (BuildConfig.DEBUG) {
-            val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
-                level = HttpLoggingInterceptor.Level.HEADERS
+            if (BuildConfig.DEBUG) {
+                val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
+                    level = HttpLoggingInterceptor.Level.HEADERS
+                }
+                builder.addInterceptor(httpLoggingInterceptor)
            }
-            builder.addInterceptor(httpLoggingInterceptor)
+
+            when (preferences.dohProvider()) {
+                PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
+                PREF_DOH_GOOGLE -> builder.dohGoogle()
+            }
+
+            return builder
        }

-        when (preferences.dohProvider()) {
-            PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
-            PREF_DOH_GOOGLE -> builder.dohGoogle()
-        }
+    val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() }

-        builder.build()
-    }
+    val coilClient by lazy { baseClientBuilder.cache(CoilUtils.createDefaultCache(context)).build() }

    val cloudflareClient by lazy {
        client.newBuilder()
--- a/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
@ -9,6 +9,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
+import okhttp3.internal.closeQuietly
 import rx.Observable
 import rx.Producer
 import rx.Subscription
@ -70,7 +71,9 @@ suspend fun Call.await(): Response {
                        return
                    }

-                    continuation.resume(response)
+                    continuation.resume(response) {
+                        response.body?.closeQuietly()
+                    }
                }

                override fun onFailure(call: Call, e: IOException) {
--- a/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
@ -1,14 +1,13 @@
-package eu.kanade.tachiyomi.network
+package eu.kanade.tachiyomi.network.interceptor

 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.WebViewClientCompat
@ -28,7 +27,7 @@ import java.util.concurrent.TimeUnit

 class CloudflareInterceptor(private val context: Context) : Interceptor {

-    private val handler = Handler(Looper.getMainLooper())
+    private val executor = ContextCompat.getMainExecutor(context)

    private val networkHelper: NetworkHelper by injectLazy()

@ -92,7 +91,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
        val headers = request.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
        headers["X-Requested-With"] = WebViewUtil.REQUESTED_WITH

-        handler.post {
+        executor.execute {
            val webview = WebView(context)
            webView = webview
            webview.setDefaultSettings()
@ -114,10 +113,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
                        latch.countDown()
                    }

-                    // HTTP error codes are only received since M
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-                        url == origRequestUrl && !challengeFound
-                    ) {
+                    if (url == origRequestUrl && !challengeFound) {
                        // The first request didn't return the challenge, abort.
                        latch.countDown()
                    }
@ -149,13 +145,14 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
        // around 4 seconds but it can take more due to slow networks or server issues.
        latch.await(12, TimeUnit.SECONDS)

-        handler.post {
+        executor.execute {
            if (!cloudflareBypassed) {
                isWebViewOutdated = webView?.isOutdated() == true
            }

            webView?.stopLoading()
            webView?.destroy()
+            webView = null
        }

        // Throw exception if we failed to bypass Cloudflare
--- a/Show More
+++ b/Show More