Update parsers

Fixes
Merge pull request #1333 from weblate/weblate-kotatsu-strings
2025-03-18 19:08:41 +02:00 · 2025-03-18 19:06:46 +02:00 · 2025-03-18 19:04:06 +02:00 · 2025-03-18 07:39:01 +01:00 · 2025-03-18 07:39:01 +01:00 · 2025-03-18 07:39:00 +01:00
1579 changed files with 72693 additions and 29235 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,6 +13,7 @@ disabled_rules = no-wildcard-imports, no-unused-imports

 [{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
 ij_continuation_indent_size = 4
+ij_xml_attribute_wrap = on_every_item

 [{*.kt,*.kts}]
 ij_kotlin_allow_trailing_comma_on_call_site = true
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +0,0 @@
-ko_fi: xtimms
-custom: ["https://yoomoney.ru/to/410012543938752"]
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
    - name: ⚠️ Source issue
      url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new
-      about: If you have troubles with a manga parser or want to propose new manga source, please open an issue in the kotatsu-parsers repository instead
+      about: If you have a problem with a specific **manga source** or want to propose a new one, please open an issue in the kotatsu-parsers repository instead
--- a/.github/ISSUE_TEMPLATE/report_bug.yml
+++ b/.github/ISSUE_TEMPLATE/report_bug.yml
@@ -60,7 +60,7 @@ body:
      attributes:
          label: Acknowledgements
          options:
-              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
                required: true
-              - label: If this is an issue with a parser, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
+              - label: This is not an issue with a specific manga source. Otherwise, you have to open an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
                required: true
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -20,5 +20,5 @@ body:
          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: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
+                required: true
--- a/.github/assets/vtuber.png
+++ b/.github/assets/vtuber.png
--- a/.gitignore
+++ b/.gitignore
@@ -10,11 +10,13 @@
 /.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
+/.idea/ktlint-plugin.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
+/.idea/deploymentTargetSelector.xml
 /.idea/render.experimental.xml
 /.idea/inspectionProfiles/
 .DS_Store
@@ -22,3 +24,6 @@
 /captures
 .externalNativeBuild
 .cxx
+/.idea/deviceManager.xml
+/.kotlin/
+/.idea/AndroidProjectSystem.xml
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -2,3 +2,4 @@
 /shelf/
 /workspace.xml
 /migrations.xml
+/runConfigurations.xml
--- a/.idea/AndroidProjectSystem.xml
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,15 +4,15 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="jbr-21" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
-        <option name="resolveExternalAnnotations" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+## Kotatsu contribution guidelines
+
+ If you want to **fix bugs** or **implement new features** that **already have an [issue card](https://github.com/KotatsuApp/Kotatsu/issues):** please assign this issue to you and/or comment about it.
+ If you want to **implement a new feature:** open an issue or discussion regarding it to ensure it will be accepted.
+ **Translations** have to be managed using the [Weblate](https://hosted.weblate.org/engage/kotatsu/) platform.
+ In case you want to **add a new manga source,** refer to the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers).
+
+**Refactoring** or some **dev-faces improvements** might also be accepted. However, please stick to the following principles:
+
+ **Performance matters.** In the case of choosing between source code beauty and performance, performance should be a priority. 
+ Please, **do not modify readme and other information files** (except for typos).
+ **Avoid adding new dependencies** unless required. APK size is important.
--- a/53
+++ b/53
@@ -619,56 +619,3 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.

                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -1,53 +1,107 @@
-# Kotatsu
+<div align="center">

-Kotatsu is a free and open source manga reader for Android.
+<a href="https://kotatsu.app">
+    <img src="./.github/assets/vtuber.png" alt="Kotatsu Logo" title="Kotatsu" width="600"/>
+</a>

-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+# [Kotatsu](https://kotatsu.app)
+
+**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is a free and open-source manga reader for Android with built-in online content sources.**
+
+![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)

 ### Download

- **Recommended:** Download and install APK from **[GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest)**. Application has a built-in self-updating feature.
- Get it on **[F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu)**. The F-Droid build may be a bit outdated and some fixes might be missing.
+<div align="left">
+
+* **Recommended:** Download and install APK from [GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest). Application has a built-in self-updating feature.
+* Get it on [F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu). The F-Droid build may be a bit outdated and some fixes might be missing.
+* Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (very unstable, use at your own risk).
+
+</div>

 ### Main Features

-* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
-* Search manga by name and genres
-* Reading history and bookmarks
-* Favourites organized by user-defined categories
-* Downloading manga and reading it offline. Third-party CBZ archives also supported
-* Tablet-optimized Material You UI
-* Standard and Webtoon-optimized reader
-* Notifications about new chapters with updates feed
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
-* Password/fingerprint protect access to the app
-* History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
+<div align="left">

-### Screenshots
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers) (with 1100+ manga sources)
+* Search manga by name, genres, and more filters
+* Favorites organized by user-defined categories
+* Reading history, bookmarks, and incognito mode support
+* Download manga and read it offline. Third-party CBZ archives are also supported
+* Clean and convenient Material You UI, optimized for phones, tablets, and desktop
+* Standard and Webtoon-optimized customizable reader, gesture support on reading interface
+* Notifications about new chapters with updates feed, manga recommendations (with filters)
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
+* Password / fingerprint-protected access to the app
+* Automatically sync app data with other devices on the same account
+* Support for older devices running Android 5+

-| ![Screenshot_20200226-210337](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
-|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| ![Screenshot_20200226-210405](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |
+</div>

-| ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
-|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
+### In-App Screenshots
+
+<div align="center">
+    <img src="./metadata/en-US/images/phoneScreenshots/1.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/2.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/3.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/4.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/5.png" alt="Mobile view" width="250"/>
+    <img src="./metadata/en-US/images/phoneScreenshots/6.png" alt="Mobile view" width="250"/>
+</div>
+
+<br>
+
+<div align="center">
+    <img src="./metadata/en-US/images/tenInchScreenshots/1.png" alt="Tablet view" width="400"/>
+    <img src="./metadata/en-US/images/tenInchScreenshots/2.png" alt="Tablet view" width="400"/>
+</div>

 ### Localization

-[<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status">](https://hosted.weblate.org/engage/kotatsu/)
+<a href="https://hosted.weblate.org/engage/kotatsu/">
+<img src="https://hosted.weblate.org/widget/kotatsu/horizontal-auto.png" alt="Translation status" />
+</a>

-Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages,
-please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)
+**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is localized in a number of different languages.**<br>
+**📌 If you would like to help improve these or add new languages,
+please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)**
+
+### Contributing
+
+<br>
+
+<a href="https://github.com/KotatsuApp/Kotatsu">
+  <picture>
+    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
+    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu GitHub Repository">
+  </picture>
+</a>
+<a href="https://github.com/KotatsuApp/Kotatsu-parsers">
+  <picture>
+    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
+    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu-parsers GitHub Repository">
+  </picture>
+</a><br></br>
+
+</br>
+
+**📌 Pull requests are welcome, if you want: See [CONTRIBUTING.md](https://github.com/KotatsuApp/Kotatsu/blob/devel/CONTRIBUTING.md) for the guidelines**

 ### License

 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)

-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications
-to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &
-install instructions.
+<div align="left">
+
+You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.
+
+</div>

 ### DMCA disclaimer

-The developers of this application does not have any affiliation with the content available in the app.
-It is collecting from the sources freely available through any web browser.
+<div align="left">
+
+The developers of this application do not have any affiliation with the content available in the app. It collects content from sources that are freely available through any web browser.
+
+</div>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,31 +1,33 @@
+import java.time.LocalDateTime
+
 plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
 	id 'kotlin-kapt'
+	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
+	id 'androidx.room'
 }

 android {
-	compileSdk = 33
-	buildToolsVersion = '33.0.2'
+	compileSdk = 35
+	buildToolsVersion = '35.0.0'
 	namespace = 'org.koitharu.kotatsu'

 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdkVersion 21
-		//TODO: update as soon as sources becomes available
-		//noinspection OldTargetApi
-		targetSdkVersion 33
-		versionCode 563
-		versionName '5.3.6'
+		minSdk = 21
+		targetSdk = 35
+		versionCode = 1004
+		versionName = '8.0'
 		generatedDensities = []
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-		kapt {
-			arguments {
-				arg 'room.schemaLocation', "$projectDir/schemas".toString()
-			}
+		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
+		ksp {
+			arg('room.generateKotlin', 'true')
+		}
+		androidResources {
+			generateLocaleConfig true
 		}
 	}
 	buildTypes {
@@ -33,36 +35,54 @@ android {
 			applicationIdSuffix = '.debug'
 		}
 		release {
-			multiDexEnabled false
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 		}
+		nightly {
+			initWith release
+			applicationIdSuffix = '.nightly'
+		}
 	}
 	buildFeatures {
 		viewBinding true
+		buildConfig true
+	}
+	packagingOptions {
+		resources {
+			excludes += [
+				'META-INF/README.md',
+				'META-INF/NOTICE.md'
+			]
+		}
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_17
-		targetCompatibility JavaVersion.VERSION_17
+		coreLibraryDesugaringEnabled true
+		sourceCompatibility JavaVersion.VERSION_11
+		targetCompatibility JavaVersion.VERSION_11
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_17.toString()
+		jvmTarget = JavaVersion.VERSION_11.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+			'-opt-in=kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
-			'-opt-in=coil.annotation.ExperimentalCoilApi',
+			'-opt-in=coil3.annotation.ExperimentalCoilApi',
+			'-opt-in=coil3.annotation.InternalCoilApi',
 		]
 	}
+	room {
+		schemaDirectory "$projectDir/schemas"
+	}
 	lint {
 		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
+		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -71,6 +91,15 @@ android {
 			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
 		}
 	}
+	applicationVariants.configureEach { variant ->
+		if (variant.name == 'nightly') {
+			variant.outputs.each { output ->
+				def now = LocalDateTime.now()
+				output.versionCodeOverride = now.format("yyMMdd").toInteger()
+				output.versionNameOverride = 'N' + now.format("yyyyMMdd")
+			}
+		}
+	}
 }
 afterEvaluate {
 	compileDebugKotlin {
@@ -80,83 +109,92 @@ afterEvaluate {
 	}
 }
 dependencies {
-	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:a1598fd712') {
+	def parsersVersion = libs.versions.parsers.get()
+	if (System.properties.containsKey('parsersVersionOverride')) {
+		// usage:
+		// -DparsersVersionOverride=$(curl -s https://api.github.com/repos/kotatsuapp/kotatsu-parsers/commits/master -H "Accept: application/vnd.github.sha" | cut -c -10)
+		parsersVersion = System.getProperty('parsersVersionOverride')
+	}
+	//noinspection UseTomlInstead
+	implementation("com.github.KotatsuApp:kotatsu-parsers:$parsersVersion") {
 		exclude group: 'org.json', module: 'json'
 	}

-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2'
+	coreLibraryDesugaring libs.desugar.jdk.libs
+	implementation libs.kotlin.stdlib
+	implementation libs.kotlinx.coroutines.android
+	implementation libs.kotlinx.coroutines.guava

-	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'androidx.core:core-ktx:1.10.1'
-	implementation 'androidx.activity:activity-ktx:1.7.2'
-	implementation 'androidx.fragment:fragment-ktx:1.6.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
-	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.0'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
-	implementation 'androidx.preference:preference-ktx:1.2.0'
-	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.9.0'
-	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
+	implementation libs.androidx.appcompat
+	implementation libs.androidx.core
+	implementation libs.androidx.activity
+	implementation libs.androidx.fragment
+	implementation libs.androidx.transition
+	implementation libs.androidx.collection
+	implementation libs.lifecycle.viewmodel
+	implementation libs.lifecycle.service
+	implementation libs.lifecycle.process
+	implementation libs.androidx.constraintlayout
+	implementation libs.androidx.swiperefreshlayout
+	implementation libs.androidx.recyclerview
+	implementation libs.androidx.viewpager2
+	implementation libs.androidx.preference
+	implementation libs.androidx.biometric
+	implementation libs.material
+	implementation libs.androidx.lifecycle.common.java8
+	implementation libs.androidx.webkit

-	// TODO https://issuetracker.google.com/issues/254846063
-	implementation 'androidx.work:work-runtime-ktx:2.8.1'
-	//noinspection GradleDependency
-	implementation('com.google.guava:guava:32.0.1-android') {
-		exclude group: 'com.google.guava', module: 'failureaccess'
-		exclude group: 'org.checkerframework', module: 'checker-qual'
-		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
-	}
+	implementation libs.androidx.work.runtime
+	implementation libs.guava

-	implementation 'androidx.room:room-runtime:2.5.2'
-	implementation 'androidx.room:room-ktx:2.5.2'
-	//noinspection KaptUsageInsteadOfKsp
-	kapt 'androidx.room:room-compiler:2.5.2'
+	implementation libs.androidx.room.runtime
+	implementation libs.androidx.room.ktx
+	ksp libs.androidx.room.compiler

-	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
-	implementation 'com.squareup.okio:okio:3.4.0'
+	implementation libs.okhttp
+	implementation libs.okhttp.tls
+	implementation libs.okhttp.dnsoverhttps
+	implementation libs.okio

-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
-	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
+	implementation libs.adapterdelegates
+	implementation libs.adapterdelegates.viewbinding

-	implementation 'com.google.dagger:hilt-android:2.47'
-	kapt 'com.google.dagger:hilt-compiler:2.47'
-	implementation 'androidx.hilt:hilt-work:1.0.0'
-	kapt 'androidx.hilt:hilt-compiler:1.0.0'
+	implementation libs.hilt.android
+	kapt libs.hilt.compiler
+	implementation libs.androidx.hilt.work
+	kapt libs.androidx.hilt.compiler

-	implementation 'io.coil-kt:coil-base:2.4.0'
-	implementation 'io.coil-kt:coil-svg:2.4.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:9b1d20be67'
-	implementation 'com.github.solkin:disk-lru-cache:1.4'
-	implementation 'io.noties.markwon:core:4.6.2'
+	implementation libs.coil.core
+	implementation libs.coil.network
+	implementation libs.coil.gif
+	implementation libs.coil.svg
+	implementation libs.avif.decoder
+	implementation libs.ssiv
+	implementation libs.disk.lru.cache
+	implementation libs.markwon

-	implementation 'ch.acra:acra-http:5.10.1'
-	implementation 'ch.acra:acra-dialog:5.10.1'
+	implementation libs.acra.http
+	implementation libs.acra.dialog

-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+	implementation libs.conscrypt.android

-	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20230618'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
+	debugImplementation libs.leakcanary.android
+	debugImplementation libs.workinspector

-	androidTestImplementation 'androidx.test:runner:1.5.2'
-	androidTestImplementation 'androidx.test:rules:1.5.0'
-	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
+	testImplementation libs.junit
+	testImplementation libs.json
+	testImplementation libs.kotlinx.coroutines.test

-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
+	androidTestImplementation libs.androidx.runner
+	androidTestImplementation libs.androidx.rules
+	androidTestImplementation libs.androidx.test.core
+	androidTestImplementation libs.androidx.junit

-	androidTestImplementation 'androidx.room:room-testing:2.5.2'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+	androidTestImplementation libs.kotlinx.coroutines.test

-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.47'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.47'
+	androidTestImplementation libs.androidx.room.testing
+	androidTestImplementation libs.moshi.kotlin
+
+	androidTestImplementation libs.hilt.android.testing
+	kaptAndroidTest libs.hilt.android.compiler
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -14,7 +14,17 @@
 -dontwarn org.conscrypt.**
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
+-dontwarn com.google.j2objc.annotations.**
+-dontwarn coil3.PlatformContext

 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
 -keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; }
+-keep class org.koitharu.kotatsu.settings.backup.PeriodicalBackupSettingsFragment { *; }
+-keep class org.jsoup.parser.Tag
+-keep class org.jsoup.internal.StringUtil
+
+-keep class org.acra.security.NoKeyStoreFactory { *; }
+-keep class org.acra.config.DefaultRetryPolicy { *; }
+-keep class org.acra.attachment.DefaultAttachmentProvider { *; }
+-keep class org.acra.sender.JobSenderService
--- a/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
@@ -1,198 +0,0 @@
-package org.koitharu.kotatsu.tracker.domain
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import junit.framework.TestCase.*
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.core.parser.MangaDataRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import javax.inject.Inject
-
-@HiltAndroidTest
-@RunWith(AndroidJUnit4::class)
-class TrackerTest {
-
-	@get:Rule
-	var hiltRule = HiltAndroidRule(this)
-
-	@Inject
-	lateinit var repository: TrackingRepository
-
-	@Inject
-	lateinit var dataRepository: MangaDataRepository
-
-	@Inject
-	lateinit var tracker: Tracker
-
-	@Before
-	fun setUp() {
-		hiltRule.inject()
-	}
-
-	@Test
-	fun noUpdates() = runTest {
-		val manga = loadManga("full.json")
-		tracker.deleteTrack(manga.id)
-
-		tracker.checkUpdates(manga, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(manga.id))
-		tracker.checkUpdates(manga, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(manga.id))
-	}
-
-	@Test
-	fun hasUpdates() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaFull = loadManga("full.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun badIds() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaBad = loadManga("bad_ids.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaBad, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun badIds2() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaBad = loadManga("bad_ids.json")
-		val mangaFull = loadManga("full.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaBad, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun fullReset() = runTest {
-		val mangaFull = loadManga("full.json")
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaEmpty = loadManga("empty.json")
-		tracker.deleteTrack(mangaFull.id)
-
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaEmpty, commit = true).apply {
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaEmpty, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-	}
-
-	@Test
-	fun syncWithHistory() = runTest {
-		val mangaFull = loadManga("full.json")
-		val mangaFirst = loadManga("first_chapters.json")
-		tracker.deleteTrack(mangaFull.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-
-		var chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
-		repository.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
-
-		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
-		repository.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	private suspend fun loadManga(name: String): Manga {
-		val manga = SampleData.loadAsset("manga/$name", Manga::class)
-		dataRepository.storeManga(manga)
-		return manga
-	}
-}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/HiltTestRunner.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/HiltTestRunner.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltTestApplication
+
+class HiltTestRunner : AndroidJUnitRunner() {
+
+    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
+    }
+}
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/Instrumentation.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/Instrumentation.kt
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/SampleData.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/SampleData.kt
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
@@ -17,7 +17,7 @@ class MangaDatabaseTest {
 		MangaDatabase::class.java,
 	)

-	private val migrations = databaseMigrations
+	private val migrations = getDatabaseMigrations(InstrumentationRegistry.getInstrumentation().targetContext)

 	@Test
 	fun versions() {
--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt
@@ -48,6 +48,7 @@ class AppShortcutManagerTest {
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
 			return@runTest
 		}
+		database.invalidationTracker.addObserver(appShortcutManager)
 		awaitUpdate()
 		assertTrue(getShortcuts().isEmpty())
 		historyRepository.addOrUpdate(
@@ -56,6 +57,7 @@ class AppShortcutManagerTest {
 			page = 4,
 			scroll = 2,
 			percent = 0.3f,
+			force = false,
 		)
 		awaitUpdate()

--- a/app/src/androidTest/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
+++ b/app/src/androidTest/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
@@ -7,7 +7,9 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -61,6 +63,7 @@ class AppBackupAgentTest {
 			page = 3,
 			scroll = 40,
 			percent = 0.2f,
+			force = false,
 		)
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))

@@ -82,7 +85,7 @@ class AppBackupAgentTest {
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
 		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))

-		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
+		val allTags = database.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
 		assertTrue(SampleData.tag in allTags)
 	}

--- a/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.EnumSet
-
-/**
- * This parser is just for parser development, it should not be used in releases
- */
-class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
-
-	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain()
-
-	override val sortOrders: Set<SortOrder>
-		get() = EnumSet.allOf(SortOrder::class.java)
-
-	override suspend fun getDetails(manga: Manga): Manga {
-		TODO("Not yet implemented")
-	}
-
-	override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder,
-	): List<Manga> {
-		TODO("Not yet implemented")
-	}
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		TODO("Not yet implemented")
-	}
-
-	override suspend fun getTags(): Set<MangaTag> {
-		TODO("Not yet implemented")
-	}
-}
--- a/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import android.util.Log
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
-
-class LoggingAdapterDataObserver(
-	private val tag: String,
-) : AdapterDataObserver() {
-
-	override fun onChanged() {
-		Log.d(tag, "onChanged()")
-	}
-
-	override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount)")
-	}
-
-	override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) {
-		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount, payload=$payload)")
-	}
-
-	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeInserted(positionStart=$positionStart, itemCount=$itemCount)")
-	}
-
-	override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeRemoved(positionStart=$positionStart, itemCount=$itemCount)")
-	}
-
-	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
-		Log.d(tag, "onItemRangeMoved(fromPosition=$fromPosition, toPosition=$toPosition, itemCount=$itemCount)")
-	}
-
-	override fun onStateRestorationPolicyChanged() {
-		Log.d(tag, "onStateRestorationPolicyChanged()")
-	}
-}
--- a/app/src/debug/java/org/koitharu/kotatsu/core/util/ext/DebugExt.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/util/ext/DebugExt.kt
@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.core.util.ext
-
-fun Throwable.printStackTraceDebug() = printStackTrace()
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
@@ -0,0 +1,99 @@
+package org.koitharu.kotatsu
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Build
+import android.os.StrictMode
+import androidx.core.content.edit
+import androidx.fragment.app.strictmode.FragmentStrictMode
+import leakcanary.LeakCanary
+import org.koitharu.kotatsu.core.BaseApp
+import org.koitharu.kotatsu.local.data.LocalMangaRepository
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.ReaderViewModel
+
+class KotatsuApp : BaseApp() {
+
+	var isLeakCanaryEnabled: Boolean
+		get() = getDebugPreferences(this).getBoolean(KEY_LEAK_CANARY, true)
+		set(value) {
+			getDebugPreferences(this).edit { putBoolean(KEY_LEAK_CANARY, value) }
+			configureLeakCanary()
+		}
+
+	override fun attachBaseContext(base: Context) {
+		super.attachBaseContext(base)
+		enableStrictMode()
+		configureLeakCanary()
+	}
+
+	private fun configureLeakCanary() {
+		LeakCanary.config = LeakCanary.config.copy(
+			dumpHeap = isLeakCanaryEnabled,
+		)
+	}
+
+	private fun enableStrictMode() {
+		val notifier = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+			StrictModeNotifier(this)
+		} else {
+			null
+		}
+		StrictMode.setThreadPolicy(
+			StrictMode.ThreadPolicy.Builder().apply {
+				detectNetwork()
+				detectDiskWrites()
+				detectCustomSlowCalls()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectUnbufferedIo()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) detectResourceMismatches()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) detectExplicitGc()
+				penaltyLog()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
+					penaltyListener(notifier.executor, notifier)
+				}
+			}.build(),
+		)
+		StrictMode.setVmPolicy(
+			StrictMode.VmPolicy.Builder().apply {
+				detectActivityLeaks()
+				detectLeakedSqlLiteObjects()
+				detectLeakedClosableObjects()
+				detectLeakedRegistrationObjects()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectContentUriWithoutPermission()
+				detectFileUriExposure()
+				setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				setClassInstanceLimit(PagesCache::class.java, 1)
+				setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				setClassInstanceLimit(PageLoader::class.java, 1)
+				setClassInstanceLimit(ReaderViewModel::class.java, 1)
+				penaltyLog()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
+					penaltyListener(notifier.executor, notifier)
+				}
+			}.build(),
+		)
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
+			detectWrongFragmentContainer()
+			detectFragmentTagUsage()
+			detectRetainInstanceUsage()
+			detectSetUserVisibleHint()
+			detectWrongNestedHierarchy()
+			detectFragmentReuse()
+			penaltyLog()
+			if (notifier != null) {
+				penaltyListener(notifier)
+			}
+		}.build()
+	}
+
+	private companion object {
+
+		const val PREFS_DEBUG = "_debug"
+		const val KEY_LEAK_CANARY = "leak_canary"
+
+		fun getDebugPreferences(context: Context): SharedPreferences =
+			context.getSharedPreferences(PREFS_DEBUG, MODE_PRIVATE)
+	}
+}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt
@@ -0,0 +1,73 @@
+package org.koitharu.kotatsu
+
+import android.app.Notification
+import android.app.Notification.BigTextStyle
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import android.os.StrictMode
+import android.os.strictmode.Violation
+import androidx.annotation.RequiresApi
+import androidx.core.app.PendingIntentCompat
+import androidx.core.content.getSystemService
+import androidx.fragment.app.strictmode.FragmentStrictMode
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+import org.koitharu.kotatsu.core.util.ShareHelper
+import kotlin.math.absoluteValue
+import androidx.fragment.app.strictmode.Violation as FragmentViolation
+
+@RequiresApi(Build.VERSION_CODES.P)
+class StrictModeNotifier(
+	private val context: Context,
+) : StrictMode.OnVmViolationListener, StrictMode.OnThreadViolationListener, FragmentStrictMode.OnViolationListener {
+
+	val executor = Dispatchers.Default.asExecutor()
+
+	private val notificationManager by lazy {
+		val nm = checkNotNull(context.getSystemService<NotificationManager>())
+		val channel = NotificationChannel(
+			CHANNEL_ID,
+			context.getString(R.string.strict_mode),
+			NotificationManager.IMPORTANCE_LOW,
+		)
+		nm.createNotificationChannel(channel)
+		nm
+	}
+
+	override fun onVmViolation(v: Violation) = showNotification(v)
+
+	override fun onThreadViolation(v: Violation) = showNotification(v)
+
+	override fun onViolation(violation: FragmentViolation) = showNotification(violation)
+
+	private fun showNotification(violation: Throwable) = Notification.Builder(context, CHANNEL_ID)
+		.setSmallIcon(R.drawable.ic_bug)
+		.setContentTitle(context.getString(R.string.strict_mode))
+		.setContentText(violation.message)
+		.setStyle(
+			BigTextStyle()
+				.setBigContentTitle(context.getString(R.string.strict_mode))
+				.setSummaryText(violation.message)
+				.bigText(violation.stackTraceToString()),
+		).setShowWhen(true)
+		.setContentIntent(
+			PendingIntentCompat.getActivity(
+				context,
+				violation.hashCode(),
+				ShareHelper(context).getShareTextIntent(violation.stackTraceToString()),
+				0,
+				false,
+			),
+		)
+		.setAutoCancel(true)
+		.setGroup(CHANNEL_ID)
+		.build()
+		.let { notificationManager.notify(CHANNEL_ID, violation.hashCode().absoluteValue, it) }
+
+	private companion object {
+
+		const val CHANNEL_ID = "strict_mode"
+	}
+}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.network

 import android.util.Log
 import okhttp3.Interceptor
+import okhttp3.Request
 import okhttp3.Response
 import okio.Buffer
 import org.koitharu.kotatsu.core.network.CommonHeaders.ACCEPT_ENCODING
@@ -10,8 +11,13 @@ class CurlLoggingInterceptor(
 	private val curlOptions: String? = null
 ) : Interceptor {

-	override fun intercept(chain: Interceptor.Chain): Response {
-		val request = chain.request()
+	private val escapeRegex = Regex("([\\[\\]\"])")
+
+	override fun intercept(chain: Interceptor.Chain): Response = chain.proceed(chain.request()).also {
+		logRequest(it.networkResponse?.request ?: it.request)
+	}
+
+	private fun logRequest(request: Request) {
 		var isCompressed = false

 		val curlCmd = StringBuilder()
@@ -40,15 +46,15 @@ class CurlLoggingInterceptor(
 		if (isCompressed) {
 			curlCmd.append(" --compressed")
 		}
-		curlCmd.append(" \"").append(request.url).append('"')
+		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')

 		log("---cURL (" + request.url + ")")
 		log(curlCmd.toString())
-
-		return chain.proceed(request)
 	}

-	private fun String.escape() = replace("\"", "\\\"")
+	private fun String.escape() = replace(escapeRegex) { match ->
+		"\\" + match.value
+	}

 	private fun log(msg: String) {
 		Log.d("CURL", msg)
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.core.ui
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.LifecycleService
+import leakcanary.AppWatcher
+
+abstract class BaseService : LifecycleService() {
+
+	override fun attachBaseContext(newBase: Context) {
+		super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		AppWatcher.objectWatcher.watch(
+			watchedObject = this,
+			description = "${javaClass.simpleName} service received Service#onDestroy() callback",
+		)
+	}
+}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/Debug.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/Debug.kt
@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.util.ext
+
+import android.os.Looper
+
+fun Throwable.printStackTraceDebug() = printStackTrace()
+
+fun assertNotInMainThread() = check(Looper.myLooper() != Looper.getMainLooper()) {
+	"Calling this from the main thread is prohibited"
+}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt
@@ -0,0 +1,49 @@
+package org.koitharu.kotatsu.settings
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import leakcanary.LeakCanary
+import org.koitharu.kotatsu.KotatsuApp
+import org.koitharu.kotatsu.R
+import org.koitharu.workinspector.WorkInspector
+
+class SettingsMenuProvider(
+	private val context: Context,
+) : MenuProvider {
+
+	private val application: KotatsuApp
+		get() = context.applicationContext as KotatsuApp
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_settings, menu)
+	}
+
+	override fun onPrepareMenu(menu: Menu) {
+		super.onPrepareMenu(menu)
+		menu.findItem(R.id.action_leakcanary).isChecked = application.isLeakCanaryEnabled
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+		R.id.action_leaks -> {
+			context.startActivity(LeakCanary.newLeakDisplayActivityIntent())
+			true
+		}
+
+		R.id.action_works -> {
+			context.startActivity(WorkInspector.getIntent(context))
+			true
+		}
+
+		R.id.action_leakcanary -> {
+			val checked = !menuItem.isChecked
+			menuItem.isChecked = checked
+			application.isLeakCanaryEnabled = checked
+			true
+		}
+
+		else -> false
+	}
+}
--- a/app/src/debug/res/drawable-anydpi-v24/ic_bug.xml
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_bug.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.98150784"
+      android:scaleY="0.98150784"
+      android:translateX="0.22190611"
+      android:translateY="-0.2688478">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+  </group>
+</vector>
--- a/app/src/debug/res/drawable-hdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-hdpi/ic_bug.png
--- a/app/src/debug/res/drawable-mdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-mdpi/ic_bug.png
--- a/app/src/debug/res/drawable-xhdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-xhdpi/ic_bug.png
--- a/app/src/debug/res/drawable-xxhdpi/ic_bug.png
+++ b/app/src/debug/res/drawable-xxhdpi/ic_bug.png
--- a/app/src/debug/res/menu/opt_settings.xml
+++ b/app/src/debug/res/menu/opt_settings.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools">

 	<item
-		android:id="@id/action_leaks"
+		android:id="@+id/action_leakcanary"
+		android:checkable="true"
+		android:title="LeakCanary"
+		app:showAsAction="never"
+		tools:ignore="HardcodedText" />
+
+	<item
+		android:id="@+id/action_leaks"
 		android:title="@string/leak_canary_display_activity_label"
 		app:showAsAction="never" />

-</menu>
+	<item
+		android:id="@+id/action_works"
+		android:title="@string/wi_lib_name"
+		app:showAsAction="never" />
+
+</menu>
--- a/app/src/debug/res/values/bools.xml
+++ b/app/src/debug/res/values/bools.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<bool name="leak_canary_add_launcher_icon" tools:node="replace">false</bool>
+	<bool name="wi_launcher_icon_enabled" tools:node="replace">false</bool>
 </resources>
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
 	<string name="app_name" translatable="false">Kotatsu Dev</string>
-</resources>
+	<string name="strict_mode">Strict mode</string>
+</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
--- a/app/src/main/assets/isrgrootx1.pem
+++ b/app/src/main/assets/isrgrootx1.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AlternativesUseCase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AlternativesUseCase.kt
@@ -0,0 +1,79 @@
+package org.koitharu.kotatsu.alternatives.domain
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.util.ext.toLocale
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.search.domain.SearchKind
+import org.koitharu.kotatsu.search.domain.SearchV2Helper
+import java.util.Locale
+import javax.inject.Inject
+
+private const val MAX_PARALLELISM = 4
+
+class AlternativesUseCase @Inject constructor(
+	private val sourcesRepository: MangaSourcesRepository,
+	private val searchHelperFactory: SearchV2Helper.Factory,
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+) {
+
+	suspend operator fun invoke(manga: Manga, throughDisabledSources: Boolean): Flow<Manga> {
+		val sources = getSources(manga.source, throughDisabledSources)
+		if (sources.isEmpty()) {
+			return emptyFlow()
+		}
+		val semaphore = Semaphore(MAX_PARALLELISM)
+		return channelFlow {
+			for (source in sources) {
+				launch {
+					val searchHelper = searchHelperFactory.create(source)
+					val list = runCatchingCancellable {
+						semaphore.withPermit {
+							searchHelper(manga.title, SearchKind.TITLE)?.manga
+						}
+					}.getOrNull()
+					list?.forEach { m ->
+						if (m.id != manga.id) {
+							launch {
+								val details = runCatchingCancellable {
+									mangaRepositoryFactory.create(m.source).getDetails(m)
+								}.getOrDefault(m)
+								send(details)
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun getSources(ref: MangaSource, disabled: Boolean): List<MangaSource> = if (disabled) {
+		sourcesRepository.getDisabledSources()
+	} else {
+		sourcesRepository.getEnabledSources()
+	}.sortedByDescending { it.priority(ref) }
+
+	private fun MangaSource.priority(ref: MangaSource): Int {
+		var res = 0
+		if (this is MangaParserSource && ref is MangaParserSource) {
+			if (locale == ref.locale) {
+				res += 4
+			} else if (locale.toLocale() == Locale.getDefault()) {
+				res += 2
+			}
+			if (contentType == ref.contentType) {
+				res++
+			}
+		}
+		return res
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AutoFixUseCase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AutoFixUseCase.kt
@@ -0,0 +1,96 @@
+package org.koitharu.kotatsu.alternatives.domain
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.lastOrNull
+import kotlinx.coroutines.flow.runningFold
+import kotlinx.coroutines.flow.transformWhile
+import kotlinx.coroutines.flow.withIndex
+import kotlinx.coroutines.launch
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.util.ext.concat
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
+
+class AutoFixUseCase @Inject constructor(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val alternativesUseCase: AlternativesUseCase,
+	private val migrateUseCase: MigrateUseCase,
+	private val mangaDataRepository: MangaDataRepository,
+) {
+
+	suspend operator fun invoke(mangaId: Long): Pair<Manga, Manga?> {
+		val seed = checkNotNull(
+			mangaDataRepository.findMangaById(mangaId, withChapters = true),
+		) { "Manga $mangaId not found" }.getDetailsSafe()
+		if (seed.isHealthy()) {
+			return seed to null // no fix required
+		}
+		val replacement = alternativesUseCase(seed, throughDisabledSources = false)
+			.concat(alternativesUseCase(seed, throughDisabledSources = true))
+			.filter { it.isHealthy() }
+			.runningFold<Manga, Manga?>(null) { best, candidate ->
+				if (best == null || best < candidate) {
+					candidate
+				} else {
+					best
+				}
+			}.selectLastWithTimeout(4, 40, TimeUnit.SECONDS)
+		migrateUseCase(seed, replacement ?: throw NoAlternativesException(ParcelableManga(seed)))
+		return seed to replacement
+	}
+
+	private suspend fun Manga.isHealthy(): Boolean = runCatchingCancellable {
+		val repo = mangaRepositoryFactory.create(source)
+		val details = if (this.chapters != null) this else repo.getDetails(this)
+		val firstChapter = details.chapters?.firstOrNull() ?: return@runCatchingCancellable false
+		val pageUrl = repo.getPageUrl(repo.getPages(firstChapter).first())
+		pageUrl.toHttpUrlOrNull() != null
+	}.getOrDefault(false)
+
+	private suspend fun Manga.getDetailsSafe() = runCatchingCancellable {
+		mangaRepositoryFactory.create(source).getDetails(this)
+	}.getOrDefault(this)
+
+	private operator fun Manga.compareTo(other: Manga) = chaptersCount().compareTo(other.chaptersCount())
+
+	@Suppress("UNCHECKED_CAST", "OPT_IN_USAGE")
+	private suspend fun <T> Flow<T>.selectLastWithTimeout(
+		minCount: Int,
+		timeout: Long,
+		timeUnit: TimeUnit
+	): T? = channelFlow<T?> {
+		var lastValue: T? = null
+		launch {
+			delay(timeUnit.toMillis(timeout))
+			close(InternalTimeoutException(lastValue))
+		}
+		withIndex().transformWhile { (index, value) ->
+			lastValue = value
+			emit(value)
+			index < minCount && !isClosedForSend
+		}.collect {
+			send(it)
+		}
+	}.catch { e ->
+		if (e is InternalTimeoutException) {
+			emit(e.value as T?)
+		} else {
+			throw e
+		}
+	}.lastOrNull()
+
+	class NoAlternativesException(val seed: ParcelableManga) : NoSuchElementException()
+
+	private class InternalTimeoutException(val value: Any?) : CancellationException()
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/MigrateUseCase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/MigrateUseCase.kt
@@ -0,0 +1,195 @@
+package org.koitharu.kotatsu.alternatives.domain
+
+import androidx.room.withTransaction
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.model.getPreferredBranch
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
+import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.history.data.toMangaHistory
+import org.koitharu.kotatsu.list.domain.ReadingProgress.Companion.PROGRESS_NONE
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
+import org.koitharu.kotatsu.tracker.data.TrackEntity
+import javax.inject.Inject
+
+class MigrateUseCase
+@Inject
+constructor(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val mangaDataRepository: MangaDataRepository,
+	private val database: MangaDatabase,
+	private val progressUpdateUseCase: ProgressUpdateUseCase,
+	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
+) {
+	suspend operator fun invoke(
+		oldManga: Manga,
+		newManga: Manga,
+	) {
+		val oldDetails =
+			if (oldManga.chapters.isNullOrEmpty()) {
+				runCatchingCancellable {
+					mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
+				}.getOrDefault(oldManga)
+			} else {
+				oldManga
+			}
+		val newDetails =
+			if (newManga.chapters.isNullOrEmpty()) {
+				mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
+			} else {
+				newManga
+			}
+		mangaDataRepository.storeManga(newDetails)
+		database.withTransaction {
+			// replace favorites
+			val favoritesDao = database.getFavouritesDao()
+			val oldFavourites = favoritesDao.findAllRaw(oldDetails.id)
+			if (oldFavourites.isNotEmpty()) {
+				favoritesDao.delete(oldManga.id)
+				for (f in oldFavourites) {
+					val e =
+						f.copy(
+							mangaId = newManga.id,
+						)
+					favoritesDao.upsert(e)
+				}
+			}
+			// replace history
+			val historyDao = database.getHistoryDao()
+			val oldHistory = historyDao.find(oldDetails.id)
+			val newHistory =
+				if (oldHistory != null) {
+					val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
+					historyDao.delete(oldDetails.id)
+					historyDao.upsert(newHistory)
+					newHistory
+				} else {
+					null
+				}
+			// track
+			val tracksDao = database.getTracksDao()
+			val oldTrack = tracksDao.find(oldDetails.id)
+			if (oldTrack != null) {
+				val lastChapter = newDetails.chapters?.lastOrNull()
+				val newTrack =
+					TrackEntity(
+						mangaId = newDetails.id,
+						lastChapterId = lastChapter?.id ?: 0L,
+						newChapters = 0,
+						lastCheckTime = System.currentTimeMillis(),
+						lastChapterDate = lastChapter?.uploadDate ?: 0L,
+						lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+						lastError = null,
+					)
+				tracksDao.delete(oldDetails.id)
+				tracksDao.upsert(newTrack)
+			}
+			// scrobbling
+			for (scrobbler in scrobblers) {
+				if (!scrobbler.isEnabled) {
+					continue
+				}
+				val prevInfo = scrobbler.getScrobblingInfoOrNull(oldDetails.id) ?: continue
+				scrobbler.unregisterScrobbling(oldDetails.id)
+				scrobbler.linkManga(newDetails.id, prevInfo.targetId)
+				scrobbler.updateScrobblingInfo(
+					mangaId = newDetails.id,
+					rating = prevInfo.rating,
+					status =
+					prevInfo.status ?: when {
+						newHistory == null -> ScrobblingStatus.PLANNED
+						newHistory.percent == 1f -> ScrobblingStatus.COMPLETED
+						else -> ScrobblingStatus.READING
+					},
+					comment = prevInfo.comment,
+				)
+				if (newHistory != null) {
+					scrobbler.scrobble(
+						manga = newDetails,
+						chapterId = newHistory.chapterId,
+					)
+				}
+			}
+		}
+		progressUpdateUseCase(newManga)
+	}
+
+	private fun makeNewHistory(
+		oldManga: Manga,
+		newManga: Manga,
+		history: HistoryEntity,
+	): HistoryEntity {
+		if (oldManga.chapters.isNullOrEmpty()) { // probably broken manga/source
+			val branch = newManga.getPreferredBranch(null)
+			val chapters = checkNotNull(newManga.getChapters(branch))
+			val currentChapter =
+				if (history.percent in 0f..1f) {
+					chapters[(chapters.lastIndex * history.percent).toInt()]
+				} else {
+					chapters.first()
+				}
+			return HistoryEntity(
+				mangaId = newManga.id,
+				createdAt = history.createdAt,
+				updatedAt = history.updatedAt,
+				chapterId = currentChapter.id,
+				page = history.page,
+				scroll = history.scroll,
+				percent = history.percent,
+				deletedAt = 0,
+				chaptersCount = chapters.count { it.branch == currentChapter.branch },
+			)
+		}
+		val branch = oldManga.getPreferredBranch(history.toMangaHistory())
+		val oldChapters = checkNotNull(oldManga.getChapters(branch))
+		var index = oldChapters.indexOfFirst { it.id == history.chapterId }
+		if (index < 0) {
+			index =
+				if (history.percent in 0f..1f) {
+					(oldChapters.lastIndex * history.percent).toInt()
+				} else {
+					0
+				}
+		}
+		val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
+		val newBranch =
+			if (newChapters.containsKey(branch)) {
+				branch
+			} else {
+				newManga.getPreferredBranch(null)
+			}
+		val newChapterId =
+			checkNotNull(newChapters[newBranch])
+				.let {
+					val oldChapter = oldChapters[index]
+					it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
+				}.id
+
+		return HistoryEntity(
+			mangaId = newManga.id,
+			createdAt = history.createdAt,
+			updatedAt = history.updatedAt,
+			chapterId = newChapterId,
+			page = history.page,
+			scroll = history.scroll,
+			percent = PROGRESS_NONE,
+			deletedAt = 0,
+			chaptersCount = checkNotNull(newChapters[newBranch]).size,
+		)
+	}
+
+	private fun List<MangaChapter>.findByNumber(
+		volume: Int,
+		number: Float,
+	): MangaChapter? =
+		if (number <= 0f) {
+			null
+		} else {
+			firstOrNull { it.volume == volume && it.number == number }
+		}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt
@@ -0,0 +1,116 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import android.text.style.ForegroundColorSpan
+import androidx.core.content.ContextCompat
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
+import androidx.core.view.isVisible
+import androidx.lifecycle.LifecycleOwner
+import coil3.ImageLoader
+import coil3.request.ImageRequest
+import coil3.request.allowRgb565
+import coil3.request.crossfade
+import coil3.request.error
+import coil3.request.fallback
+import coil3.request.lifecycle
+import coil3.request.placeholder
+import coil3.request.transformations
+import coil3.transform.RoundedCornersTransformation
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.parser.favicon.faviconUri
+import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
+import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getQuantityStringSafe
+import org.koitharu.kotatsu.core.util.ext.mangaExtra
+import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.databinding.ItemMangaAlternativeBinding
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import kotlin.math.sign
+import com.google.android.material.R as materialR
+
+fun alternativeAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	listener: OnListItemClickListener<MangaAlternativeModel>,
+) = adapterDelegateViewBinding<MangaAlternativeModel, ListModel, ItemMangaAlternativeBinding>(
+	{ inflater, parent -> ItemMangaAlternativeBinding.inflate(inflater, parent, false) },
+) {
+
+	val colorGreen = ContextCompat.getColor(context, R.color.common_green)
+	val colorRed = ContextCompat.getColor(context, R.color.common_red)
+	val clickListener = AdapterDelegateClickListenerAdapter(this, listener)
+	itemView.setOnClickListener(clickListener)
+	binding.buttonMigrate.setOnClickListener(clickListener)
+	binding.chipSource.setOnClickListener(clickListener)
+
+	bind { payloads ->
+		binding.textViewTitle.text = item.mangaModel.title
+		with(binding.iconsView) {
+			clearIcons()
+			if (item.mangaModel.isSaved) addIcon(R.drawable.ic_storage)
+			if (item.mangaModel.isFavorite) addIcon(R.drawable.ic_heart_outline)
+			isVisible = iconsCount > 0
+		}
+		binding.textViewSubtitle.text = buildSpannedString {
+			if (item.chaptersCount > 0) {
+				append(
+					context.resources.getQuantityStringSafe(
+						R.plurals.chapters,
+						item.chaptersCount,
+						item.chaptersCount,
+					),
+				)
+			} else {
+				append(context.getString(R.string.no_chapters))
+			}
+			when (item.chaptersDiff.sign) {
+				-1 -> inSpans(ForegroundColorSpan(colorRed)) {
+					append("  ▼ ")
+					append(item.chaptersDiff.toString())
+				}
+
+				1 -> inSpans(ForegroundColorSpan(colorGreen)) {
+					append("  ▲ +")
+					append(item.chaptersDiff.toString())
+				}
+			}
+		}
+		binding.progressView.setProgress(
+			item.mangaModel.progress,
+			ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads,
+		)
+		binding.chipSource.also { chip ->
+			chip.text = item.manga.source.getTitle(chip.context)
+			ImageRequest.Builder(context)
+				.data(item.manga.source.faviconUri())
+				.lifecycle(lifecycleOwner)
+				.crossfade(false)
+				.size(context.resources.getDimensionPixelSize(materialR.dimen.m3_chip_icon_size))
+				.target(ChipIconTarget(chip))
+				.placeholder(R.drawable.ic_web)
+				.fallback(R.drawable.ic_web)
+				.error(R.drawable.ic_web)
+				.mangaSourceExtra(item.manga.source)
+				.transformations(RoundedCornersTransformation(context.resources.getDimension(R.dimen.chip_icon_corner)))
+				.allowRgb565(true)
+				.enqueueWith(coil)
+		}
+		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
+			size(CoverSizeResolver(binding.imageViewCover))
+			defaultPlaceholders(context)
+			transformations(TrimTransformation())
+			allowRgb565(true)
+			mangaExtra(item.manga)
+			enqueueWith(coil)
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesActivity.kt
@@ -0,0 +1,124 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import coil3.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.nav.router
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.consumeAllSystemBarsInsets
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.systemBarsInsets
+import org.koitharu.kotatsu.databinding.ActivityAlternativesBinding
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
+import org.koitharu.kotatsu.list.ui.adapter.buttonFooterAD
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
+	ListStateHolderListener,
+	OnListItemClickListener<MangaAlternativeModel> {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private val viewModel by viewModels<AlternativesViewModel>()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityAlternativesBinding.inflate(layoutInflater))
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			subtitle = viewModel.manga.title
+		}
+		val listAdapter = BaseListAdapter<ListModel>()
+			.addDelegate(ListItemType.MANGA_LIST_DETAILED, alternativeAD(coil, this, this))
+			.addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, this, null))
+			.addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+			.addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+			.addDelegate(ListItemType.FOOTER_BUTTON, buttonFooterAD(this))
+		with(viewBinding.recyclerView) {
+			setHasFixedSize(true)
+			addItemDecoration(TypedListSpacingDecoration(context, addHorizontalPadding = false))
+			adapter = listAdapter
+		}
+
+		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
+		viewModel.list.observe(this, listAdapter)
+		viewModel.onMigrated.observeEvent(this) {
+			Toast.makeText(this, R.string.migration_completed, Toast.LENGTH_SHORT).show()
+			router.openDetails(it)
+			finishAfterTransition()
+		}
+	}
+
+	override fun onApplyWindowInsets(
+		v: View,
+		insets: WindowInsetsCompat
+	): WindowInsetsCompat {
+		val barsInsets = insets.systemBarsInsets
+		viewBinding.recyclerView.updatePadding(
+			left = barsInsets.left,
+			right = barsInsets.right,
+			bottom = barsInsets.bottom,
+		)
+		viewBinding.appbar.updatePadding(
+			left = barsInsets.left,
+			right = barsInsets.right,
+			top = barsInsets.top,
+		)
+		return insets.consumeAllSystemBarsInsets()
+	}
+
+	override fun onItemClick(item: MangaAlternativeModel, view: View) {
+		when (view.id) {
+			R.id.chip_source -> router.openSearch(item.manga.source, viewModel.manga.title)
+			R.id.button_migrate -> confirmMigration(item.manga)
+			else -> router.openDetails(item.manga)
+		}
+	}
+
+	override fun onRetryClick(error: Throwable) = viewModel.retry()
+
+	override fun onEmptyActionClick() = Unit
+
+	override fun onFooterButtonClick() = viewModel.continueSearch()
+
+	private fun confirmMigration(target: Manga) {
+		buildAlertDialog(this, isCentered = true) {
+			setIcon(R.drawable.ic_replace)
+			setTitle(R.string.manga_migration)
+			setMessage(
+				getString(
+					R.string.migrate_confirmation,
+					viewModel.manga.title,
+					viewModel.manga.source.getTitle(context),
+					target.title,
+					target.source.getTitle(context),
+				),
+			)
+			setNegativeButton(android.R.string.cancel, null)
+			setPositiveButton(R.string.migrate) { _, _ ->
+				viewModel.migrate(target)
+			}
+		}.show()
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesViewModel.kt
@@ -0,0 +1,136 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.alternatives.domain.AlternativesUseCase
+import org.koitharu.kotatsu.alternatives.domain.MigrateUseCase
+import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.ListMode
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
+import org.koitharu.kotatsu.core.util.ext.append
+import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.list.domain.MangaListMapper
+import org.koitharu.kotatsu.list.ui.model.ButtonFooter
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.MangaGridModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrDefault
+import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
+import javax.inject.Inject
+
+@HiltViewModel
+class AlternativesViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val alternativesUseCase: AlternativesUseCase,
+	private val migrateUseCase: MigrateUseCase,
+	private val mangaListMapper: MangaListMapper,
+) : BaseViewModel() {
+
+	val manga = savedStateHandle.require<ParcelableManga>(AppRouter.KEY_MANGA).manga
+
+	private var includeDisabledSources = MutableStateFlow(false)
+	private val results = MutableStateFlow<List<MangaAlternativeModel>>(emptyList())
+
+	private var migrationJob: Job? = null
+	private var searchJob: Job? = null
+
+	private val mangaDetails = suspendLazy {
+		mangaRepositoryFactory.create(manga.source).getDetails(manga)
+	}
+
+	val onMigrated = MutableEventFlow<Manga>()
+
+	val list: StateFlow<List<ListModel>> = combine(
+		results,
+		isLoading,
+		includeDisabledSources,
+	) { list, loading, includeDisabled ->
+		when {
+			list.isEmpty() -> listOf(
+				when {
+					loading -> LoadingState
+					else -> EmptyState(
+						icon = R.drawable.ic_empty_common,
+						textPrimary = R.string.nothing_found,
+						textSecondary = R.string.text_search_holder_secondary,
+						actionStringRes = 0,
+					)
+				},
+			)
+
+			loading -> list + LoadingFooter()
+			includeDisabled -> list
+			else -> list + ButtonFooter(R.string.search_disabled_sources)
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+
+	init {
+		doSearch(throughDisabledSources = false)
+	}
+
+	fun retry() {
+		searchJob?.cancel()
+		results.value = emptyList()
+		includeDisabledSources.value = false
+		doSearch(throughDisabledSources = false)
+	}
+
+	fun continueSearch() {
+		if (includeDisabledSources.value) {
+			return
+		}
+		val prevJob = searchJob
+		searchJob = launchLoadingJob(Dispatchers.Default) {
+			includeDisabledSources.value = true
+			prevJob?.join()
+			doSearch(throughDisabledSources = true)
+		}
+	}
+
+	fun migrate(target: Manga) {
+		if (migrationJob?.isActive == true) {
+			return
+		}
+		migrationJob = launchLoadingJob(Dispatchers.Default) {
+			migrateUseCase(manga, target)
+			onMigrated.call(target)
+		}
+	}
+
+	private fun doSearch(throughDisabledSources: Boolean) {
+		val prevJob = searchJob
+		searchJob = launchLoadingJob(Dispatchers.Default) {
+			prevJob?.cancelAndJoin()
+			val ref = mangaDetails.getOrDefault(manga)
+			val refCount = ref.chaptersCount()
+			alternativesUseCase.invoke(ref, throughDisabledSources)
+				.collect {
+					val model = MangaAlternativeModel(
+						mangaModel = mangaListMapper.toListModel(it, ListMode.GRID) as MangaGridModel,
+						referenceChapters = refCount,
+					)
+					results.append(model)
+				}
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt
@@ -0,0 +1,196 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
+import androidx.core.content.ContextCompat
+import coil3.ImageLoader
+import coil3.request.ImageRequest
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.runBlocking
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.alternatives.domain.AutoFixUseCase
+import org.koitharu.kotatsu.core.ErrorReporterReceiver
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.ui.CoroutineIntentService
+import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
+import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
+import org.koitharu.kotatsu.core.util.ext.powerManager
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
+import org.koitharu.kotatsu.core.util.ext.withPartialWakeLock
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+import com.google.android.material.R as materialR
+
+@AndroidEntryPoint
+class AutoFixService : CoroutineIntentService() {
+
+	@Inject
+	lateinit var autoFixUseCase: AutoFixUseCase
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private lateinit var notificationManager: NotificationManagerCompat
+
+	override fun onCreate() {
+		super.onCreate()
+		notificationManager = NotificationManagerCompat.from(applicationContext)
+	}
+
+	override suspend fun IntentJobContext.processIntent(intent: Intent) {
+		val ids = requireNotNull(intent.getLongArrayExtra(DATA_IDS))
+		startForeground(this)
+		for (mangaId in ids) {
+			powerManager.withPartialWakeLock(TAG) {
+				val result = runCatchingCancellable {
+					autoFixUseCase.invoke(mangaId)
+				}
+				if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
+					val notification = buildNotification(result)
+					notificationManager.notify(TAG, startId, notification)
+				}
+			}
+		}
+	}
+
+	override fun IntentJobContext.onError(error: Throwable) {
+		if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
+			val notification = runBlocking { buildNotification(Result.failure(error)) }
+			notificationManager.notify(TAG, startId, notification)
+		}
+	}
+
+	@SuppressLint("InlinedApi")
+	private fun startForeground(jobContext: IntentJobContext) {
+		val title = applicationContext.getString(R.string.fixing_manga)
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_MIN)
+			.setName(title)
+			.setShowBadge(false)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		notificationManager.createNotificationChannel(channel)
+
+		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
+			.setContentTitle(title)
+			.setPriority(NotificationCompat.PRIORITY_MIN)
+			.setDefaults(0)
+			.setSilent(true)
+			.setOngoing(true)
+			.setProgress(0, 0, true)
+			.setSmallIcon(R.drawable.ic_stat_auto_fix)
+			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
+			.setCategory(NotificationCompat.CATEGORY_PROGRESS)
+			.addAction(
+				materialR.drawable.material_ic_clear_black_24dp,
+				applicationContext.getString(android.R.string.cancel),
+				jobContext.getCancelIntent(),
+			)
+			.build()
+
+		jobContext.setForeground(
+			FOREGROUND_NOTIFICATION_ID,
+			notification,
+			ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
+		)
+	}
+
+	private suspend fun buildNotification(result: Result<Pair<Manga, Manga?>>): Notification {
+		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
+			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
+			.setDefaults(0)
+			.setSilent(true)
+			.setAutoCancel(true)
+		result.onSuccess { (seed, replacement) ->
+			if (replacement != null) {
+				notification.setLargeIcon(
+					coil.execute(
+						ImageRequest.Builder(applicationContext)
+							.data(replacement.coverUrl)
+							.mangaSourceExtra(replacement.source)
+							.build(),
+					).toBitmapOrNull(),
+				)
+				notification.setSubText(replacement.title)
+				val intent = AppRouter.detailsIntent(applicationContext, replacement)
+				notification.setContentIntent(
+					PendingIntentCompat.getActivity(
+						applicationContext,
+						replacement.id.toInt(),
+						intent,
+						PendingIntent.FLAG_UPDATE_CURRENT,
+						false,
+					),
+				).setVisibility(
+					if (replacement.isNsfw) NotificationCompat.VISIBILITY_SECRET else NotificationCompat.VISIBILITY_PUBLIC,
+				)
+				notification
+					.setContentTitle(applicationContext.getString(R.string.fixed))
+					.setContentText(
+						applicationContext.getString(
+							R.string.manga_replaced,
+							seed.title,
+							seed.source.getTitle(applicationContext),
+							replacement.title,
+							replacement.source.getTitle(applicationContext),
+						),
+					)
+					.setSmallIcon(R.drawable.ic_stat_done)
+			} else {
+				notification
+					.setContentTitle(applicationContext.getString(R.string.fixing_manga))
+					.setContentText(applicationContext.getString(R.string.no_fix_required, seed.title))
+					.setSmallIcon(android.R.drawable.stat_sys_warning)
+			}
+		}.onFailure { error ->
+			notification
+				.setContentTitle(applicationContext.getString(R.string.error_occurred))
+				.setContentText(
+					if (error is AutoFixUseCase.NoAlternativesException) {
+						applicationContext.getString(R.string.no_alternatives_found, error.seed.manga.title)
+					} else {
+						error.getDisplayMessage(applicationContext.resources)
+					},
+				).setSmallIcon(android.R.drawable.stat_notify_error)
+			ErrorReporterReceiver.getPendingIntent(applicationContext, error)?.let { reportIntent ->
+				notification.addAction(
+					R.drawable.ic_alert_outline,
+					applicationContext.getString(R.string.report),
+					reportIntent,
+				)
+			}
+		}
+		return notification.build()
+	}
+
+	companion object {
+
+		private const val DATA_IDS = "ids"
+		private const val TAG = "auto_fix"
+		private const val CHANNEL_ID = "auto_fix"
+		private const val FOREGROUND_NOTIFICATION_ID = 38
+
+		fun start(context: Context, mangaIds: Collection<Long>): Boolean = try {
+			val intent = Intent(context, AutoFixService::class.java)
+			intent.putExtra(DATA_IDS, mangaIds.toLongArray())
+			ContextCompat.startForegroundService(context, intent)
+			true
+		} catch (e: Exception) {
+			e.printStackTraceDebug()
+			false
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/MangaAlternativeModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/MangaAlternativeModel.kt
@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaGridModel
+import org.koitharu.kotatsu.parsers.model.Manga
+
+data class MangaAlternativeModel(
+	val mangaModel: MangaGridModel,
+	private val referenceChapters: Int,
+) : ListModel {
+
+	val manga: Manga
+		get() = mangaModel.manga
+
+	val chaptersCount = manga.chaptersCount()
+
+	val chaptersDiff: Int
+		get() = if (referenceChapters == 0 || chaptersCount == 0) 0 else chaptersCount - referenceChapters
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is MangaAlternativeModel && other.manga.id == manga.id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? = if (previousState is MangaAlternativeModel) {
+		mangaModel.getChangePayload(previousState.mangaModel)
+	} else {
+		null
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
@@ -5,24 +5,31 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Transaction
+import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaWithTags

@Dao
 abstract class BookmarksDao {

-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
-	abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
+	@Query("SELECT * FROM bookmarks WHERE page_id = :pageId")
+	abstract suspend fun find(pageId: Long): BookmarkEntity?

-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
+	@Transaction
+	@Query(
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY percent",
+	)
+	abstract suspend fun findAll(): Map<MangaWithTags, List<BookmarkEntity>>
+
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page ORDER BY percent")
 	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>

-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY percent")
 	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>

 	@Transaction
 	@Query(
-		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at",
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY percent",
 	)
 	abstract fun observe(): Flow<Map<MangaWithTags, List<BookmarkEntity>>>

@@ -32,9 +39,12 @@ abstract class BookmarksDao {
 	@Delete
 	abstract suspend fun delete(entity: BookmarkEntity)

-	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
-	abstract suspend fun delete(mangaId: Long, pageId: Long): Int
+	@Query("DELETE FROM bookmarks WHERE page_id = :pageId")
+	abstract suspend fun delete(pageId: Long): Int

 	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
 	abstract suspend fun delete(mangaId: Long, chapterId: Long, page: Int): Int
+
+	@Upsert
+	abstract suspend fun upsert(bookmarks: Collection<BookmarkEntity>)
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt
@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.data

 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.*
+import java.time.Instant

 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
@@ -11,7 +11,7 @@ fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = Date(createdAt),
+	createdAt = Instant.ofEpochMilli(createdAt),
 	percent = percent,
 )

@@ -22,7 +22,7 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = createdAt.time,
+	createdAt = createdAt.toEpochMilli(),
 	percent = percent,
 )

@@ -30,4 +30,5 @@ fun Collection<BookmarkEntity>.toBookmarks(manga: Manga) = map {
 	it.toBookmark(manga)
 }

-fun Collection<Bookmark>.ids() = map { it.pageId }
+@JvmName("bookmarksIds")
+fun Collection<Bookmark>.ids() = map { it.pageId }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt
@@ -1,23 +1,31 @@
 package org.koitharu.kotatsu.bookmarks.domain

-import org.koitharu.kotatsu.local.data.ImageFileFilter
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.local.data.hasImageExtension
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import java.util.Date
+import java.time.Instant

-class Bookmark(
+data class Bookmark(
 	val manga: Manga,
 	val pageId: Long,
 	val chapterId: Long,
 	val page: Int,
 	val scroll: Int,
 	val imageUrl: String,
-	val createdAt: Date,
+	val createdAt: Instant,
 	val percent: Float,
-) {
+) : ListModel {

-	val directImageUrl: String?
-		get() = if (isImageUrlDirect()) imageUrl else null
+	val imageLoadData: Any
+		get() = if (isImageUrlDirect()) imageUrl else toMangaPage()
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is Bookmark &&
+			manga.id == other.manga.id &&
+			chapterId == other.chapterId &&
+			page == other.page
+	}

 	fun toMangaPage() = MangaPage(
 		id = pageId,
@@ -27,35 +35,6 @@ class Bookmark(
 	)

 	private fun isImageUrlDirect(): Boolean {
-		val extension = imageUrl.substringAfterLast('.')
-		return extension.isNotEmpty() && ImageFileFilter().isExtensionValid(extension)
-	}
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as Bookmark
-
-		if (manga != other.manga) return false
-		if (pageId != other.pageId) return false
-		if (chapterId != other.chapterId) return false
-		if (page != other.page) return false
-		if (scroll != other.scroll) return false
-		if (imageUrl != other.imageUrl) return false
-		if (createdAt != other.createdAt) return false
-		return percent == other.percent
-	}
-
-	override fun hashCode(): Int {
-		var result = manga.hashCode()
-		result = 31 * result + pageId.hashCode()
-		result = 31 * result + chapterId.hashCode()
-		result = 31 * result + page
-		result = 31 * result + scroll
-		result = 31 * result + imageUrl.hashCode()
-		result = 31 * result + createdAt.hashCode()
-		result = 31 * result + percent.hashCode()
-		return result
+		return hasImageExtension(imageUrl)
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
@@ -25,15 +25,15 @@ class BookmarksRepository @Inject constructor(
 ) {

 	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
-		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+		return db.getBookmarksDao().observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
 	}

 	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
-		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
+		return db.getBookmarksDao().observe(manga.id).mapItems { it.toBookmark(manga) }
 	}

 	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
-		return db.bookmarksDao.observe().map { map ->
+		return db.getBookmarksDao().observe().map { map ->
 			val res = LinkedHashMap<Manga, List<Bookmark>>(map.size)
 			for ((k, v) in map) {
 				val manga = k.toManga()
@@ -46,14 +46,21 @@ class BookmarksRepository @Inject constructor(
 	suspend fun addBookmark(bookmark: Bookmark) {
 		db.withTransaction {
 			val tags = bookmark.manga.tags.toEntities()
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
-			db.bookmarksDao.insert(bookmark.toEntity())
+			db.getTagsDao().upsert(tags)
+			db.getMangaDao().upsert(bookmark.manga.toEntity(), tags)
+			db.getBookmarksDao().insert(bookmark.toEntity())
 		}
 	}

+	suspend fun updateBookmark(bookmark: Bookmark, imageUrl: String) {
+		val entity = bookmark.toEntity().copy(
+			imageUrl = imageUrl,
+		)
+		db.getBookmarksDao().upsert(listOf(entity))
+	}
+
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
-		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
+		check(db.getBookmarksDao().delete(mangaId, chapterId, page) != 0) {
 			"Bookmark not found"
 		}
 	}
@@ -62,18 +69,16 @@ class BookmarksRepository @Inject constructor(
 		removeBookmark(bookmark.manga.id, bookmark.chapterId, bookmark.page)
 	}

-	suspend fun removeBookmarks(ids: Map<Manga, Set<Long>>): ReversibleHandle {
+	suspend fun removeBookmarks(ids: Set<Long>): ReversibleHandle {
 		val entities = ArrayList<BookmarkEntity>(ids.size)
 		db.withTransaction {
-			val dao = db.bookmarksDao
-			for ((manga, idSet) in ids) {
-				for (pageId in idSet) {
-					val e = dao.find(manga.id, pageId)
-					if (e != null) {
-						entities.add(e)
-					}
-					dao.delete(manga.id, pageId)
+			val dao = db.getBookmarksDao()
+			for (pageId in ids) {
+				val e = dao.find(pageId)
+				if (e != null) {
+					entities.add(e)
 				}
+				dao.delete(pageId)
 			}
 		}
 		return BookmarksRestorer(entities)
@@ -87,7 +92,7 @@ class BookmarksRepository @Inject constructor(
 			db.withTransaction {
 				for (e in entities) {
 					try {
-						db.bookmarksDao.insert(e)
+						db.getBookmarksDao().insert(e)
 					} catch (e: SQLException) {
 						e.printStackTraceDebug()
 					}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksActivity.kt
@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import org.koitharu.kotatsu.core.ui.FragmentContainerActivity
+
+class AllBookmarksActivity : FragmentContainerActivity(AllBookmarksFragment::class.java)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksFragment.kt
@@ -0,0 +1,213 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.appcompat.view.ActionMode
+import androidx.core.view.WindowInsetsCompat
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import coil3.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.nav.ReaderIntent
+import org.koitharu.kotatsu.core.nav.router
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.BaseFragment
+import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.util.ext.consumeAllSystemBarsInsets
+import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.systemBarsInsets
+import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
+import org.koitharu.kotatsu.list.ui.GridSpanResolver
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AllBookmarksFragment :
+	BaseFragment<FragmentListSimpleBinding>(),
+	ListStateHolderListener,
+	OnListItemClickListener<Bookmark>,
+	ListSelectionController.Callback,
+	FastScroller.FastScrollListener, ListHeaderClickListener {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	private val viewModel by viewModels<AllBookmarksViewModel>()
+	private var bookmarksAdapter: BookmarksAdapter? = null
+	private var selectionController: ListSelectionController? = null
+
+	override fun onCreateViewBinding(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	): FragmentListSimpleBinding {
+		return FragmentListSimpleBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewBindingCreated(
+		binding: FragmentListSimpleBinding,
+		savedInstanceState: Bundle?,
+	) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		selectionController = ListSelectionController(
+			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
+			decoration = BookmarksSelectionDecoration(binding.root.context),
+			registryOwner = this,
+			callback = this,
+		)
+		bookmarksAdapter = BookmarksAdapter(
+			lifecycleOwner = viewLifecycleOwner,
+			coil = coil,
+			clickListener = this,
+			headerClickListener = this,
+		)
+		val spanSizeLookup = SpanSizeLookup()
+		with(binding.recyclerView) {
+			setHasFixedSize(true)
+			val spanResolver = GridSpanResolver(resources)
+			addItemDecoration(TypedListSpacingDecoration(context, false))
+			adapter = bookmarksAdapter
+			addOnLayoutChangeListener(spanResolver)
+			spanResolver.setGridSize(settings.gridSize / 100f, this)
+			val lm = GridLayoutManager(context, spanResolver.spanCount)
+			lm.spanSizeLookup = spanSizeLookup
+			layoutManager = lm
+			selectionController?.attachToRecyclerView(this)
+		}
+		viewModel.content.observe(viewLifecycleOwner) {
+			bookmarksAdapter?.setItems(it, spanSizeLookup)
+		}
+		viewModel.onError.observeEvent(
+			viewLifecycleOwner,
+			SnackbarErrorObserver(binding.recyclerView, this),
+		)
+		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
+	}
+
+	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+		val barsInsets = insets.systemBarsInsets
+		val basePadding = resources.getDimensionPixelOffset(R.dimen.list_spacing_normal)
+		viewBinding?.recyclerView?.setPadding(
+			barsInsets.left + basePadding,
+			barsInsets.top + basePadding,
+			barsInsets.right + basePadding,
+			barsInsets.bottom + basePadding,
+		)
+		return insets.consumeAllSystemBarsInsets()
+	}
+
+	override fun onDestroyView() {
+		super.onDestroyView()
+		bookmarksAdapter = null
+		selectionController = null
+	}
+
+	override fun onItemClick(item: Bookmark, view: View) {
+		if (selectionController?.onItemClick(item.pageId) != true) {
+			val intent = ReaderIntent.Builder(view.context)
+				.bookmark(item)
+				.incognito(true)
+				.build()
+			router.openReader(intent)
+			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
+		}
+	}
+
+	override fun onListHeaderClick(item: ListHeader, view: View) {
+		val manga = item.payload as? Manga ?: return
+		router.openDetails(manga)
+	}
+
+	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
+		return selectionController?.onItemLongClick(view, item.pageId) == true
+	}
+
+	override fun onItemContextClick(item: Bookmark, view: View): Boolean {
+		return selectionController?.onItemContextClick(view, item.pageId) == true
+	}
+
+	override fun onRetryClick(error: Throwable) = Unit
+
+	override fun onEmptyActionClick() = Unit
+
+	override fun onFastScrollStart(fastScroller: FastScroller) {
+		(activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
+	}
+
+	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
+
+	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
+		requireViewBinding().recyclerView.invalidateItemDecorations()
+	}
+
+	override fun onCreateActionMode(
+		controller: ListSelectionController,
+		menuInflater: MenuInflater,
+		menu: Menu,
+	): Boolean {
+		menuInflater.inflate(R.menu.mode_bookmarks, menu)
+		return true
+	}
+
+	override fun onActionItemClicked(
+		controller: ListSelectionController,
+		mode: ActionMode?,
+		item: MenuItem,
+	): Boolean {
+		return when (item.itemId) {
+			R.id.action_remove -> {
+				val ids = selectionController?.snapshot() ?: return false
+				viewModel.removeBookmarks(ids)
+				mode?.finish()
+				true
+			}
+
+			else -> false
+		}
+	}
+
+	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {
+
+		init {
+			isSpanIndexCacheEnabled = true
+			isSpanGroupIndexCacheEnabled = true
+		}
+
+		override fun getSpanSize(position: Int): Int {
+			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount
+				?: return 1
+			return when (bookmarksAdapter?.getItemViewType(position)) {
+				ListItemType.PAGE_THUMB.ordinal -> 1
+				else -> total
+			}
+		}
+
+		override fun run() {
+			invalidateSpanGroupIndexCache()
+			invalidateSpanIndexCache()
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksViewModel.kt
@@ -10,13 +10,14 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
@@ -24,7 +25,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import javax.inject.Inject

@HiltViewModel
-class BookmarksViewModel @Inject constructor(
+class AllBookmarksViewModel @Inject constructor(
 	private val repository: BookmarksRepository,
 ) : BaseViewModel() {

@@ -41,17 +42,26 @@ class BookmarksViewModel @Inject constructor(
 						actionStringRes = 0,
 					),
 				)
-			} else list.map { (manga, bookmarks) ->
-				BookmarksGroup(manga, bookmarks)
+			} else {
+				mapList(list)
 			}
 		}
 		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))

-	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
+	fun removeBookmarks(ids: Set<Long>) {
 		launchJob(Dispatchers.Default) {
 			val handle = repository.removeBookmarks(ids)
 			onActionDone.call(ReversibleAction(R.string.bookmarks_removed, handle))
 		}
 	}
+
+	private fun mapList(data: Map<Manga, List<Bookmark>>): List<ListModel> {
+		val result = ArrayList<ListModel>(data.values.sumOf { it.size + 1 })
+		for ((manga, bookmarks) in data) {
+			result.add(ListHeader(manga.title, R.string.more, manga))
+			result.addAll(bookmarks)
+		}
+		return result
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
@@ -1,204 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.appcompat.view.ActionMode
-import androidx.core.graphics.Insets
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.fragment.app.viewModels
-import coil.ImageLoader
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.bookmarks.data.ids
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.ui.BaseFragment
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.ui.util.reverseAsync
-import org.koitharu.kotatsu.core.util.ext.invalidateNestedItemDecorations
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
-import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class BookmarksFragment :
-	BaseFragment<FragmentListSimpleBinding>(),
-	ListStateHolderListener,
-	OnListItemClickListener<Bookmark>,
-	SectionedSelectionController.Callback<Manga>,
-	FastScroller.FastScrollListener {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private val viewModel by viewModels<BookmarksViewModel>()
-	private var adapter: BookmarksGroupAdapter? = null
-	private var selectionController: SectionedSelectionController<Manga>? = null
-
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
-		return FragmentListSimpleBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: FragmentListSimpleBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		selectionController = SectionedSelectionController(
-			activity = requireActivity(),
-			owner = this,
-			callback = this,
-		)
-		adapter = BookmarksGroupAdapter(
-			lifecycleOwner = viewLifecycleOwner,
-			coil = coil,
-			listener = this,
-			selectionController = checkNotNull(selectionController),
-			bookmarkClickListener = this,
-			groupClickListener = OnGroupClickListener(),
-		)
-		binding.recyclerView.adapter = adapter
-		binding.recyclerView.setHasFixedSize(true)
-		val spacingDecoration = SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing))
-		binding.recyclerView.addItemDecoration(spacingDecoration)
-
-		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
-	}
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		adapter = null
-		selectionController = null
-	}
-
-	override fun onItemClick(item: Bookmark, view: View) {
-		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
-			val intent = ReaderActivity.IntentBuilder(view.context)
-				.bookmark(item)
-				.incognito(true)
-				.build()
-			startActivity(intent, scaleUpActivityOptionsOf(view))
-			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
-		}
-	}
-
-	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(item.manga, item.pageId) ?: false
-	}
-
-	override fun onRetryClick(error: Throwable) = Unit
-
-	override fun onEmptyActionClick() = Unit
-
-	override fun onFastScrollStart(fastScroller: FastScroller) {
-		(activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
-	}
-
-	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
-
-	override fun onSelectionChanged(controller: SectionedSelectionController<Manga>, count: Int) {
-		requireViewBinding().recyclerView.invalidateNestedItemDecorations()
-	}
-
-	override fun onCreateActionMode(
-		controller: SectionedSelectionController<Manga>,
-		mode: ActionMode,
-		menu: Menu,
-	): Boolean {
-		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
-		return true
-	}
-
-	override fun onActionItemClicked(
-		controller: SectionedSelectionController<Manga>,
-		mode: ActionMode,
-		item: MenuItem,
-	): Boolean {
-		return when (item.itemId) {
-			R.id.action_remove -> {
-				val ids = selectionController?.snapshot() ?: return false
-				viewModel.removeBookmarks(ids)
-				mode.finish()
-				true
-			}
-
-			else -> false
-		}
-	}
-
-	override fun onCreateItemDecoration(
-		controller: SectionedSelectionController<Manga>,
-		section: Manga,
-	): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().recyclerView.updatePadding(
-			bottom = insets.bottom,
-		)
-		requireViewBinding().recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			bottomMargin = insets.bottom
-		}
-	}
-
-	private fun onListChanged(list: List<ListModel>) {
-		adapter?.items = list
-	}
-
-	private fun onActionDone(action: ReversibleAction) {
-		val handle = action.handle
-		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
-		val snackbar = Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
-		if (handle != null) {
-			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
-		}
-		snackbar.show()
-	}
-
-	private inner class OnGroupClickListener : OnListItemClickListener<BookmarksGroup> {
-
-		override fun onItemClick(item: BookmarksGroup, view: View) {
-			val controller = selectionController
-			if (controller != null && controller.count > 0) {
-				if (controller.getSectionCount(item.manga) == item.bookmarks.size) {
-					controller.clearSelection(item.manga)
-				} else {
-					controller.addToSelection(item.manga, item.bookmarks.ids())
-				}
-				return
-			}
-			val intent = DetailsActivity.newIntent(view.context, item.manga)
-			startActivity(intent)
-		}
-
-		override fun onItemLongClick(item: BookmarksGroup, view: View): Boolean {
-			return selectionController?.addToSelection(item.manga, item.bookmarks.ids()) ?: false
-		}
-	}
-
-	companion object {
-
-		fun newInstance() = BookmarksFragment()
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkLargeAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkLargeAD.kt
@@ -0,0 +1,39 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import coil3.ImageLoader
+import coil3.request.allowRgb565
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.bookmarkExtra
+import org.koitharu.kotatsu.core.util.ext.decodeRegion
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.databinding.ItemBookmarkLargeBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+fun bookmarkLargeAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+) = adapterDelegateViewBinding<Bookmark, ListModel, ItemBookmarkLargeBinding>(
+	{ inflater, parent -> ItemBookmarkLargeBinding.inflate(inflater, parent, false) },
+) {
+	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
+
+	bind {
+		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
+			size(CoverSizeResolver(binding.imageViewThumb))
+			defaultPlaceholders(context)
+			allowRgb565(true)
+			bookmarkExtra(item)
+			decodeRegion(item.scroll)
+			enqueueWith(coil)
+		}
+		binding.progressView.setProgress(item.percent, false)
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
@@ -1,51 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import androidx.lifecycle.LifecycleOwner
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.drawable.TextDrawable
-import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.decodeRegion
-import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.getThemeResId
-import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.source
-import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
-import org.koitharu.kotatsu.parsers.util.format
-import com.google.android.material.R as materialR
-
-fun bookmarkListAD(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	clickListener: OnListItemClickListener<Bookmark>,
-) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
-	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
-) {
-	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
-
-	binding.root.setOnClickListener(listener)
-	binding.root.setOnLongClickListener(listener)
-
-	bind {
-		val data: Any = item.directImageUrl ?: item.toMangaPage()
-		binding.imageViewThumb.newImageRequest(lifecycleOwner, data)?.run {
-			size(CoverSizeResolver(binding.imageViewThumb))
-			placeholder(R.drawable.ic_placeholder)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
-			allowRgb565(true)
-			decodeRegion(item.scroll)
-			source(item.manga.source)
-			enqueueWith(coil)
-		}
-	}
-
-	onViewRecycled {
-		binding.imageViewThumb.disposeImageRequest()
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
@@ -1,32 +1,38 @@
 package org.koitharu.kotatsu.bookmarks.ui.adapter

+import android.content.Context
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import coil3.ImageLoader
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.model.ListModel

 class BookmarksAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
-) : AsyncListDifferDelegationAdapter<Bookmark>(
-	DiffCallback(),
-	bookmarkListAD(coil, lifecycleOwner, clickListener),
-) {
+	headerClickListener: ListHeaderClickListener?,
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {

-	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
-
-		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
-			return oldItem.manga.id == newItem.manga.id &&
-				oldItem.chapterId == newItem.chapterId &&
-				oldItem.page == newItem.page
-		}
-
-		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
-			return oldItem.imageUrl == newItem.imageUrl
-		}
+	init {
+		addDelegate(ListItemType.PAGE_THUMB, bookmarkLargeAD(coil, lifecycleOwner, clickListener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
+		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(null))
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
+	}

+	override fun getSectionText(context: Context, position: Int): CharSequence? {
+		return findHeader(position)?.getText(context)
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt
@@ -1,69 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import android.view.View
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.util.ext.clearItemDecorations
-import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.source
-import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-
-fun bookmarksGroupAD(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	sharedPool: RecyclerView.RecycledViewPool,
-	selectionController: SectionedSelectionController<Manga>,
-	bookmarkClickListener: OnListItemClickListener<Bookmark>,
-	groupClickListener: OnListItemClickListener<BookmarksGroup>,
-) = adapterDelegateViewBinding<BookmarksGroup, ListModel, ItemBookmarksGroupBinding>(
-	{ layoutInflater, parent -> ItemBookmarksGroupBinding.inflate(layoutInflater, parent, false) },
-) {
-	val viewListenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
-		override fun onClick(v: View) = groupClickListener.onItemClick(item, v)
-		override fun onLongClick(v: View) = groupClickListener.onItemLongClick(item, v)
-	}
-
-	val adapter = BookmarksAdapter(coil, lifecycleOwner, bookmarkClickListener)
-	binding.recyclerView.setRecycledViewPool(sharedPool)
-	binding.recyclerView.adapter = adapter
-	val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
-	binding.recyclerView.addItemDecoration(spacingDecoration)
-	binding.root.setOnClickListener(viewListenerAdapter)
-	binding.root.setOnLongClickListener(viewListenerAdapter)
-
-	bind { payloads ->
-		if (payloads.isEmpty()) {
-			binding.recyclerView.clearItemDecorations()
-			binding.recyclerView.addItemDecoration(spacingDecoration)
-			selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
-		}
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
-			placeholder(R.drawable.ic_placeholder)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
-			allowRgb565(true)
-			size(CoverSizeResolver(binding.imageViewCover))
-			source(item.manga.source)
-			enqueueWith(coil)
-		}
-		binding.textViewTitle.text = item.manga.title
-		adapter.items = item.bookmarks
-	}
-
-	onViewRecycled {
-		binding.imageViewCover.disposeImageRequest()
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt
@@ -1,77 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
-import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.parsers.model.Manga
-import kotlin.jvm.internal.Intrinsics
-
-class BookmarksGroupAdapter(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	selectionController: SectionedSelectionController<Manga>,
-	listener: ListStateHolderListener,
-	bookmarkClickListener: OnListItemClickListener<Bookmark>,
-	groupClickListener: OnListItemClickListener<BookmarksGroup>,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
-
-	init {
-		val pool = RecyclerView.RecycledViewPool()
-		delegatesManager
-			.addDelegate(
-				bookmarksGroupAD(
-					coil = coil,
-					lifecycleOwner = lifecycleOwner,
-					sharedPool = pool,
-					selectionController = selectionController,
-					bookmarkClickListener = bookmarkClickListener,
-					groupClickListener = groupClickListener,
-				),
-			)
-			.addDelegate(loadingStateAD())
-			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
-			.addDelegate(errorStateListAD(listener))
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
-					oldItem.manga.id == newItem.manga.id
-				}
-
-				oldItem is LoadingFooter && newItem is LoadingFooter -> {
-					oldItem.key == newItem.key
-				}
-
-				else -> oldItem.javaClass == newItem.javaClass
-			}
-		}
-
-		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return Intrinsics.areEqual(oldItem, newItem)
-		}
-
-		override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
-			return when {
-				oldItem is BookmarksGroup && newItem is BookmarksGroup -> Unit
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt
@@ -1,31 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.model
-
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.areItemsEquals
-
-class BookmarksGroup(
-	val manga: Manga,
-	val bookmarks: List<Bookmark>,
-) : ListModel {
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as BookmarksGroup
-
-		if (manga != other.manga) return false
-
-		return bookmarks.areItemsEquals(other.bookmarks) { a, b ->
-			a.imageUrl == b.imageUrl
-		}
-	}
-
-	override fun hashCode(): Int {
-		var result = manga.hashCode()
-		result = 31 * result + bookmarks.sumOf { it.imageUrl.hashCode() }
-		return result
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BaseBrowserActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BaseBrowserActivity.kt
@@ -0,0 +1,82 @@
+package org.koitharu.kotatsu.browser
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.core.network.proxy.ProxyProvider
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.consumeAll
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import javax.inject.Inject
+
+@AndroidEntryPoint
+abstract class BaseBrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
+
+	@Inject
+	lateinit var proxyProvider: ProxyProvider
+
+	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
+			return
+		}
+		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
+		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
+		onBackPressedDispatcher.addCallback(onBackPressedCallback)
+	}
+
+	override fun onApplyWindowInsets(
+		v: View,
+		insets: WindowInsetsCompat
+	): WindowInsetsCompat {
+		val type = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+		val barsInsets = insets.getInsets(type)
+		viewBinding.webView.updatePadding(
+			left = barsInsets.left,
+			right = barsInsets.right,
+			bottom = barsInsets.bottom,
+		)
+		viewBinding.appbar.updatePadding(
+			left = barsInsets.left,
+			right = barsInsets.right,
+			top = barsInsets.top,
+		)
+		return insets.consumeAll(type)
+	}
+
+	override fun onPause() {
+		viewBinding.webView.onPause()
+		super.onPause()
+	}
+
+	override fun onResume() {
+		super.onResume()
+		viewBinding.webView.onResume()
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		if (hasViewBinding()) {
+			viewBinding.webView.stopLoading()
+			viewBinding.webView.destroy()
+		}
+	}
+
+	override fun onLoadingStateChanged(isLoading: Boolean) {
+		viewBinding.progressBar.isVisible = isLoading
+	}
+
+	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
+		this.title = title
+		supportActionBar?.subtitle = subtitle
+	}
+
+	override fun onHistoryChanged() {
+		onBackPressedCallback.onHistoryChanged()
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -1,71 +1,58 @@
 package org.koitharu.kotatsu.browser

-import android.annotation.SuppressLint
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.webkit.CookieManager
-import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
-import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
-import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import com.google.android.material.R as materialR
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.nav.router
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.ParserMangaRepository
+import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import javax.inject.Inject

-@SuppressLint("SetJavaScriptEnabled")
-class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
+@AndroidEntryPoint
+class BrowserActivity : BaseBrowserActivity() {

-	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
+	@Inject
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory

 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
-			return
+		setDisplayHomeAsUp(true, true)
+		val mangaSource = MangaSource(intent?.getStringExtra(AppRouter.KEY_SOURCE))
+		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
+		val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
+		viewBinding.webView.configureForParser(userAgent)
+		viewBinding.webView.webViewClient = BrowserClient(proxyProvider, this)
+		lifecycleScope.launch {
+			try {
+				proxyProvider.applyWebViewConfig()
+			} catch (e: Exception) {
+				e.printStackTraceDebug()
+				Snackbar.make(viewBinding.webView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
+			}
+			if (savedInstanceState == null) {
+				val url = intent?.dataString
+				if (url.isNullOrEmpty()) {
+					finishAfterTransition()
+				} else {
+					onTitleChanged(
+						intent?.getStringExtra(AppRouter.KEY_TITLE) ?: getString(R.string.loading_),
+						url,
+					)
+					viewBinding.webView.loadUrl(url)
+				}
+			}
 		}
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
-		}
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			userAgentString = UserAgents.CHROME_MOBILE
-		}
-		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
-		viewBinding.webView.webViewClient = BrowserClient(this)
-		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
-		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
-		onBackPressedDispatcher.addCallback(onBackPressedCallback)
-		if (savedInstanceState != null) {
-			return
-		}
-		val url = intent?.dataString
-		if (url.isNullOrEmpty()) {
-			finishAfterTransition()
-		} else {
-			onTitleChanged(
-				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
-				url,
-			)
-			viewBinding.webView.loadUrl(url)
-		}
-	}
-
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
 	}

 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -82,66 +69,12 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}

 		R.id.action_browser -> {
-			val intent = Intent(Intent.ACTION_VIEW)
-			intent.data = Uri.parse(viewBinding.webView.url)
-			try {
-				startActivity(Intent.createChooser(intent, item.title))
-			} catch (_: ActivityNotFoundException) {
+			if (!router.openExternalBrowser(viewBinding.webView.url.orEmpty(), item.title)) {
+				Snackbar.make(viewBinding.webView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
 			}
 			true
 		}

 		else -> super.onOptionsItemSelected(item)
 	}
-
-	override fun onPause() {
-		viewBinding.webView.onPause()
-		super.onPause()
-	}
-
-	override fun onResume() {
-		super.onResume()
-		viewBinding.webView.onResume()
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		viewBinding.webView.stopLoading()
-		viewBinding.webView.destroy()
-	}
-
-	override fun onLoadingStateChanged(isLoading: Boolean) {
-		viewBinding.progressBar.isVisible = isLoading
-	}
-
-	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
-		this.title = title
-		supportActionBar?.subtitle = subtitle
-	}
-
-	override fun onHistoryChanged() {
-		onBackPressedCallback.onHistoryChanged()
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.appbar.updatePadding(
-			top = insets.top,
-		)
-		viewBinding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-			bottom = insets.bottom,
-		)
-	}
-
-	companion object {
-
-		private const val EXTRA_TITLE = "title"
-
-		fun newIntent(context: Context, url: String, title: String?): Intent {
-			return Intent(context, BrowserActivity::class.java)
-				.setData(Uri.parse(url))
-				.putExtra(EXTRA_TITLE, title)
-		}
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserClient.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserClient.kt
@@ -2,9 +2,13 @@ package org.koitharu.kotatsu.browser

 import android.graphics.Bitmap
 import android.webkit.WebView
-import android.webkit.WebViewClient
+import androidx.webkit.WebViewClientCompat
+import org.koitharu.kotatsu.core.network.proxy.ProxyProvider

-open class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
+open class BrowserClient(
+	private val proxyProvider: ProxyProvider,
+	private val callback: BrowserCallback
+) : WebViewClientCompat() {

 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)
@@ -16,7 +20,7 @@ open class BrowserClient(private val callback: BrowserCallback) : WebViewClient(
 		callback.onLoadingStateChanged(isLoading = true)
 	}

-	override fun onPageCommitVisible(view: WebView, url: String?) {
+	override fun onPageCommitVisible(view: WebView, url: String) {
 		super.onPageCommitVisible(view, url)
 		callback.onTitleChanged(view.title.orEmpty(), url)
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt
@@ -0,0 +1,111 @@
+package org.koitharu.kotatsu.browser.cloudflare
+
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.provider.Settings
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
+import androidx.core.net.toUri
+import coil3.EventListener
+import coil3.Extras
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.model.isNsfw
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+class CaptchaNotifier(
+	private val context: Context,
+) : EventListener() {
+
+	fun notify(exception: CloudFlareProtectedException) {
+		if (!context.checkNotificationPermission(CHANNEL_ID)) {
+			return
+		}
+		if (exception.source != null && SourceSettings(context, exception.source).isCaptchaNotificationsDisabled) {
+			return
+		}
+		val manager = NotificationManagerCompat.from(context)
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+			.setName(context.getString(R.string.captcha_required))
+			.setShowBadge(true)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		manager.createNotificationChannel(channel)
+
+		val intent = AppRouter.cloudFlareResolveIntent(context, exception)
+			.setData(exception.url.toUri())
+		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
+			.setContentTitle(channel.name)
+			.setPriority(NotificationCompat.PRIORITY_LOW)
+			.setDefaults(0)
+			.setSmallIcon(R.drawable.ic_bot)
+			.setGroup(GROUP_CAPTCHA)
+			.setAutoCancel(true)
+			.setVisibility(
+				if (exception.source?.isNsfw() == true) {
+					NotificationCompat.VISIBILITY_SECRET
+				} else {
+					NotificationCompat.VISIBILITY_PUBLIC
+				},
+			)
+			.setContentText(
+				context.getString(
+					R.string.captcha_required_summary,
+					exception.source?.getTitle(context) ?: context.getString(R.string.app_name),
+				),
+			)
+			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val actionIntent = PendingIntentCompat.getActivity(
+				context, SETTINGS_ACTION_CODE,
+				Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+					.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+					.putExtra(Settings.EXTRA_CHANNEL_ID, CHANNEL_ID),
+				0, false,
+			)
+			notification.addAction(
+				R.drawable.ic_settings,
+				context.getString(R.string.notifications_settings),
+				actionIntent,
+			)
+		}
+		manager.notify(TAG, exception.source.hashCode(), notification.build())
+	}
+
+	fun dismiss(source: MangaSource) {
+		NotificationManagerCompat.from(context).cancel(TAG, source.hashCode())
+	}
+
+	override fun onError(request: ImageRequest, result: ErrorResult) {
+		super.onError(request, result)
+		val e = result.throwable
+		if (e is CloudFlareProtectedException && request.extras[ignoreCaptchaKey] != true) {
+			notify(e)
+		}
+	}
+
+	companion object {
+
+		fun ImageRequest.Builder.ignoreCaptchaErrors() = apply {
+			extras[ignoreCaptchaKey] = true
+		}
+
+		val ignoreCaptchaKey = Extras.Key(false)
+
+		private const val CHANNEL_ID = "captcha"
+		private const val TAG = CHANNEL_ID
+		private const val GROUP_CAPTCHA = "org.koitharu.kotatsu.CAPTCHA"
+		private const val SETTINGS_ACTION_CODE = 3
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
@@ -3,100 +3,67 @@ package org.koitharu.kotatsu.browser.cloudflare
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
-import android.webkit.CookieManager
-import android.webkit.WebSettings
 import androidx.activity.result.contract.ActivityResultContract
-import androidx.core.graphics.Insets
-import androidx.core.net.toUri
 import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import okhttp3.Headers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.yield
+import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
+import org.koitharu.kotatsu.browser.BaseBrowserActivity
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
-import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.TaggedActivityResult
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
-import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
+import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
 import javax.inject.Inject
-import com.google.android.material.R as materialR

@AndroidEntryPoint
-class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCallback {
+class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {

 	private var pendingResult = RESULT_CANCELED

 	@Inject
 	lateinit var cookieJar: MutableCookieJar

-	private var onBackPressedCallback: WebViewBackPressedCallback? = null
+	private lateinit var cfClient: CloudFlareClient

 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
-			return
-		}
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
-		}
-		val url = intent?.dataString.orEmpty()
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			domStorageEnabled = true
-			databaseEnabled = true
-			userAgentString = intent?.getStringExtra(ARG_UA) ?: UserAgents.CHROME_MOBILE
-		}
-		viewBinding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
-		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
-			onBackPressedDispatcher.addCallback(it)
-		}
-		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
-		if (savedInstanceState != null) {
-			return
-		}
-		if (url.isEmpty()) {
+		setDisplayHomeAsUp(true, true)
+		val url = intent?.dataString
+		if (url.isNullOrEmpty()) {
 			finishAfterTransition()
-		} else {
-			onTitleChanged(getString(R.string.loading_), url)
-			viewBinding.webView.loadUrl(url)
+			return
+		}
+		cfClient = CloudFlareClient(proxyProvider, cookieJar, this, url)
+		viewBinding.webView.configureForParser(intent?.getStringExtra(AppRouter.KEY_USER_AGENT))
+		viewBinding.webView.webViewClient = cfClient
+		lifecycleScope.launch {
+			try {
+				proxyProvider.applyWebViewConfig()
+			} catch (e: Exception) {
+				Snackbar.make(viewBinding.webView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
+			}
+			if (savedInstanceState == null) {
+				onTitleChanged(getString(R.string.loading_), url)
+				viewBinding.webView.loadUrl(url)
+			}
 		}
 	}

-	override fun onDestroy() {
-		viewBinding.webView.run {
-			stopLoading()
-			destroy()
-		}
-		super.onDestroy()
-	}
-
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.appbar.updatePadding(
-			top = insets.top,
-		)
-		viewBinding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-			bottom = insets.bottom,
-		)
+	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+		menuInflater.inflate(R.menu.opt_captcha, menu)
+		return super.onCreateOptionsMenu(menu)
 	}

 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
@@ -106,70 +73,75 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			true
 		}

+		R.id.action_retry -> {
+			restartCheck()
+			true
+		}
+
 		else -> super.onOptionsItemSelected(item)
 	}

-	override fun onResume() {
-		super.onResume()
-		viewBinding.webView.onResume()
-	}
-
-	override fun onPause() {
-		viewBinding.webView.onPause()
-		super.onPause()
-	}
-
 	override fun finish() {
 		setResult(pendingResult)
 		super.finish()
 	}

+	override fun onLoadingStateChanged(isLoading: Boolean) = Unit
+
 	override fun onPageLoaded() {
 		viewBinding.progressBar.isInvisible = true
 	}

+	override fun onLoopDetected() {
+		restartCheck()
+	}
+
 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
+		val source = intent?.getStringExtra(AppRouter.KEY_SOURCE)
+		if (source != null) {
+			CaptchaNotifier(this).dismiss(MangaSource(source))
+		}
 		finishAfterTransition()
 	}

-	override fun onLoadingStateChanged(isLoading: Boolean) {
-		viewBinding.progressBar.isVisible = isLoading
-	}
-
-	override fun onHistoryChanged() {
-		onBackPressedCallback?.onHistoryChanged()
-	}
-
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
 		setTitle(title)
-		supportActionBar?.subtitle = subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
+		supportActionBar?.subtitle =
+			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
 	}

-	class Contract : ActivityResultContract<Pair<String, Headers?>, TaggedActivityResult>() {
-		override fun createIntent(context: Context, input: Pair<String, Headers?>): Intent {
-			return newIntent(context, input.first, input.second)
+	private fun restartCheck() {
+		lifecycleScope.launch {
+			viewBinding.webView.stopLoading()
+			yield()
+			cfClient.reset()
+			val targetUrl = intent?.dataString?.toHttpUrlOrNull()
+			if (targetUrl != null) {
+				clearCfCookies(targetUrl)
+				viewBinding.webView.loadUrl(targetUrl.toString())
+			}
+		}
+	}
+
+	private suspend fun clearCfCookies(url: HttpUrl) = runInterruptible(Dispatchers.Default) {
+		cookieJar.removeCookies(url) { cookie ->
+			CloudFlareHelper.isCloudFlareCookie(cookie.name)
+		}
+	}
+
+	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
+		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
+			return AppRouter.cloudFlareResolveIntent(context, input)
 		}

-		override fun parseResult(resultCode: Int, intent: Intent?): TaggedActivityResult {
-			return TaggedActivityResult(TAG, resultCode)
+		override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
+			return resultCode == RESULT_OK
 		}
 	}

 	companion object {

 		const val TAG = "CloudFlareActivity"
-		private const val ARG_UA = "ua"
-
-		fun newIntent(
-			context: Context,
-			url: String,
-			headers: Headers?,
-		) = Intent(context, CloudFlareActivity::class.java).apply {
-			data = url.toUri()
-			headers?.get(CommonHeaders.USER_AGENT)?.let {
-				putExtra(ARG_UA, it)
-			}
-		}
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareCallback.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareCallback.kt
@@ -4,11 +4,11 @@ import org.koitharu.kotatsu.browser.BrowserCallback

 interface CloudFlareCallback : BrowserCallback {

-	override fun onLoadingStateChanged(isLoading: Boolean) = Unit
-
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) = Unit

 	fun onPageLoaded()

 	fun onCheckPassed()
+
+	fun onLoopDetected()
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
@@ -2,26 +2,29 @@ package org.koitharu.kotatsu.browser.cloudflare

 import android.graphics.Bitmap
 import android.webkit.WebView
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
+import org.koitharu.kotatsu.core.network.proxy.ProxyProvider
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper

-private const val CF_CLEARANCE = "cf_clearance"
+private const val LOOP_COUNTER = 3

 class CloudFlareClient(
+	proxyProvider: ProxyProvider,
 	private val cookieJar: MutableCookieJar,
 	private val callback: CloudFlareCallback,
 	private val targetUrl: String,
-) : BrowserClient(callback) {
+) : BrowserClient(proxyProvider, callback) {

 	private val oldClearance = getClearance()
+	private var counter = 0

 	override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
 		super.onPageStarted(view, url, favicon)
 		checkClearance()
 	}

-	override fun onPageCommitVisible(view: WebView, url: String?) {
+	override fun onPageCommitVisible(view: WebView, url: String) {
 		super.onPageCommitVisible(view, url)
 		callback.onPageLoaded()
 	}
@@ -31,15 +34,22 @@ class CloudFlareClient(
 		callback.onPageLoaded()
 	}

+	fun reset() {
+		counter = 0
+	}
+
 	private fun checkClearance() {
 		val clearance = getClearance()
 		if (clearance != null && clearance != oldClearance) {
 			callback.onCheckPassed()
+		} else {
+			counter++
+			if (counter >= LOOP_COUNTER) {
+				reset()
+				callback.onLoopDetected()
+			}
 		}
 	}

-	private fun getClearance(): String? {
-		return cookieJar.loadForRequest(targetUrl.toHttpUrl())
-			.find { it.name == CF_CLEARANCE }?.value
-	}
+	private fun getClearance() = CloudFlareHelper.getClearanceCookie(cookieJar, targetUrl)
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
@@ -2,15 +2,22 @@ package org.koitharu.kotatsu.core

 import android.app.Application
 import android.content.Context
+import android.os.Build
 import android.provider.SearchRecentSuggestions
 import android.text.Html
 import androidx.collection.arraySetOf
+import androidx.core.content.ContextCompat
 import androidx.room.InvalidationTracker
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.decode.SvgDecoder
-import coil.disk.DiskCache
-import coil.util.DebugLogger
+import androidx.work.WorkManager
+import coil3.ImageLoader
+import coil3.disk.DiskCache
+import coil3.disk.directory
+import coil3.gif.AnimatedImageDecoder
+import coil3.gif.GifDecoder
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.request.allowRgb565
+import coil3.svg.SvgDecoder
+import coil3.util.DebugLogger
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -24,34 +31,38 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.cache.ContentCache
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.cache.StubContentCache
+import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.network.*
+import org.koitharu.kotatsu.core.image.AvifImageDecoder
+import org.koitharu.kotatsu.core.image.CbzFetcher
+import org.koitharu.kotatsu.core.image.MangaSourceHeaderInterceptor
+import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.util.AcraScreenLogger
-import org.koitharu.kotatsu.core.util.IncognitoModeIndicator
-import org.koitharu.kotatsu.core.util.ext.activityManager
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
+import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageFetcher
+import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageKeyer
 import org.koitharu.kotatsu.local.data.CacheDir
-import org.koitharu.kotatsu.local.data.CbzFetcher
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.ui.thumbnails.MangaPageFetcher
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
 import org.koitharu.kotatsu.sync.domain.SyncController
 import org.koitharu.kotatsu.widget.WidgetUpdater
+import javax.inject.Provider
 import javax.inject.Singleton

@Module
@@ -66,28 +77,35 @@ interface AppModule {

 	companion object {

+		@Provides
+		@LocalizedAppContext
+		fun provideLocalizedContext(
+			@ApplicationContext context: Context,
+		): Context = ContextCompat.getContextForLanguage(context)
+
 		@Provides
 		@Singleton
 		fun provideNetworkState(
-			@ApplicationContext context: Context
-		) = NetworkState(context.connectivityManager)
+			@ApplicationContext context: Context,
+			settings: AppSettings,
+		) = NetworkState(context.connectivityManager, settings)

 		@Provides
 		@Singleton
 		fun provideMangaDatabase(
 			@ApplicationContext context: Context,
-		): MangaDatabase {
-			return MangaDatabase(context)
-		}
+		): MangaDatabase = MangaDatabase(context)

 		@Provides
 		@Singleton
 		fun provideCoil(
-			@ApplicationContext context: Context,
-			@MangaHttpClient okHttpClient: OkHttpClient,
+			@LocalizedAppContext context: Context,
+			@MangaHttpClient okHttpClientProvider: Provider<OkHttpClient>,
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
 			pageFetcherFactory: MangaPageFetcher.Factory,
+			coverRestoreInterceptor: CoverRestoreInterceptor,
+			networkStateProvider: Provider<NetworkState>,
 		): ImageLoader {
 			val diskCacheFactory = {
 				val rootDir = context.externalCacheDir ?: context.cacheDir
@@ -95,32 +113,43 @@ interface AppModule {
 					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
 					.build()
 			}
+			val okHttpClientLazy = lazy {
+				okHttpClientProvider.get().newBuilder().cache(null).build()
+			}
 			return ImageLoader.Builder(context)
-				.okHttpClient(okHttpClient.newBuilder().cache(null).build())
-				.interceptorDispatcher(Dispatchers.Default)
-				.fetcherDispatcher(Dispatchers.IO)
-				.decoderDispatcher(Dispatchers.Default)
-				.transformationDispatcher(Dispatchers.Default)
+				.interceptorCoroutineContext(Dispatchers.Default)
 				.diskCache(diskCacheFactory)
 				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
 				.allowRgb565(context.isLowRamDevice())
-				.components(
-					ComponentRegistry.Builder()
-						.add(SvgDecoder.Factory())
-						.add(CbzFetcher.Factory())
-						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
-						.add(pageFetcherFactory)
-						.add(imageProxyInterceptor)
-						.build(),
-				).build()
+				.eventListener(CaptchaNotifier(context))
+				.components {
+					add(
+						OkHttpNetworkFetcherFactory(
+							callFactory = okHttpClientLazy::value,
+							connectivityChecker = { networkStateProvider.get() },
+						),
+					)
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+						add(AnimatedImageDecoder.Factory())
+					} else {
+						add(GifDecoder.Factory())
+					}
+					add(SvgDecoder.Factory())
+					add(CbzFetcher.Factory())
+					add(AvifImageDecoder.Factory())
+					add(FaviconFetcher.Factory(mangaRepositoryFactory))
+					add(MangaPageKeyer())
+					add(pageFetcherFactory)
+					add(imageProxyInterceptor)
+					add(coverRestoreInterceptor)
+					add(MangaSourceHeaderInterceptor())
+				}.build()
 		}

 		@Provides
 		fun provideSearchSuggestions(
 			@ApplicationContext context: Context,
-		): SearchRecentSuggestions {
-			return MangaSuggestionsProvider.createSuggestions(context)
-		}
+		): SearchRecentSuggestions = MangaSuggestionsProvider.createSuggestions(context)

 		@Provides
 		@ElementsIntoSet
@@ -141,27 +170,15 @@ interface AppModule {
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
-			incognitoModeIndicator: IncognitoModeIndicator,
 			acraScreenLogger: AcraScreenLogger,
+			screenshotPolicyHelper: ScreenshotPolicyHelper,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
-			incognitoModeIndicator,
 			acraScreenLogger,
+			screenshotPolicyHelper,
 		)

-		@Provides
-		@Singleton
-		fun provideContentCache(
-			application: Application,
-		): ContentCache {
-			return if (application.activityManager?.isLowRamDevice == true) {
-				StubContentCache()
-			} else {
-				MemoryContentCache(application)
-			}
-		}
-
 		@Provides
 		@Singleton
 		@LocalStorageChanges
@@ -172,5 +189,10 @@ interface AppModule {
 		fun provideLocalStorageChangesFlow(
 			@LocalStorageChanges flow: MutableSharedFlow<LocalManga?>,
 		): SharedFlow<LocalManga?> = flow.asSharedFlow()
+
+		@Provides
+		fun provideWorkManager(
+			@ApplicationContext context: Context,
+		): WorkManager = WorkManager.getInstance(context)
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt
@@ -1,16 +1,17 @@
-package org.koitharu.kotatsu
+package org.koitharu.kotatsu.core

 import android.app.Application
 import android.content.Context
-import android.os.StrictMode
+import android.os.Build
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.strictmode.FragmentStrictMode
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.room.InvalidationTracker
 import androidx.work.Configuration
+import androidx.work.WorkManager
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import org.acra.ACRA
 import org.acra.ReportField
@@ -19,29 +20,35 @@ import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
+import org.conscrypt.Conscrypt
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.os.AppValidator
+import org.koitharu.kotatsu.core.os.RomCompat
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.local.data.LocalMangaRepository
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.local.data.LocalStorageChanges
+import org.koitharu.kotatsu.local.data.index.LocalMangaIndex
+import org.koitharu.kotatsu.local.domain.model.LocalManga
+import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
+import java.security.Security
 import javax.inject.Inject
+import javax.inject.Provider

@HiltAndroidApp
-class KotatsuApp : Application(), Configuration.Provider {
+open class BaseApp : Application(), Configuration.Provider {

 	@Inject
-	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
+	lateinit var databaseObserversProvider: Provider<Set<@JvmSuppressWildcards InvalidationTracker.Observer>>

 	@Inject
 	lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>

 	@Inject
-	lateinit var database: MangaDatabase
+	lateinit var database: Provider<MangaDatabase>

 	@Inject
 	lateinit var settings: AppSettings
@@ -55,34 +62,49 @@ class KotatsuApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workScheduleManager: WorkScheduleManager

+	@Inject
+	lateinit var workManagerProvider: Provider<WorkManager>
+
+	@Inject
+	lateinit var localMangaIndexProvider: Provider<LocalMangaIndex>
+
+	@Inject
+	@LocalStorageChanges
+	lateinit var localStorageChanges: MutableSharedFlow<LocalManga?>
+
+	override val workManagerConfiguration: Configuration
+		get() = Configuration.Builder()
+			.setWorkerFactory(workerFactory)
+			.build()
+
 	override fun onCreate() {
 		super.onCreate()
-		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
-		if (BuildConfig.DEBUG) {
-			enableStrictMode()
+		if (ACRA.isACRASenderServiceProcess()) {
+			return
 		}
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
-		AppCompatDelegate.setApplicationLocales(settings.appLocales)
+		// TLS 1.3 support for Android < 10
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+			Security.insertProviderAt(Conscrypt.newProvider(), 1)
+		}
 		setupActivityLifecycleCallbacks()
+		processLifecycleScope.launch {
+			ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.getOrNull().toString())
+			ACRA.errorReporter.putCustomData("isMiui", RomCompat.isMiui.getOrNull().toString())
+		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
+			localStorageChanges.collect(localMangaIndexProvider.get())
 		}
 		workScheduleManager.init()
-		WorkServiceStopHelper(applicationContext).setup()
+		WorkServiceStopHelper(workManagerProvider).setup()
 	}

-	override fun attachBaseContext(base: Context?) {
+	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
 			reportFormat = StringFormat.JSON
-			excludeMatchingSharedPreferencesKeys = listOf(
-				"sources_\\w+",
-				AppSettings.KEY_APP_PASSWORD,
-				AppSettings.KEY_PROXY_LOGIN,
-				AppSettings.KEY_PROXY_ADDRESS,
-				AppSettings.KEY_PROXY_PASSWORD,
-			)
 			httpSender {
 				uri = getString(R.string.url_error_report)
 				basicAuthLogin = getString(R.string.acra_login)
@@ -99,7 +121,6 @@ class KotatsuApp : Application(), Configuration.Provider {
 				ReportField.STACK_TRACE,
 				ReportField.CRASH_CONFIGURATION,
 				ReportField.CUSTOM_DATA,
-				ReportField.SHARED_PREFERENCES,
 			)

 			dialog {
@@ -112,16 +133,10 @@ class KotatsuApp : Application(), Configuration.Provider {
 		}
 	}

-	override fun getWorkManagerConfiguration(): Configuration {
-		return Configuration.Builder()
-			.setWorkerFactory(workerFactory)
-			.build()
-	}
-
 	@WorkerThread
 	private fun setupDatabaseObservers() {
-		val tracker = database.invalidationTracker
-		databaseObservers.forEach {
+		val tracker = database.get().invalidationTracker
+		databaseObserversProvider.get().forEach {
 			tracker.addObserver(it)
 		}
 	}
@@ -131,31 +146,4 @@ class KotatsuApp : Application(), Configuration.Provider {
 			registerActivityLifecycleCallbacks(it)
 		}
 	}
-
-	private fun enableStrictMode() {
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder()
-				.detectAll()
-				.penaltyLog()
-				.build(),
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder()
-				.detectAll()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				.setClassInstanceLimit(PagesCache::class.java, 1)
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.setClassInstanceLimit(PageLoader::class.java, 1)
-				.penaltyLog()
-				.build(),
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
-			.penaltyDeath()
-			.detectFragmentReuse()
-			.detectWrongFragmentContainer()
-			.detectRetainInstanceUsage()
-			.detectSetUserVisibleHint()
-			.detectFragmentTagUsage()
-			.build()
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ErrorReporterReceiver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ErrorReporterReceiver.kt
@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.core
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.BadParcelableException
+import androidx.core.app.PendingIntentCompat
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.util.ext.report
+
+class ErrorReporterReceiver : BroadcastReceiver() {
+
+	override fun onReceive(context: Context?, intent: Intent?) {
+		val e = intent?.getSerializableExtraCompat<Throwable>(AppRouter.KEY_ERROR) ?: return
+		e.report()
+	}
+
+	companion object {
+
+		private const val ACTION_REPORT = "${BuildConfig.APPLICATION_ID}.action.REPORT_ERROR"
+
+		fun getPendingIntent(context: Context, e: Throwable): PendingIntent? = try {
+			val intent = Intent(context, ErrorReporterReceiver::class.java)
+			intent.setAction(ACTION_REPORT)
+			intent.setData(Uri.parse("err://${e.hashCode()}"))
+			intent.putExtra(AppRouter.KEY_ERROR, e)
+			PendingIntentCompat.getBroadcast(context, 0, intent, 0, false)
+		} catch (e: BadParcelableException) {
+			e.printStackTraceDebug()
+			null
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/LocalizedAppContext.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/LocalizedAppContext.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Target(
+	AnnotationTarget.FUNCTION,
+	AnnotationTarget.PROPERTY_GETTER,
+	AnnotationTarget.PROPERTY_SETTER,
+	AnnotationTarget.VALUE_PARAMETER,
+	AnnotationTarget.FIELD,
+)
+annotation class LocalizedAppContext
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
@@ -3,15 +3,21 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONArray

 class BackupEntry(
-	val name: String,
+	val name: Name,
 	val data: JSONArray
 ) {

-	companion object Names {
+	enum class Name(
+		val key: String,
+	) {

-		const val INDEX = "index"
-		const val HISTORY = "history"
-		const val CATEGORIES = "categories"
-		const val FAVOURITES = "favourites"
+		INDEX("index"),
+		HISTORY("history"),
+		CATEGORIES("categories"),
+		FAVOURITES("favourites"),
+		SETTINGS("settings"),
+		SETTINGS_READER_GRID("reader_grid"),
+		BOOKMARKS("bookmarks"),
+		SOURCES("sources"),
 	}
-}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupFile.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupFile.kt
@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.net.Uri
+import java.util.Date
+
+data class BackupFile(
+	val uri: Uri,
+	val dateTime: Date,
+): Comparable<BackupFile> {
+
+	override fun compareTo(other: BackupFile): Int = compareValues(dateTime, other.dateTime)
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
@@ -1,24 +1,34 @@
 package org.koitharu.kotatsu.core.backup

 import androidx.room.withTransaction
+import kotlinx.coroutines.flow.FlowCollector
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.progress.Progress
+import org.koitharu.kotatsu.parsers.util.json.asTypedList
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.reader.data.TapGridSettings
+import java.util.Date
 import javax.inject.Inject

 private const val PAGE_SIZE = 10

-class BackupRepository @Inject constructor(private val db: MangaDatabase) {
+class BackupRepository @Inject constructor(
+	private val db: MangaDatabase,
+	private val settings: AppSettings,
+	private val tapGridSettings: TapGridSettings,
+) {

 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
-		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.HISTORY, JSONArray())
 		while (true) {
-			val history = db.historyDao.findAll(offset, PAGE_SIZE)
+			val history = db.getHistoryDao().findAll(offset, PAGE_SIZE)
 			if (history.isEmpty()) {
 				break
 			}
@@ -37,8 +47,8 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 	}

 	suspend fun dumpCategories(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
-		val categories = db.favouriteCategoriesDao.findAll()
+		val entry = BackupEntry(BackupEntry.Name.CATEGORIES, JSONArray())
+		val categories = db.getFavouriteCategoriesDao().findAll()
 		for (item in categories) {
 			entry.data.put(JsonSerializer(item).toJson())
 		}
@@ -47,9 +57,9 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {

 	suspend fun dumpFavourites(): BackupEntry {
 		var offset = 0
-		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.favouritesDao.findAll(offset, PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAllRaw(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}
@@ -67,8 +77,56 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 		return entry
 	}

+	suspend fun dumpBookmarks(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.BOOKMARKS, JSONArray())
+		val all = db.getBookmarksDao().findAll()
+		for ((m, b) in all) {
+			val json = JSONObject()
+			val manga = JsonSerializer(m.manga).toJson()
+			json.put("manga", manga)
+			val tags = JSONArray()
+			m.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
+			json.put("tags", tags)
+			val bookmarks = JSONArray()
+			b.forEach { bookmarks.put(JsonSerializer(it).toJson()) }
+			json.put("bookmarks", bookmarks)
+			entry.data.put(json)
+		}
+		return entry
+	}
+
+	fun dumpSettings(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.SETTINGS, JSONArray())
+		val settingsDump = settings.getAllValues().toMutableMap()
+		settingsDump.remove(AppSettings.KEY_APP_PASSWORD)
+		settingsDump.remove(AppSettings.KEY_PROXY_PASSWORD)
+		settingsDump.remove(AppSettings.KEY_PROXY_LOGIN)
+		settingsDump.remove(AppSettings.KEY_INCOGNITO_MODE)
+		val json = JsonSerializer(settingsDump).toJson()
+		entry.data.put(json)
+		return entry
+	}
+
+	fun dumpReaderGridSettings(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.SETTINGS_READER_GRID, JSONArray())
+		val settingsDump = tapGridSettings.getAllValues()
+		val json = JsonSerializer(settingsDump).toJson()
+		entry.data.put(json)
+		return entry
+	}
+
+	suspend fun dumpSources(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.SOURCES, JSONArray())
+		val all = db.getSourcesDao().findAll()
+		for (source in all) {
+			val json = JsonSerializer(source).toJson()
+			entry.data.put(json)
+		}
+		return entry
+	}
+
 	fun createIndex(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.INDEX, JSONArray())
 		val json = JSONObject()
 		json.put("app_id", BuildConfig.APPLICATION_ID)
 		json.put("app_version", BuildConfig.VERSION_CODE)
@@ -77,9 +135,16 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 		return entry
 	}

-	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
+	fun getBackupDate(entry: BackupEntry?): Date? {
+		val timestamp = entry?.data?.optJSONObject(0)?.getLongOrDefault("created_at", 0) ?: 0
+		return if (timestamp == 0L) null else Date(timestamp)
+	}
+
+	suspend fun restoreHistory(entry: BackupEntry, outProgress: FlowCollector<Progress>?): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
+		val list = entry.data.asTypedList<JSONObject>()
+		outProgress?.emit(Progress(progress = 0, total = list.size))
+		for ((index, item) in list.withIndex()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = JsonDeserializer(mangaJson).toMangaEntity()
 			val tags = mangaJson.getJSONArray("tags").mapJSON {
@@ -88,29 +153,32 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 			val history = JsonDeserializer(item).toHistoryEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.historyDao.upsert(history)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getHistoryDao().upsert(history)
 				}
 			}
+			outProgress?.emit(Progress(progress = index, total = list.size))
 		}
 		return result
 	}

 	suspend fun restoreCategories(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
+		for (item in entry.data.asTypedList<JSONObject>()) {
 			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
 			result += runCatchingCancellable {
-				db.favouriteCategoriesDao.upsert(category)
+				db.getFavouriteCategoriesDao().upsert(category)
 			}
 		}
 		return result
 	}

-	suspend fun restoreFavourites(entry: BackupEntry): CompositeResult {
+	suspend fun restoreFavourites(entry: BackupEntry, outProgress: FlowCollector<Progress>?): CompositeResult {
 		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
+		val list = entry.data.asTypedList<JSONObject>()
+		outProgress?.emit(Progress(progress = 0, total = list.size))
+		for ((index, item) in list.withIndex()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = JsonDeserializer(mangaJson).toMangaEntity()
 			val tags = mangaJson.getJSONArray("tags").mapJSON {
@@ -119,12 +187,66 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 			val favourite = JsonDeserializer(item).toFavouriteEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.favouritesDao.upsert(favourite)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getFavouritesDao().upsert(favourite)
+				}
+			}
+			outProgress?.emit(Progress(progress = index, total = list.size))
+		}
+		return result
+	}
+
+	suspend fun restoreBookmarks(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.asTypedList<JSONObject>()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = item.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val bookmarks = item.getJSONArray("bookmarks").mapJSON {
+				JsonDeserializer(it).toBookmarkEntity()
+			}
+			result += runCatchingCancellable {
+				db.withTransaction {
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getBookmarksDao().upsert(bookmarks)
 				}
 			}
 		}
 		return result
 	}
+
+	suspend fun restoreSources(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.asTypedList<JSONObject>()) {
+			val source = JsonDeserializer(item).toMangaSourceEntity()
+			result += runCatchingCancellable {
+				db.getSourcesDao().upsert(source)
+			}
+		}
+		return result
+	}
+
+	fun restoreSettings(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.asTypedList<JSONObject>()) {
+			result += runCatchingCancellable {
+				settings.upsertAll(JsonDeserializer(item).toMap())
+			}
+		}
+		return result
+	}
+
+	fun restoreReaderGridSettings(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.asTypedList<JSONObject>()) {
+			result += runCatchingCancellable {
+				tapGridSettings.upsertAll(JsonDeserializer(item).toMap())
+			}
+		}
+		return result
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
@@ -2,24 +2,60 @@ package org.koitharu.kotatsu.core.backup

 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
+import okhttp3.internal.closeQuietly
 import okio.Closeable
 import org.json.JSONArray
+import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
 import java.io.File
+import java.util.EnumSet
+import java.util.zip.ZipException
 import java.util.zip.ZipFile

-class BackupZipInput(val file: File) : Closeable {
+class BackupZipInput private constructor(val file: File) : Closeable {

 	private val zipFile = ZipFile(file)

-	suspend fun getEntry(name: String): BackupEntry = runInterruptible(Dispatchers.IO) {
-		val entry = zipFile.getEntry(name)
+	suspend fun getEntry(name: BackupEntry.Name): BackupEntry? = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name.key) ?: return@runInterruptible null
 		val json = zipFile.getInputStream(entry).use {
 			JSONArray(it.bufferedReader().readText())
 		}
 		BackupEntry(name, json)
 	}

+	suspend fun entries(): Set<BackupEntry.Name> = runInterruptible(Dispatchers.IO) {
+		zipFile.entries().toList().mapNotNullTo(EnumSet.noneOf(BackupEntry.Name::class.java)) { ze ->
+			BackupEntry.Name.entries.find { it.key == ze.name }
+		}
+	}
+
 	override fun close() {
 		zipFile.close()
 	}
-}
+
+	fun closeAndDelete() {
+		closeQuietly()
+		file.delete()
+	}
+
+	companion object {
+
+		fun from(file: File): BackupZipInput {
+			var res: BackupZipInput? = null
+			return try {
+				res = BackupZipInput(file)
+				if (res.zipFile.getEntry("index") == null) {
+					throw BadBackupFormatException(null)
+				}
+				res
+			} catch (exception: Throwable) {
+				res?.closeQuietly()
+				throw if (exception is ZipException) {
+					BadBackupFormatException(exception)
+				} else {
+					exception
+				}
+			}
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
@@ -5,9 +5,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.format
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.zip.ZipOutput
 import java.io.File
+import java.text.ParseException
+import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.zip.Deflater
@@ -17,7 +19,7 @@ class BackupZipOutput(val file: File) : Closeable {
 	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)

 	suspend fun put(entry: BackupEntry) = runInterruptible(Dispatchers.IO) {
-		output.put(entry.name, entry.data.toString(2))
+		output.put(entry.name.key, entry.data.toString(2))
 	}

 	suspend fun finish() = runInterruptible(Dispatchers.IO) {
@@ -27,20 +29,32 @@ class BackupZipOutput(val file: File) : Closeable {
 	override fun close() {
 		output.close()
 	}
-}

-private const val DIR_BACKUPS = "backups"
+	companion object {

-suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptible(Dispatchers.IO) {
-	val dir = context.run {
-		getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
+		const val DIR_BACKUPS = "backups"
+		private val dateTimeFormat = SimpleDateFormat("yyyyMMdd-HHmm")
+
+		fun generateFileName(context: Context) = buildString {
+			append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
+			append('_')
+			append(dateTimeFormat.format(Date()))
+			append(".bk.zip")
+		}
+
+		fun parseBackupDateTime(fileName: String): Date? = try {
+			dateTimeFormat.parse(fileName.substringAfterLast('_').substringBefore('.'))
+		} catch (e: ParseException) {
+			e.printStackTraceDebug()
+			null
+		}
+
+		suspend fun createTemp(context: Context): BackupZipOutput = runInterruptible(Dispatchers.IO) {
+			val dir = context.run {
+				getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
+			}
+			dir.mkdirs()
+			BackupZipOutput(File(dir, generateFileName(context)))
+		}
 	}
-	dir.mkdirs()
-	val filename = buildString {
-		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
-		append('_')
-		append(Date().format("ddMMyyyy"))
-		append(".bk.zip")
-	}
-	BackupZipOutput(File(dir, filename))
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt
@@ -11,6 +11,9 @@ class CompositeResult {
 	val failures: List<Throwable>
 		get() = errors.filterNotNull()

+	val isEmpty: Boolean
+		get() = errors.isEmpty() && successCount == 0
+
 	val isAllSuccess: Boolean
 		get() = errors.none { it != null }

@@ -24,6 +27,10 @@ class CompositeResult {
 		}
 	}

+	operator fun plusAssign(error: Throwable) {
+		errors.add(error)
+	}
+
 	operator fun plusAssign(other: CompositeResult) {
 		this.successCount += other.successCount
 		this.errors += other.errors
@@ -36,4 +43,4 @@ class CompositeResult {
 		result.errors.addAll(other.errors)
 		return result
 	}
-}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/ExternalBackupStorage.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/ExternalBackupStorage.kt
@@ -0,0 +1,91 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.content.Context
+import android.net.Uri
+import androidx.annotation.CheckResult
+import androidx.documentfile.provider.DocumentFile
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.buffer
+import okio.sink
+import okio.source
+import org.jetbrains.annotations.Blocking
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.io.File
+import javax.inject.Inject
+
+class ExternalBackupStorage @Inject constructor(
+	@ApplicationContext private val context: Context,
+	private val settings: AppSettings,
+) {
+
+	suspend fun list(): List<BackupFile> = runInterruptible(Dispatchers.IO) {
+		getRootOrThrow().listFiles().mapNotNull {
+			if (it.isFile && it.canRead()) {
+				BackupFile(
+					uri = it.uri,
+					dateTime = it.name?.let { fileName ->
+						BackupZipOutput.parseBackupDateTime(fileName)
+					} ?: return@mapNotNull null,
+				)
+			} else {
+				null
+			}
+		}.sortedDescending()
+	}
+
+	suspend fun listOrNull() = runCatchingCancellable {
+		list()
+	}.onFailure { e ->
+		e.printStackTraceDebug()
+	}.getOrNull()
+
+	suspend fun put(file: File): Uri = runInterruptible(Dispatchers.IO) {
+		val out = checkNotNull(getRootOrThrow().createFile("application/zip", file.nameWithoutExtension)) {
+			"Cannot create target backup file"
+		}
+		checkNotNull(context.contentResolver.openOutputStream(out.uri, "wt")).sink().use { sink ->
+			file.source().buffer().use { src ->
+				src.readAll(sink)
+			}
+		}
+		out.uri
+	}
+
+	@CheckResult
+	suspend fun delete(victim: BackupFile) = runInterruptible(Dispatchers.IO) {
+		val df = DocumentFile.fromSingleUri(context, victim.uri)
+		df != null && df.delete()
+	}
+
+	suspend fun getLastBackupDate() = listOrNull()?.maxOfOrNull { it.dateTime }
+
+	suspend fun trim(maxCount: Int): Boolean {
+		if (maxCount == Int.MAX_VALUE) {
+			return false
+		}
+		val list = listOrNull()
+		if (list == null || list.size <= maxCount) {
+			return false
+		}
+		var result = false
+		for (i in maxCount until list.size) {
+			if (delete(list[i])) {
+				result = true
+			}
+		}
+		return result
+	}
+
+	@Blocking
+	private fun getRootOrThrow(): DocumentFile {
+		val uri = checkNotNull(settings.periodicalBackupDirectory) {
+			"Backup directory is not specified"
+		}
+		val root = DocumentFile.fromTreeUri(context, uri)
+		return checkNotNull(root) { "Cannot obtain DocumentFile from $uri" }
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.core.backup

 import org.json.JSONObject
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -10,6 +12,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull

 class JsonDeserializer(private val json: JSONObject) {
@@ -25,23 +28,24 @@ class JsonDeserializer(private val json: JSONObject) {
 	fun toMangaEntity() = MangaEntity(
 		id = json.getLong("id"),
 		title = json.getString("title"),
-		altTitle = json.getStringOrNull("alt_title"),
+		altTitles = json.getStringOrNull("alt_title"),
 		url = json.getString("url"),
 		publicUrl = json.getStringOrNull("public_url").orEmpty(),
 		rating = json.getDouble("rating").toFloat(),
 		isNsfw = json.getBooleanOrDefault("nsfw", false),
+		contentRating = json.getStringOrNull("content_rating"),
 		coverUrl = json.getString("cover_url"),
 		largeCoverUrl = json.getStringOrNull("large_cover_url"),
 		state = json.getStringOrNull("state"),
-		author = json.getStringOrNull("author"),
-		source = json.getString("source")
+		authors = json.getStringOrNull("author"),
+		source = json.getString("source"),
 	)

 	fun toTagEntity() = TagEntity(
 		id = json.getLong("id"),
 		title = json.getString("title"),
 		key = json.getString("key"),
-		source = json.getString("source")
+		source = json.getString("source"),
 	)

 	fun toHistoryEntity() = HistoryEntity(
@@ -52,6 +56,7 @@ class JsonDeserializer(private val json: JSONObject) {
 		page = json.getInt("page"),
 		scroll = json.getDouble("scroll").toFloat(),
 		percent = json.getFloatOrDefault("percent", -1f),
+		chaptersCount = json.getIntOrDefault("chapters", -1),
 		deletedAt = 0L,
 	)

@@ -65,4 +70,37 @@ class JsonDeserializer(private val json: JSONObject) {
 		isVisibleInLibrary = json.getBooleanOrDefault("show_in_lib", true),
 		deletedAt = 0L,
 	)
+
+	fun toBookmarkEntity() = BookmarkEntity(
+		mangaId = json.getLong("manga_id"),
+		pageId = json.getLong("page_id"),
+		chapterId = json.getLong("chapter_id"),
+		page = json.getInt("page"),
+		scroll = json.getInt("scroll"),
+		imageUrl = json.getString("image_url"),
+		createdAt = json.getLong("created_at"),
+		percent = json.getDouble("percent").toFloat(),
+	)
+
+	fun toMangaSourceEntity() = MangaSourceEntity(
+		source = json.getString("source"),
+		isEnabled = json.getBoolean("enabled"),
+		sortKey = json.getInt("sort_key"),
+		addedIn = json.getIntOrDefault("added_in", 0),
+		lastUsedAt = json.getLongOrDefault("used_at", 0L),
+		isPinned = json.getBooleanOrDefault("pinned", false),
+	)
+
+	fun toMap(): Map<String, Any?> {
+		val map = mutableMapOf<String, Any?>()
+		val keys = json.keys()
+
+		while (keys.hasNext()) {
+			val key = keys.next()
+			val value = json.get(key)
+			map[key] = value
+		}
+
+		return map
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.core.backup

 import org.json.JSONObject
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -15,7 +17,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("category_id", e.categoryId)
 			put("sort_key", e.sortKey)
 			put("created_at", e.createdAt)
-		}
+		},
 	)

 	constructor(e: FavouriteCategoryEntity) : this(
@@ -27,7 +29,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("order", e.order)
 			put("track", e.track)
 			put("show_in_lib", e.isVisibleInLibrary)
-		}
+		},
 	)

 	constructor(e: HistoryEntity) : this(
@@ -39,7 +41,8 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("page", e.page)
 			put("scroll", e.scroll)
 			put("percent", e.percent)
-		}
+			put("chapters", e.chaptersCount)
+		},
 	)

 	constructor(e: TagEntity) : this(
@@ -48,25 +51,54 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("title", e.title)
 			put("key", e.key)
 			put("source", e.source)
-		}
+		},
 	)

 	constructor(e: MangaEntity) : this(
 		JSONObject().apply {
 			put("id", e.id)
 			put("title", e.title)
-			put("alt_title", e.altTitle)
+			put("alt_title", e.altTitles)
 			put("url", e.url)
 			put("public_url", e.publicUrl)
 			put("rating", e.rating)
 			put("nsfw", e.isNsfw)
+			put("content_rating", e.contentRating)
 			put("cover_url", e.coverUrl)
 			put("large_cover_url", e.largeCoverUrl)
 			put("state", e.state)
-			put("author", e.author)
+			put("author", e.authors)
 			put("source", e.source)
-		}
+		},
+	)
+
+	constructor(e: BookmarkEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("page_id", e.pageId)
+			put("chapter_id", e.chapterId)
+			put("page", e.page)
+			put("scroll", e.scroll)
+			put("image_url", e.imageUrl)
+			put("created_at", e.createdAt)
+			put("percent", e.percent)
+		},
+	)
+
+	constructor(e: MangaSourceEntity) : this(
+		JSONObject().apply {
+			put("source", e.source)
+			put("enabled", e.isEnabled)
+			put("sort_key", e.sortKey)
+			put("added_in", e.addedIn)
+			put("used_at", e.lastUsedAt)
+			put("pinned", e.isPinned)
+		},
+	)
+
+	constructor(m: Map<String, *>) : this(
+		JSONObject(m),
 	)

 	fun toJson(): JSONObject = json
-}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/TelegramBackupUploader.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/TelegramBackupUploader.kt
@@ -0,0 +1,93 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.content.Context
+import androidx.annotation.CheckResult
+import dagger.hilt.android.qualifiers.ApplicationContext
+import okhttp3.HttpUrl
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.Response
+import okhttp3.internal.closeQuietly
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.network.BaseHttpClient
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.parseJson
+import java.io.File
+import javax.inject.Inject
+
+class TelegramBackupUploader @Inject constructor(
+	private val settings: AppSettings,
+	@BaseHttpClient private val client: OkHttpClient,
+	@ApplicationContext private val context: Context,
+) {
+
+	private val botToken = context.getString(R.string.tg_backup_bot_token)
+
+	suspend fun uploadBackup(file: File) {
+		val requestBody = file.asRequestBody("application/zip".toMediaTypeOrNull())
+		val multipartBody = MultipartBody.Builder()
+			.setType(MultipartBody.FORM)
+			.addFormDataPart("chat_id", requireChatId())
+			.addFormDataPart("document", file.name, requestBody)
+			.build()
+		val request = Request.Builder()
+			.url(urlOf("sendDocument").build())
+			.post(multipartBody)
+			.build()
+		client.newCall(request).await().consume()
+	}
+
+	suspend fun sendTestMessage() {
+		val request = Request.Builder()
+			.url(urlOf("getMe").build())
+			.build()
+		client.newCall(request).await().consume()
+		sendMessage(context.getString(R.string.backup_tg_echo))
+	}
+
+	@CheckResult
+	fun openBotInApp(router: AppRouter): Boolean {
+		val botUsername = context.getString(R.string.tg_backup_bot_name)
+		return router.openExternalBrowser("tg://resolve?domain=$botUsername") ||
+			router.openExternalBrowser("https://t.me/$botUsername")
+	}
+
+	private suspend fun sendMessage(message: String) {
+		val url = urlOf("sendMessage")
+			.addQueryParameter("chat_id", requireChatId())
+			.addQueryParameter("text", message)
+			.build()
+		val request = Request.Builder()
+			.url(url)
+			.build()
+		client.newCall(request).await().consume()
+	}
+
+	private fun requireChatId() = checkNotNull(settings.backupTelegramChatId) {
+		"Telegram chat ID not set in settings"
+	}
+
+	private fun Response.consume() {
+		if (isSuccessful) {
+			closeQuietly()
+			return
+		}
+		val jo = parseJson()
+		if (!jo.getBooleanOrDefault("ok", true)) {
+			throw RuntimeException(jo.getStringOrNull("description"))
+		}
+	}
+
+	private fun urlOf(method: String) = HttpUrl.Builder()
+		.scheme("https")
+		.host("api.telegram.org")
+		.addPathSegment("bot$botToken")
+		.addPathSegment(method)
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt
@@ -1,23 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-interface ContentCache {
-
-	val isCachingEnabled: Boolean
-
-	suspend fun getDetails(source: MangaSource, url: String): Manga?
-
-	fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>)
-
-	suspend fun getPages(source: MangaSource, url: String): List<MangaPage>?
-
-	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>)
-
-	data class Key(
-		val source: MangaSource,
-		val url: String,
-	)
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ExpiringLruCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ExpiringLruCache.kt
@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.core.cache

-import androidx.collection.LruCache
+import org.koitharu.kotatsu.core.util.SynchronizedSieveCache
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.core.cache.MemoryContentCache.Key as CacheKey

 class ExpiringLruCache<T>(
 	val maxSize: Int,
@@ -9,18 +11,19 @@ class ExpiringLruCache<T>(
 	private val timeUnit: TimeUnit,
 ) {

-	private val cache = LruCache<ContentCache.Key, ExpiringValue<T>>(maxSize)
+	private val cache = SynchronizedSieveCache<CacheKey, ExpiringValue<T>>(maxSize)

-	operator fun get(key: ContentCache.Key): T? {
-		val value = cache.get(key) ?: return null
+	operator fun get(key: CacheKey): T? {
+		val value = cache[key] ?: return null
 		if (value.isExpired) {
 			cache.remove(key)
 		}
 		return value.get()
 	}

-	operator fun set(key: ContentCache.Key, value: T) {
-		cache.put(key, ExpiringValue(value, lifetime, timeUnit))
+	operator fun set(key: CacheKey, value: T) {
+		val value = ExpiringValue(value, lifetime, timeUnit)
+		cache.put(key, value)
 	}

 	fun clear() {
@@ -30,4 +33,12 @@ class ExpiringLruCache<T>(
 	fun trimToSize(size: Int) {
 		cache.trimToSize(size)
 	}
+
+	fun remove(key: CacheKey) {
+		cache.remove(key)
+	}
+
+	fun removeAll(source: MangaSource) {
+		cache.removeIf { key, _ -> key.source == source }
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
@@ -3,36 +3,57 @@ package org.koitharu.kotatsu.core.cache
 import android.app.Application
 import android.content.ComponentCallbacks2
 import android.content.res.Configuration
+import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton

-class MemoryContentCache(application: Application) : ContentCache, ComponentCallbacks2 {
+@Singleton
+class MemoryContentCache @Inject constructor(application: Application) : ComponentCallbacks2 {
+
+	private val isLowRam = application.isLowRamDevice()
+
+	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(if (isLowRam) 1 else 4, 5, TimeUnit.MINUTES)
+	private val pagesCache =
+		ExpiringLruCache<SafeDeferred<List<MangaPage>>>(if (isLowRam) 1 else 4, 10, TimeUnit.MINUTES)
+	private val relatedMangaCache =
+		ExpiringLruCache<SafeDeferred<List<Manga>>>(if (isLowRam) 1 else 3, 10, TimeUnit.MINUTES)

 	init {
 		application.registerComponentCallbacks(this)
 	}

-	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(4, 5, TimeUnit.MINUTES)
-	private val pagesCache = ExpiringLruCache<SafeDeferred<List<MangaPage>>>(4, 10, TimeUnit.MINUTES)
-
-	override val isCachingEnabled: Boolean = true
-
-	override suspend fun getDetails(source: MangaSource, url: String): Manga? {
-		return detailsCache[ContentCache.Key(source, url)]?.awaitOrNull()
+	suspend fun getDetails(source: MangaSource, url: String): Manga? {
+		return detailsCache[Key(source, url)]?.awaitOrNull()
 	}

-	override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) {
-		detailsCache[ContentCache.Key(source, url)] = details
+	fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) {
+		detailsCache[Key(source, url)] = details
 	}

-	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? {
-		return pagesCache[ContentCache.Key(source, url)]?.awaitOrNull()
+	suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? {
+		return pagesCache[Key(source, url)]?.awaitOrNull()
 	}

-	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) {
-		pagesCache[ContentCache.Key(source, url)] = pages
+	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) {
+		pagesCache[Key(source, url)] = pages
+	}
+
+	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
+		return relatedMangaCache[Key(source, url)]?.awaitOrNull()
+	}
+
+	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
+		relatedMangaCache[Key(source, url)] = related
+	}
+
+	fun clear(source: MangaSource) {
+		clearCache(detailsCache, source)
+		clearCache(pagesCache, source)
+		clearCache(relatedMangaCache, source)
 	}

 	override fun onConfigurationChanged(newConfig: Configuration) = Unit
@@ -42,6 +63,7 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 	override fun onTrimMemory(level: Int) {
 		trimCache(detailsCache, level)
 		trimCache(pagesCache, level)
+		trimCache(relatedMangaCache, level)
 	}

 	private fun trimCache(cache: ExpiringLruCache<*>, level: Int) {
@@ -57,4 +79,13 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 			else -> cache.trimToSize(cache.maxSize / 2)
 		}
 	}
+
+	private fun clearCache(cache: ExpiringLruCache<*>, source: MangaSource) {
+		cache.removeAll(source)
+	}
+
+	data class Key(
+		val source: MangaSource,
+		val url: String,
+	)
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt
@@ -1,18 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-class StubContentCache : ContentCache {
-
-	override val isCachingEnabled: Boolean = false
-
-	override suspend fun getDetails(source: MangaSource, url: String): Manga? = null
-
-	override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) = Unit
-
-	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? = null
-
-	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) = Unit
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -6,17 +6,22 @@ import androidx.room.InvalidationTracker
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
+import org.koitharu.kotatsu.core.db.dao.ChaptersDao
 import org.koitharu.kotatsu.core.db.dao.MangaDao
+import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.dao.PreferencesDao
 import org.koitharu.kotatsu.core.db.dao.TagsDao
 import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
+import org.koitharu.kotatsu.core.db.entity.ChapterEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.db.migrations.Migration10To11
@@ -25,7 +30,17 @@ import org.koitharu.kotatsu.core.db.migrations.Migration12To13
 import org.koitharu.kotatsu.core.db.migrations.Migration13To14
 import org.koitharu.kotatsu.core.db.migrations.Migration14To15
 import org.koitharu.kotatsu.core.db.migrations.Migration15To16
+import org.koitharu.kotatsu.core.db.migrations.Migration16To17
+import org.koitharu.kotatsu.core.db.migrations.Migration17To18
+import org.koitharu.kotatsu.core.db.migrations.Migration18To19
+import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
+import org.koitharu.kotatsu.core.db.migrations.Migration20To21
+import org.koitharu.kotatsu.core.db.migrations.Migration21To22
+import org.koitharu.kotatsu.core.db.migrations.Migration22To23
+import org.koitharu.kotatsu.core.db.migrations.Migration23To24
+import org.koitharu.kotatsu.core.db.migrations.Migration24To23
+import org.koitharu.kotatsu.core.db.migrations.Migration24To25
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -41,79 +56,100 @@ import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.local.data.index.LocalMangaIndexDao
+import org.koitharu.kotatsu.local.data.index.LocalMangaIndexEntity
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingDao
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingEntity
+import org.koitharu.kotatsu.stats.data.StatsDao
+import org.koitharu.kotatsu.stats.data.StatsEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao

-const val DATABASE_VERSION = 16
+const val DATABASE_VERSION = 25

@Database(
 	entities = [
-		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
-		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
-		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class,
+		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class, ChapterEntity::class,
+		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class, TrackEntity::class,
+		TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class, ScrobblingEntity::class,
+		MangaSourceEntity::class, StatsEntity::class, LocalMangaIndexEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
 abstract class MangaDatabase : RoomDatabase() {

-	abstract val historyDao: HistoryDao
+	abstract fun getHistoryDao(): HistoryDao

-	abstract val tagsDao: TagsDao
+	abstract fun getTagsDao(): TagsDao

-	abstract val mangaDao: MangaDao
+	abstract fun getMangaDao(): MangaDao

-	abstract val favouritesDao: FavouritesDao
+	abstract fun getFavouritesDao(): FavouritesDao

-	abstract val preferencesDao: PreferencesDao
+	abstract fun getPreferencesDao(): PreferencesDao

-	abstract val favouriteCategoriesDao: FavouriteCategoriesDao
+	abstract fun getFavouriteCategoriesDao(): FavouriteCategoriesDao

-	abstract val tracksDao: TracksDao
+	abstract fun getTracksDao(): TracksDao

-	abstract val trackLogsDao: TrackLogsDao
+	abstract fun getTrackLogsDao(): TrackLogsDao

-	abstract val suggestionDao: SuggestionDao
+	abstract fun getSuggestionDao(): SuggestionDao

-	abstract val bookmarksDao: BookmarksDao
+	abstract fun getBookmarksDao(): BookmarksDao

-	abstract val scrobblingDao: ScrobblingDao
+	abstract fun getScrobblingDao(): ScrobblingDao
+
+	abstract fun getSourcesDao(): MangaSourcesDao
+
+	abstract fun getStatsDao(): StatsDao
+
+	abstract fun getLocalMangaIndexDao(): LocalMangaIndexDao
+
+	abstract fun getChaptersDao(): ChaptersDao
 }

-val databaseMigrations: Array<Migration>
-	get() = arrayOf(
-		Migration1To2(),
-		Migration2To3(),
-		Migration3To4(),
-		Migration4To5(),
-		Migration5To6(),
-		Migration6To7(),
-		Migration7To8(),
-		Migration8To9(),
-		Migration9To10(),
-		Migration10To11(),
-		Migration11To12(),
-		Migration12To13(),
-		Migration13To14(),
-		Migration14To15(),
-		Migration15To16(),
-	)
+fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
+	Migration1To2(),
+	Migration2To3(),
+	Migration3To4(),
+	Migration4To5(),
+	Migration5To6(),
+	Migration6To7(),
+	Migration7To8(),
+	Migration8To9(),
+	Migration9To10(),
+	Migration10To11(),
+	Migration11To12(),
+	Migration12To13(),
+	Migration13To14(),
+	Migration14To15(),
+	Migration15To16(),
+	Migration16To17(context),
+	Migration17To18(),
+	Migration18To19(),
+	Migration19To20(),
+	Migration20To21(),
+	Migration21To22(),
+	Migration22To23(),
+	Migration23To24(),
+	Migration24To23(),
+	Migration24To25(),
+)

 fun MangaDatabase(context: Context): MangaDatabase = Room
 	.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
-	.addMigrations(*databaseMigrations)
+	.addMigrations(*getDatabaseMigrations(context))
 	.addCallback(DatabasePrePopulateCallback(context.resources))
 	.build()

 fun InvalidationTracker.removeObserverAsync(observer: InvalidationTracker.Observer) {
 	val scope = processLifecycleScope
 	if (scope.isActive) {
-		processLifecycleScope.launch(Dispatchers.Default) {
+		processLifecycleScope.launch(Dispatchers.Default, CoroutineStart.ATOMIC) {
 			removeObserver(observer)
 		}
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaQueryBuilder.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaQueryBuilder.kt
@@ -0,0 +1,113 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.sqlite.db.SimpleSQLiteQuery
+import org.koitharu.kotatsu.list.domain.ListFilterOption
+import java.util.LinkedList
+
+class MangaQueryBuilder(
+	private val table: String,
+	private val conditionCallback: ConditionCallback
+) {
+
+	private var filterOptions: Collection<ListFilterOption> = emptyList()
+	private var whereConditions = LinkedList<String>()
+	private var orderBy: String? = null
+	private var groupBy: String? = null
+	private var extraJoins: String? = null
+	private var limit: Int = 0
+
+	fun filters(options: Collection<ListFilterOption>) = apply {
+		filterOptions = options
+	}
+
+	fun where(condition: String) = apply {
+		whereConditions.add(condition)
+	}
+
+	fun orderBy(orderBy: String?) = apply {
+		this@MangaQueryBuilder.orderBy = orderBy
+	}
+
+	fun groupBy(groupBy: String?) = apply {
+		this@MangaQueryBuilder.groupBy = groupBy
+	}
+
+	fun limit(limit: Int) = apply {
+		this@MangaQueryBuilder.limit = limit
+	}
+
+	fun join(join: String?) = apply {
+		extraJoins = join
+	}
+
+	fun build() = buildString {
+		append("SELECT * FROM ")
+		append(table)
+		extraJoins?.let {
+			append(' ')
+			append(it)
+		}
+		if (whereConditions.isNotEmpty()) {
+			whereConditions.joinTo(
+				buffer = this,
+				prefix = " WHERE ",
+				separator = " AND ",
+			)
+		}
+		if (filterOptions.isNotEmpty()) {
+			if (whereConditions.isEmpty()) {
+				append(" WHERE")
+			} else {
+				append(" AND")
+			}
+			var isFirst = true
+			val groupedOptions = filterOptions.groupBy { it.groupKey }
+			for ((_, group) in groupedOptions) {
+				if (group.isEmpty()) {
+					continue
+				}
+				if (isFirst) {
+					isFirst = false
+					append(' ')
+				} else {
+					append(" AND ")
+				}
+				if (group.size > 1) {
+					group.joinTo(
+						buffer = this,
+						separator = " OR ",
+						prefix = "(",
+						postfix = ")",
+						transform = ::getConditionOrThrow,
+					)
+				} else {
+					append(getConditionOrThrow(group.single()))
+				}
+			}
+		}
+		groupBy?.let {
+			append(" GROUP BY ")
+			append(it)
+		}
+		orderBy?.let {
+			append(" ORDER BY ")
+			append(it)
+		}
+		if (limit > 0) {
+			append(" LIMIT ")
+			append(limit)
+		}
+	}.let { SimpleSQLiteQuery(it) }
+
+	private fun getConditionOrThrow(option: ListFilterOption): String = when (option) {
+		is ListFilterOption.Inverted -> "NOT(${getConditionOrThrow(option.option)})"
+		else -> requireNotNull(conditionCallback.getCondition(option)) {
+			"Unsupported filter option $option"
+		}
+	}
+
+	fun interface ConditionCallback {
+
+		fun getCondition(option: ListFilterOption): String?
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/Tables.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/Tables.kt
@@ -6,3 +6,5 @@ const val TABLE_TAGS = "tags"
 const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
 const val TABLE_HISTORY = "history"
 const val TABLE_MANGA_TAGS = "manga_tags"
+const val TABLE_SOURCES = "sources"
+const val TABLE_CHAPTERS = "chapters"
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/ChaptersDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/ChaptersDao.kt
@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import org.koitharu.kotatsu.core.db.entity.ChapterEntity
+
+@Dao
+abstract class ChaptersDao {
+
+	@Query("SELECT * FROM chapters WHERE manga_id = :mangaId ORDER BY `index` ASC")
+	abstract suspend fun findAll(mangaId: Long): List<ChapterEntity>
+
+	@Query("DELETE FROM chapters WHERE manga_id = :mangaId")
+	abstract suspend fun deleteAll(mangaId: Long)
+
+	@Query("DELETE FROM chapters WHERE manga_id NOT IN (SELECT manga_id FROM history WHERE deleted_at = 0) AND manga_id NOT IN (SELECT manga_id FROM favourites WHERE deleted_at = 0)")
+	abstract suspend fun gc()
+
+	@Transaction
+	open suspend fun replaceAll(mangaId: Long, entities: Collection<ChapterEntity>) {
+		deleteAll(mangaId)
+		insert(entities)
+	}
+
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	protected abstract suspend fun insert(entities: Collection<ChapterEntity>)
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
@@ -1,6 +1,13 @@
 package org.koitharu.kotatsu.core.db.dao

-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
+import androidx.room.Upsert
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
 import org.koitharu.kotatsu.core.db.entity.MangaWithTags
@@ -13,6 +20,20 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE manga_id = :id")
 	abstract suspend fun find(id: Long): MangaWithTags?

+	@Query("SELECT EXISTS(SELECT * FROM manga WHERE manga_id = :id)")
+	abstract suspend operator fun contains(id: Long): Boolean
+
+	@Transaction
+	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
+	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
+
+	@Transaction
+	@Query("SELECT * FROM manga WHERE source = :source")
+	abstract suspend fun findAllBySource(source: String): List<MangaWithTags>
+
+	@Query("SELECT author FROM manga WHERE author LIKE :query GROUP BY author ORDER BY COUNT(author) DESC LIMIT :limit")
+	abstract suspend fun findAuthors(query: String, limit: Int): List<String>
+
 	@Transaction
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>
@@ -21,8 +42,8 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND source = :source AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, source: String, limit: Int): List<MangaWithTags>

-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	abstract suspend fun insert(manga: MangaEntity): Long
+	@Upsert
+	protected abstract suspend fun upsert(manga: MangaEntity)

 	@Update(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun update(manga: MangaEntity): Int
@@ -33,17 +54,32 @@ abstract class MangaDao {
 	@Query("DELETE FROM manga_tags WHERE manga_id = :mangaId")
 	abstract suspend fun clearTagRelation(mangaId: Long)

+	@Transaction
+	@Delete
+	abstract suspend fun delete(subjects: Collection<MangaEntity>)
+
+	@Query(
+		"""
+		DELETE FROM manga WHERE NOT EXISTS(SELECT * FROM history WHERE history.manga_id == manga.manga_id) 
+			AND NOT EXISTS(SELECT * FROM favourites WHERE favourites.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM bookmarks WHERE bookmarks.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM suggestions WHERE suggestions.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM scrobblings WHERE scrobblings.manga_id == manga.manga_id)
+			AND NOT EXISTS(SELECT * FROM local_index WHERE local_index.manga_id == manga.manga_id)
+			AND manga.manga_id NOT IN (:idsToKeep)
+		""",
+	)
+	abstract suspend fun cleanup(idsToKeep: Set<Long>)
+
 	@Transaction
 	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
-		if (update(manga) <= 0) {
-			insert(manga)
-			if (tags != null) {
-				clearTagRelation(manga.id)
-				tags.map {
-					MangaTagsEntity(manga.id, it.id)
-				}.forEach {
-					insertTagRelation(it)
-				}
+		upsert(manga)
+		if (tags != null) {
+			clearTagRelation(manga.id)
+			tags.map {
+				MangaTagsEntity(manga.id, it.id)
+			}.forEach {
+				insertTagRelation(it)
 			}
 		}
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt
@@ -0,0 +1,110 @@
+package org.koitharu.kotatsu.core.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.RawQuery
+import androidx.room.Transaction
+import androidx.room.Upsert
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
+import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
+
+@Dao
+abstract class MangaSourcesDao {
+
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
+	abstract suspend fun findAll(): List<MangaSourceEntity>
+
+	@Query("SELECT source FROM sources WHERE enabled = 1")
+	abstract suspend fun findAllEnabledNames(): List<String>
+
+	@Query("SELECT * FROM sources WHERE added_in >= :version")
+	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources ORDER BY used_at DESC LIMIT :limit")
+	abstract suspend fun findLastUsed(limit: Int): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
+	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
+
+	@Query("SELECT enabled FROM sources WHERE source = :source")
+	abstract fun observeIsEnabled(source: String): Flow<Boolean>
+
+	@Query("SELECT IFNULL(MAX(sort_key),0) FROM sources")
+	abstract suspend fun getMaxSortKey(): Int
+
+	@Query("UPDATE sources SET enabled = 0")
+	abstract suspend fun disableAllSources()
+
+	@Query("UPDATE sources SET sort_key = :sortKey WHERE source = :source")
+	abstract suspend fun setSortKey(source: String, sortKey: Int)
+
+	@Query("UPDATE sources SET used_at = :value WHERE source = :source")
+	abstract suspend fun setLastUsed(source: String, value: Long)
+
+	@Query("UPDATE sources SET pinned = :isPinned WHERE source = :source")
+	abstract suspend fun setPinned(source: String, isPinned: Boolean)
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	@Transaction
+	abstract suspend fun insertIfAbsent(entries: Collection<MangaSourceEntity>)
+
+	@Upsert
+	abstract suspend fun upsert(entry: MangaSourceEntity)
+
+	@Query("SELECT * FROM sources WHERE pinned = 1")
+	abstract suspend fun findAllPinned(): List<MangaSourceEntity>
+
+	fun observeAll(enabledOnly: Boolean, order: SourcesSortOrder): Flow<List<MangaSourceEntity>> =
+		observeImpl(getQuery(enabledOnly, order))
+
+	suspend fun findAll(enabledOnly: Boolean, order: SourcesSortOrder): List<MangaSourceEntity> =
+		findAllImpl(getQuery(enabledOnly, order))
+
+	@Transaction
+	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
+		if (updateIsEnabled(source, isEnabled) == 0) {
+			val entity = MangaSourceEntity(
+				source = source,
+				isEnabled = isEnabled,
+				sortKey = getMaxSortKey() + 1,
+				addedIn = BuildConfig.VERSION_CODE,
+				lastUsedAt = 0,
+				isPinned = false,
+			)
+			upsert(entity)
+		}
+	}
+
+	@Query("UPDATE sources SET enabled = :isEnabled WHERE source = :source")
+	protected abstract suspend fun updateIsEnabled(source: String, isEnabled: Boolean): Int
+
+	@RawQuery(observedEntities = [MangaSourceEntity::class])
+	protected abstract fun observeImpl(query: SupportSQLiteQuery): Flow<List<MangaSourceEntity>>
+
+	@RawQuery
+	protected abstract suspend fun findAllImpl(query: SupportSQLiteQuery): List<MangaSourceEntity>
+
+	private fun getQuery(enabledOnly: Boolean, order: SourcesSortOrder) = SimpleSQLiteQuery(
+		buildString {
+			append("SELECT * FROM sources ")
+			if (enabledOnly) {
+				append("WHERE enabled = 1 ")
+			}
+			append("ORDER BY pinned DESC, ")
+			append(getOrderBy(order))
+		},
+	)
+
+	private fun getOrderBy(order: SourcesSortOrder) = when (order) {
+		SourcesSortOrder.ALPHABETIC -> "source ASC"
+		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
+		SourcesSortOrder.MANUAL -> "sort_key ASC"
+		SourcesSortOrder.LAST_USED -> "used_at DESC"
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/PreferencesDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/PreferencesDao.kt
@@ -1,6 +1,8 @@
 package org.koitharu.kotatsu.core.db.dao

-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity

@@ -13,6 +15,9 @@ abstract class PreferencesDao {
 	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
 	abstract fun observe(mangaId: Long): Flow<MangaPrefsEntity?>

+	@Query("UPDATE preferences SET cf_brightness = 0, cf_contrast = 0, cf_invert = 0, cf_grayscale = 0")
+	abstract suspend fun resetColorFilters()
+
 	@Upsert
 	abstract suspend fun upsert(pref: MangaPrefsEntity)
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/TagsDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/TagsDao.kt
@@ -1,6 +1,8 @@
 package org.koitharu.kotatsu.core.db.dao

-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
 import org.koitharu.kotatsu.core.db.entity.TagEntity

@Dao
@@ -12,6 +14,7 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM history UNION SELECT manga_id FROM favourites)
 		GROUP BY tags.title 
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -21,7 +24,7 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
-		WHERE tags.source = :source 
+		WHERE tags.source = :source  
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -31,7 +34,17 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
-		WHERE tags.source = :source AND title LIKE :query
+		WHERE tags.source = :source  
+		GROUP BY tags.title
+		ORDER BY COUNT(manga_id) ASC 
+		LIMIT :limit""",
+	)
+	abstract suspend fun findRareTags(source: String, limit: Int): List<TagEntity>
+
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE tags.source = :source AND title LIKE :query 
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -41,13 +54,35 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
-		WHERE title LIKE :query
+		WHERE title LIKE :query AND manga_tags.manga_id IN (SELECT manga_id FROM history UNION SELECT manga_id FROM favourites)
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
 	)
 	abstract suspend fun findTags(query: String, limit: Int): List<TagEntity>

+	@Query(
+		"""
+		SELECT tags.* FROM manga_tags 
+		LEFT JOIN tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM manga_tags WHERE tag_id = :tagId)
+		GROUP BY tags.tag_id 
+		ORDER BY COUNT(manga_id) DESC;
+	""",
+	)
+	abstract suspend fun findRelatedTags(tagId: Long): List<TagEntity>
+
+	@Query(
+		"""
+		SELECT tags.* FROM manga_tags 
+		LEFT JOIN tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM manga_tags WHERE tag_id IN (:ids))
+		GROUP BY tags.tag_id 
+		ORDER BY COUNT(manga_id) DESC;
+	""",
+	)
+	abstract suspend fun findRelatedTags(ids: Set<Long>): List<TagEntity>
+
 	@Upsert
 	abstract suspend fun upsert(tags: Iterable<TagEntity>)
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt
@@ -1,29 +1,62 @@
 package org.koitharu.kotatsu.core.db.dao

-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.RawQuery
+import androidx.room.Transaction
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.core.db.MangaQueryBuilder
+import org.koitharu.kotatsu.list.domain.ListFilterOption
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogWithManga

@Dao
-interface TrackLogsDao {
+abstract class TrackLogsDao : MangaQueryBuilder.ConditionCallback {

-	@Transaction
-	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
-	fun observeAll(limit: Int): Flow<List<TrackLogWithManga>>
+	fun observeAll(
+		limit: Int,
+		filterOptions: Set<ListFilterOption>,
+	): Flow<List<TrackLogWithManga>> = observeAllImpl(
+		MangaQueryBuilder("track_logs", this)
+			.filters(filterOptions)
+			.limit(limit)
+			.orderBy("created_at DESC")
+			.build(),
+	)
+
+	@Query("SELECT COUNT(*) FROM track_logs WHERE unread = 1")
+	abstract fun observeUnreadCount(): Flow<Int>

 	@Query("DELETE FROM track_logs")
-	suspend fun clear()
+	abstract suspend fun clear()
+
+	@Query("UPDATE track_logs SET unread = 0 WHERE id = :id")
+	abstract suspend fun markAsRead(id: Long)

 	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun insert(entity: TrackLogEntity): Long
-
-	@Query("DELETE FROM track_logs WHERE manga_id = :mangaId")
-	suspend fun removeAll(mangaId: Long)
+	abstract suspend fun insert(entity: TrackLogEntity): Long

 	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
-	suspend fun gc()
+	abstract suspend fun gc()
+
+	@Query("DELETE FROM track_logs WHERE id IN (SELECT id FROM track_logs ORDER BY created_at DESC LIMIT 0 OFFSET :size)")
+	abstract suspend fun trim(size: Int)

 	@Query("SELECT COUNT(*) FROM track_logs")
-	suspend fun count(): Int
+	abstract suspend fun count(): Int
+
+	@Transaction
+	@RawQuery(observedEntities = [TrackLogEntity::class])
+	protected abstract fun observeAllImpl(query: SupportSQLiteQuery): Flow<List<TrackLogWithManga>>
+
+	override fun getCondition(option: ListFilterOption): String? = when (option) {
+		ListFilterOption.Macro.FAVORITE -> "EXISTS(SELECT * FROM favourites WHERE favourites.manga_id = track_logs.manga_id)"
+		is ListFilterOption.Favorite -> "EXISTS(SELECT * FROM favourites WHERE favourites.manga_id = track_logs.manga_id AND favourites.category_id = ${option.category.id})"
+		is ListFilterOption.Tag -> "EXISTS(SELECT * FROM manga_tags WHERE manga_tags.manga_id = track_logs.manga_id AND tag_id = ${option.tagId})"
+		ListFilterOption.Macro.NSFW -> "(SELECT nsfw FROM manga WHERE manga.manga_id = track_logs.manga_id) = 1"
+		else -> null
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/ChapterEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/ChapterEntity.kt
@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.TABLE_CHAPTERS
+
+@Entity(
+	tableName = TABLE_CHAPTERS,
+	primaryKeys = ["manga_id", "chapter_id"],
+	foreignKeys = [
+		ForeignKey(
+			entity = MangaEntity::class,
+			parentColumns = ["manga_id"],
+			childColumns = ["manga_id"],
+			onDelete = ForeignKey.CASCADE,
+		),
+	],
+)
+data class ChapterEntity(
+	@ColumnInfo(name = "chapter_id") val chapterId: Long,
+	@ColumnInfo(name = "manga_id") val mangaId: Long,
+	@ColumnInfo(name = "name") val title: String,
+	@ColumnInfo(name = "number") val number: Float,
+	@ColumnInfo(name = "volume") val volume: Int,
+	@ColumnInfo(name = "url") val url: String,
+	@ColumnInfo(name = "scanlator") val scanlator: String?,
+	@ColumnInfo(name = "upload_date") val uploadDate: Long,
+	@ColumnInfo(name = "branch") val branch: String?,
+	@ColumnInfo(name = "source") val source: String,
+	@ColumnInfo(name = "index") val index: Int,
+)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
@@ -1,14 +1,20 @@
 package org.koitharu.kotatsu.core.db.entity

 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.util.ext.longHashCode
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.nullIfEmpty
+import org.koitharu.kotatsu.parsers.util.toArraySet
 import org.koitharu.kotatsu.parsers.util.toTitleCase

+private const val VALUES_DIVIDER = '\n'
+
 // Entity to model

 fun TagEntity.toMangaTag() = MangaTag(
@@ -19,23 +25,43 @@ fun TagEntity.toMangaTag() = MangaTag(

 fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)

-fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
+fun Collection<TagEntity>.toMangaTagsList() = map(TagEntity::toMangaTag)
+
+fun MangaEntity.toManga(tags: Set<MangaTag>, chapters: List<ChapterEntity>?) = Manga(
 	id = this.id,
 	title = this.title,
-	altTitle = this.altTitle,
+	altTitles = this.altTitles?.split(VALUES_DIVIDER)?.toArraySet().orEmpty(),
 	state = this.state?.let { MangaState(it) },
 	rating = this.rating,
-	isNsfw = this.isNsfw,
+	contentRating = ContentRating(this.contentRating)
+		?: if (isNsfw) ContentRating.ADULT else null,
 	url = this.url,
 	publicUrl = this.publicUrl,
 	coverUrl = this.coverUrl,
 	largeCoverUrl = this.largeCoverUrl,
-	author = this.author,
+	authors = this.authors?.split(VALUES_DIVIDER)?.toArraySet().orEmpty(),
 	source = MangaSource(this.source),
 	tags = tags,
+	chapters = chapters?.toMangaChapters(),
 )

-fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
+fun MangaWithTags.toManga(chapters: List<ChapterEntity>? = null) = manga.toManga(tags.toMangaTags(), chapters)
+
+fun Collection<MangaWithTags>.toMangaList() = map { it.toManga() }
+
+fun ChapterEntity.toMangaChapter() = MangaChapter(
+	id = chapterId,
+	title = title.nullIfEmpty(),
+	number = number,
+	volume = volume,
+	url = url,
+	scanlator = scanlator,
+	uploadDate = uploadDate,
+	branch = branch,
+	source = MangaSource(source),
+)
+
+fun Collection<ChapterEntity>.toMangaChapters() = map { it.toMangaChapter() }

 // Model to entity

@@ -45,13 +71,14 @@ fun Manga.toEntity() = MangaEntity(
 	publicUrl = publicUrl,
 	source = source.name,
 	largeCoverUrl = largeCoverUrl,
-	coverUrl = coverUrl,
-	altTitle = altTitle,
+	coverUrl = coverUrl.orEmpty(),
+	altTitles = altTitles.joinToString(VALUES_DIVIDER.toString()),
 	rating = rating,
 	isNsfw = isNsfw,
+	contentRating = contentRating?.name,
 	state = state?.name,
 	title = title,
-	author = author,
+	authors = authors.joinToString(VALUES_DIVIDER.toString()),
 )

 fun MangaTag.toEntity() = TagEntity(
@@ -63,6 +90,22 @@ fun MangaTag.toEntity() = TagEntity(

 fun Collection<MangaTag>.toEntities() = map(MangaTag::toEntity)

+fun Iterable<IndexedValue<MangaChapter>>.toEntities(mangaId: Long) = map { (index, chapter) ->
+	ChapterEntity(
+		chapterId = chapter.id,
+		mangaId = mangaId,
+		title = chapter.title.orEmpty(),
+		number = chapter.number,
+		volume = chapter.volume,
+		url = chapter.url,
+		scanlator = chapter.scanlator,
+		uploadDate = chapter.uploadDate,
+		branch = chapter.branch,
+		source = chapter.source.name,
+		index = index,
+	)
+}
+
 // Other

 fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
@@ -72,3 +115,7 @@ fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
 fun MangaState(name: String): MangaState? = runCatching {
 	MangaState.valueOf(name)
 }.getOrNull()
+
+fun ContentRating(name: String?): ContentRating? = runCatching {
+	ContentRating.valueOf(name ?: return@runCatching null)
+}.getOrNull()
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
@@ -10,14 +10,15 @@ data class MangaEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
-	@ColumnInfo(name = "alt_title") val altTitle: String?,
+	@ColumnInfo(name = "alt_title") val altTitles: String?,
 	@ColumnInfo(name = "url") val url: String,
 	@ColumnInfo(name = "public_url") val publicUrl: String,
 	@ColumnInfo(name = "rating") val rating: Float, // normalized value [0..1] or -1
 	@ColumnInfo(name = "nsfw") val isNsfw: Boolean,
+	@ColumnInfo(name = "content_rating") val contentRating: String?,
 	@ColumnInfo(name = "cover_url") val coverUrl: String,
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
 	@ColumnInfo(name = "state") val state: String?,
-	@ColumnInfo(name = "author") val author: String?,
+	@ColumnInfo(name = "author") val authors: String?,
 	@ColumnInfo(name = "source") val source: String,
 )
--- a/Show More
+++ b/Show More