diff --git a/.editorconfig b/.editorconfig
index 999845632..63c49d65d 100644
--- 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
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f697..9f47dfb43 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
diff --git a/app/build.gradle b/app/build.gradle
index 5cb84e4a6..b6c002771 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,30 +2,30 @@ plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
 	id 'kotlin-kapt'
+	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
 }
 
 android {
 	compileSdk = 33
-	buildToolsVersion = '33.0.2'
+//	compileSdkExtension = 4
+	buildToolsVersion = '34.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 568
-		versionName '5.3.11'
+		versionCode 570
+		versionName '6.0-a1'
 		generatedDensities = []
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-		kapt {
-			arguments {
-				arg 'room.schemaLocation', "$projectDir/schemas".toString()
-			}
+		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
+		ksp {
+			arg("room.schemaLocation", "$projectDir/schemas")
+		}
+		androidResources {
+			generateLocaleConfig true
 		}
 	}
 	buildTypes {
@@ -41,6 +41,7 @@ android {
 	}
 	buildFeatures {
 		viewBinding true
+		buildConfig true
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
@@ -81,30 +82,29 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:1b3b5d95c0') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:407ef5b655') {
 		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'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.0'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	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.fragment:fragment-ktx:1.6.1'
 	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.recyclerview:recyclerview:1.3.1'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
-	implementation 'androidx.preference:preference-ktx:1.2.0'
+	implementation 'androidx.preference:preference-ktx:1.2.1'
 	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 'androidx.lifecycle:lifecycle-common-java8:2.6.1'
 
 	// TODO https://issuetracker.google.com/issues/254846063
 	implementation 'androidx.work:work-runtime-ktx:2.8.1'
@@ -117,8 +117,7 @@ dependencies {
 
 	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'
+	ksp 'androidx.room:room-compiler:2.5.2'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
@@ -145,14 +144,14 @@ dependencies {
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.json:json:20230618'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
 	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'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
 	androidTestImplementation 'androidx.room:room-testing:2.5.2'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/HiltTestRunner.kt b/app/src/androidTest/java/org/koitharu/kotatsu/HiltTestRunner.kt
new file mode 100644
index 000000000..0c0a60f73
--- /dev/null
+++ b/app/src/androidTest/java/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)
+    }
+}
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt b/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
index b7e4a07f5..523da54c1 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/java/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() {
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt b/app/src/androidTest/java/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt
index d7fad17d9..bbc70b8db 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt
+++ b/app/src/androidTest/java/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(
diff --git a/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt b/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt
deleted file mode 100644
index 2d47a63b3..000000000
--- a/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt
+++ /dev/null
@@ -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()")
-	}
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a2c84584..bc598d4b7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,6 @@
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:largeHeap="true"
-		android:localeConfig="@xml/locales"
 		android:networkSecurityConfig="@xml/network_security_config"
 		android:requestLegacyExternalStorage="true"
 		android:roundIcon="@mipmap/ic_launcher_round"
@@ -100,6 +99,9 @@
 		<activity
 			android:name="org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity"
 			android:label="@string/suggestions" />
+		<activity
+			android:name="org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity"
+			android:label="@string/related_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
@@ -132,8 +134,7 @@
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
-			android:label="@string/favourites"
-			android:windowSoftInputMode="stateAlwaysHidden" />
+			android:label="@string/manage_categories" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:exported="true"
@@ -164,9 +165,6 @@
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity"
 			android:label="@string/color_correction" />
-		<activity
-			android:name="org.koitharu.kotatsu.shelf.ui.config.ShelfSettingsActivity"
-			android:label="@string/settings" />
 		<activity
 			android:name="org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity"
 			android:exported="true"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/main/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
index ae4926462..ea5f3f253 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
@@ -9,6 +9,7 @@ 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.launch
@@ -22,7 +23,6 @@ import org.acra.sender.HttpSender
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.os.AppValidator
 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
@@ -30,6 +30,7 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 import javax.inject.Inject
+import javax.inject.Provider
 
 @HiltAndroidApp
 class KotatsuApp : Application(), Configuration.Provider {
@@ -55,6 +56,9 @@ class KotatsuApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workScheduleManager: WorkScheduleManager
 
+	@Inject
+	lateinit var workManagerProvider: Provider<WorkManager>
+
 	override fun onCreate() {
 		super.onCreate()
 		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
@@ -68,7 +72,6 @@ class KotatsuApp : Application(), Configuration.Provider {
 			setupDatabaseObservers()
 		}
 		workScheduleManager.init()
-		WorkServiceStopHelper(applicationContext).setup()
 	}
 
 	override fun attachBaseContext(base: Context?) {
@@ -152,7 +155,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
 			.penaltyDeath()
 			.detectFragmentReuse()
-			.detectWrongFragmentContainer()
+			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
 			.detectRetainInstanceUsage()
 			.detectSetUserVisibleHint()
 			.detectFragmentTagUsage()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
index 0f7533857..d38ee4f71 100644
--- 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,6 +5,7 @@ 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
 
@@ -14,15 +15,24 @@ 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 manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
+	@Query("SELECT * FROM bookmarks WHERE page_id = :pageId")
+	abstract suspend fun find(pageId: Long): BookmarkEntity?
+
+	@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>>>
 
@@ -35,6 +45,12 @@ abstract class BookmarksDao {
 	@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>)
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt
index a8b2e0912..37816464e 100644
--- 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.util.Date
 
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
@@ -30,4 +30,5 @@ fun Collection<BookmarkEntity>.toBookmarks(manga: Manga) = map {
 	it.toBookmark(manga)
 }
 
-fun Collection<Bookmark>.ids() = map { it.pageId }
\ No newline at end of file
+@JvmName("bookmarksIds")
+fun Collection<Bookmark>.ids() = map { it.pageId }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt
index 1dc908cc4..258a53ec8 100644
--- 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,11 +1,12 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.local.data.ImageFileFilter
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import java.util.Date
 
-class Bookmark(
+data class Bookmark(
 	val manga: Manga,
 	val pageId: Long,
 	val chapterId: Long,
@@ -14,11 +15,21 @@ class Bookmark(
 	val imageUrl: String,
 	val createdAt: Date,
 	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,
 		url = imageUrl,
@@ -30,32 +41,4 @@ class Bookmark(
 		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
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
index fab2180f3..a8379c9aa 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
@@ -62,18 +62,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)
+			for (pageId in ids) {
+				val e = dao.find(pageId)
+				if (e != null) {
+					entities.add(e)
 				}
+				dao.delete(pageId)
 			}
 		}
 		return BookmarksRestorer(entities)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
index cbc9656f0..a37e65f05 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
@@ -12,31 +12,32 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
 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.bookmarks.ui.sheet.BookmarksAdapter
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+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.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.MangaListSpanResolver
+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.model.ListModel
+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.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -48,15 +49,18 @@ class BookmarksFragment :
 	BaseFragment<FragmentListSimpleBinding>(),
 	ListStateHolderListener,
 	OnListItemClickListener<Bookmark>,
-	SectionedSelectionController.Callback<Manga>,
-	FastScroller.FastScrollListener {
+	ListSelectionController.Callback2,
+	FastScroller.FastScrollListener, ListHeaderClickListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
+	@Inject
+	lateinit var settings: AppSettings
+
 	private val viewModel by viewModels<BookmarksViewModel>()
-	private var adapter: BookmarksGroupAdapter? = null
-	private var selectionController: SectionedSelectionController<Manga>? = null
+	private var bookmarksAdapter: BookmarksAdapter? = null
+	private var selectionController: ListSelectionController? = null
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
 		return FragmentListSimpleBinding.inflate(inflater, container, false)
@@ -64,48 +68,62 @@ class BookmarksFragment :
 
 	override fun onViewBindingCreated(binding: FragmentListSimpleBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		selectionController = SectionedSelectionController(
+		selectionController = ListSelectionController(
 			activity = requireActivity(),
-			owner = this,
+			decoration = BookmarksSelectionDecoration(binding.root.context),
+			registryOwner = this,
 			callback = this,
 		)
-		adapter = BookmarksGroupAdapter(
+		bookmarksAdapter = BookmarksAdapter(
 			lifecycleOwner = viewLifecycleOwner,
 			coil = coil,
-			listener = this,
-			selectionController = checkNotNull(selectionController),
-			bookmarkClickListener = this,
-			groupClickListener = OnGroupClickListener(),
+			clickListener = this,
+			headerClickListener = this,
 		)
-		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)
+		val spanSizeLookup = SpanSizeLookup()
+		with(binding.recyclerView) {
+			setHasFixedSize(true)
+			val spanResolver = MangaListSpanResolver(resources)
+			addItemDecoration(TypedListSpacingDecoration(context))
+			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, ::onActionDone)
 	}
 
 	override fun onDestroyView() {
 		super.onDestroyView()
-		adapter = null
+		bookmarksAdapter = null
 		selectionController = null
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
-		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
+		if (selectionController?.onItemClick(item.pageId) != true) {
 			val intent = ReaderActivity.IntentBuilder(view.context)
 				.bookmark(item)
 				.incognito(true)
 				.build()
-			startActivity(intent, scaleUpActivityOptionsOf(view))
+			startActivity(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
+		startActivity(DetailsActivity.newIntent(view.context, manga))
+	}
+
 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(item.manga, item.pageId) ?: false
+		return selectionController?.onItemLongClick(item.pageId) ?: false
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -118,24 +136,16 @@ class BookmarksFragment :
 
 	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
 
-	override fun onSelectionChanged(controller: SectionedSelectionController<Manga>, count: Int) {
-		requireViewBinding().recyclerView.invalidateNestedItemDecorations()
+	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
+		requireViewBinding().recyclerView.invalidateItemDecorations()
 	}
 
-	override fun onCreateActionMode(
-		controller: SectionedSelectionController<Manga>,
-		mode: ActionMode,
-		menu: Menu,
-	): Boolean {
+	override fun onCreateActionMode(controller: ListSelectionController, 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 {
+	override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
 				val ids = selectionController?.snapshot() ?: return false
@@ -148,11 +158,6 @@ class BookmarksFragment :
 		}
 	}
 
-	override fun onCreateItemDecoration(
-		controller: SectionedSelectionController<Manga>,
-		section: Manga,
-	): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
-
 	override fun onWindowInsetsChanged(insets: Insets) {
 		requireViewBinding().recyclerView.updatePadding(
 			bottom = insets.bottom,
@@ -162,10 +167,6 @@ class BookmarksFragment :
 		}
 	}
 
-	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
@@ -176,24 +177,24 @@ class BookmarksFragment :
 		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
+	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
 			}
-			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
+		override fun run() {
+			invalidateSpanGroupIndexCache()
+			invalidateSpanIndexCache()
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt
index d08ce07b4..f661ce4b2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.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
@@ -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
+	}
 }
diff --git 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
index e394d3396..f8b9c411e 100644
--- 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
@@ -5,19 +5,15 @@ 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,
@@ -32,8 +28,7 @@ fun bookmarkListAD(
 	binding.root.setOnLongClickListener(listener)
 
 	bind {
-		val data: Any = item.directImageUrl ?: item.toMangaPage()
-		binding.imageViewThumb.newImageRequest(lifecycleOwner, data)?.run {
+		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
 			size(CoverSizeResolver(binding.imageViewThumb))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
diff --git 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
index 8d15f00ab..c484af1f3 100644
--- 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,15 @@
 package org.koitharu.kotatsu.bookmarks.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 
 class BookmarksAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
-) : AsyncListDifferDelegationAdapter<Bookmark>(
-	DiffCallback(),
+) : BaseListAdapter<Bookmark>(
 	bookmarkListAD(coil, lifecycleOwner, clickListener),
-) {
-
-	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
-		}
-
-	}
-}
+)
diff --git 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
deleted file mode 100644
index df737ff54..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt
+++ /dev/null
@@ -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()
-	}
-}
diff --git 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
deleted file mode 100644
index 31ab12fd7..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt
+++ /dev/null
@@ -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)
-			}
-		}
-	}
-}
diff --git 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
deleted file mode 100644
index c9dc2e129..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt
+++ /dev/null
@@ -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
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarkLargeAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarkLargeAD.kt
new file mode 100644
index 000000000..6c19f1900
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarkLargeAD.kt
@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.bookmarks.ui.sheet
+
+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.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.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.source
+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) },
+) {
+	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
+
+	binding.root.setOnClickListener(listener)
+	binding.root.setOnLongClickListener(listener)
+
+	bind {
+		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.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)
+		}
+		binding.progressView.percent = item.percent
+	}
+
+	onViewRecycled {
+		binding.imageViewThumb.disposeImageRequest()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksAdapter.kt
new file mode 100644
index 000000000..7c5307731
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksAdapter.kt
@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.bookmarks.ui.sheet
+
+import android.content.Context
+import androidx.lifecycle.LifecycleOwner
+import coil.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.listHeaderAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+class BookmarksAdapter(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+	headerClickListener: ListHeaderClickListener?,
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
+
+	init {
+		addDelegate(ListItemType.PAGE_THUMB, bookmarkLargeAD(coil, lifecycleOwner, clickListener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+	}
+
+	override fun getSectionText(context: Context, position: Int): CharSequence? {
+		val list = items
+		for (i in (0..position).reversed()) {
+			val item = list.getOrNull(i) ?: continue
+			if (item is ListHeader) {
+				return item.getText(context)
+			}
+		}
+		return null
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheet.kt
new file mode 100644
index 000000000..e11c0103b
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheet.kt
@@ -0,0 +1,169 @@
+package org.koitharu.kotatsu.bookmarks.ui.sheet
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetBehavior
+import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetCallback
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
+import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.plus
+import org.koitharu.kotatsu.core.util.ext.showDistinct
+import org.koitharu.kotatsu.core.util.ext.withArgs
+import org.koitharu.kotatsu.databinding.SheetPagesBinding
+import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
+import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
+import org.koitharu.kotatsu.reader.ui.thumbnails.OnPageSelectListener
+import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
+import javax.inject.Inject
+import kotlin.math.roundToInt
+
+@AndroidEntryPoint
+class BookmarksSheet :
+	BaseAdaptiveSheet<SheetPagesBinding>(),
+	AdaptiveSheetCallback,
+	OnListItemClickListener<Bookmark> {
+
+	private val viewModel by viewModels<BookmarksSheetViewModel>()
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	@Inject
+	lateinit var settings: AppSettings
+
+	private var bookmarksAdapter: BookmarksAdapter? = null
+	private var spanResolver: MangaListSpanResolver? = null
+
+	private val spanSizeLookup = SpanSizeLookup()
+	private val listCommitCallback = Runnable {
+		spanSizeLookup.invalidateCache()
+	}
+
+	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetPagesBinding {
+		return SheetPagesBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewBindingCreated(binding: SheetPagesBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		addSheetCallback(this)
+		spanResolver = MangaListSpanResolver(binding.root.resources)
+		bookmarksAdapter = BookmarksAdapter(
+			coil = coil,
+			lifecycleOwner = viewLifecycleOwner,
+			clickListener = this@BookmarksSheet,
+			headerClickListener = null,
+		)
+		viewBinding?.headerBar?.setTitle(R.string.bookmarks)
+		with(binding.recyclerView) {
+			addItemDecoration(TypedListSpacingDecoration(context))
+			adapter = bookmarksAdapter
+			addOnLayoutChangeListener(spanResolver)
+			spanResolver?.setGridSize(settings.gridSize / 100f, this)
+			(layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup
+		}
+		viewModel.content.observe(viewLifecycleOwner, ::onThumbnailsChanged)
+		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+	}
+
+	override fun onDestroyView() {
+		spanResolver = null
+		bookmarksAdapter = null
+		spanSizeLookup.invalidateCache()
+		super.onDestroyView()
+	}
+
+	override fun onItemClick(item: Bookmark, view: View) {
+		val listener = (parentFragment as? OnPageSelectListener) ?: (activity as? OnPageSelectListener)
+		if (listener != null) {
+			listener.onPageSelected(ReaderPage(item.toMangaPage(), item.page, item.chapterId))
+		} else {
+			val intent = IntentBuilder(view.context)
+				.manga(viewModel.manga)
+				.bookmark(item)
+				.incognito(true)
+				.build()
+			startActivity(intent)
+		}
+		dismiss()
+	}
+
+	override fun onStateChanged(sheet: View, newState: Int) {
+		viewBinding?.recyclerView?.isFastScrollerEnabled = newState == AdaptiveSheetBehavior.STATE_EXPANDED
+	}
+
+	private fun onThumbnailsChanged(list: List<ListModel>) {
+		val adapter = bookmarksAdapter ?: return
+		if (adapter.itemCount == 0) {
+			var position = list.indexOfFirst { it is PageThumbnail && it.isCurrent }
+			if (position > 0) {
+				val spanCount = spanResolver?.spanCount ?: 0
+				val offset = if (position > spanCount + 1) {
+					(resources.getDimensionPixelSize(R.dimen.manga_list_details_item_height) * 0.6).roundToInt()
+				} else {
+					position = 0
+					0
+				}
+				val scrollCallback = RecyclerViewScrollCallback(requireViewBinding().recyclerView, position, offset)
+				adapter.setItems(list, listCommitCallback + scrollCallback)
+			} else {
+				adapter.setItems(list, listCommitCallback)
+			}
+		} else {
+			adapter.setItems(list, listCommitCallback)
+		}
+	}
+
+	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup() {
+
+		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
+			}
+		}
+
+		fun invalidateCache() {
+			invalidateSpanGroupIndexCache()
+			invalidateSpanIndexCache()
+		}
+	}
+
+	companion object {
+
+		const val ARG_MANGA = "manga"
+
+		private const val TAG = "BookmarksSheet"
+
+		fun show(fm: FragmentManager, manga: Manga) {
+			BookmarksSheet().withArgs(1) {
+				putParcelable(ARG_MANGA, ParcelableManga(manga, withChapters = true))
+			}.showDistinct(fm, TAG)
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheetViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheetViewModel.kt
new file mode 100644
index 000000000..937a50917
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarksSheetViewModel.kt
@@ -0,0 +1,54 @@
+package org.koitharu.kotatsu.bookmarks.ui.sheet
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.parsers.util.SuspendLazy
+import javax.inject.Inject
+
+@HiltViewModel
+class BookmarksSheetViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
+	mangaRepositoryFactory: MangaRepository.Factory,
+	bookmarksRepository: BookmarksRepository,
+) : BaseViewModel() {
+
+	val manga = savedStateHandle.require<ParcelableManga>(BookmarksSheet.ARG_MANGA).manga
+	private val chaptersLazy = SuspendLazy {
+		requireNotNull(manga.chapters ?: mangaRepositoryFactory.create(manga.source).getDetails(manga).chapters)
+	}
+
+	val content: StateFlow<List<ListModel>> = bookmarksRepository.observeBookmarks(manga)
+		.map { mapList(it) }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, listOf(LoadingFooter()))
+
+	private suspend fun mapList(bookmarks: List<Bookmark>): List<ListModel> {
+		val chapters = chaptersLazy.get()
+		val bookmarksMap = bookmarks.groupBy { it.chapterId }
+		val result = ArrayList<ListModel>(bookmarks.size + bookmarksMap.size)
+		for (chapter in chapters) {
+			val b = bookmarksMap[chapter.id]
+			if (b.isNullOrEmpty()) {
+				continue
+			}
+			result += ListHeader(chapter.name)
+			result.addAll(b)
+		}
+		return result
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
index 832c4679f..af49d1dcd 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -13,7 +13,6 @@ import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 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
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt
new file mode 100644
index 000000000..04a76345b
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt
@@ -0,0 +1,74 @@
+package org.koitharu.kotatsu.browser.cloudflare
+
+import android.annotation.SuppressLint
+import android.content.Context
+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 coil.request.ErrorResult
+import coil.request.ImageRequest
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.parsers.model.ContentType
+
+class CaptchaNotifier(
+	private val context: Context,
+) : ImageRequest.Listener {
+
+	@SuppressLint("MissingPermission")
+	fun notify(exception: CloudFlareProtectedException) {
+		val manager = NotificationManagerCompat.from(context)
+		if (!manager.areNotificationsEnabled()) {
+			return
+		}
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_DEFAULT)
+			.setName(context.getString(R.string.captcha_required))
+			.setShowBadge(true)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		manager.createNotificationChannel(channel)
+
+		val intent = CloudFlareActivity.newIntent(context, exception.url, exception.headers)
+			.setData(exception.url.toUri())
+		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
+			.setContentTitle(channel.name)
+			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
+			.setDefaults(NotificationCompat.DEFAULT_SOUND)
+			.setSmallIcon(android.R.drawable.stat_notify_error)
+			.setAutoCancel(true)
+			.setVisibility(
+				if (exception.source?.contentType == ContentType.HENTAI) {
+					NotificationCompat.VISIBILITY_SECRET
+				} else {
+					NotificationCompat.VISIBILITY_PUBLIC
+				},
+			)
+			.setContentText(
+				context.getString(
+					R.string.captcha_required_summary,
+					exception.source?.title ?: context.getString(R.string.app_name),
+				),
+			)
+			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))
+			.build()
+		manager.notify(TAG, exception.source.hashCode(), notification)
+	}
+
+	override fun onError(request: ImageRequest, result: ErrorResult) {
+		super.onError(request, result)
+		val e = result.throwable
+		if (e is CloudFlareProtectedException) {
+			notify(e)
+		}
+	}
+
+	private companion object {
+
+		private const val CHANNEL_ID = "captcha"
+		private const val TAG = CHANNEL_ID
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
index 8dba17b23..22b44c4d6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 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
@@ -18,7 +17,6 @@ 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.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
index c6d273615..8dc1dc098 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
@@ -6,6 +6,7 @@ import android.provider.SearchRecentSuggestions
 import android.text.Html
 import androidx.collection.arraySetOf
 import androidx.room.InvalidationTracker
+import androidx.work.WorkManager
 import coil.ComponentRegistry
 import coil.ImageLoader
 import coil.decode.SvgDecoder
@@ -172,5 +173,10 @@ interface AppModule {
 		fun provideLocalStorageChangesFlow(
 			@LocalStorageChanges flow: MutableSharedFlow<LocalManga?>,
 		): SharedFlow<LocalManga?> = flow.asSharedFlow()
+
+		@Provides
+		fun provideWorkManager(
+			@ApplicationContext context: Context,
+		): WorkManager = WorkManager.getInstance(context)
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
index 407365d3c..7498608c2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
@@ -13,5 +13,7 @@ class BackupEntry(
 		const val HISTORY = "history"
 		const val CATEGORIES = "categories"
 		const val FAVOURITES = "favourites"
+		const val SETTINGS = "settings"
+		const val BOOKMARKS = "bookmarks"
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
index f02602cef..231866047 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
@@ -5,6 +5,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -12,7 +13,10 @@ 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,
+) {
 
 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
@@ -67,6 +71,36 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 		return entry
 	}
 
+	suspend fun dumpBookmarks(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.BOOKMARKS, JSONArray())
+		val all = db.bookmarksDao.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.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 createIndex(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
 		val json = JSONObject()
@@ -127,4 +161,36 @@ class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 		}
 		return result
 	}
+
+	suspend fun restoreBookmarks(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			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.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.bookmarksDao.upsert(bookmarks)
+				}
+			}
+		}
+		return result
+	}
+
+	fun restoreSettings(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			result += runCatchingCancellable {
+				settings.upsertAll(JsonDeserializer(item).toMap())
+			}
+		}
+		return result
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
index 25e1d3688..5416836f9 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
@@ -11,8 +11,8 @@ class BackupZipInput(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: String): BackupEntry? = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name) ?: return@runInterruptible null
 		val json = zipFile.getInputStream(entry).use {
 			JSONArray(it.bufferedReader().readText())
 		}
@@ -22,4 +22,4 @@ class BackupZipInput(val file: File) : Closeable {
 	override fun close() {
 		zipFile.close()
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt
index cd12a97fe..9311bb253 100644
--- 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 }
 
@@ -36,4 +39,4 @@ class CompositeResult {
 		result.errors.addAll(other.errors)
 		return result
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
index 42aa846b1..3a0789048 100644
--- 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,6 +1,7 @@
 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.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
@@ -34,14 +35,14 @@ class JsonDeserializer(private val json: JSONObject) {
 		largeCoverUrl = json.getStringOrNull("large_cover_url"),
 		state = json.getStringOrNull("state"),
 		author = json.getStringOrNull("author"),
-		source = json.getString("source")
+		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(
@@ -65,4 +66,28 @@ 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 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
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializer.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
index 3d4d2f068..34a406a3b 100644
--- 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,6 +1,7 @@
 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.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
@@ -15,7 +16,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 +28,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 +40,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("page", e.page)
 			put("scroll", e.scroll)
 			put("percent", e.percent)
-		}
+		},
 	)
 
 	constructor(e: TagEntity) : this(
@@ -48,7 +49,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("title", e.title)
 			put("key", e.key)
 			put("source", e.source)
-		}
+		},
 	)
 
 	constructor(e: MangaEntity) : this(
@@ -65,8 +66,25 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("state", e.state)
 			put("author", e.author)
 			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(m: Map<String, *>) : this(
+		JSONObject(m),
 	)
 
 	fun toJson(): JSONObject = json
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt
index 791ce9358..0992360a8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt
@@ -16,8 +16,29 @@ interface ContentCache {
 
 	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>)
 
-	data class Key(
+	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>?
+
+	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
+
+	class Key(
 		val source: MangaSource,
 		val url: String,
-	)
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Key
+
+			if (source != other.source) return false
+			return url == other.url
+		}
+
+		override fun hashCode(): Int {
+			var result = source.hashCode()
+			result = 31 * result + url.hashCode()
+			return result
+		}
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
index 722b06d41..986b61947 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
@@ -16,6 +16,7 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 
 	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(4, 5, TimeUnit.MINUTES)
 	private val pagesCache = ExpiringLruCache<SafeDeferred<List<MangaPage>>>(4, 10, TimeUnit.MINUTES)
+	private val relatedMangaCache = ExpiringLruCache<SafeDeferred<List<Manga>>>(4, 10, TimeUnit.MINUTES)
 
 	override val isCachingEnabled: Boolean = true
 
@@ -35,6 +36,14 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 		pagesCache[ContentCache.Key(source, url)] = pages
 	}
 
+	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
+		return relatedMangaCache[ContentCache.Key(source, url)]?.awaitOrNull()
+	}
+
+	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
+		relatedMangaCache[ContentCache.Key(source, url)] = related
+	}
+
 	override fun onConfigurationChanged(newConfig: Configuration) = Unit
 
 	override fun onLowMemory() = Unit
@@ -42,6 +51,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) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt
index 4750deb98..ade77ea97 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt
@@ -15,4 +15,8 @@ class StubContentCache : ContentCache {
 	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? = null
 
 	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) = Unit
+
+	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? = null
+
+	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) = Unit
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
index d70dcb983..226879511 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -12,11 +12,13 @@ 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.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.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,6 +27,7 @@ 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.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
@@ -49,14 +52,14 @@ 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 = 17
 
 @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,
+		ScrobblingEntity::class, MangaSourceEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -83,30 +86,32 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val bookmarksDao: BookmarksDao
 
 	abstract val scrobblingDao: ScrobblingDao
+
+	abstract val sourcesDao: MangaSourcesDao
 }
 
-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),
+)
 
 fun MangaDatabase(context: Context): MangaDatabase = Room
 	.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
-	.addMigrations(*databaseMigrations)
+	.addMigrations(*getDatabaseMigrations(context))
 	.addCallback(DatabasePrePopulateCallback(context.resources))
 	.build()
 
diff --git 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
index efca0e36b..7f078bb7f 100644
--- 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,12 @@
 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.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
@@ -21,8 +27,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
+	abstract suspend fun upsert(manga: MangaEntity)
 
 	@Update(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun update(manga: MangaEntity): Int
@@ -35,15 +41,13 @@ abstract class MangaDao {
 
 	@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)
 			}
 		}
 	}
diff --git 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
new file mode 100644
index 000000000..5d91447eb
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt
@@ -0,0 +1,57 @@
+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 androidx.room.Upsert
+import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
+
+@Dao
+abstract class MangaSourcesDao {
+
+	@Query("SELECT * FROM sources ORDER BY sort_key")
+	abstract suspend fun findAll(): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
+	abstract suspend fun findAllEnabled(): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
+	abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
+
+	@Query("SELECT * FROM sources ORDER BY sort_key")
+	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
+
+	@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)
+
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	@Transaction
+	abstract suspend fun insertIfAbsent(entries: Collection<MangaSourceEntity>)
+
+	@Upsert
+	abstract suspend fun upsert(entry: MangaSourceEntity)
+
+	@Transaction
+	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
+		if (updateIsEnabled(source, isEnabled) == 0) {
+			val entity = MangaSourceEntity(
+				source = source,
+				isEnabled = isEnabled,
+				sortKey = getMaxSortKey() + 1,
+			)
+			upsert(entity)
+		}
+	}
+
+	@Query("UPDATE sources SET enabled = :isEnabled WHERE source = :source")
+	protected abstract suspend fun updateIsEnabled(source: String, isEnabled: Boolean): Int
+}
diff --git 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
index e84ffa352..bde4641d6 100644
--- 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,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 AND title LIKE :query
+		WHERE tags.source = :source AND title LIKE :query 
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -41,7 +44,7 @@ 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""",
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaSourceEntity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaSourceEntity.kt
new file mode 100644
index 000000000..bd570c0c6
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaSourceEntity.kt
@@ -0,0 +1,16 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(
+	tableName = "sources",
+)
+data class MangaSourceEntity(
+	@PrimaryKey(autoGenerate = false)
+	@ColumnInfo(name = "source")
+	val source: String,
+	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
+	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
+)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
index dd814dace..61c5e34ca 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
@@ -21,9 +21,7 @@ class MangaWithTags(
 		other as MangaWithTags
 
 		if (manga != other.manga) return false
-		if (tags != other.tags) return false
-
-		return true
+		return tags == other.tags
 	}
 
 	override fun hashCode(): Int {
@@ -31,4 +29,4 @@ class MangaWithTags(
 		result = 31 * result + tags.hashCode()
 		return result
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt
index 204e20843..9bd66a08e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt
@@ -9,5 +9,7 @@ class Migration13To14 : Migration(13, 14) {
 		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
 		database.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
 		database.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
+		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration14To15.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration14To15.kt
index 3dda50a12..7007851d0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration14To15.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration14To15.kt
@@ -5,8 +5,5 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration14To15 : Migration(14, 15) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
-	}
+	override fun migrate(database: SupportSQLiteDatabase) = Unit
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration16To17.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration16To17.kt
new file mode 100644
index 000000000..cc86586f8
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration16To17.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+class Migration16To17(context: Context) : Migration(16, 17) {
+
+	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
+		database.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
+		val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
+		val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
+		val sources = MangaSource.entries
+		for (source in sources) {
+			if (source == MangaSource.LOCAL) {
+				continue
+			}
+			val name = source.name
+			var sortKey = order.indexOf(name)
+			if (sortKey == -1) {
+				sortKey = order.size + source.ordinal
+			}
+			database.execSQL(
+				"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
+				arrayOf(name, (name !in hiddenSources).toInt(), sortKey),
+			)
+		}
+	}
+
+	private fun Boolean.toInt() = if (this) 1 else 0
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
index 100c0d0f5..23b2523a0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
@@ -2,8 +2,10 @@ package org.koitharu.kotatsu.core.exceptions
 
 import okhttp3.Headers
 import okio.IOException
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class CloudFlareProtectedException(
 	val url: String,
+	val source: MangaSource?,
 	@Transient val headers: Headers,
 ) : IOException("Protected by CloudFlare")
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/TooManyRequestExceptions.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/TooManyRequestExceptions.kt
new file mode 100644
index 000000000..a2908547d
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/TooManyRequestExceptions.kt
@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import okio.IOException
+import java.util.Date
+
+class TooManyRequestExceptions(
+	val url: String,
+	val retryAt: Date?,
+) : IOException()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/fs/FileSequence.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/fs/FileSequence.kt
new file mode 100644
index 000000000..ab8713642
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/fs/FileSequence.kt
@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.core.fs
+
+import android.os.Build
+import org.koitharu.kotatsu.core.util.iterator.CloseableIterator
+import org.koitharu.kotatsu.core.util.iterator.MappingIterator
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.Path
+
+class FileSequence(private val dir: File) : Sequence<File> {
+
+	override fun iterator(): Iterator<File> {
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val stream = Files.newDirectoryStream(dir.toPath())
+			CloseableIterator(MappingIterator(stream.iterator(), Path::toFile), stream)
+		} else {
+			dir.listFiles().orEmpty().iterator()
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/github/VersionId.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/github/VersionId.kt
index 4080b8c76..ec3a0eb71 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/github/VersionId.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/github/VersionId.kt
@@ -40,9 +40,7 @@ class VersionId(
 		if (minor != other.minor) return false
 		if (build != other.build) return false
 		if (variantType != other.variantType) return false
-		if (variantNumber != other.variantNumber) return false
-
-		return true
+		return variantNumber == other.variantNumber
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/FavouriteCategory.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
index 307cb50cd..19dbeb9b0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
@@ -2,8 +2,10 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.*
+import java.util.Date
 
 @Parcelize
 data class FavouriteCategory(
@@ -14,4 +16,20 @@ data class FavouriteCategory(
 	val createdAt: Date,
 	val isTrackingEnabled: Boolean,
 	val isVisibleInLibrary: Boolean,
-) : Parcelable
\ No newline at end of file
+) : Parcelable, ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is FavouriteCategory && id == other.id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		if (previousState !is FavouriteCategory) {
+			return null
+		}
+		return if (isTrackingEnabled != previousState.isTrackingEnabled || isVisibleInLibrary != previousState.isVisibleInLibrary) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			null
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
index 341796c1e..ac21c279a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
@@ -10,7 +10,7 @@ fun MangaSource.getLocaleTitle(): String? {
 }
 
 fun MangaSource(name: String): MangaSource {
-	MangaSource.values().forEach {
+	MangaSource.entries.forEach {
 		if (it.name == name) return it
 	}
 	return MangaSource.DUMMY
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
deleted file mode 100644
index e774ce82e..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import androidx.core.os.ParcelCompat
-import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
-import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
-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.MangaTag
-
-fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
-	out.writeLong(id)
-	out.writeString(title)
-	out.writeString(altTitle)
-	out.writeString(url)
-	out.writeString(publicUrl)
-	out.writeFloat(rating)
-	ParcelCompat.writeBoolean(out, isNsfw)
-	out.writeString(coverUrl)
-	out.writeString(largeCoverUrl)
-	out.writeString(description)
-	out.writeParcelable(ParcelableMangaTags(tags), flags)
-	out.writeSerializable(state)
-	out.writeString(author)
-	if (withChapters) {
-		out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
-	} else {
-		out.writeString(null)
-	}
-	out.writeSerializable(source)
-}
-
-fun Parcel.readManga() = Manga(
-	id = readLong(),
-	title = requireNotNull(readString()),
-	altTitle = readString(),
-	url = requireNotNull(readString()),
-	publicUrl = requireNotNull(readString()),
-	rating = readFloat(),
-	isNsfw = ParcelCompat.readBoolean(this),
-	coverUrl = requireNotNull(readString()),
-	largeCoverUrl = readString(),
-	description = readString(),
-	tags = requireNotNull(readParcelableCompat<ParcelableMangaTags>()).tags,
-	state = readSerializableCompat(),
-	author = readString(),
-	chapters = readParcelableCompat<ParcelableMangaChapters>()?.chapters,
-	source = checkNotNull(readSerializableCompat()),
-)
-
-fun MangaPage.writeToParcel(out: Parcel) {
-	out.writeLong(id)
-	out.writeString(url)
-	out.writeString(preview)
-	out.writeSerializable(source)
-}
-
-fun Parcel.readMangaPage() = MangaPage(
-	id = readLong(),
-	url = requireNotNull(readString()),
-	preview = readString(),
-	source = checkNotNull(readSerializableCompat()),
-)
-
-fun MangaChapter.writeToParcel(out: Parcel) {
-	out.writeLong(id)
-	out.writeString(name)
-	out.writeInt(number)
-	out.writeString(url)
-	out.writeString(scanlator)
-	out.writeLong(uploadDate)
-	out.writeString(branch)
-	out.writeSerializable(source)
-}
-
-fun Parcel.readMangaChapter() = MangaChapter(
-	id = readLong(),
-	name = requireNotNull(readString()),
-	number = readInt(),
-	url = requireNotNull(readString()),
-	scanlator = readString(),
-	uploadDate = readLong(),
-	branch = readString(),
-	source = checkNotNull(readSerializableCompat()),
-)
-
-fun MangaTag.writeToParcel(out: Parcel) {
-	out.writeString(title)
-	out.writeString(key)
-	out.writeSerializable(source)
-}
-
-fun Parcel.readMangaTag() = MangaTag(
-	title = requireNotNull(readString()),
-	key = requireNotNull(readString()),
-	source = checkNotNull(readSerializableCompat()),
-)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
index f5b578700..81893cd4c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
@@ -2,56 +2,83 @@ package org.koitharu.kotatsu.core.model.parcelable
 
 import android.os.Parcel
 import android.os.Parcelable
+import androidx.core.os.ParcelCompat
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.Manga
 
 // Limits to avoid TransactionTooLargeException
 private const val MAX_SAFE_SIZE = 1024 * 100 // Assume that 100 kb is safe parcel size
 private const val MAX_SAFE_CHAPTERS_COUNT = 24 // this is 100% safe
 
-class ParcelableManga(
+@Parcelize
+data class ParcelableManga(
 	val manga: Manga,
 	private val withChapters: Boolean,
 ) : Parcelable {
-
-	constructor(parcel: Parcel) : this(parcel.readManga(), true)
-
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		val chapters = manga.chapters
-		if (!withChapters || chapters == null) {
-			manga.writeToParcel(parcel, flags, withChapters = false)
-			return
-		}
-		if (chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
-			// fast path
-			manga.writeToParcel(parcel, flags, withChapters = true)
-			return
+	companion object : Parceler<ParcelableManga> {
+		private fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
+			out.writeLong(id)
+			out.writeString(title)
+			out.writeString(altTitle)
+			out.writeString(url)
+			out.writeString(publicUrl)
+			out.writeFloat(rating)
+			ParcelCompat.writeBoolean(out, isNsfw)
+			out.writeString(coverUrl)
+			out.writeString(largeCoverUrl)
+			out.writeString(description)
+			out.writeParcelable(ParcelableMangaTags(tags), flags)
+			out.writeSerializable(state)
+			out.writeString(author)
+			val parcelableChapters = if (withChapters) null else chapters?.let(::ParcelableMangaChapters)
+			out.writeParcelable(parcelableChapters, flags)
+			out.writeSerializable(source)
 		}
-		val tempParcel = Parcel.obtain()
-		manga.writeToParcel(tempParcel, flags, withChapters = true)
-		val size = tempParcel.dataSize()
-		if (size < MAX_SAFE_SIZE) {
-			parcel.appendFrom(tempParcel, 0, size)
-		} else {
-			manga.writeToParcel(parcel, flags, withChapters = false)
-		}
-		tempParcel.recycle()
-	}
 
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	override fun toString(): String {
-		return "ParcelableManga(manga=$manga, withChapters=$withChapters)"
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableManga> {
-		override fun createFromParcel(parcel: Parcel): ParcelableManga {
-			return ParcelableManga(parcel)
+		override fun ParcelableManga.write(parcel: Parcel, flags: Int) {
+			val chapters = manga.chapters
+			if (!withChapters || chapters == null) {
+				manga.writeToParcel(parcel, flags, withChapters = false)
+				return
+			}
+			if (chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
+				// fast path
+				manga.writeToParcel(parcel, flags, withChapters = true)
+				return
+			}
+			val tempParcel = Parcel.obtain()
+			manga.writeToParcel(tempParcel, flags, withChapters = true)
+			val size = tempParcel.dataSize()
+			if (size < MAX_SAFE_SIZE) {
+				parcel.appendFrom(tempParcel, 0, size)
+			} else {
+				manga.writeToParcel(parcel, flags, withChapters = false)
+			}
+			tempParcel.recycle()
 		}
 
-		override fun newArray(size: Int): Array<ParcelableManga?> {
-			return arrayOfNulls(size)
-		}
+		override fun create(parcel: Parcel) = ParcelableManga(
+			Manga(
+				id = parcel.readLong(),
+				title = requireNotNull(parcel.readString()),
+				altTitle = parcel.readString(),
+				url = requireNotNull(parcel.readString()),
+				publicUrl = requireNotNull(parcel.readString()),
+				rating = parcel.readFloat(),
+				isNsfw = ParcelCompat.readBoolean(parcel),
+				coverUrl = requireNotNull(parcel.readString()),
+				largeCoverUrl = parcel.readString(),
+				description = parcel.readString(),
+				tags = requireNotNull(parcel.readParcelableCompat<ParcelableMangaTags>()).tags,
+				state = parcel.readSerializableCompat(),
+				author = parcel.readString(),
+				chapters = parcel.readParcelableCompat<ParcelableMangaChapters>()?.chapters,
+				source = requireNotNull(parcel.readSerializableCompat()),
+			),
+			withChapters = true
+		)
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
index 6196069ba..e080696cf 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
@@ -2,38 +2,36 @@ package org.koitharu.kotatsu.core.model.parcelable
 
 import android.os.Parcel
 import android.os.Parcelable
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
-class ParcelableMangaChapters(
-	val chapters: List<MangaChapter>,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(
-		List(parcel.readInt()) { parcel.readMangaChapter() }
+object MangaChapterParceler : Parceler<MangaChapter> {
+	override fun create(parcel: Parcel) = MangaChapter(
+		id = parcel.readLong(),
+		name = requireNotNull(parcel.readString()),
+		number = parcel.readInt(),
+		url = requireNotNull(parcel.readString()),
+		scanlator = parcel.readString(),
+		uploadDate = parcel.readLong(),
+		branch = parcel.readString(),
+		source = requireNotNull(parcel.readSerializableCompat()),
 	)
 
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeInt(chapters.size)
-		for (chapter in chapters) {
-			chapter.writeToParcel(parcel)
-		}
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	override fun toString(): String {
-		return "ParcelableMangaChapters(chapters=$chapters)"
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableMangaChapters> {
-		override fun createFromParcel(parcel: Parcel): ParcelableMangaChapters {
-			return ParcelableMangaChapters(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableMangaChapters?> {
-			return arrayOfNulls(size)
-		}
+	override fun MangaChapter.write(parcel: Parcel, flags: Int) {
+		parcel.writeLong(id)
+		parcel.writeString(name)
+		parcel.writeInt(number)
+		parcel.writeString(url)
+		parcel.writeString(scanlator)
+		parcel.writeLong(uploadDate)
+		parcel.writeString(branch)
+		parcel.writeSerializable(source)
 	}
 }
+
+@Parcelize
+@TypeParceler<MangaChapter, MangaChapterParceler>
+data class ParcelableMangaChapters(val chapters: List<MangaChapter>) : Parcelable
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt
new file mode 100644
index 000000000..eee936e84
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPage.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.parsers.model.MangaPage
+
+object MangaPageParceler : Parceler<MangaPage> {
+	override fun create(parcel: Parcel) = MangaPage(
+		id = parcel.readLong(),
+		url = requireNotNull(parcel.readString()),
+		preview = parcel.readString(),
+		source = requireNotNull(parcel.readSerializableCompat()),
+	)
+
+	override fun MangaPage.write(parcel: Parcel, flags: Int) {
+		parcel.writeLong(id)
+		parcel.writeString(url)
+		parcel.writeString(preview)
+		parcel.writeSerializable(source)
+	}
+}
+
+@Parcelize
+@TypeParceler<MangaPage, MangaPageParceler>
+class ParcelableMangaPage(val page: MangaPage) : Parcelable
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
deleted file mode 100644
index 593e01600..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.koitharu.kotatsu.core.model.parcelable
-
-import android.os.Parcel
-import android.os.Parcelable
-import org.koitharu.kotatsu.parsers.model.MangaPage
-
-class ParcelableMangaPages(
-	val pages: List<MangaPage>,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(
-		List(parcel.readInt()) { parcel.readMangaPage() }
-	)
-
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeInt(pages.size)
-		for (page in pages) {
-			page.writeToParcel(parcel)
-		}
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	override fun toString(): String {
-		return "ParcelableMangaPages(pages=$pages)"
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableMangaPages> {
-		override fun createFromParcel(parcel: Parcel): ParcelableMangaPages {
-			return ParcelableMangaPages(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableMangaPages?> {
-			return arrayOfNulls(size)
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
index bcfca9864..75640156a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
@@ -2,39 +2,26 @@ package org.koitharu.kotatsu.core.model.parcelable
 
 import android.os.Parcel
 import android.os.Parcelable
-import org.koitharu.kotatsu.core.util.ext.Set
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.MangaTag
 
-class ParcelableMangaTags(
-	val tags: Set<MangaTag>,
-) : Parcelable {
-
-	constructor(parcel: Parcel) : this(
-		Set(parcel.readInt()) { parcel.readMangaTag() },
+object MangaTagParceler : Parceler<MangaTag> {
+	override fun create(parcel: Parcel) = MangaTag(
+		title = requireNotNull(parcel.readString()),
+		key = requireNotNull(parcel.readString()),
+		source = requireNotNull(parcel.readSerializableCompat()),
 	)
 
-	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeInt(tags.size)
-		for (tag in tags) {
-			tag.writeToParcel(parcel)
-		}
-	}
-
-	override fun describeContents(): Int {
-		return 0
-	}
-
-	override fun toString(): String {
-		return "ParcelableMangaTags(tags=$tags)"
-	}
-
-	companion object CREATOR : Parcelable.Creator<ParcelableMangaTags> {
-		override fun createFromParcel(parcel: Parcel): ParcelableMangaTags {
-			return ParcelableMangaTags(parcel)
-		}
-
-		override fun newArray(size: Int): Array<ParcelableMangaTags?> {
-			return arrayOfNulls(size)
-		}
+	override fun MangaTag.write(parcel: Parcel, flags: Int) {
+		parcel.writeString(title)
+		parcel.writeString(key)
+		parcel.writeSerializable(source)
 	}
 }
+
+@Parcelize
+@TypeParceler<MangaTag, MangaTagParceler>
+data class ParcelableMangaTags(val tags: Set<MangaTag>) : Parcelable
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt
index 44eda7c96..fcf9e51e3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt
@@ -3,23 +3,26 @@ package org.koitharu.kotatsu.core.network
 import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
+import org.jsoup.Jsoup
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.net.HttpURLConnection.HTTP_FORBIDDEN
 import java.net.HttpURLConnection.HTTP_UNAVAILABLE
 
-private const val HEADER_SERVER = "Server"
-private const val SERVER_CLOUDFLARE = "cloudflare"
-
 class CloudFlareInterceptor : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val response = chain.proceed(chain.request())
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
-			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
+			val content = response.body?.source()?.peek()?.use {
+				Jsoup.parse(it.inputStream(), Charsets.UTF_8.name(), response.request.url.toString())
+			} ?: return response
+			if (content.getElementById("challenge-error-title") != null) {
 				val request = response.request
 				response.closeQuietly()
 				throw CloudFlareProtectedException(
 					url = request.url.toString(),
+					source = request.tag(MangaSource::class.java),
 					headers = request.headers,
 				)
 			}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeaders.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeaders.kt
index 1454542ea..9a31233a0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeaders.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeaders.kt
@@ -15,6 +15,7 @@ object CommonHeaders {
 	const val AUTHORIZATION = "Authorization"
 	const val CACHE_CONTROL = "Cache-Control"
 	const val PROXY_AUTHORIZATION = "Proxy-Authorization"
+	const val RETRY_AFTER = "Retry-After"
 
 	val CACHE_CONTROL_NO_STORE: CacheControl
 		get() = CacheControl.Builder().noStore().build()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt
index 1c91966a0..e9e6a6dc6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt
@@ -67,6 +67,7 @@ interface NetworkModule {
 			cache(cache)
 			addInterceptor(GZipInterceptor())
 			addInterceptor(CloudFlareInterceptor())
+			addInterceptor(RateLimitInterceptor())
 			if (BuildConfig.DEBUG) {
 				addInterceptor(CurlLoggingInterceptor())
 			}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/RateLimitInterceptor.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/RateLimitInterceptor.kt
new file mode 100644
index 000000000..83e3dbb6e
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/RateLimitInterceptor.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.network
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import okhttp3.internal.closeQuietly
+import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class RateLimitInterceptor : Interceptor {
+
+	private val dateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ZZZ", Locale.ENGLISH)
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val response = chain.proceed(chain.request())
+		if (response.code == 429) {
+			val retryDate = response.header(CommonHeaders.RETRY_AFTER)?.parseRetryDate()
+			val request = response.request
+			response.closeQuietly()
+			throw TooManyRequestExceptions(
+				url = request.url.toString(),
+				retryAt = retryDate,
+			)
+		}
+		return response
+	}
+
+	private fun String.parseRetryDate(): Date? {
+		toIntOrNull()?.let {
+			return Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(it.toLong()))
+		}
+		return dateFormat.parse(this)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/CookieWrapper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/CookieWrapper.kt
index 6254d720b..320e8ef91 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/CookieWrapper.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/CookieWrapper.kt
@@ -73,9 +73,7 @@ class CookieWrapper(
 
 		other as CookieWrapper
 
-		if (cookie != other.cookie) return false
-
-		return true
+		return cookie == other.cookie
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt
index c1db43782..bdbff7938 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt
@@ -1,12 +1,9 @@
 package org.koitharu.kotatsu.core.os
 
-import android.app.ActivityManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.ShortcutManager
 import android.os.Build
-import android.util.Size
-import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -16,6 +13,7 @@ import androidx.room.InvalidationTracker
 import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.size.Scale
+import coil.size.Size
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -28,6 +26,7 @@ import org.koitharu.kotatsu.core.ui.image.ThumbnailTransformation
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
+import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -44,7 +43,9 @@ class AppShortcutManager @Inject constructor(
 	private val settings: AppSettings,
 ) : InvalidationTracker.Observer(TABLE_HISTORY), SharedPreferences.OnSharedPreferenceChangeListener {
 
-	private val iconSize by lazy { getIconSize(context) }
+	private val iconSize by lazy {
+		Size(ShortcutManagerCompat.getIconMaxWidth(context), ShortcutManagerCompat.getIconMaxHeight(context))
+	}
 	private var shortcutsUpdateJob: Job? = null
 
 	init {
@@ -52,7 +53,7 @@ class AppShortcutManager @Inject constructor(
 	}
 
 	override fun onInvalidated(tables: Set<String>) {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1 || !settings.isDynamicShortcutsEnabled) {
+		if (!settings.isDynamicShortcutsEnabled) {
 			return
 		}
 		val prevJob = shortcutsUpdateJob
@@ -63,7 +64,7 @@ class AppShortcutManager @Inject constructor(
 	}
 
 	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && key == AppSettings.KEY_SHORTCUTS) {
+		if (key == AppSettings.KEY_SHORTCUTS) {
 			if (settings.isDynamicShortcutsEnabled) {
 				onInvalidated(emptySet())
 			} else {
@@ -73,11 +74,7 @@ class AppShortcutManager @Inject constructor(
 	}
 
 	suspend fun requestPinShortcut(manga: Manga): Boolean {
-		return ShortcutManagerCompat.requestPinShortcut(
-			context,
-			buildShortcutInfo(manga).build(),
-			null,
-		)
+		return ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(manga), null)
 	}
 
 	@VisibleForTesting
@@ -85,49 +82,34 @@ class AppShortcutManager @Inject constructor(
 		return shortcutsUpdateJob?.join() != null
 	}
 
-	fun isDynamicShortcutsAvailable(): Boolean {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-			return false
-		}
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-		return manager.maxShortcutCountPerActivity > 0
-	}
-
 	fun notifyMangaOpened(mangaId: Long) {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-			return
-		}
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-		manager.reportShortcutUsed(mangaId.toString())
+		ShortcutManagerCompat.reportShortcutUsed(context, mangaId.toString())
 	}
 
-	@RequiresApi(Build.VERSION_CODES.N_MR1)
 	private suspend fun updateShortcutsImpl() = runCatchingCancellable {
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
+		val maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context).coerceAtLeast(5)
+		val shortcuts = historyRepository.getList(0, maxShortcuts)
 			.filter { x -> x.title.isNotEmpty() }
-			.map { buildShortcutInfo(it).build().toShortcutInfo() }
-		manager.dynamicShortcuts = shortcuts
+			.map { buildShortcutInfo(it) }
+		ShortcutManagerCompat.setDynamicShortcuts(context, shortcuts)
 	}.onFailure {
 		it.printStackTraceDebug()
 	}
 
-	@RequiresApi(Build.VERSION_CODES.N_MR1)
 	private fun clearShortcuts() {
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		try {
-			manager.removeAllDynamicShortcuts()
+			ShortcutManagerCompat.removeAllDynamicShortcuts(context)
 		} catch (_: IllegalStateException) {
 		}
 	}
 
-	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
+	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat {
 		val icon = runCatchingCancellable {
 			coil.execute(
 				ImageRequest.Builder(context)
 					.data(manga.coverUrl)
-					.size(iconSize.width, iconSize.height)
-					.tag(manga.source)
+					.size(iconSize)
+					.source(manga.source)
 					.scale(Scale.FILL)
 					.transformations(ThumbnailTransformation())
 					.build(),
@@ -141,22 +123,17 @@ class AppShortcutManager @Inject constructor(
 			.setShortLabel(manga.title)
 			.setLongLabel(manga.title)
 			.setIcon(icon)
+			.setLongLived(true)
 			.setIntent(
 				ReaderActivity.IntentBuilder(context)
 					.mangaId(manga.id)
 					.build(),
 			)
+			.build()
 	}
 
-	private fun getIconSize(context: Context): Size {
-		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-			(context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager).let {
-				Size(it.iconMaxWidth, it.iconMaxHeight)
-			}
-		} else {
-			(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).launcherLargeIconSize.let {
-				Size(it, it)
-			}
-		}
+	fun isDynamicShortcutsAvailable(): Boolean {
+		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 &&
+			context.getSystemService(ShortcutManager::class.java).maxShortcutCountPerActivity > 0
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaParser.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaParser.kt
index ce28cfab3..769ca8e52 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaParser.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaParser.kt
@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.parser
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.newParser
 
 fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
 	return if (source == MangaSource.DUMMY) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index 8fab1b77c..d3df9f404 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -36,6 +36,8 @@ interface MangaRepository {
 
 	suspend fun getTags(): Set<MangaTag>
 
+	suspend fun getRelated(seed: Manga): List<Manga>
+
 	@Singleton
 	class Factory @Inject constructor(
 		private val localMangaRepository: LocalMangaRepository,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
index 3df9988bd..84ad71d5f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -51,7 +51,7 @@ class RemoteMangaRepository(
 			getConfig()[parser.configKeyDomain] = value
 		}
 
-	val headers: Headers?
+	val headers: Headers
 		get() = parser.headers
 
 	override fun intercept(chain: Interceptor.Chain): Response {
@@ -94,6 +94,15 @@ class RemoteMangaRepository(
 
 	suspend fun getFavicons(): Favicons = parser.getFavicons()
 
+	override suspend fun getRelated(seed: Manga): List<Manga> {
+		cache.getRelatedManga(source, seed.url)?.let { return it }
+		val related = asyncSafe {
+			parser.getRelatedManga(seed).filterNot { it.id == seed.id }
+		}
+		cache.putRelatedManga(source, seed.url, related)
+		return related.await()
+	}
+
 	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
 
 	fun getConfigKeys(): List<ConfigKey<*>> = ArrayList<ConfigKey<*>>().also {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt
index 6af4218ae..911c2703f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt
@@ -20,7 +20,9 @@ import okhttp3.Response
 import okhttp3.ResponseBody
 import okhttp3.internal.closeQuietly
 import okio.Closeable
+import okio.IOException
 import okio.buffer
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
@@ -49,22 +51,32 @@ class FaviconFetcher(
 	override suspend fun fetch(): FetchResult {
 		getCached(options)?.let { return it }
 		val repo = mangaRepositoryFactory.create(mangaSource) as RemoteMangaRepository
-		val favicons = repo.getFavicons()
 		val sizePx = maxOf(
 			options.size.width.pxOrElse { FALLBACK_SIZE },
 			options.size.height.pxOrElse { FALLBACK_SIZE },
 		)
-		val icon = checkNotNull(favicons.find(sizePx)) { "No favicons found" }
-		val response = loadIcon(icon.url, mangaSource)
-		val responseBody = response.requireBody()
-		val source = writeToDiskCache(responseBody)?.toImageSource()?.also {
-			response.closeQuietly()
-		} ?: responseBody.toImageSource(response)
-		return SourceResult(
-			source = source,
-			mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(icon.type),
-			dataSource = response.toDataSource(),
-		)
+		var favicons = repo.getFavicons()
+		while (favicons.isNotEmpty()) {
+			val icon = favicons.find(sizePx) ?: throwNSEE()
+			val response = try {
+				loadIcon(icon.url, mangaSource)
+			} catch (e: CloudFlareProtectedException) {
+				throw e
+			} catch (e: IOException) {
+				favicons -= icon
+				continue
+			}
+			val responseBody = response.requireBody()
+			val source = writeToDiskCache(responseBody)?.toImageSource()?.also {
+				response.closeQuietly()
+			} ?: responseBody.toImageSource(response)
+			return SourceResult(
+				source = source,
+				mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(icon.type),
+				dataSource = response.toDataSource(),
+			)
+		}
+		throwNSEE()
 	}
 
 	private suspend fun loadIcon(url: String, source: MangaSource): Response {
@@ -143,6 +155,8 @@ class FaviconFetcher(
 		append(height.toString())
 	}
 
+	private fun throwNSEE(): Nothing = throw NoSuchElementException("No favicons found")
+
 	class Factory(
 		context: Context,
 		private val okHttpClient: OkHttpClient,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index ff07b0b5d..615c7d482 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -8,30 +8,26 @@ import android.os.Build
 import android.provider.Settings
 import androidx.annotation.FloatRange
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.collection.arraySetOf
+import androidx.collection.ArraySet
 import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
-import org.koitharu.kotatsu.BuildConfig
+import org.json.JSONArray
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
-import org.koitharu.kotatsu.core.util.ext.filterToSet
 import org.koitharu.kotatsu.core.util.ext.getEnumValue
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.shelf.domain.model.ShelfSection
 import java.io.File
 import java.net.Proxy
-import java.util.Collections
-import java.util.EnumSet
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -42,32 +38,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 	private val connectivityManager = context.connectivityManager
 
-	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
-		remove(MangaSource.LOCAL)
-		if (!BuildConfig.DEBUG) {
-			remove(MangaSource.DUMMY)
-		}
-	}
-
-	val remoteMangaSources: Set<MangaSource>
-		get() = Collections.unmodifiableSet(remoteSources)
-
-	var shelfSections: List<ShelfSection>
-		get() {
-			val raw = prefs.getString(KEY_SHELF_SECTIONS, null)
-			val values = enumValues<ShelfSection>()
-			if (raw.isNullOrEmpty()) {
-				return values.toList()
-			}
-			return raw.split('|')
-				.mapNotNull { values.getOrNull(it.toIntOrNull() ?: -1) }
-				.distinct()
-		}
-		set(value) {
-			val raw = value.joinToString("|") { it.ordinal.toString() }
-			prefs.edit { putString(KEY_SHELF_SECTIONS, raw) }
-		}
-
 	var listMode: ListMode
 		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.GRID)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }
@@ -85,6 +55,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
 
+	var isNsfwContentDisabled: Boolean
+		get() = prefs.getBoolean(KEY_DISABLE_NSFW, false)
+		set(value) = prefs.edit { putBoolean(KEY_DISABLE_NSFW, value) }
+
 	var appLocales: LocaleListCompat
 		get() {
 			val raw = prefs.getString(KEY_APP_LOCALE, null)
@@ -113,6 +87,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isTrackerEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRACKER_ENABLED, true)
 
+	val isTrackerWifiOnly: Boolean
+		get() = prefs.getBoolean(KEY_TRACKER_WIFI_ONLY, false)
+
 	val isTrackerNotificationsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRACKER_NOTIFICATIONS, true)
 
@@ -127,8 +104,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val notificationLight: Boolean
 		get() = prefs.getBoolean(KEY_NOTIFICATIONS_LIGHT, true)
 
-	val readerAnimation: Boolean
-		get() = prefs.getBoolean(KEY_READER_ANIMATION, false)
+	val readerAnimation: ReaderAnimation
+		get() = prefs.getEnumValue(KEY_READER_ANIMATION, ReaderAnimation.DEFAULT)
+
+	val readerBackground: ReaderBackground
+		get() = prefs.getEnumValue(KEY_READER_BACKGROUND, ReaderBackground.DEFAULT)
 
 	val defaultReaderMode: ReaderMode
 		get() = prefs.getEnumValue(KEY_READER_MODE, ReaderMode.STANDARD)
@@ -158,7 +138,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_ZOOM_MODE, ZoomMode.FIT_CENTER)
 
 	val trackSources: Set<String>
-		get() = prefs.getStringSet(KEY_TRACK_SOURCES, null) ?: arraySetOf(TRACK_FAVOURITES, TRACK_HISTORY)
+		get() = prefs.getStringSet(KEY_TRACK_SOURCES, null) ?: setOf(TRACK_FAVOURITES)
 
 	var appPassword: String?
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
@@ -192,37 +172,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
-	var sourcesOrder: List<String>
-		get() = prefs.getString(KEY_SOURCES_ORDER, null)
-			?.split('|')
-			.orEmpty()
-		set(value) = prefs.edit {
-			putString(KEY_SOURCES_ORDER, value.joinToString("|"))
-		}
-
-	var hiddenSources: Set<String>
-		get() = prefs.getStringSet(KEY_SOURCES_HIDDEN, null)?.filterToSet { name ->
-			remoteSources.any { it.name == name }
-		}.orEmpty()
-		set(value) = prefs.edit { putStringSet(KEY_SOURCES_HIDDEN, value) }
-
-	val isSourcesSelected: Boolean
-		get() = KEY_SOURCES_HIDDEN in prefs
-
-	val newSources: Set<MangaSource>
-		get() {
-			val known = sourcesOrder.toSet()
-			val hidden = hiddenSources
-			return remoteMangaSources
-				.filterNotTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
-					x.name in known || x.name in hidden
-				}
-		}
-
-	fun markKnownSources(sources: Collection<MangaSource>) {
-		sourcesOrder = (sourcesOrder + sources.map { it.name }).distinct()
-	}
-
 	var isSourcesGridMode: Boolean
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, false)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
@@ -272,11 +221,14 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_SUGGESTIONS, false)
 		set(value) = prefs.edit { putBoolean(KEY_SUGGESTIONS, value) }
 
+	val isSuggestionsWiFiOnly: Boolean
+		get() = prefs.getBoolean(KEY_SUGGESTIONS_WIFI_ONLY, false)
+
 	val isSuggestionsExcludeNsfw: Boolean
 		get() = prefs.getBoolean(KEY_SUGGESTIONS_EXCLUDE_NSFW, false)
 
 	val isSuggestionsNotificationAvailable: Boolean
-		get() = prefs.getBoolean(KEY_SUGGESTIONS_NOTIFICATIONS, true)
+		get() = prefs.getBoolean(KEY_SUGGESTIONS_NOTIFICATIONS, false)
 
 	val suggestionsTagsBlacklist: Set<String>
 		get() {
@@ -324,6 +276,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_LOCAL_LIST_ORDER, SortOrder.NEWEST)
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
+	var historySortOrder: HistoryOrder
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, HistoryOrder.UPDATED)
+		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
+
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
@@ -341,20 +297,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
-	fun getMangaSources(includeHidden: Boolean): List<MangaSource> {
-		val list = remoteSources.toMutableList()
-		val order = sourcesOrder
-		list.sortBy { x ->
-			val e = order.indexOf(x.name)
-			if (e == -1) order.size + x.ordinal else e
-		}
-		if (!includeHidden) {
-			val hidden = hiddenSources
-			list.removeAll { x -> x.name in hidden }
-		}
-		return list
-	}
-
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -377,6 +319,23 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 	fun observe() = prefs.observe()
 
+	fun getAllValues(): Map<String, *> = prefs.all
+
+	fun upsertAll(m: Map<String, *>) {
+		prefs.edit {
+			m.forEach { e ->
+				when (val v = e.value) {
+					is Boolean -> putBoolean(e.key, v)
+					is Int -> putInt(e.key, v)
+					is Long -> putLong(e.key, v)
+					is Float -> putFloat(e.key, v)
+					is String -> putString(e.key, v)
+					is JSONArray -> putStringSet(e.key, v.toStringSet())
+				}
+			}
+		}
+	}
+
 	private fun isBackgroundNetworkRestricted(): Boolean {
 		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 			connectivityManager.restrictBackgroundStatus == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED
@@ -385,6 +344,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		}
 	}
 
+	private fun JSONArray.toStringSet(): Set<String> {
+		val len = length()
+		val result = ArraySet<String>(len)
+		for (i in 0 until len) {
+			result.add(getString(i))
+		}
+		return result
+	}
+
 	companion object {
 
 		const val PAGE_SWITCH_TAPS = "taps"
@@ -397,8 +365,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_THEME = "theme"
 		const val KEY_COLOR_THEME = "color_theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
-		const val KEY_SOURCES_ORDER = "sources_order_2"
-		const val KEY_SOURCES_HIDDEN = "sources_hidden"
 		const val KEY_TRAFFIC_WARNING = "traffic_warning"
 		const val KEY_PAGES_CACHE_CLEAR = "pages_cache_clear"
 		const val KEY_HTTP_CACHE_CLEAR = "http_cache_clear"
@@ -411,6 +377,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_LOCAL_STORAGE = "local_storage"
 		const val KEY_READER_SWITCHERS = "reader_switchers"
 		const val KEY_TRACKER_ENABLED = "tracker_enabled"
+		const val KEY_TRACKER_WIFI_ONLY = "tracker_wifi"
 		const val KEY_TRACK_SOURCES = "track_sources"
 		const val KEY_TRACK_CATEGORIES = "track_categories"
 		const val KEY_TRACK_WARNING = "track_warning"
@@ -420,7 +387,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
 		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
 		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
-		const val KEY_READER_ANIMATION = "reader_animation"
+		const val KEY_READER_ANIMATION = "reader_animation2"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
@@ -438,6 +405,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SCREENSHOTS_POLICY = "screenshots_policy"
 		const val KEY_PAGES_PRELOAD = "pages_preload"
 		const val KEY_SUGGESTIONS = "suggestions"
+		const val KEY_SUGGESTIONS_WIFI_ONLY = "suggestions_wifi"
 		const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
 		const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
 		const val KEY_SUGGESTIONS_NOTIFICATIONS = "suggestions_notifications"
@@ -454,11 +422,12 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SYNC_SETTINGS = "sync_settings"
 		const val KEY_READER_BAR = "reader_bar"
 		const val KEY_READER_SLIDER = "reader_slider"
+		const val KEY_READER_BACKGROUND = "reader_background"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
 		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
 		const val KEY_LOCAL_LIST_ORDER = "local_order"
+		const val KEY_HISTORY_ORDER = "history_order"
 		const val KEY_WEBTOON_ZOOM = "webtoon_zoom"
-		const val KEY_SHELF_SECTIONS = "shelf_sections_2"
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
@@ -478,6 +447,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PROXY_PASSWORD = "proxy_password"
 		const val KEY_IMAGES_PROXY = "images_proxy"
 		const val KEY_LOCAL_MANGA_DIRS = "local_manga_dirs"
+		const val KEY_DISABLE_NSFW = "no_nsfw"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
index cd8c97b22..c2ffee581 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
@@ -4,6 +4,7 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import com.google.android.material.color.DynamicColors
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.util.find
 
 enum class ColorScheme(
 	@StyleRes val styleResId: Int,
@@ -31,7 +32,7 @@ enum class ColorScheme(
 			}
 
 		fun getAvailableList(): List<ColorScheme> {
-			val list = enumValues<ColorScheme>().toMutableList()
+			val list = ColorScheme.entries.toMutableList()
 			if (!DynamicColors.isDynamicColorAvailable()) {
 				list.remove(MONET)
 			}
@@ -39,7 +40,7 @@ enum class ColorScheme(
 		}
 
 		fun safeValueOf(name: String): ColorScheme? {
-			return enumValues<ColorScheme>().find { it.name == name }
+			return ColorScheme.entries.find(name)
 		}
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/NetworkPolicy.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/NetworkPolicy.kt
index 8be2cf0c7..fc5556801 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/NetworkPolicy.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/NetworkPolicy.kt
@@ -20,7 +20,7 @@ enum class NetworkPolicy(
 
 		fun from(key: String?, default: NetworkPolicy): NetworkPolicy {
 			val intKey = key?.toIntOrNull() ?: return default
-			return enumValues<NetworkPolicy>().find { it.key == intKey } ?: default
+			return NetworkPolicy.entries.find { it.key == intKey } ?: default
 		}
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt
new file mode 100644
index 000000000..e95559322
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt
@@ -0,0 +1,7 @@
+package org.koitharu.kotatsu.core.prefs
+
+enum class ReaderAnimation {
+
+	// Do not rename this
+	NONE, DEFAULT, ADVANCED;
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt
new file mode 100644
index 000000000..5422b0322
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt
@@ -0,0 +1,25 @@
+package org.koitharu.kotatsu.core.prefs
+
+import android.content.Context
+import android.view.ContextThemeWrapper
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toDrawable
+import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
+import com.google.android.material.R as materialR
+
+enum class ReaderBackground {
+
+	DEFAULT, LIGHT, DARK, WHITE, BLACK;
+
+	fun resolve(context: Context) = when (this) {
+		DEFAULT -> context.getThemeDrawable(android.R.attr.windowBackground)
+		LIGHT -> ContextThemeWrapper(context, materialR.style.ThemeOverlay_Material3_Light)
+			.getThemeDrawable(android.R.attr.windowBackground)
+
+		DARK -> ContextThemeWrapper(context, materialR.style.ThemeOverlay_Material3_Dark)
+			.getThemeDrawable(android.R.attr.windowBackground)
+
+		WHITE -> ContextCompat.getColor(context, android.R.color.white).toDrawable()
+		BLACK -> ContextCompat.getColor(context, android.R.color.black).toDrawable()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt
index 9ec51d479..9d7907c14 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt
@@ -8,6 +8,6 @@ enum class ReaderMode(val id: Int) {
 
 	companion object {
 
-		fun valueOf(id: Int) = values().firstOrNull { it.id == id }
+		fun valueOf(id: Int) = entries.firstOrNull { it.id == id }
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
index be9a10694..91968b0ad 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
@@ -97,7 +97,6 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-		@Suppress("DEPRECATION")
 		onBackPressed()
 		true
 	} else super.onOptionsItemSelected(item)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseBottomSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseBottomSheet.kt
deleted file mode 100644
index 0cf8dfc1e..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseBottomSheet.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams
-import androidx.activity.OnBackPressedDispatcher
-import androidx.core.view.updateLayoutParams
-import androidx.viewbinding.ViewBinding
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.dialog.AppBottomSheetDialog
-import org.koitharu.kotatsu.core.util.ext.findActivity
-import org.koitharu.kotatsu.core.util.ext.getDisplaySize
-import com.google.android.material.R as materialR
-
-@Deprecated(
-	"Use BaseAdaptiveSheet",
-	replaceWith = ReplaceWith("BaseAdaptiveSheet<B>", "org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet"),
-)
-abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
-
-	var viewBinding: B? = null
-		private set
-
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
-	protected val binding: B
-		get() = requireViewBinding()
-
-	protected val behavior: BottomSheetBehavior<*>?
-		get() = (dialog as? BottomSheetDialog)?.behavior
-
-	val isExpanded: Boolean
-		get() = behavior?.state == BottomSheetBehavior.STATE_EXPANDED
-
-	val onBackPressedDispatcher: OnBackPressedDispatcher
-		get() = (requireDialog() as AppBottomSheetDialog).onBackPressedDispatcher
-
-	final override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		savedInstanceState: Bundle?,
-	): View {
-		val binding = onCreateViewBinding(inflater, container)
-		viewBinding = binding
-		return binding.root
-	}
-
-	final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		val binding = requireViewBinding()
-		// Enforce max width for tablets
-		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
-		if (width > 0) {
-			behavior?.maxWidth = width
-		}
-		// Set peek height to 40% display height
-		binding.root.context.findActivity()?.getDisplaySize()?.let {
-			behavior?.peekHeight = (it.height() * 0.4).toInt()
-		}
-		onViewBindingCreated(binding, savedInstanceState)
-	}
-
-	override fun onDestroyView() {
-		viewBinding = null
-		super.onDestroyView()
-	}
-
-	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return AppBottomSheetDialog(requireContext(), theme)
-	}
-
-	fun addBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) {
-		val b = behavior ?: return
-		b.addBottomSheetCallback(callback)
-		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
-		if (rootView != null) {
-			callback.onStateChanged(rootView, b.state)
-		}
-	}
-
-	protected abstract fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): B
-
-	protected open fun onViewBindingCreated(binding: B, savedInstanceState: Bundle?) = Unit
-
-	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {
-		val b = behavior ?: return
-		if (isExpanded) {
-			b.state = BottomSheetBehavior.STATE_EXPANDED
-		}
-		b.isFitToContents = !isExpanded
-		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
-		rootView?.updateLayoutParams {
-			height = if (isExpanded) LayoutParams.MATCH_PARENT else LayoutParams.WRAP_CONTENT
-		}
-		b.isDraggable = !isLocked
-	}
-
-	fun requireViewBinding(): B = checkNotNull(viewBinding) {
-		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseListAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseListAdapter.kt
new file mode 100644
index 000000000..378e638b1
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseListAdapter.kt
@@ -0,0 +1,41 @@
+package org.koitharu.kotatsu.core.ui
+
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.AsyncListDiffer.ListListener
+import com.hannesdorfmann.adapterdelegates4.AdapterDelegate
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.flow.FlowCollector
+import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import kotlin.coroutines.suspendCoroutine
+
+open class BaseListAdapter<T : ListModel>(
+	vararg delegates: AdapterDelegate<List<T>>,
+) : AsyncListDifferDelegationAdapter<T>(
+	AsyncDifferConfig.Builder(ListModelDiffCallback<T>())
+		.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
+		.build(),
+	*delegates,
+), FlowCollector<List<T>?> {
+
+	override suspend fun emit(value: List<T>?) = suspendCoroutine { cont ->
+		setItems(value.orEmpty(), ContinuationResumeRunnable(cont))
+	}
+
+	fun addDelegate(type: ListItemType, delegate: AdapterDelegate<List<T>>): BaseListAdapter<T> {
+		delegatesManager.addDelegate(type.ordinal, delegate)
+		return this
+	}
+
+	fun addListListener(listListener: ListListener<T>) {
+		differ.addListListener(listListener)
+	}
+
+	fun removeListListener(listListener: ListListener<T>) {
+		differ.removeListListener(listListener)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt
index ce407ddca..331802824 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt
@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.settings.SettingsActivity
 import javax.inject.Inject
 
@@ -33,7 +34,8 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		view.setBackgroundColor(view.context.getThemeColor(android.R.attr.colorBackground))
+		val themedContext = (view.parentView ?: view).context
+		view.setBackgroundColor(themedContext.getThemeColor(android.R.attr.colorBackground))
 		listView.clipToPadding = false
 		insetsDelegate.onViewCreated(view)
 		insetsDelegate.addInsetsListener(this)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt
index 424ab726e..244636ded 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt
@@ -7,10 +7,14 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -32,9 +36,8 @@ abstract class BaseViewModel : ViewModel() {
 	val onError: EventFlow<Throwable>
 		get() = errorEvent
 
-	val isLoading: StateFlow<Boolean>
-		get() = loadingCounter.map { it > 0 }
-			.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), loadingCounter.value > 0)
+	val isLoading: StateFlow<Boolean> = loadingCounter.map { it > 0 }
+		.stateIn(viewModelScope, SharingStarted.Lazily, loadingCounter.value > 0)
 
 	protected fun launchJob(
 		context: CoroutineContext = EmptyCoroutineContext,
@@ -55,14 +58,24 @@ abstract class BaseViewModel : ViewModel() {
 		}
 	}
 
+	protected fun <T> Flow<T>.withLoading() = onStart {
+		loadingCounter.increment()
+	}.onCompletion {
+		loadingCounter.decrement()
+	}
+
+	protected fun <T> Flow<T>.withErrorHandling() = catch { error ->
+		errorEvent.call(error)
+	}
+
+	protected fun MutableStateFlow<Int>.increment() = update { it + 1 }
+
+	protected fun MutableStateFlow<Int>.decrement() = update { it - 1 }
+
 	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
 		throwable.printStackTraceDebug()
 		if (throwable !is CancellationException) {
 			errorEvent.call(throwable)
 		}
 	}
-
-	protected fun MutableStateFlow<Int>.increment() = update { it + 1 }
-
-	protected fun MutableStateFlow<Int>.decrement() = update { it - 1 }
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/AppBottomSheetDialog.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/AppBottomSheetDialog.kt
deleted file mode 100644
index f76e27d11..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/AppBottomSheetDialog.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.core.ui.dialog
-
-import android.content.Context
-import android.graphics.Color
-import android.view.View
-import com.google.android.material.bottomsheet.BottomSheetDialog
-
-class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(context, theme) {
-
-	/**
-	 * https://github.com/material-components/material-components-android/issues/2582
-	 */
-	@Suppress("DEPRECATION")
-	override fun onAttachedToWindow() {
-		val window = window
-		val initialSystemUiVisibility = window?.decorView?.systemUiVisibility ?: 0
-		super.onAttachedToWindow()
-		if (window != null) {
-			// If the navigation bar is translucent at all, the BottomSheet should be edge to edge
-			val drawEdgeToEdge = edgeToEdgeEnabled && Color.alpha(window.navigationBarColor) < 0xFF
-			if (drawEdgeToEdge) {
-				// Copied from super.onAttachedToWindow:
-				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-				// Fix super-class's window flag bug by respecting the initial system UI visibility:
-				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
-			}
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconFallbackDrawable.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconDrawable.kt
similarity index 52%
rename from app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconFallbackDrawable.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconDrawable.kt
index ab065e004..492ee9f97 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconFallbackDrawable.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/FaviconDrawable.kt
@@ -5,45 +5,67 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.ColorFilter
 import android.graphics.Paint
+import android.graphics.Path
 import android.graphics.PixelFormat
 import android.graphics.Rect
+import android.graphics.RectF
 import android.graphics.drawable.Drawable
+import androidx.annotation.StyleRes
+import androidx.core.content.withStyledAttributes
 import androidx.core.graphics.ColorUtils
+import androidx.core.graphics.withClip
 import com.google.android.material.color.MaterialColors
+import org.koitharu.kotatsu.R
 import kotlin.math.absoluteValue
 
-class FaviconFallbackDrawable(
+class FaviconDrawable(
 	context: Context,
+	@StyleRes styleResId: Int,
 	name: String,
 ) : Drawable() {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+	private var colorBackground = Color.WHITE
+	private var colorStroke = Color.LTGRAY
 	private val letter = name.take(1).uppercase()
-	private val color = MaterialColors.harmonizeWithPrimary(context, colorOfString(name))
+	private var cornerSize = 0f
+	private var colorForeground = Color.DKGRAY
 	private val textBounds = Rect()
 	private val tempRect = Rect()
+	private val boundsF = RectF()
+	private val clipPath = Path()
 
 	init {
-		paint.style = Paint.Style.FILL
+		context.withStyledAttributes(styleResId, R.styleable.FaviconFallbackDrawable) {
+			colorBackground = getColor(R.styleable.FaviconFallbackDrawable_backgroundColor, colorBackground)
+			colorStroke = getColor(R.styleable.FaviconFallbackDrawable_strokeColor, colorStroke)
+			cornerSize = getDimension(R.styleable.FaviconFallbackDrawable_cornerSize, cornerSize)
+			paint.strokeWidth = getDimension(R.styleable.FaviconFallbackDrawable_strokeWidth, 0f) * 2f
+		}
 		paint.textAlign = Paint.Align.CENTER
 		paint.isFakeBoldText = true
+		colorForeground = MaterialColors.harmonize(colorOfString(name), colorBackground)
 	}
 
 	override fun draw(canvas: Canvas) {
-		val cx = bounds.exactCenterX()
-		paint.color = color
-		canvas.drawPaint(paint)
-		paint.color = Color.WHITE
-		val ty = bounds.height() / 2f + textBounds.height() / 2f - textBounds.bottom
-		canvas.drawText(letter, cx, ty, paint)
+		if (cornerSize > 0f) {
+			canvas.withClip(clipPath) {
+				doDraw(canvas)
+			}
+		} else {
+			doDraw(canvas)
+		}
 	}
 
 	override fun onBoundsChange(bounds: Rect) {
 		super.onBoundsChange(bounds)
+		boundsF.set(bounds)
 		val innerWidth = bounds.width() - (paint.strokeWidth * 2f)
 		paint.textSize = getTextSizeForWidth(innerWidth, letter) * 0.5f
 		paint.getTextBounds(letter, 0, letter.length, textBounds)
-		invalidateSelf()
+		clipPath.reset()
+		clipPath.addRoundRect(boundsF, cornerSize, cornerSize, Path.Direction.CW)
+		clipPath.close()
 	}
 
 	override fun setAlpha(alpha: Int) {
@@ -58,6 +80,24 @@ class FaviconFallbackDrawable(
 	@Deprecated("Deprecated in Java")
 	override fun getOpacity() = PixelFormat.TRANSPARENT
 
+	private fun doDraw(canvas: Canvas) {
+		// background
+		paint.color = colorBackground
+		paint.style = Paint.Style.FILL
+		canvas.drawPaint(paint)
+		// letter
+		paint.color = colorForeground
+		val cx = (boundsF.left + boundsF.right) * 0.6f
+		val ty = boundsF.bottom * 0.7f + textBounds.height() * 0.5f - textBounds.bottom
+		canvas.drawText(letter, cx, ty, paint)
+		if (paint.strokeWidth > 0f) {
+			// stroke
+			paint.color = colorStroke
+			paint.style = Paint.Style.STROKE
+			canvas.drawPath(clipPath, paint)
+		}
+	}
+
 	private fun getTextSizeForWidth(width: Float, text: String): Float {
 		val testTextSize = 48f
 		paint.textSize = testTextSize
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/TrimTransformation.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/TrimTransformation.kt
index bc22724ed..ad9e13009 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/TrimTransformation.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/image/TrimTransformation.kt
@@ -15,7 +15,7 @@ class TrimTransformation(
 	private val tolerance: Int = 20,
 ) : Transformation {
 
-	override val cacheKey: String = javaClass.name
+	override val cacheKey: String = "${javaClass.name}-$tolerance"
 
 	override suspend fun transform(input: Bitmap, size: Size): Bitmap {
 		var left = 0
@@ -98,14 +98,23 @@ class TrimTransformation(
 		}
 	}
 
-	override fun equals(other: Any?) = other is TrimTransformation
-
-	override fun hashCode() = javaClass.hashCode()
-
 	private fun isColorTheSame(@ColorInt a: Int, @ColorInt b: Int): Boolean {
 		return abs(a.red - b.red) <= tolerance &&
 			abs(a.green - b.green) <= tolerance &&
 			abs(a.blue - b.blue) <= tolerance &&
 			abs(a.alpha - b.alpha) <= tolerance
 	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as TrimTransformation
+
+		return tolerance == other.tolerance
+	}
+
+	override fun hashCode(): Int {
+		return tolerance
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/AbstractDividerItemDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/AbstractDividerItemDecoration.kt
deleted file mode 100644
index ca4bbec76..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/AbstractDividerItemDecoration.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.koitharu.kotatsu.core.ui.list.decor
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.view.View
-import androidx.core.content.res.getColorOrThrow
-import androidx.core.view.children
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.R as materialR
-
-@SuppressLint("PrivateResource")
-abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
-
-	private val bounds = Rect()
-	private val thickness: Int
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-
-	init {
-		paint.style = Paint.Style.FILL
-		val ta = context.obtainStyledAttributes(
-			null,
-			materialR.styleable.MaterialDivider,
-			materialR.attr.materialDividerStyle,
-			materialR.style.Widget_Material3_MaterialDivider,
-		)
-		paint.color = ta.getColorOrThrow(materialR.styleable.MaterialDivider_dividerColor)
-		thickness = ta.getDimensionPixelSize(
-			materialR.styleable.MaterialDivider_dividerThickness,
-			context.resources.getDimensionPixelSize(materialR.dimen.material_divider_thickness),
-		)
-		ta.recycle()
-	}
-
-
-	override fun getItemOffsets(
-		outRect: Rect,
-		view: View,
-		parent: RecyclerView,
-		state: RecyclerView.State,
-	) {
-		outRect.set(0, thickness, 0, 0)
-	}
-
-	// TODO implement for horizontal lists on demand
-	override fun onDraw(canvas: Canvas, parent: RecyclerView, s: RecyclerView.State) {
-		if (parent.layoutManager == null || thickness == 0) {
-			return
-		}
-		canvas.save()
-		val left: Float
-		val right: Float
-		if (parent.clipToPadding) {
-			left = parent.paddingLeft.toFloat()
-			right = (parent.width - parent.paddingRight).toFloat()
-			canvas.clipRect(
-				left,
-				parent.paddingTop.toFloat(),
-				right,
-				(parent.height - parent.paddingBottom).toFloat(),
-			)
-		} else {
-			left = 0f
-			right = parent.width.toFloat()
-		}
-
-		var previous: RecyclerView.ViewHolder? = null
-		for (child in parent.children) {
-			val holder = parent.getChildViewHolder(child)
-			if (previous != null && shouldDrawDivider(previous, holder)) {
-				parent.getDecoratedBoundsWithMargins(child, bounds)
-				val top: Float = bounds.top + child.translationY
-				val bottom: Float = top + thickness
-				canvas.drawRect(left, top, right, bottom, paint)
-			}
-			previous = holder
-		}
-		canvas.restore()
-	}
-
-	protected abstract fun shouldDrawDivider(
-		above: RecyclerView.ViewHolder,
-		below: RecyclerView.ViewHolder,
-	): Boolean
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/TypedSpacingItemDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/TypedSpacingItemDecoration.kt
deleted file mode 100644
index 244936dbf..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/decor/TypedSpacingItemDecoration.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.core.ui.list.decor
-
-import android.graphics.Rect
-import android.util.SparseIntArray
-import android.view.View
-import androidx.core.util.getOrDefault
-import androidx.core.util.set
-import androidx.recyclerview.widget.RecyclerView
-
-class TypedSpacingItemDecoration(
-	vararg spacingMapping: Pair<Int, Int>,
-	private val fallbackSpacing: Int = 0,
-) : RecyclerView.ItemDecoration() {
-
-	private val mapping = SparseIntArray(spacingMapping.size)
-
-	init {
-		spacingMapping.forEach { (k, v) -> mapping[k] = v }
-	}
-
-	override fun getItemOffsets(
-		outRect: Rect,
-		view: View,
-		parent: RecyclerView,
-		state: RecyclerView.State
-	) {
-		val itemType = parent.getChildViewHolder(view)?.itemViewType
-		val spacing = if (itemType == null) {
-			fallbackSpacing
-		} else {
-			mapping.getOrDefault(itemType, fallbackSpacing)
-		}
-		outRect.set(spacing, spacing, spacing, spacing)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
index 946992aea..973664042 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
@@ -519,7 +519,7 @@ class FastScroller @JvmOverloads constructor(
 
 	private fun TypedArray.getBubbleSize(@StyleableRes index: Int, defaultValue: BubbleSize): BubbleSize {
 		val ordinal = getInt(index, -1)
-		return BubbleSize.values().getOrNull(ordinal) ?: defaultValue
+		return BubbleSize.entries.getOrNull(ordinal) ?: defaultValue
 	}
 
 	private fun findValidParent(view: View): ViewGroup? = view.parents.firstNotNullOfOrNull { p ->
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/DateTimeAgo.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/DateTimeAgo.kt
index 8e468b5ad..cfb69a705 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/DateTimeAgo.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/DateTimeAgo.kt
@@ -4,10 +4,9 @@ import android.content.res.Resources
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.core.util.ext.format
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import java.util.Date
 
-sealed class DateTimeAgo : ListModel {
+sealed class DateTimeAgo {
 
 	abstract fun format(resources: Resources): String
 
@@ -77,6 +76,7 @@ sealed class DateTimeAgo : ListModel {
 	}
 
 	class DaysAgo(val days: Int) : DateTimeAgo() {
+
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.days_ago, days, days)
 		}
@@ -93,6 +93,30 @@ sealed class DateTimeAgo : ListModel {
 		override fun toString() = "days_ago_$days"
 	}
 
+	class MonthsAgo(val months: Int) : DateTimeAgo() {
+
+		override fun format(resources: Resources): String {
+			return if (months == 0) {
+				resources.getString(R.string.this_month)
+			} else {
+				resources.getQuantityString(R.plurals.months_ago, months, months)
+			}
+		}
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as MonthsAgo
+
+			return months == other.months
+		}
+
+		override fun hashCode(): Int {
+			return months
+		}
+	}
+
 	class Absolute(private val date: Date) : DateTimeAgo() {
 
 		private val day = date.daysDiff(0)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/MenuInvalidator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/MenuInvalidator.kt
new file mode 100644
index 000000000..d2fd6978e
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/MenuInvalidator.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.ui.util
+
+import androidx.core.view.MenuHost
+import kotlinx.coroutines.flow.FlowCollector
+
+class MenuInvalidator(
+	private val host: MenuHost,
+) : FlowCollector<Any?> {
+
+	override suspend fun emit(value: Any?) {
+		host.invalidateMenu()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/OptionsMenuBadgeHelper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/OptionsMenuBadgeHelper.kt
new file mode 100644
index 000000000..7e1ff5daf
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/OptionsMenuBadgeHelper.kt
@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.core.ui.util
+
+import androidx.annotation.IdRes
+import androidx.appcompat.widget.Toolbar
+import com.google.android.material.badge.BadgeDrawable
+import com.google.android.material.badge.BadgeUtils
+import com.google.android.material.badge.ExperimentalBadgeUtils
+
+@androidx.annotation.OptIn(ExperimentalBadgeUtils::class)
+class OptionsMenuBadgeHelper(
+	private val toolbar: Toolbar,
+	@IdRes private val itemId: Int,
+) {
+
+	private var badge: BadgeDrawable? = null
+
+	fun setBadgeVisible(isVisible: Boolean) {
+		if (isVisible) {
+			showBadge()
+		} else {
+			hideBadge()
+		}
+	}
+
+	private fun hideBadge() {
+		badge?.let {
+			BadgeUtils.detachBadgeDrawable(it, toolbar, itemId)
+		}
+		badge = null
+	}
+
+	private fun showBadge() {
+		val badgeDrawable = badge ?: BadgeDrawable.create(toolbar.context).also {
+			badge = it
+		}
+		BadgeUtils.attachBadgeDrawable(badgeDrawable, toolbar, itemId)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/BottomSheetHeaderBar.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/BottomSheetHeaderBar.kt
deleted file mode 100644
index 1fa1dcf37..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/BottomSheetHeaderBar.kt
+++ /dev/null
@@ -1,316 +0,0 @@
-package org.koitharu.kotatsu.core.ui.widgets
-
-import android.animation.LayoutTransition
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowInsets
-import androidx.annotation.AttrRes
-import androidx.annotation.MenuRes
-import androidx.annotation.StringRes
-import androidx.appcompat.widget.Toolbar
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.content.withStyledAttributes
-import androidx.core.view.*
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.MaterialToolbar
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
-import org.koitharu.kotatsu.core.util.ext.parents
-import org.koitharu.kotatsu.databinding.LayoutSheetHeaderBinding
-import java.util.*
-import com.google.android.material.R as materialR
-
-private const val THROTTLE_DELAY = 200L
-
-@Deprecated("")
-class BottomSheetHeaderBar @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = materialR.attr.appBarLayoutStyle,
-) : AppBarLayout(context, attrs, defStyleAttr), MenuHost {
-
-	private val binding = LayoutSheetHeaderBinding.inflate(LayoutInflater.from(context), this)
-	private val closeDrawable = context.getThemeDrawable(materialR.attr.actionModeCloseDrawable)
-	private val bottomSheetCallback = Callback()
-	private val adjustStateRunnable = Runnable { adjustState() }
-	private var bottomSheetBehavior: BottomSheetBehavior<*>? = null
-	private val locationBuffer = IntArray(2)
-	private val expansionListeners = LinkedList<OnExpansionChangeListener>()
-	private var fitStatusBar = false
-	private val minHandleHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_handle_size_min)
-	private val maxHandleHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_handle_size_max)
-	private var isLayoutSuppressedCompat = false
-	private var isLayoutCalledWhileSuppressed = false
-	private var isBsExpanded = false
-	private var stateAdjustedAt = 0L
-
-	@Deprecated("")
-	val toolbar: MaterialToolbar
-		get() = binding.toolbar
-
-	val menu: Menu
-		get() = binding.toolbar.menu
-
-	var title: CharSequence?
-		get() = binding.toolbar.title
-		set(value) {
-			binding.toolbar.title = value
-		}
-
-	var subtitle: CharSequence?
-		get() = binding.toolbar.subtitle
-		set(value) {
-			binding.toolbar.subtitle = value
-		}
-
-	val isExpanded: Boolean
-		get() = binding.dragHandle.isGone
-
-	init {
-		setBackgroundResource(R.drawable.sheet_toolbar_background)
-		layoutTransition = LayoutTransition().apply {
-			setDuration(context.getAnimationDuration(R.integer.config_tinyAnimTime))
-		}
-		context.withStyledAttributes(attrs, R.styleable.BottomSheetHeaderBar, defStyleAttr) {
-			binding.toolbar.title = getString(R.styleable.BottomSheetHeaderBar_title)
-			fitStatusBar = getBoolean(R.styleable.BottomSheetHeaderBar_fitStatusBar, fitStatusBar)
-			val menuResId = getResourceId(R.styleable.BottomSheetHeaderBar_menu, 0)
-			if (menuResId != 0) {
-				binding.toolbar.inflateMenu(menuResId)
-			}
-		}
-		binding.toolbar.setNavigationOnClickListener(bottomSheetCallback)
-	}
-
-	override fun onAttachedToWindow() {
-		super.onAttachedToWindow()
-		setBottomSheetBehavior(findParentBottomSheetBehavior())
-	}
-
-	override fun onDetachedFromWindow() {
-		setBottomSheetBehavior(null)
-		super.onDetachedFromWindow()
-	}
-
-	override fun addView(child: View?, index: Int) {
-		if (shouldAddView(child)) {
-			super.addView(child, index)
-		} else {
-			binding.toolbar.addView(child, index)
-		}
-	}
-
-	override fun addView(child: View?, width: Int, height: Int) {
-		if (shouldAddView(child)) {
-			super.addView(child, width, height)
-		} else {
-			binding.toolbar.addView(child, width, height)
-		}
-	}
-
-	override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
-		if (shouldAddView(child)) {
-			super.addView(child, index, params)
-		} else {
-			binding.toolbar.addView(child, index, convertLayoutParams(params))
-		}
-	}
-
-	override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
-		dispatchInsets(if (insets != null) WindowInsetsCompat.toWindowInsetsCompat(insets) else null)
-		return super.onApplyWindowInsets(insets)
-	}
-
-	override fun addMenuProvider(provider: MenuProvider) {
-		binding.toolbar.addMenuProvider(provider)
-	}
-
-	override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner) {
-		binding.toolbar.addMenuProvider(provider, owner)
-	}
-
-	override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner, state: Lifecycle.State) {
-		binding.toolbar.addMenuProvider(provider, owner, state)
-	}
-
-	override fun removeMenuProvider(provider: MenuProvider) {
-		binding.toolbar.removeMenuProvider(provider)
-	}
-
-	override fun invalidateMenu() {
-		binding.toolbar.invalidateMenu()
-	}
-
-	fun inflateMenu(@MenuRes resId: Int) {
-		binding.toolbar.inflateMenu(resId)
-	}
-
-	fun setNavigationOnClickListener(onClickListener: OnClickListener) {
-		binding.toolbar.setNavigationOnClickListener(onClickListener)
-	}
-
-	fun addOnExpansionChangeListener(listener: OnExpansionChangeListener) {
-		expansionListeners.add(listener)
-	}
-
-	fun removeOnExpansionChangeListener(listener: OnExpansionChangeListener) {
-		expansionListeners.remove(listener)
-	}
-
-	fun setTitle(@StringRes resId: Int) {
-		binding.toolbar.setTitle(resId)
-	}
-
-	fun setSubtitle(@StringRes resId: Int) {
-		binding.toolbar.setSubtitle(resId)
-	}
-
-	override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-		if (isLayoutSuppressedCompat) {
-			isLayoutCalledWhileSuppressed = true
-		} else {
-			super.onLayout(changed, l, t, r, b)
-		}
-	}
-
-	private fun setBottomSheetBehavior(behavior: BottomSheetBehavior<*>?) {
-		bottomSheetBehavior?.removeBottomSheetCallback(bottomSheetCallback)
-		bottomSheetBehavior = behavior
-		if (behavior != null) {
-			onBottomSheetStateChanged(behavior.state)
-			behavior.addBottomSheetCallback(bottomSheetCallback)
-		}
-	}
-
-	private fun onBottomSheetStateChanged(newState: Int) {
-		val expanded = newState == BottomSheetBehavior.STATE_EXPANDED && isOnTopOfScreen()
-		if (isBsExpanded != expanded) {
-			isBsExpanded = expanded
-			postAdjustState()
-		}
-	}
-
-	private fun suppressLayoutCompat(suppress: Boolean) {
-		if (suppress == isLayoutSuppressedCompat) return
-		isLayoutSuppressedCompat = suppress
-		if (!suppress && isLayoutCalledWhileSuppressed) {
-			requestLayout()
-		}
-		isLayoutCalledWhileSuppressed = false
-	}
-
-	private fun dispatchInsets(insets: WindowInsetsCompat?) {
-		if (!fitStatusBar) {
-			return
-		}
-		val isExpanded = binding.dragHandle.isGone
-		val topInset = insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
-		if (isExpanded) {
-			updatePadding(top = topInset)
-		} else {
-			updatePadding(top = 0)
-			binding.dragHandle.updateLayoutParams {
-				height = topInset.coerceIn(minHandleHeight, maxHandleHeight)
-			}
-		}
-	}
-
-	private fun findParentBottomSheetBehavior(): BottomSheetBehavior<*>? {
-		for (p in parents) {
-			val layoutParams = (p as? View)?.layoutParams
-			if (layoutParams is CoordinatorLayout.LayoutParams) {
-				val behavior = layoutParams.behavior
-				if (behavior is BottomSheetBehavior<*>) {
-					return behavior
-				}
-			}
-		}
-		return null
-	}
-
-	private fun isOnTopOfScreen(): Boolean {
-		getLocationInWindow(locationBuffer)
-		val topInset = ViewCompat.getRootWindowInsets(this)
-			?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
-		val zeroTop = (layoutParams as? MarginLayoutParams)?.topMargin ?: 0
-		return (locationBuffer[1] - topInset) <= zeroTop
-	}
-
-	private fun dismissBottomSheet() {
-		val behavior = bottomSheetBehavior ?: return
-		if (behavior.isHideable) {
-			behavior.state = BottomSheetBehavior.STATE_HIDDEN
-		} else {
-			behavior.state = BottomSheetBehavior.STATE_COLLAPSED
-		}
-	}
-
-	private fun shouldAddView(child: View?): Boolean {
-		if (child == null) {
-			return true
-		}
-		val viewId = child.id
-		return viewId == R.id.dragHandle || viewId == R.id.toolbar
-	}
-
-	private fun convertLayoutParams(params: ViewGroup.LayoutParams?): Toolbar.LayoutParams? {
-		return when (params) {
-			null -> null
-			is MarginLayoutParams -> {
-				val lp = Toolbar.LayoutParams(params)
-				if (params is LayoutParams) {
-					lp.gravity = params.gravity
-				}
-				lp
-			}
-
-			else -> Toolbar.LayoutParams(params)
-		}
-	}
-
-	private fun postAdjustState() {
-		removeCallbacks(adjustStateRunnable)
-		val now = System.currentTimeMillis()
-		if (stateAdjustedAt + THROTTLE_DELAY < now) {
-			adjustState()
-		} else {
-			postDelayed(adjustStateRunnable, THROTTLE_DELAY)
-		}
-	}
-
-	private fun adjustState() {
-		suppressLayoutCompat(true)
-		binding.toolbar.navigationIcon = (if (isBsExpanded) closeDrawable else null)
-		binding.dragHandle.isGone = isBsExpanded
-		expansionListeners.forEach { it.onExpansionStateChanged(this, isBsExpanded) }
-		dispatchInsets(ViewCompat.getRootWindowInsets(this))
-		stateAdjustedAt = System.currentTimeMillis()
-		suppressLayoutCompat(false)
-	}
-
-	private inner class Callback : BottomSheetBehavior.BottomSheetCallback(), OnClickListener {
-
-		override fun onStateChanged(bottomSheet: View, newState: Int) {
-			onBottomSheetStateChanged(newState)
-		}
-
-		override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
-
-		override fun onClick(v: View?) {
-			dismissBottomSheet()
-		}
-	}
-
-	fun interface OnExpansionChangeListener {
-
-		fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/EnhancedViewPager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/EnhancedViewPager.kt
new file mode 100644
index 000000000..08d280070
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/EnhancedViewPager.kt
@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.viewpager.widget.ViewPager
+
+@SuppressLint("ClickableViewAccessibility")
+class EnhancedViewPager @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+) : ViewPager(context, attrs) {
+
+	var isUserInputEnabled: Boolean = true
+		set(value) {
+			field = value
+			if (!value) {
+				cancelPendingInputEvents()
+			}
+		}
+
+	override fun onTouchEvent(event: MotionEvent): Boolean {
+		return isUserInputEnabled && super.onTouchEvent(event)
+	}
+
+	override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+		return isUserInputEnabled && super.onInterceptTouchEvent(event)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/PieChart.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/PieChart.kt
new file mode 100644
index 000000000..b5cb32206
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/PieChart.kt
@@ -0,0 +1,397 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.CornerPathEffect
+import android.graphics.Paint
+import android.graphics.Rect
+import android.graphics.RectF
+import android.graphics.Typeface
+import android.os.Build
+import android.os.Parcelable
+import android.text.Layout
+import android.text.StaticLayout
+import android.text.TextDirectionHeuristic
+import android.text.TextDirectionHeuristics
+import android.text.TextPaint
+import android.util.AttributeSet
+import android.view.View
+import androidx.annotation.RequiresApi
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.draw
+import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
+import org.koitharu.kotatsu.core.util.ext.resolveDp
+import org.koitharu.kotatsu.core.util.ext.resolveSp
+
+class PieChart @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr), PieChartInterface {
+
+	private var marginTextFirst: Float = context.resources.resolveDp(DEFAULT_MARGIN_TEXT_1)
+	private var marginTextSecond: Float = context.resources.resolveDp(DEFAULT_MARGIN_TEXT_2)
+	private var marginTextThird: Float = context.resources.resolveDp(DEFAULT_MARGIN_TEXT_3)
+	private var marginSmallCircle: Float = context.resources.resolveDp(DEFAULT_MARGIN_SMALL_CIRCLE)
+	private val marginText: Float = marginTextFirst + marginTextSecond
+	private val circleRect = RectF()
+	private var circleStrokeWidth: Float = context.resources.resolveDp(6f)
+	private var circleRadius: Float = 0f
+	private var circlePadding: Float = context.resources.resolveDp(8f)
+	private var circlePaintRoundSize: Boolean = true
+	private var circleSectionSpace: Float = 3f
+	private var circleCenterX: Float = 0f
+	private var circleCenterY: Float = 0f
+	private var numberTextPaint: TextPaint = TextPaint()
+	private var descriptionTextPain: TextPaint = TextPaint()
+	private var amountTextPaint: TextPaint = TextPaint()
+	private var textStartX: Float = 0f
+	private var textStartY: Float = 0f
+	private var textHeight: Int = 0
+	private var textCircleRadius: Float = context.resources.resolveDp(4f)
+	private var textAmountStr: String = ""
+	private var textAmountY: Float = 0f
+	private var textAmountXNumber: Float = 0f
+	private var textAmountXDescription: Float = 0f
+	private var textAmountYDescription: Float = 0f
+	private var totalAmount: Int = 0
+	private var pieChartColors: List<String> = listOf()
+	private var percentageCircleList: List<PieChartModel> = listOf()
+	private var textRowList: MutableList<StaticLayout> = mutableListOf()
+	private var dataList: List<Pair<Int, String>> = listOf()
+	private var animationSweepAngle: Int = 0
+
+	init {
+		var textAmountSize: Float = context.resources.resolveSp(22f)
+		var textNumberSize: Float = context.resources.resolveSp(20f)
+		var textDescriptionSize: Float = context.resources.resolveSp(14f)
+		var textAmountColor: Int = Color.WHITE
+		var textNumberColor: Int = Color.WHITE
+		var textDescriptionColor: Int = Color.GRAY
+
+		if (attrs != null) {
+			val typeArray = context.obtainStyledAttributes(attrs, R.styleable.PieChart)
+
+			val colorResId = typeArray.getResourceId(R.styleable.PieChart_pieChartColors, 0)
+			pieChartColors = typeArray.resources.getStringArray(colorResId).toList()
+
+			marginTextFirst = typeArray.getDimension(R.styleable.PieChart_pieChartMarginTextFirst, marginTextFirst)
+			marginTextSecond = typeArray.getDimension(R.styleable.PieChart_pieChartMarginTextSecond, marginTextSecond)
+			marginTextThird = typeArray.getDimension(R.styleable.PieChart_pieChartMarginTextThird, marginTextThird)
+			marginSmallCircle =
+				typeArray.getDimension(R.styleable.PieChart_pieChartMarginSmallCircle, marginSmallCircle)
+
+			circleStrokeWidth =
+				typeArray.getDimension(R.styleable.PieChart_pieChartCircleStrokeWidth, circleStrokeWidth)
+			circlePadding = typeArray.getDimension(R.styleable.PieChart_pieChartCirclePadding, circlePadding)
+			circlePaintRoundSize =
+				typeArray.getBoolean(R.styleable.PieChart_pieChartCirclePaintRoundSize, circlePaintRoundSize)
+			circleSectionSpace = typeArray.getFloat(R.styleable.PieChart_pieChartCircleSectionSpace, circleSectionSpace)
+
+			textCircleRadius = typeArray.getDimension(R.styleable.PieChart_pieChartTextCircleRadius, textCircleRadius)
+			textAmountSize = typeArray.getDimension(R.styleable.PieChart_pieChartTextAmountSize, textAmountSize)
+			textNumberSize = typeArray.getDimension(R.styleable.PieChart_pieChartTextNumberSize, textNumberSize)
+			textDescriptionSize =
+				typeArray.getDimension(R.styleable.PieChart_pieChartTextDescriptionSize, textDescriptionSize)
+			textAmountColor = typeArray.getColor(R.styleable.PieChart_pieChartTextAmountColor, textAmountColor)
+			textNumberColor = typeArray.getColor(R.styleable.PieChart_pieChartTextNumberColor, textNumberColor)
+			textDescriptionColor =
+				typeArray.getColor(R.styleable.PieChart_pieChartTextDescriptionColor, textDescriptionColor)
+			textAmountStr = typeArray.getString(R.styleable.PieChart_pieChartTextAmount) ?: ""
+
+			typeArray.recycle()
+		}
+
+		circlePadding += circleStrokeWidth
+
+		// Инициализация кистей View
+		initPaints(amountTextPaint, textAmountSize, textAmountColor)
+		initPaints(numberTextPaint, textNumberSize, textNumberColor)
+		initPaints(descriptionTextPain, textDescriptionSize, textDescriptionColor, true)
+	}
+
+	@RequiresApi(Build.VERSION_CODES.M)
+	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+		textRowList.clear()
+
+		val initSizeWidth = resolveDefaultSize(widthMeasureSpec, DEFAULT_VIEW_SIZE_WIDTH)
+
+		val textTextWidth = (initSizeWidth * TEXT_WIDTH_PERCENT)
+		val initSizeHeight = calculateViewHeight(heightMeasureSpec, textTextWidth.toInt())
+
+		textStartX = initSizeWidth - textTextWidth.toFloat()
+		textStartY = initSizeHeight.toFloat() / 2 - textHeight / 2
+
+		calculateCircleRadius(initSizeWidth, initSizeHeight)
+
+		setMeasuredDimension(initSizeWidth, initSizeHeight)
+	}
+
+	override fun onDraw(canvas: Canvas) {
+		super.onDraw(canvas)
+
+		drawCircle(canvas)
+		drawText(canvas)
+	}
+
+	override fun onRestoreInstanceState(state: Parcelable?) {
+		val pieChartState = state as? PieChartState
+		super.onRestoreInstanceState(pieChartState?.superState ?: state)
+
+		dataList = pieChartState?.dataList ?: listOf()
+	}
+
+	override fun onSaveInstanceState(): Parcelable {
+		val superState = super.onSaveInstanceState()
+		return PieChartState(superState, dataList)
+	}
+
+	override fun setDataChart(list: List<Pair<Int, String>>) {
+		dataList = list
+		calculatePercentageOfData()
+	}
+
+	override fun startAnimation() {
+		val animator = ValueAnimator.ofInt(0, 360).apply {
+			duration = context.getAnimationDuration(android.R.integer.config_longAnimTime)
+			interpolator = FastOutSlowInInterpolator()
+			addUpdateListener { valueAnimator ->
+				animationSweepAngle = valueAnimator.animatedValue as Int
+				invalidate()
+			}
+		}
+		animator.start()
+	}
+
+	private fun drawCircle(canvas: Canvas) {
+		for (percent in percentageCircleList) {
+			if (animationSweepAngle > percent.percentToStartAt + percent.percentOfCircle) {
+				canvas.drawArc(circleRect, percent.percentToStartAt, percent.percentOfCircle, false, percent.paint)
+			} else if (animationSweepAngle > percent.percentToStartAt) {
+				canvas.drawArc(
+					circleRect,
+					percent.percentToStartAt,
+					animationSweepAngle - percent.percentToStartAt,
+					false,
+					percent.paint,
+				)
+			}
+		}
+	}
+
+	private fun drawText(canvas: Canvas) {
+		var textBuffY = textStartY
+		textRowList.forEachIndexed { index, staticLayout ->
+			if (index % 2 == 0) {
+				staticLayout.draw(canvas, textStartX + marginSmallCircle + textCircleRadius, textBuffY)
+				canvas.drawCircle(
+					textStartX + marginSmallCircle / 2,
+					textBuffY + staticLayout.height / 2 + textCircleRadius / 2,
+					textCircleRadius,
+					Paint().apply { color = Color.parseColor(pieChartColors[(index / 2) % pieChartColors.size]) },
+				)
+				textBuffY += staticLayout.height + marginTextFirst
+			} else {
+				staticLayout.draw(canvas, textStartX, textBuffY)
+				textBuffY += staticLayout.height + marginTextSecond
+			}
+		}
+
+		canvas.drawText(totalAmount.toString(), textAmountXNumber, textAmountY, amountTextPaint)
+		canvas.drawText(textAmountStr, textAmountXDescription, textAmountYDescription, descriptionTextPain)
+	}
+
+	private fun initPaints(textPaint: TextPaint, textSize: Float, textColor: Int, isDescription: Boolean = false) {
+		textPaint.color = textColor
+		textPaint.textSize = textSize
+		textPaint.isAntiAlias = true
+
+		if (!isDescription) textPaint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
+	}
+
+	private fun resolveDefaultSize(spec: Int, defValue: Int): Int {
+		return when (MeasureSpec.getMode(spec)) {
+			MeasureSpec.UNSPECIFIED -> resources.resolveDp(defValue)
+			else -> MeasureSpec.getSize(spec)
+		}
+	}
+
+	@RequiresApi(Build.VERSION_CODES.M)
+	private fun calculateViewHeight(heightMeasureSpec: Int, textWidth: Int): Int {
+		val initSizeHeight = resolveDefaultSize(heightMeasureSpec, DEFAULT_VIEW_SIZE_HEIGHT)
+		textHeight = (dataList.size * marginText + getTextViewHeight(textWidth)).toInt()
+
+		val textHeightWithPadding = textHeight + paddingTop + paddingBottom
+		return if (textHeightWithPadding > initSizeHeight) textHeightWithPadding else initSizeHeight
+	}
+
+	private fun calculateCircleRadius(width: Int, height: Int) {
+		val circleViewWidth = (width * CIRCLE_WIDTH_PERCENT)
+		circleRadius = if (circleViewWidth > height) {
+			(height.toFloat() - circlePadding) / 2
+		} else {
+			circleViewWidth.toFloat() / 2
+		}
+
+		with(circleRect) {
+			left = circlePadding
+			top = height / 2 - circleRadius
+			right = circleRadius * 2 + circlePadding
+			bottom = height / 2 + circleRadius
+		}
+
+		circleCenterX = (circleRadius * 2 + circlePadding + circlePadding) / 2
+		circleCenterY = (height / 2 + circleRadius + (height / 2 - circleRadius)) / 2
+
+		textAmountY = circleCenterY
+
+		val sizeTextAmountNumber = getWidthOfAmountText(
+			totalAmount.toString(),
+			amountTextPaint,
+		)
+
+		textAmountXNumber = circleCenterX - sizeTextAmountNumber.width() / 2
+		textAmountXDescription = circleCenterX - getWidthOfAmountText(textAmountStr, descriptionTextPain).width() / 2
+		textAmountYDescription = circleCenterY + sizeTextAmountNumber.height() + marginTextThird
+	}
+
+	@RequiresApi(Build.VERSION_CODES.M)
+	private fun getTextViewHeight(maxWidth: Int): Int {
+		var textHeight = 0
+		dataList.forEach {
+			val textLayoutNumber = getMultilineText(
+				text = it.first.toString(),
+				textPaint = numberTextPaint,
+				width = maxWidth,
+			)
+			val textLayoutDescription = getMultilineText(
+				text = it.second,
+				textPaint = descriptionTextPain,
+				width = maxWidth,
+			)
+			textRowList.apply {
+				add(textLayoutNumber)
+				add(textLayoutDescription)
+			}
+			textHeight += textLayoutNumber.height + textLayoutDescription.height
+		}
+
+		return textHeight
+	}
+
+	private fun calculatePercentageOfData() {
+		totalAmount = dataList.fold(0) { res, value -> res + value.first }
+
+		var startAt = circleSectionSpace
+		percentageCircleList = dataList.mapIndexed { index, pair ->
+			var percent = pair.first * 100 / totalAmount.toFloat() - circleSectionSpace
+			percent = if (percent < 0f) 0f else percent
+
+			val resultModel = PieChartModel(
+				percentOfCircle = percent,
+				percentToStartAt = startAt,
+				colorOfLine = Color.parseColor(pieChartColors[index % pieChartColors.size]),
+				stroke = circleStrokeWidth,
+				paintRound = circlePaintRoundSize,
+			)
+			if (percent != 0f) startAt += percent + circleSectionSpace
+			resultModel
+		}
+	}
+
+	private fun getWidthOfAmountText(text: String, textPaint: TextPaint): Rect {
+		val bounds = Rect()
+		textPaint.getTextBounds(text, 0, text.length, bounds)
+		return bounds
+	}
+
+	@RequiresApi(Build.VERSION_CODES.M)
+	private fun getMultilineText(
+		text: CharSequence,
+		textPaint: TextPaint,
+		width: Int,
+		start: Int = 0,
+		end: Int = text.length,
+		alignment: Layout.Alignment = Layout.Alignment.ALIGN_NORMAL,
+		textDir: TextDirectionHeuristic = TextDirectionHeuristics.LTR,
+		spacingMult: Float = 1f,
+		spacingAdd: Float = 0f
+	): StaticLayout {
+
+		return StaticLayout.Builder
+			.obtain(text, start, end, textPaint, width)
+			.setAlignment(alignment)
+			.setTextDirection(textDir)
+			.setLineSpacing(spacingAdd, spacingMult)
+			.build()
+	}
+
+	companion object {
+		private const val DEFAULT_MARGIN_TEXT_1 = 2f
+		private const val DEFAULT_MARGIN_TEXT_2 = 10f
+		private const val DEFAULT_MARGIN_TEXT_3 = 2f
+		private const val DEFAULT_MARGIN_SMALL_CIRCLE = 12f
+
+		private const val TEXT_WIDTH_PERCENT = 0.40
+		private const val CIRCLE_WIDTH_PERCENT = 0.50
+
+		const val DEFAULT_VIEW_SIZE_HEIGHT = 150
+		const val DEFAULT_VIEW_SIZE_WIDTH = 250
+	}
+}
+
+interface PieChartInterface {
+
+	fun setDataChart(list: List<Pair<Int, String>>)
+
+	fun startAnimation()
+}
+
+data class PieChartModel(
+	var percentOfCircle: Float = 0f,
+	var percentToStartAt: Float = 0f,
+	var colorOfLine: Int = 0,
+	var stroke: Float = 0f,
+	var paint: Paint = Paint(),
+	var paintRound: Boolean = true
+) {
+
+	init {
+		if (percentOfCircle < 0 || percentOfCircle > 100) {
+			percentOfCircle = 100f
+		}
+
+		percentOfCircle = 360 * percentOfCircle / 100
+
+		if (percentToStartAt < 0 || percentToStartAt > 100) {
+			percentToStartAt = 0f
+		}
+
+		percentToStartAt = 360 * percentToStartAt / 100
+
+		if (colorOfLine == 0) {
+			colorOfLine = Color.parseColor("#000000")
+		}
+
+		paint = Paint()
+		paint.color = colorOfLine
+		paint.isAntiAlias = true
+		paint.style = Paint.Style.STROKE
+		paint.strokeWidth = stroke
+		paint.isDither = true
+
+		if (paintRound) {
+			paint.strokeJoin = Paint.Join.ROUND
+			paint.strokeCap = Paint.Cap.ROUND
+			paint.pathEffect = CornerPathEffect(8f)
+		}
+	}
+}
+
+class PieChartState(
+	superSavedState: Parcelable?,
+	val dataList: List<Pair<Int, String>>
+) : View.BaseSavedState(superSavedState), Parcelable
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt
index 39591490a..6550dadf5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SegmentedBarView.kt
@@ -9,15 +9,13 @@ import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewOutlineProvider
-import android.view.animation.DecelerateInterpolator
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.parsers.util.replaceWith
-import com.google.android.material.R as materialR
 
 class SegmentedBarView @JvmOverloads constructor(
 	context: Context,
@@ -28,13 +26,12 @@ class SegmentedBarView @JvmOverloads constructor(
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val segmentsData = ArrayList<Segment>()
 	private val segmentsSizes = ArrayList<Float>()
-	private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
 	private var cornerSize = 0f
 	private var scaleFactor = 1f
 	private var scaleAnimator: ValueAnimator? = null
 
 	init {
-		paint.strokeWidth = context.resources.resolveDp(1f)
+		paint.strokeWidth = context.resources.resolveDp(0f)
 		outlineProvider = OutlineProvider()
 		clipToOutline = true
 	}
@@ -57,12 +54,10 @@ class SegmentedBarView @JvmOverloads constructor(
 			paint.style = Paint.Style.FILL
 			val segmentWidth = segmentsSizes[i]
 			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
-			paint.color = outlineColor
 			paint.style = Paint.Style.STROKE
 			canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
 			x -= segmentWidth
 		}
-		paint.color = outlineColor
 		paint.style = Paint.Style.STROKE
 		canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
 	}
@@ -100,7 +95,7 @@ class SegmentedBarView @JvmOverloads constructor(
 		invalidate()
 		val animator = ValueAnimator.ofFloat(0f, 1f)
 		animator.duration = context.getAnimationDuration(android.R.integer.config_longAnimTime)
-		animator.interpolator = DecelerateInterpolator()
+		animator.interpolator = FastOutSlowInInterpolator()
 		animator.addUpdateListener(this@SegmentedBarView)
 		animator.addListener(this@SegmentedBarView)
 		scaleAnimator = animator
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SelectableTextView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SelectableTextView.kt
index 32cb29875..1f80fb57b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SelectableTextView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SelectableTextView.kt
@@ -26,4 +26,8 @@ class SelectableTextView @JvmOverloads constructor(
 			Selection.setSelection(spannableText, text.length)
 		}
 	}
+
+	override fun scrollTo(x: Int, y: Int) {
+		super.scrollTo(0, 0)
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt
new file mode 100644
index 000000000..b3fe08f3f
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt
@@ -0,0 +1,135 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.content.Context
+import android.graphics.Outline
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewOutlineProvider
+import android.widget.LinearLayout
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.setPadding
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.ShapeAppearanceModel
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.drawableStart
+import org.koitharu.kotatsu.core.util.ext.getDrawableCompat
+import org.koitharu.kotatsu.core.util.ext.getThemeColorStateList
+import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
+import org.koitharu.kotatsu.core.util.ext.textAndVisible
+import org.koitharu.kotatsu.databinding.ViewTipBinding
+import com.google.android.material.R as materialR
+
+class TipView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = R.attr.tipViewStyle,
+) : LinearLayout(context, attrs, defStyleAttr), View.OnClickListener {
+
+	private val binding = ViewTipBinding.inflate(LayoutInflater.from(context), this)
+
+	var title: CharSequence?
+		get() = binding.textViewTitle.text
+		set(value) {
+			binding.textViewTitle.text = value
+		}
+
+	var text: CharSequence?
+		get() = binding.textViewBody.text
+		set(value) {
+			binding.textViewBody.text = value
+		}
+
+	var icon: Drawable?
+		get() = binding.textViewTitle.drawableStart
+		set(value) {
+			binding.textViewTitle.drawableStart = value
+		}
+
+	var primaryButtonText: CharSequence?
+		get() = binding.buttonPrimary.textAndVisible
+		set(value) {
+			binding.buttonPrimary.textAndVisible = value
+		}
+
+	var secondaryButtonText: CharSequence?
+		get() = binding.buttonSecondary.textAndVisible
+		set(value) {
+			binding.buttonSecondary.textAndVisible = value
+		}
+
+	var onButtonClickListener: OnButtonClickListener? = null
+
+	init {
+		orientation = VERTICAL
+		setPadding(context.resources.getDimensionPixelOffset(R.dimen.margin_normal))
+		context.withStyledAttributes(attrs, R.styleable.TipView, defStyleAttr) {
+			title = getText(R.styleable.TipView_title)
+			text = getText(R.styleable.TipView_android_text)
+			icon = getDrawableCompat(context, R.styleable.TipView_icon)
+			primaryButtonText = getString(R.styleable.TipView_primaryButtonText)
+			secondaryButtonText = getString(R.styleable.TipView_secondaryButtonText)
+			val shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0).build()
+			background = MaterialShapeDrawable(shapeAppearanceModel).also {
+				it.fillColor = getColorStateList(R.styleable.TipView_cardBackgroundColor)
+					?: context.getThemeColorStateList(materialR.attr.colorBackgroundFloating)
+				it.strokeWidth = getDimension(R.styleable.TipView_strokeWidth, 0f)
+				it.strokeColor = getColorStateList(R.styleable.TipView_strokeColor)
+				it.elevation = getDimension(R.styleable.TipView_elevation, 0f)
+			}
+			outlineProvider = OutlineProvider(shapeAppearanceModel)
+		}
+		binding.buttonPrimary.setOnClickListener(this)
+		binding.buttonSecondary.setOnClickListener(this)
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_primary -> onButtonClickListener?.onPrimaryButtonClick(this)
+			R.id.button_secondary -> onButtonClickListener?.onSecondaryButtonClick(this)
+		}
+	}
+
+	fun setTitle(@StringRes resId: Int) {
+		binding.textViewTitle.setText(resId)
+	}
+
+	fun setText(@StringRes resId: Int) {
+		binding.textViewBody.setText(resId)
+	}
+
+	fun setPrimaryButtonText(@StringRes resId: Int) {
+		binding.buttonPrimary.setTextAndVisible(resId)
+	}
+
+	fun setSecondaryButtonText(@StringRes resId: Int) {
+		binding.buttonSecondary.setTextAndVisible(resId)
+	}
+
+	fun setIcon(@DrawableRes resId: Int) {
+		icon = ContextCompat.getDrawable(context, resId)
+	}
+
+	interface OnButtonClickListener {
+
+		fun onPrimaryButtonClick(tipView: TipView)
+
+		fun onSecondaryButtonClick(tipView: TipView)
+	}
+
+	private class OutlineProvider(
+		shapeAppearanceModel: ShapeAppearanceModel,
+	) : ViewOutlineProvider() {
+
+		private val shapeDrawable = MaterialShapeDrawable(shapeAppearanceModel)
+		override fun getOutline(view: View, outline: Outline) {
+			shapeDrawable.setBounds(0, 0, view.width, view.height)
+			shapeDrawable.getOutline(outline)
+		}
+	}
+
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ContinuationResumeRunnable.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ContinuationResumeRunnable.kt
new file mode 100644
index 000000000..5eb098c86
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ContinuationResumeRunnable.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.util
+
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+class ContinuationResumeRunnable(
+	private val continuation: Continuation<Unit>,
+) : Runnable {
+
+	override fun run() {
+		continuation.resume(Unit)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkManagerHelper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkManagerHelper.kt
deleted file mode 100644
index 5d16e9f05..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkManagerHelper.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import android.annotation.SuppressLint
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
-import androidx.work.WorkQuery
-import androidx.work.WorkRequest
-import androidx.work.await
-import androidx.work.impl.WorkManagerImpl
-import java.util.UUID
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-
-@SuppressLint("RestrictedApi")
-class WorkManagerHelper(
-	workManager: WorkManager,
-) {
-
-	private val workManagerImpl = workManager as WorkManagerImpl
-
-	suspend fun deleteWork(id: UUID) = suspendCoroutine { cont ->
-		workManagerImpl.workTaskExecutor.executeOnTaskThread {
-			try {
-				workManagerImpl.workDatabase.workSpecDao().delete(id.toString())
-				cont.resume(Unit)
-			} catch (e: Exception) {
-				cont.resumeWithException(e)
-			}
-		}
-	}
-
-	suspend fun deleteWorks(ids: Collection<UUID>) = suspendCoroutine { cont ->
-		workManagerImpl.workTaskExecutor.executeOnTaskThread {
-			try {
-				val db = workManagerImpl.workDatabase
-				db.runInTransaction {
-					for (id in ids) {
-						db.workSpecDao().delete(id.toString())
-					}
-				}
-				cont.resume(Unit)
-			} catch (e: Exception) {
-				cont.resumeWithException(e)
-			}
-		}
-	}
-
-	suspend fun getWorkInfosByTag(tag: String): List<WorkInfo> {
-		return workManagerImpl.getWorkInfosByTag(tag).await()
-	}
-
-	suspend fun getFinishedWorkInfosByTag(tag: String): List<WorkInfo> {
-		val query = WorkQuery.Builder.fromTags(listOf(tag))
-			.addStates(listOf(WorkInfo.State.SUCCEEDED, WorkInfo.State.CANCELLED, WorkInfo.State.FAILED))
-			.build()
-		return workManagerImpl.getWorkInfos(query).await()
-	}
-
-	suspend fun getWorkInfoById(id: UUID): WorkInfo? {
-		return workManagerImpl.getWorkInfoById(id).await()
-	}
-
-	suspend fun getUniqueWorkInfoByName(name: String): List<WorkInfo> {
-		return workManagerImpl.getWorkInfosForUniqueWork(name).await().orEmpty()
-	}
-
-	suspend fun updateWork(request: WorkRequest): WorkManager.UpdateResult {
-		return workManagerImpl.updateWork(request).await()
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt
deleted file mode 100644
index 533c407a2..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/WorkServiceStopHelper.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import android.annotation.SuppressLint
-import android.content.Context
-import androidx.lifecycle.asFlow
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
-import androidx.work.WorkQuery
-import androidx.work.impl.foreground.SystemForegroundService
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-
-/**
- * Workaround for issue
- * https://issuetracker.google.com/issues/270245927
- * https://issuetracker.google.com/issues/280504155
- */
-class WorkServiceStopHelper(
-	private val context: Context,
-) {
-
-	fun setup() {
-		processLifecycleScope.launch(Dispatchers.Default) {
-			WorkManager.getInstance(context)
-				.getWorkInfosLiveData(WorkQuery.fromStates(WorkInfo.State.RUNNING))
-				.asFlow()
-				.map { it.isEmpty() }
-				.distinctUntilChanged()
-				.collectLatest {
-					if (it) {
-						delay(1_000)
-						stopWorkerService()
-					}
-				}
-		}
-	}
-
-	@SuppressLint("RestrictedApi")
-	private fun stopWorkerService() {
-		SystemForegroundService.getInstance()?.stop()
-	}
-}
-
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
index 92403178d..42cfcaab0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
@@ -1,9 +1,12 @@
 package org.koitharu.kotatsu.core.util.ext
 
+import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.ActivityManager
 import android.app.ActivityManager.MemoryInfo
 import android.app.ActivityOptions
+import android.app.LocaleConfig
 import android.content.Context
 import android.content.Context.ACTIVITY_SERVICE
 import android.content.Context.POWER_SERVICE
@@ -11,8 +14,8 @@ import android.content.ContextWrapper
 import android.content.OperationApplicationException
 import android.content.SharedPreferences
 import android.content.SyncResult
+import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
-import android.content.res.Resources
 import android.database.SQLException
 import android.graphics.Color
 import android.net.Uri
@@ -27,6 +30,8 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
 import androidx.core.app.ActivityOptionsCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
@@ -69,11 +74,14 @@ fun <I> ActivityResultLauncher<I>.resolve(context: Context, input: I): ResolveIn
 	return pm.resolveActivity(intent, 0)
 }
 
-fun <I> ActivityResultLauncher<I>.tryLaunch(input: I, options: ActivityOptionsCompat? = null): Boolean {
-	return runCatching {
-		launch(input, options)
-	}.isSuccess
-}
+fun <I> ActivityResultLauncher<I>.tryLaunch(
+	input: I,
+	options: ActivityOptionsCompat? = null,
+): Boolean = runCatching {
+	launch(input, options)
+}.onFailure { e ->
+	e.printStackTraceDebug()
+}.isSuccess
 
 fun SharedPreferences.observe() = callbackFlow<String> {
 	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
@@ -169,10 +177,17 @@ fun scaleUpActivityOptionsOf(view: View): Bundle? = if (view.context.isAnimation
 	null
 }
 
-fun Resources.getLocalesConfig(): LocaleListCompat {
+@SuppressLint("DiscouragedApi")
+fun Context.getLocalesConfig(): LocaleListCompat {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+		LocaleConfig(this).supportedLocales?.let {
+			return LocaleListCompat.wrap(it)
+		}
+	}
 	val tagsList = StringJoiner(",")
 	try {
-		val xpp: XmlPullParser = getXml(R.xml.locales)
+		val resId = resources.getIdentifier("_generated_res_locale_config", "xml", packageName)
+		val xpp: XmlPullParser = resources.getXml(resId)
 		while (xpp.eventType != XmlPullParser.END_DOCUMENT) {
 			if (xpp.eventType == XmlPullParser.START_TAG) {
 				if (xpp.name == "locale") {
@@ -209,3 +224,9 @@ inline fun Activity.catchingWebViewUnavailability(block: () -> Unit): Boolean {
 		}
 	}
 }
+
+fun Context.checkNotificationPermission(): Boolean = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+	ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
+} else {
+	NotificationManagerCompat.from(this).areNotificationsEnabled()
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt
index d870f8d3b..782811b67 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt
@@ -12,6 +12,7 @@ import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
 import org.koitharu.kotatsu.core.ui.image.RegionBitmapDecoder
 import org.koitharu.kotatsu.core.util.progress.ImageRequestIndicatorListener
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -28,6 +29,7 @@ fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): Image
 		.data(data)
 		.lifecycle(lifecycleOwner)
 		.crossfade(context)
+		.listener(CaptchaNotifier(context.applicationContext))
 		.target(this)
 }
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Collections.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Collections.kt
index 9cb967878..92edc2773 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Collections.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Collections.kt
@@ -3,15 +3,7 @@ package org.koitharu.kotatsu.core.util.ext
 import androidx.collection.ArrayMap
 import androidx.collection.ArraySet
 import java.util.Collections
-
-@Deprecated("TODO: remove")
-fun <T> MutableList<T>.move(sourceIndex: Int, targetIndex: Int) {
-	if (sourceIndex <= targetIndex) {
-		Collections.rotate(subList(sourceIndex, targetIndex + 1), -1)
-	} else {
-		Collections.rotate(subList(targetIndex, sourceIndex + 1), 1)
-	}
-}
+import java.util.EnumSet
 
 inline fun <T> MutableSet(size: Int, init: (index: Int) -> T): MutableSet<T> {
 	val set = ArraySet<T>(size)
@@ -40,10 +32,6 @@ fun <K, V> Map<K, V>.findKeyByValue(value: V): K? {
 	return null
 }
 
-inline fun <T> Collection<T>.filterToSet(predicate: (T) -> Boolean): Set<T> {
-	return filterTo(ArraySet(size), predicate)
-}
-
 fun <T> Sequence<T>.toListSorted(comparator: Comparator<T>): List<T> {
 	return toMutableList().apply { sortWith(comparator) }
 }
@@ -61,3 +49,9 @@ fun <T> List<T>.takeMostFrequent(limit: Int): List<T> {
 		}
 	}
 }
+
+inline fun <reified E : Enum<E>> Collection<E>.toEnumSet(): EnumSet<E> = if (isEmpty()) {
+	EnumSet.noneOf(E::class.java)
+} else {
+	EnumSet.copyOf(this)
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/File.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/File.kt
index 79877887b..54505f1ba 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/File.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/File.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.fs.FileSequence
 import java.io.File
 import java.io.FileFilter
 import java.util.zip.ZipEntry
@@ -73,11 +74,10 @@ suspend fun File.computeSize(): Long = runInterruptible(Dispatchers.IO) {
 
 @WorkerThread
 private fun computeSizeInternal(file: File): Long {
-	if (file.isDirectory) {
-		val files = file.listFiles() ?: return 0L
-		return files.sumOf { computeSizeInternal(it) }
+	return if (file.isDirectory) {
+		file.children().sumOf { computeSizeInternal(it) }
 	} else {
-		return file.length()
+		file.length()
 	}
 }
 
@@ -86,9 +86,8 @@ fun File.listFilesRecursive(filter: FileFilter? = null): Sequence<File> = sequen
 }
 
 private suspend fun SequenceScope<File>.listFilesRecursiveImpl(root: File, filter: FileFilter?) {
-	val ss = root.list() ?: return
-	for (s in ss) {
-		val f = File(root, s)
+	val ss = root.children()
+	for (f in ss) {
 		if (f.isDirectory) {
 			listFilesRecursiveImpl(f, filter)
 		} else if (filter == null || filter.accept(f)) {
@@ -96,3 +95,7 @@ private suspend fun SequenceScope<File>.listFilesRecursiveImpl(root: File, filte
 		}
 	}
 }
+
+fun File.children() = FileSequence(this)
+
+fun Sequence<File>.filterWith(filter: FileFilter): Sequence<File> = filter { f -> filter.accept(f) }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Fragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Fragment.kt
index aaa71435f..62de07110 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Fragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Fragment.kt
@@ -30,7 +30,7 @@ fun DialogFragment.showAllowStateLoss(manager: FragmentManager, tag: String?) {
 }
 
 fun Fragment.addMenuProvider(provider: MenuProvider) {
-	requireActivity().addMenuProvider(provider, viewLifecycleOwner, Lifecycle.State.STARTED)
+	requireActivity().addMenuProvider(provider, viewLifecycleOwner, Lifecycle.State.RESUMED)
 }
 
 @MainThread
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Resources.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Resources.kt
index 6e75afee3..1d12c85e5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Resources.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Resources.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.util.ext
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Resources
+import android.util.TypedValue
 import androidx.annotation.Px
 import kotlin.math.roundToInt
 
@@ -12,6 +13,9 @@ fun Resources.resolveDp(dp: Int) = (dp * displayMetrics.density).roundToInt()
 @Px
 fun Resources.resolveDp(dp: Float) = dp * displayMetrics.density
 
+@Px
+fun Resources.resolveSp(sp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, displayMetrics)
+
 @SuppressLint("DiscouragedApi")
 fun Context.getSystemBoolean(resName: String, fallback: Boolean): Boolean {
 	val id = Resources.getSystem().getIdentifier(resName, "bool", "android")
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/StaticLayout.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/StaticLayout.kt
new file mode 100644
index 000000000..43e5a3d1e
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/StaticLayout.kt
@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.util.ext
+
+import android.graphics.Canvas
+import android.text.StaticLayout
+import androidx.core.graphics.withTranslation
+
+fun StaticLayout.draw(canvas: Canvas, x: Float, y: Float) {
+	canvas.withTranslation(x, y) {
+		draw(this)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/TextView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/TextView.kt
index 424e1e77c..038619b66 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/TextView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/TextView.kt
@@ -11,6 +11,7 @@ import androidx.core.content.res.use
 import androidx.core.view.isGone
 import androidx.core.widget.TextViewCompat
 
+
 var TextView.textAndVisible: CharSequence?
 	get() = text?.takeIf { visibility == View.VISIBLE }
 	set(value) {
@@ -70,3 +71,13 @@ fun TextView.setThemeTextAppearance(@AttrRes resId: Int, @StyleRes fallback: Int
 		TextViewCompat.setTextAppearance(this, it.getResourceId(0, fallback))
 	}
 }
+
+val TextView.isTextTruncated: Boolean
+	get() {
+		val l = layout ?: return false
+		if (maxLines in 0 until l.lineCount) {
+			return true
+		}
+		val layoutLines = l.lineCount
+		return layoutLines > 0 && l.getEllipsisCount(layoutLines - 1) > 0
+	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt
index 75c44715c..e5b713d8f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt
@@ -1,11 +1,14 @@
 package org.koitharu.kotatsu.core.util.ext
 
 import android.content.Context
+import android.content.res.TypedArray
 import android.graphics.Color
+import android.graphics.drawable.Drawable
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
 import androidx.annotation.Px
+import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
 import androidx.core.graphics.ColorUtils
 
@@ -67,3 +70,8 @@ fun Context.getThemeResId(
 ): Int = obtainStyledAttributes(intArrayOf(resId)).use {
 	it.getResourceId(0, fallback)
 }
+
+fun TypedArray.getDrawableCompat(context: Context, index: Int): Drawable? {
+	val resId = getResourceId(index, 0)
+	return if (resId != 0) ContextCompat.getDrawable(context, resId) else null
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt
index abafc3db7..0a369f99f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt
@@ -14,6 +14,7 @@ import org.koitharu.kotatsu.core.exceptions.CaughtException
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.exceptions.SyncApiException
+import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
@@ -32,6 +33,7 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is UnsupportedOperationException,
 	-> resources.getString(R.string.operation_not_supported)
 
+	is TooManyRequestExceptions -> resources.getString(R.string.too_many_requests_message)
 	is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported)
 	is FileNotFoundException -> resources.getString(R.string.file_not_found)
 	is AccessDeniedException -> resources.getString(R.string.no_access_to_file)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt
index 70816e0b1..5dd9c0464 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt
@@ -12,6 +12,7 @@ import androidx.core.view.children
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.slider.Slider
+import com.google.android.material.tabs.TabLayout
 import kotlin.math.roundToInt
 
 fun View.hideKeyboard() {
@@ -147,3 +148,9 @@ var View.isRtl: Boolean
 	set(value) {
 		layoutDirection = if (value) View.LAYOUT_DIRECTION_RTL else View.LAYOUT_DIRECTION_LTR
 	}
+
+fun TabLayout.setTabsEnabled(enabled: Boolean) {
+	for (i in 0 until tabCount) {
+		getTabAt(i)?.view?.isEnabled = enabled
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt
new file mode 100644
index 000000000..b46c13571
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/WorkManager.kt
@@ -0,0 +1,73 @@
+package org.koitharu.kotatsu.core.util.ext
+
+import android.annotation.SuppressLint
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import androidx.work.WorkQuery
+import androidx.work.WorkRequest
+import androidx.work.await
+import androidx.work.impl.WorkManagerImpl
+import java.util.UUID
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.deleteWork(id: UUID) = suspendCoroutine { cont ->
+	workManagerImpl.workTaskExecutor.executeOnTaskThread {
+		try {
+			workManagerImpl.workDatabase.workSpecDao().delete(id.toString())
+			cont.resume(Unit)
+		} catch (e: Exception) {
+			cont.resumeWithException(e)
+		}
+	}
+}
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.deleteWorks(ids: Collection<UUID>) = suspendCoroutine { cont ->
+	workManagerImpl.workTaskExecutor.executeOnTaskThread {
+		try {
+			val db = workManagerImpl.workDatabase
+			db.runInTransaction {
+				for (id in ids) {
+					db.workSpecDao().delete(id.toString())
+				}
+			}
+			cont.resume(Unit)
+		} catch (e: Exception) {
+			cont.resumeWithException(e)
+		}
+	}
+}
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.awaitWorkInfosByTag(tag: String): List<WorkInfo> {
+	return getWorkInfosByTag(tag).await()
+}
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.awaitFinishedWorkInfosByTag(tag: String): List<WorkInfo> {
+	val query = WorkQuery.Builder.fromTags(listOf(tag))
+		.addStates(listOf(WorkInfo.State.SUCCEEDED, WorkInfo.State.CANCELLED, WorkInfo.State.FAILED))
+		.build()
+	return getWorkInfos(query).await()
+}
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.awaitWorkInfoById(id: UUID): WorkInfo? {
+	return getWorkInfoById(id).await()
+}
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.awaitUniqueWorkInfoByName(name: String): List<WorkInfo> {
+	return getWorkInfosForUniqueWork(name).await().orEmpty()
+}
+
+@SuppressLint("RestrictedApi")
+suspend fun WorkManager.awaitUpdateWork(request: WorkRequest): WorkManager.UpdateResult {
+	return updateWork(request).await()
+}
+
+private val WorkManager.workManagerImpl
+	@SuppressLint("RestrictedApi") inline get() = this as WorkManagerImpl
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/iterator/CloseableIterator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/iterator/CloseableIterator.kt
new file mode 100644
index 000000000..da59d5efc
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/iterator/CloseableIterator.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.util.iterator
+
+import okhttp3.internal.closeQuietly
+import okio.Closeable
+
+class CloseableIterator<T>(
+	private val upstream: Iterator<T>,
+	private val closeable: Closeable,
+) : Iterator<T>, Closeable {
+
+	private var isClosed = false
+
+	override fun hasNext(): Boolean {
+		val result = upstream.hasNext()
+		if (!result) {
+			close()
+		}
+		return result
+	}
+
+	override fun next(): T {
+		try {
+			return upstream.next()
+		} catch (e: NoSuchElementException) {
+			close()
+			throw e
+		}
+	}
+
+	override fun close() {
+		if (!isClosed) {
+			closeable.closeQuietly()
+			isClosed = true
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/iterator/MappingIterator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/iterator/MappingIterator.kt
new file mode 100644
index 000000000..8ac9f9d41
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/iterator/MappingIterator.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.util.iterator
+
+import org.koitharu.kotatsu.R
+
+class MappingIterator<T, R>(
+	private val upstream: Iterator<T>,
+	private val mapper: (T) -> R,
+) : Iterator<R> {
+
+	override fun hasNext(): Boolean = upstream.hasNext()
+
+	override fun next(): R = mapper(upstream.next())
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipOutput.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipOutput.kt
index fd38f1c04..448341678 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipOutput.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipOutput.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.zip
 import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
 import okio.Closeable
+import org.koitharu.kotatsu.core.util.ext.children
 import java.io.File
 import java.io.FileInputStream
 import java.util.zip.Deflater
@@ -90,7 +91,7 @@ class ZipOutput(
 			}
 			putNextEntry(entry)
 			closeEntry()
-			fileToZip.listFiles()?.forEach { childFile ->
+			fileToZip.children().forEach { childFile ->
 				appendFile(childFile, "$name/${childFile.name}")
 			}
 		} else {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipPool.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipPool.kt
new file mode 100644
index 000000000..13f2ba8ca
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipPool.kt
@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.core.zip
+
+import android.net.Uri
+import androidx.annotation.WorkerThread
+import androidx.collection.LruCache
+import okhttp3.internal.closeQuietly
+import okio.Source
+import okio.source
+import java.io.File
+import java.util.zip.ZipFile
+
+class ZipPool(maxSize: Int) : LruCache<String, ZipFile>(maxSize) {
+
+	override fun entryRemoved(evicted: Boolean, key: String, oldValue: ZipFile, newValue: ZipFile?) {
+		super.entryRemoved(evicted, key, oldValue, newValue)
+		oldValue.closeQuietly()
+	}
+
+	override fun create(key: String): ZipFile {
+		return ZipFile(File(key), ZipFile.OPEN_READ)
+	}
+
+	@Synchronized
+	@WorkerThread
+	operator fun get(uri: Uri): Source {
+		val zip = requireNotNull(get(uri.schemeSpecificPart)) {
+			"Cannot obtain zip by \"$uri\""
+		}
+		val entry = zip.getEntry(uri.fragment)
+		return zip.getInputStream(entry).source()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/DoubleMangaLoadUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/DoubleMangaLoadUseCase.kt
index 143d1ae24..e228acb57 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/DoubleMangaLoadUseCase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/DoubleMangaLoadUseCase.kt
@@ -8,9 +8,11 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.details.domain.model.DoubleManga
+import org.koitharu.kotatsu.explore.domain.RecoverMangaUseCase
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.recoverNotNull
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
@@ -18,6 +20,7 @@ class DoubleMangaLoadUseCase @Inject constructor(
 	private val mangaDataRepository: MangaDataRepository,
 	private val localMangaRepository: LocalMangaRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val recoverUseCase: RecoverMangaUseCase,
 ) {
 
 	suspend operator fun invoke(manga: Manga): DoubleManga = coroutineScope {
@@ -58,6 +61,12 @@ class DoubleMangaLoadUseCase @Inject constructor(
 			} ?: return null
 			val repository = mangaRepositoryFactory.create(seed.source)
 			repository.getDetails(seed)
+		}.recoverNotNull { e ->
+			if (e is NotFoundException) {
+				recoverUseCase(manga)
+			} else {
+				null
+			}
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/RelatedMangaUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/RelatedMangaUseCase.kt
new file mode 100644
index 000000000..15670f6ab
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/domain/RelatedMangaUseCase.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.details.domain
+
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+
+class RelatedMangaUseCase @Inject constructor(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+) {
+
+	suspend operator fun invoke(seed: Manga) = runCatchingCancellable {
+		mangaRepositoryFactory.create(seed.source).getRelated(seed)
+	}.onFailure {
+		it.printStackTraceDebug()
+	}.getOrNull()
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index dc9998095..c8c3f59a4 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -87,7 +87,6 @@ class ChaptersFragment :
 				.manga(viewModel.manga.value ?: return)
 				.state(ReaderState(item.chapter.id, 0, 0))
 				.build(),
-			scaleUpActivityOptionsOf(view),
 		)
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index e41b998d2..b03b19521 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -1,13 +1,16 @@
 package org.koitharu.kotatsu.details.ui
 
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.text.style.ForegroundColorSpan
+import android.text.style.RelativeSizeSpan
 import android.transition.AutoTransition
 import android.transition.Slide
 import android.transition.TransitionManager
 import android.view.Gravity
+import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +20,8 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
@@ -33,11 +38,11 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.ui.dialog.RecyclerViewAlertDialog
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ViewBadge
 import org.koitharu.kotatsu.core.util.ext.doOnExpansionsChanged
 import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.measureHeight
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -47,10 +52,8 @@ import org.koitharu.kotatsu.core.util.ext.setNavigationIconSafe
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
-import org.koitharu.kotatsu.details.ui.adapter.branchAD
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
-import org.koitharu.kotatsu.details.ui.model.MangaBranch
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -131,12 +134,8 @@ class DetailsActivity :
 			viewBinding.toolbarChapters?.subtitle = it
 			viewBinding.textViewSubtitle?.textAndVisible = it
 		}
-		viewModel.isChaptersReversed.observe(this) {
-			viewBinding.toolbarChapters?.invalidateMenu() ?: invalidateOptionsMenu()
-		}
-		viewModel.favouriteCategories.observe(this) {
-			invalidateOptionsMenu()
-		}
+		viewModel.isChaptersReversed.observe(this, MenuInvalidator(viewBinding.toolbarChapters ?: this))
+		viewModel.favouriteCategories.observe(this, MenuInvalidator(this))
 		viewModel.branches.observe(this) {
 			viewBinding.buttonDropdown.isVisible = it.size > 1
 		}
@@ -160,7 +159,7 @@ class DetailsActivity :
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_read -> openReader(isIncognitoMode = false)
-			R.id.button_dropdown -> showBranchPopupMenu()
+			R.id.button_dropdown -> showBranchPopupMenu(v)
 		}
 	}
 
@@ -278,20 +277,28 @@ class DetailsActivity :
 		viewBadge.counter = newChapters
 	}
 
-	private fun showBranchPopupMenu() {
-		var dialog: DialogInterface? = null
-		val listener = OnListItemClickListener<MangaBranch> { item, _ ->
-			viewModel.setSelectedBranch(item.name)
-			dialog?.dismiss()
+	private fun showBranchPopupMenu(v: View) {
+		val menu = PopupMenu(v.context, v)
+		val branches = viewModel.branches.value
+		for ((i, branch) in branches.withIndex()) {
+			val title = buildSpannedString {
+				append(branch.name ?: getString(R.string.system_default))
+				append(' ')
+				append(' ')
+				inSpans(
+					ForegroundColorSpan(v.context.getThemeColor(android.R.attr.textColorSecondary, Color.LTGRAY)),
+					RelativeSizeSpan(0.74f),
+				) {
+					append(branch.count.toString())
+				}
+			}
+			menu.menu.add(Menu.NONE, Menu.NONE, i, title)
+		}
+		menu.setOnMenuItemClickListener {
+			viewModel.setSelectedBranch(branches.getOrNull(it.order)?.name)
+			true
 		}
-		dialog = RecyclerViewAlertDialog.Builder<MangaBranch>(this)
-			.addAdapterDelegate(branchAD(listener))
-			.setCancelable(true)
-			.setNegativeButton(android.R.string.cancel, null)
-			.setTitle(R.string.translations)
-			.setItems(viewModel.branches.value)
-			.create()
-			.also { it.show() }
+		menu.show()
 	}
 
 	private fun openReader(isIncognitoMode: Boolean) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index c7013447e..056675880 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -2,9 +2,11 @@ package org.koitharu.kotatsu.details.ui
 
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
+import android.transition.TransitionManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
@@ -23,8 +25,10 @@ import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
+import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksSheet
 import org.koitharu.kotatsu.core.model.countChaptersByBranch
 import org.koitharu.kotatsu.core.ui.BaseFragment
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
@@ -34,18 +38,25 @@ import org.koitharu.kotatsu.core.util.ext.crossfade
 import org.koitharu.kotatsu.core.util.ext.drawableTop
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
+import org.koitharu.kotatsu.core.util.ext.isTextTruncated
 import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
+import org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity
 import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingItemDecoration
 import org.koitharu.kotatsu.details.ui.scrobbling.ScrollingInfoAdapter
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.image.ui.ImageActivity
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -53,6 +64,7 @@ import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import javax.inject.Inject
@@ -62,7 +74,7 @@ class DetailsFragment :
 	BaseFragment<FragmentDetailsBinding>(),
 	View.OnClickListener,
 	ChipsView.OnChipClickListener,
-	OnListItemClickListener<Bookmark> {
+	OnListItemClickListener<Bookmark>, ViewTreeObserver.OnDrawListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -81,9 +93,17 @@ class DetailsFragment :
 		super.onViewBindingCreated(binding, savedInstanceState)
 		binding.textViewAuthor.setOnClickListener(this)
 		binding.imageViewCover.setOnClickListener(this)
+		binding.buttonDescriptionMore.setOnClickListener(this)
+		binding.buttonBookmarksMore.setOnClickListener(this)
+		binding.buttonScrobblingMore.setOnClickListener(this)
+		binding.buttonRelatedMore.setOnClickListener(this)
 		binding.infoLayout.textViewSource.setOnClickListener(this)
+		binding.textViewDescription.viewTreeObserver.addOnDrawListener(this)
 		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
 		binding.chipsTags.onChipClickListener = this
+		binding.recyclerViewRelated.addItemDecoration(
+			SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),
+		)
 		TitleScrollCoordinator(binding.textViewTitle).attach(binding.scrollView)
 		viewModel.manga.filterNotNull().observe(viewLifecycleOwner, ::onMangaUpdated)
 		viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
@@ -93,12 +113,12 @@ class DetailsFragment :
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
 		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
 		viewModel.localSize.observe(viewLifecycleOwner, ::onLocalSizeChanged)
+		viewModel.relatedManga.observe(viewLifecycleOwner, ::onRelatedMangaChanged)
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
 		startActivity(
 			ReaderActivity.IntentBuilder(view.context).bookmark(item).incognito(true).build(),
-			scaleUpActivityOptionsOf(view),
 		)
 		Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 	}
@@ -116,6 +136,13 @@ class DetailsFragment :
 		return true
 	}
 
+	override fun onDraw() {
+		viewBinding?.run {
+			buttonDescriptionMore.isVisible = textViewDescription.maxLines == Int.MAX_VALUE ||
+				textViewDescription.isTextTruncated
+		}
+	}
+
 	private fun onMangaUpdated(manga: Manga) {
 		with(requireViewBinding()) {
 			// Main
@@ -173,11 +200,13 @@ class DetailsFragment :
 	}
 
 	private fun onDescriptionChanged(description: CharSequence?) {
+		val tv = requireViewBinding().textViewDescription
 		if (description.isNullOrBlank()) {
-			requireViewBinding().textViewDescription.setText(R.string.no_description)
+			tv.setText(R.string.no_description)
 		} else {
-			requireViewBinding().textViewDescription.text = description
+			tv.text = description
 		}
+		requireViewBinding().buttonDescriptionMore.isVisible = tv.isTextTruncated
 	}
 
 	private fun onLocalSizeChanged(size: Long) {
@@ -190,6 +219,26 @@ class DetailsFragment :
 		}
 	}
 
+	private fun onRelatedMangaChanged(related: List<MangaItemModel>) {
+		if (related.isEmpty()) {
+			requireViewBinding().groupRelated.isVisible = false
+			return
+		}
+		val rv = viewBinding?.recyclerViewRelated ?: return
+
+		@Suppress("UNCHECKED_CAST")
+		val adapter = (rv.adapter as? BaseListAdapter<ListModel>) ?: BaseListAdapter(
+			mangaGridItemAD(
+				coil, viewLifecycleOwner,
+				StaticItemSizeResolver(resources.getDimensionPixelSize(R.dimen.smaller_grid_width)),
+			) { item, view ->
+				startActivity(DetailsActivity.newIntent(view.context, item))
+			},
+		).also { rv.adapter = it }
+		adapter.items = related
+		requireViewBinding().groupRelated.isVisible = true
+	}
+
 	private fun onHistoryChanged(history: HistoryInfo) {
 		requireViewBinding().progressView.setPercent(history.history?.percent ?: PROGRESS_NONE, animate = true)
 	}
@@ -218,7 +267,7 @@ class DetailsFragment :
 
 	private fun onScrobblingInfoChanged(scrobblings: List<ScrobblingInfo>) {
 		var adapter = requireViewBinding().recyclerViewScrobbling.adapter as? ScrollingInfoAdapter
-		requireViewBinding().recyclerViewScrobbling.isGone = scrobblings.isEmpty()
+		requireViewBinding().groupScrobbling.isGone = scrobblings.isEmpty()
 		if (adapter != null) {
 			adapter.items = scrobblings
 		} else {
@@ -261,6 +310,28 @@ class DetailsFragment :
 					scaleUpActivityOptionsOf(v),
 				)
 			}
+
+			R.id.button_description_more -> {
+				val tv = requireViewBinding().textViewDescription
+				TransitionManager.beginDelayedTransition(tv.parentView)
+				if (tv.maxLines in 1 until Integer.MAX_VALUE) {
+					tv.maxLines = Integer.MAX_VALUE
+				} else {
+					tv.maxLines = resources.getInteger(R.integer.details_description_lines)
+				}
+			}
+
+			R.id.button_scrobbling_more -> {
+				ScrobblingSelectorSheet.show(parentFragmentManager, manga, null)
+			}
+
+			R.id.button_bookmarks_more -> {
+				BookmarksSheet.show(parentFragmentManager, manga)
+			}
+
+			R.id.button_related_more -> {
+				startActivity(RelatedMangaActivity.newIntent(v.context, manga))
+			}
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt
index 4832e24a7..b18df6945 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt
@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.download.ui.dialog.DownloadOption
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
@@ -62,7 +62,7 @@ class DetailsMenuProvider(
 
 			R.id.action_favourite -> {
 				viewModel.manga.value?.let {
-					FavouriteCategoriesSheet.show(activity.supportFragmentManager, it)
+					FavouriteSheet.show(activity.supportFragmentManager, it)
 				}
 			}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 38b041a6e..c0e82cb6f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -23,6 +23,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.flow.update
@@ -34,6 +35,7 @@ import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
@@ -46,12 +48,16 @@ import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.details.domain.BranchComparator
 import org.koitharu.kotatsu.details.domain.DetailsInteractor
 import org.koitharu.kotatsu.details.domain.DoubleMangaLoadUseCase
+import org.koitharu.kotatsu.details.domain.RelatedMangaUseCase
 import org.koitharu.kotatsu.details.domain.model.DoubleManga
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
 import org.koitharu.kotatsu.details.ui.model.MangaBranch
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.DeleteLocalMangaUseCase
 import org.koitharu.kotatsu.local.domain.model.LocalManga
@@ -74,6 +80,8 @@ class DetailsViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val deleteLocalMangaUseCase: DeleteLocalMangaUseCase,
 	private val doubleMangaLoadUseCase: DoubleMangaLoadUseCase,
+	private val relatedMangaUseCase: RelatedMangaUseCase,
+	private val extraProvider: ListExtraProvider,
 	networkState: NetworkState,
 ) : BaseViewModel() {
 
@@ -155,6 +163,18 @@ class DetailsViewModel @Inject constructor(
 	val scrobblingInfo: StateFlow<List<ScrobblingInfo>> = interactor.observeScrobblingInfo(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
+	val relatedManga: StateFlow<List<MangaItemModel>> = doubleManga.map {
+		it?.remote
+	}.distinctUntilChangedBy { it?.id }
+		.mapLatest {
+			if (it != null) {
+				relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
+			} else {
+				emptyList()
+			}
+		}
+		.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
+
 	val branches: StateFlow<List<MangaBranch>> = combine(
 		doubleManga,
 		selectedBranch,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt
deleted file mode 100644
index add2a583f..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.koitharu.kotatsu.details.ui.adapter
-
-import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.details.ui.model.MangaBranch
-
-class BranchesAdapter(
-	list: List<MangaBranch>,
-	listener: OnListItemClickListener<MangaBranch>,
-) : ListDelegationAdapter<List<MangaBranch>>() {
-
-	init {
-		delegatesManager.addDelegate(branchAD(listener))
-		items = list
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
index d1de826d9..2cc6f1f9f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
@@ -1,16 +1,14 @@
 package org.koitharu.kotatsu.details.ui.adapter
 
 import android.content.Context
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+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.details.ui.model.ChapterListItem
-import kotlin.jvm.internal.Intrinsics
 
 class ChaptersAdapter(
 	onItemClickListener: OnListItemClickListener<ChapterListItem>,
-) : AsyncListDifferDelegationAdapter<ChapterListItem>(DiffCallback()), FastScroller.SectionIndexer {
+) : BaseListAdapter<ChapterListItem>(), FastScroller.SectionIndexer {
 
 	init {
 		setHasStableIds(true)
@@ -21,27 +19,6 @@ class ChaptersAdapter(
 		return items[position].chapter.id
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<ChapterListItem>() {
-
-		override fun areItemsTheSame(oldItem: ChapterListItem, newItem: ChapterListItem): Boolean {
-			return oldItem.chapter.id == newItem.chapter.id
-		}
-
-		override fun areContentsTheSame(
-			oldItem: ChapterListItem,
-			newItem: ChapterListItem
-		): Boolean {
-			return Intrinsics.areEqual(oldItem, newItem)
-		}
-
-		override fun getChangePayload(oldItem: ChapterListItem, newItem: ChapterListItem): Any? {
-			if (oldItem.flags != newItem.flags && oldItem.chapter == newItem.chapter) {
-				return newItem.flags
-			}
-			return null
-		}
-	}
-
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
 		val item = items.getOrNull(position) ?: return null
 		return item.chapter.number.toString()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
index 5c3cfd46e..cece102e9 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
@@ -1,13 +1,14 @@
 package org.koitharu.kotatsu.details.ui.model
 
 import android.text.format.DateUtils
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
 class ChapterListItem(
 	val chapter: MangaChapter,
 	val flags: Int,
 	private val uploadDateMs: Long,
-) {
+) : ListModel {
 
 	var uploadDate: CharSequence? = null
 		private set
@@ -50,6 +51,21 @@ class ChapterListItem(
 		return (flags and flag) == flag
 	}
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ChapterListItem && chapter.id == other.chapter.id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		if (previousState !is ChapterListItem) {
+			return super.getChangePayload(previousState)
+		}
+		return if (chapter == previousState.chapter && flags != previousState.flags) {
+			flags
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt
index 2ba871400..72e2f7837 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt
@@ -22,9 +22,7 @@ class HistoryInfo(
 		if (totalChapters != other.totalChapters) return false
 		if (currentChapter != other.currentChapter) return false
 		if (history != other.history) return false
-		if (isIncognitoMode != other.isIncognitoMode) return false
-
-		return true
+		return isIncognitoMode == other.isIncognitoMode
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/MangaBranch.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/MangaBranch.kt
index 8588187f6..dfe1f7d66 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/MangaBranch.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/MangaBranch.kt
@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.details.ui.model
 
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class MangaBranch(
@@ -8,6 +9,18 @@ class MangaBranch(
 	val isSelected: Boolean,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is MangaBranch && other.name == name
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is MangaBranch && previousState.isSelected != isSelected) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedListFragment.kt
new file mode 100644
index 000000000..8ec35ac90
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedListFragment.kt
@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.details.ui.related
+
+import android.view.Menu
+import androidx.appcompat.view.ActionMode
+import androidx.fragment.app.viewModels
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.list.ui.MangaListFragment
+
+@AndroidEntryPoint
+class RelatedListFragment : MangaListFragment() {
+
+	override val viewModel by viewModels<RelatedListViewModel>()
+	override val isSwipeRefreshEnabled = false
+
+	override fun onScrolledToEnd() = Unit
+
+	override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+		mode.menuInflater.inflate(R.menu.mode_remote, menu)
+		return super.onCreateActionMode(controller, mode, menu)
+	}
+}
+
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedListViewModel.kt
new file mode 100644
index 000000000..8cc83be4b
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedListViewModel.kt
@@ -0,0 +1,99 @@
+package org.koitharu.kotatsu.details.ui.related
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.ui.MangaListViewModel
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.list.ui.model.toUi
+import org.koitharu.kotatsu.parsers.model.Manga
+import javax.inject.Inject
+
+@HiltViewModel
+class RelatedListViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
+	mangaRepositoryFactory: MangaRepository.Factory,
+	settings: AppSettings,
+	private val extraProvider: ListExtraProvider,
+	downloadScheduler: DownloadWorker.Scheduler,
+) : MangaListViewModel(settings, downloadScheduler) {
+
+	private val seed = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga
+	private val repository = mangaRepositoryFactory.create(seed.source)
+	private val mangaList = MutableStateFlow<List<Manga>?>(null)
+	private val listError = MutableStateFlow<Throwable?>(null)
+	private var loadingJob: Job? = null
+
+	override val content = combine(
+		mangaList,
+		listMode,
+		listError,
+	) { list, mode, error ->
+		when {
+			list.isNullOrEmpty() && error != null -> listOf(error.toErrorState(canRetry = true))
+			list == null -> listOf(LoadingState)
+			list.isEmpty() -> listOf(createEmptyState())
+			else -> list.toUi(mode, extraProvider)
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+
+	init {
+		loadList()
+	}
+
+	override fun onRefresh() {
+		loadList()
+	}
+
+	override fun onRetry() {
+		loadList()
+	}
+
+	private fun loadList(): Job {
+		loadingJob?.let {
+			if (it.isActive) return it
+		}
+		return launchLoadingJob(Dispatchers.Default) {
+			try {
+				listError.value = null
+				mangaList.value = repository.getRelated(seed)
+			} catch (e: CancellationException) {
+				throw e
+			} catch (e: Throwable) {
+				e.printStackTraceDebug()
+				listError.value = e
+				if (!mangaList.value.isNullOrEmpty()) {
+					errorEvent.call(e)
+				}
+			}
+		}.also { loadingJob = it }
+	}
+
+	private fun createEmptyState() = EmptyState(
+		icon = R.drawable.ic_empty_common,
+		textPrimary = R.string.nothing_found,
+		textSecondary = 0,
+		actionStringRes = 0,
+	)
+}
+
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedMangaActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedMangaActivity.kt
new file mode 100644
index 000000000..49aca965c
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/related/RelatedMangaActivity.kt
@@ -0,0 +1,50 @@
+package org.koitharu.kotatsu.details.ui.related
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
+import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityContainerBinding
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.parsers.model.Manga
+
+@AndroidEntryPoint
+class RelatedMangaActivity : BaseActivity<ActivityContainerBinding>(), AppBarOwner {
+
+	override val appBar: AppBarLayout
+		get() = viewBinding.appbar
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityContainerBinding.inflate(layoutInflater))
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		val fm = supportFragmentManager
+		if (fm.findFragmentById(R.id.container) == null) {
+			fm.commit {
+				setReorderingAllowed(true)
+				replace(R.id.container, RelatedListFragment::class.java, intent.extras)
+			}
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+	}
+
+	companion object {
+
+		fun newIntent(context: Context, seed: Manga) = Intent(context, RelatedMangaActivity::class.java)
+			.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(seed, withChapters = false))
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoAD.kt
index 42644501a..a7059e477 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoAD.kt
@@ -9,13 +9,14 @@ 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.databinding.ItemScrobblingInfoBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 
 fun scrobblingInfoAD(
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
 	fragmentManager: FragmentManager,
-) = adapterDelegateViewBinding<ScrobblingInfo, ScrobblingInfo, ItemScrobblingInfoBinding>(
+) = adapterDelegateViewBinding<ScrobblingInfo, ListModel, ItemScrobblingInfoBinding>(
 	{ layoutInflater, parent -> ItemScrobblingInfoBinding.inflate(layoutInflater, parent, false) },
 ) {
 	binding.root.setOnClickListener {
@@ -29,8 +30,8 @@ fun scrobblingInfoAD(
 			error(R.drawable.ic_error_placeholder)
 			enqueueWith(coil)
 		}
-		binding.textViewTitle.text = item.title
-		binding.textViewTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, item.scrobbler.iconResId, 0)
+		binding.textViewTitle.setText(item.scrobbler.titleResId)
+		binding.imageViewIcon.setImageResource(item.scrobbler.iconResId)
 		binding.ratingBar.rating = item.rating * binding.ratingBar.numStars
 		binding.textViewStatus.text = item.status?.let {
 			context.resources.getStringArray(R.array.scrobbling_statuses).getOrNull(it.ordinal)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt
index c48304386..3593b0e69 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt
@@ -88,7 +88,7 @@ class ScrobblingInfoSheet :
 		viewModel.updateScrobbling(
 			index = scrobblerIndex,
 			rating = requireViewBinding().ratingBar.rating / requireViewBinding().ratingBar.numStars,
-			status = enumValues<ScrobblingStatus>().getOrNull(position),
+			status = ScrobblingStatus.entries.getOrNull(position),
 		)
 	}
 
@@ -99,7 +99,7 @@ class ScrobblingInfoSheet :
 			viewModel.updateScrobbling(
 				index = scrobblerIndex,
 				rating = rating / ratingBar.numStars,
-				status = enumValues<ScrobblingStatus>().getOrNull(requireViewBinding().spinnerStatus.selectedItemPosition),
+				status = ScrobblingStatus.entries.getOrNull(requireViewBinding().spinnerStatus.selectedItemPosition),
 			)
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingItemDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingItemDecoration.kt
index 7b9d86300..ce9523a8d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingItemDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingItemDecoration.kt
@@ -5,7 +5,7 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
 
-class ScrobblingItemDecoration() : RecyclerView.ItemDecoration() {
+class ScrobblingItemDecoration : RecyclerView.ItemDecoration() {
 
 	private var spacing: Int = -1
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrollingInfoAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrollingInfoAdapter.kt
index d4cfd55a2..aa36cb8c1 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrollingInfoAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrollingInfoAdapter.kt
@@ -2,33 +2,17 @@ package org.koitharu.kotatsu.details.ui.scrobbling
 
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class ScrollingInfoAdapter(
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
 	fragmentManager: FragmentManager,
-) : AsyncListDifferDelegationAdapter<ScrobblingInfo>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		delegatesManager.addDelegate(scrobblingInfoAD(lifecycleOwner, coil, fragmentManager))
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ScrobblingInfo>() {
-
-		override fun areItemsTheSame(oldItem: ScrobblingInfo, newItem: ScrobblingInfo): Boolean {
-			return oldItem.scrobbler == newItem.scrobbler
-		}
-
-		override fun areContentsTheSame(oldItem: ScrobblingInfo, newItem: ScrobblingInfo): Boolean {
-			return oldItem == newItem
-		}
-
-		override fun getChangePayload(oldItem: ScrobblingInfo, newItem: ScrobblingInfo): Any {
-			return Unit
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemAD.kt
index e2150152a..9c475d438 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemAD.kt
@@ -7,6 +7,7 @@ import androidx.work.WorkInfo
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
@@ -53,6 +54,7 @@ fun downloadItemAD(
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
+			transformations(TrimTransformation())
 			source(item.manga.source)
 			enqueueWith(coil)
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt
index f8d95a66c..2a4e5a613 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt
@@ -47,6 +47,24 @@ class DownloadItemModel(
 		return timestamp.compareTo(other.timestamp)
 	}
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is DownloadItemModel && other.id == id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return when (previousState) {
+			is DownloadItemModel -> {
+				if (workState == previousState.workState) {
+					Unit
+				} else {
+					null
+				}
+			}
+
+			else -> super.getChangePayload(previousState)
+		}
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsActivity.kt
index 5a6128b75..fa22c000c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsActivity.kt
@@ -13,17 +13,17 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.FlowCollector
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.PausingReceiver
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -46,7 +46,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 		listSpacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		val downloadsAdapter = DownloadsAdapter(this, coil, this)
-		val decoration = SpacingItemDecoration(listSpacing)
+		val decoration = TypedListSpacingDecoration(this)
 		selectionController = ListSelectionController(
 			activity = this,
 			decoration = DownloadsSelectionDecoration(this),
@@ -64,10 +64,10 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 			downloadsAdapter.items = it
 		}
 		viewModel.onActionDone.observeEvent(this, ReversibleActionObserver(viewBinding.recyclerView))
-		val menuObserver = FlowCollector<Any> { _ -> invalidateOptionsMenu() }
-		viewModel.hasActiveWorks.observe(this, menuObserver)
-		viewModel.hasPausedWorks.observe(this, menuObserver)
-		viewModel.hasCancellableWorks.observe(this, menuObserver)
+		val menuInvalidator = MenuInvalidator(this)
+		viewModel.hasActiveWorks.observe(this, menuInvalidator)
+		viewModel.hasPausedWorks.observe(this, menuInvalidator)
+		viewModel.hasCancellableWorks.observe(this, menuInvalidator)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsAdapter.kt
index 16fa29387..ea30e09f7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsAdapter.kt
@@ -1,65 +1,24 @@
 package org.koitharu.kotatsu.download.ui.list
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.adapter.relatedDateItemAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import kotlin.jvm.internal.Intrinsics
 
 class DownloadsAdapter(
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
 	listener: DownloadItemListener,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
-		delegatesManager.addDelegate(ITEM_TYPE_DOWNLOAD, downloadItemAD(lifecycleOwner, coil, listener))
-			.addDelegate(loadingStateAD())
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, null))
-			.addDelegate(relatedDateItemAD())
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel) = when {
-
-			oldItem is DownloadItemModel && newItem is DownloadItemModel -> {
-				oldItem.id == newItem.id
-			}
-
-			oldItem is DateTimeAgo && newItem is DateTimeAgo -> {
-				oldItem == newItem
-			}
-
-			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 (newItem) {
-				is DownloadItemModel -> {
-					oldItem as DownloadItemModel
-					if (oldItem.workState == newItem.workState) {
-						Unit
-					} else {
-						null
-					}
-				}
-
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
-
-	companion object {
-		const val ITEM_TYPE_DOWNLOAD = 0
+		addDelegate(ListItemType.DOWNLOAD, downloadItemAD(lifecycleOwner, coil, listener))
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
+		addDelegate(ListItemType.HEADER, listHeaderAD(null))
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt
index aebe6b3f7..af02a056d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt
@@ -26,11 +26,13 @@ import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 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.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.Date
+import java.util.LinkedList
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -180,16 +182,34 @@ class DownloadsViewModel @Inject constructor(
 		if (isEmpty()) {
 			return emptyStateList()
 		}
-		val destination = ArrayList<ListModel>((size * 1.4).toInt())
+		val queued = LinkedList<ListModel>()
+		val running = LinkedList<ListModel>()
+		val destination = ArrayDeque<ListModel>((size * 1.4).toInt())
 		var prevDate: DateTimeAgo? = null
 		for (item in this) {
-			val date = timeAgo(item.timestamp)
-			if (prevDate != date) {
-				destination += date
+			when (item.workState) {
+				WorkInfo.State.RUNNING -> running += item
+				WorkInfo.State.BLOCKED,
+				WorkInfo.State.ENQUEUED -> queued += item
+
+				else -> {
+					val date = timeAgo(item.timestamp)
+					if (prevDate != date) {
+						destination += ListHeader(date)
+					}
+					prevDate = date
+					destination += item
+				}
 			}
-			prevDate = date
-			destination += item
 		}
+		if (running.isNotEmpty()) {
+			running.addFirst(ListHeader(R.string.in_progress))
+		}
+		destination.addAll(0, running)
+		if (queued.isNotEmpty()) {
+			queued.addFirst(ListHeader(R.string.queued))
+		}
+		destination.addAll(0, queued)
 		return destination
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt
index 41568e832..7f2e3d564 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt
@@ -1,13 +1,11 @@
 package org.koitharu.kotatsu.download.ui.worker
 
 import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.text.format.DateUtils
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
@@ -24,6 +22,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
@@ -32,7 +31,6 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.search.ui.MangaListActivity
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.util.UUID
 import com.google.android.material.R as materialR
 
@@ -41,6 +39,7 @@ private const val GROUP_ID = "downloads"
 
 class DownloadNotificationFactory @AssistedInject constructor(
 	@ApplicationContext private val context: Context,
+	private val workManager: WorkManager,
 	private val coil: ImageLoader,
 	@Assisted private val uuid: UUID,
 ) {
@@ -67,7 +66,7 @@ class DownloadNotificationFactory @AssistedInject constructor(
 		NotificationCompat.Action(
 			materialR.drawable.material_ic_clear_black_24dp,
 			context.getString(android.R.string.cancel),
-			WorkManager.getInstance(context).createCancelPendingIntent(uuid),
+			workManager.createCancelPendingIntent(uuid),
 		)
 	}
 
@@ -246,20 +245,14 @@ class DownloadNotificationFactory @AssistedInject constructor(
 	}
 
 	private fun createChannel() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val manager = NotificationManagerCompat.from(context)
-			if (manager.getNotificationChannel(CHANNEL_ID) == null) {
-				val channel = NotificationChannel(
-					CHANNEL_ID,
-					context.getString(R.string.downloads),
-					NotificationManager.IMPORTANCE_LOW,
-				)
-				channel.enableVibration(false)
-				channel.enableLights(false)
-				channel.setSound(null, null)
-				manager.createNotificationChannel(channel)
-			}
-		}
+		val manager = NotificationManagerCompat.from(context)
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+			.setName(context.getString(R.string.downloads))
+			.setVibrationEnabled(false)
+			.setLightsEnabled(false)
+			.setSound(null, null)
+			.build()
+		manager.createNotificationChannel(channel)
 	}
 
 	@AssistedFactory
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt
index e74cd7c21..7bba51708 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt
@@ -41,8 +41,13 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.Throttler
-import org.koitharu.kotatsu.core.util.WorkManagerHelper
+import org.koitharu.kotatsu.core.util.ext.awaitFinishedWorkInfosByTag
+import org.koitharu.kotatsu.core.util.ext.awaitUpdateWork
+import org.koitharu.kotatsu.core.util.ext.awaitWorkInfoById
+import org.koitharu.kotatsu.core.util.ext.awaitWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
+import org.koitharu.kotatsu.core.util.ext.deleteWork
+import org.koitharu.kotatsu.core.util.ext.deleteWorks
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
@@ -313,7 +318,7 @@ class DownloadWorker @AssistedInject constructor(
 	}
 
 	private suspend fun getDoneChapters(): LongArray {
-		val work = WorkManagerHelper(WorkManager.getInstance(applicationContext)).getWorkInfoById(id)
+		val work = WorkManager.getInstance(applicationContext).awaitWorkInfoById(id)
 			?: return LongArray(0)
 		return DownloadState.getDownloadedChapters(work.progress)
 	}
@@ -346,13 +351,11 @@ class DownloadWorker @AssistedInject constructor(
 	@Reusable
 	class Scheduler @Inject constructor(
 		@ApplicationContext private val context: Context,
+		private val workManager: WorkManager,
 		private val dataRepository: MangaDataRepository,
 		private val settings: AppSettings,
 	) {
 
-		private val workManager: WorkManager
-			inline get() = WorkManager.getInstance(context)
-
 		suspend fun schedule(manga: Manga, chaptersIds: Collection<Long>?) {
 			dataRepository.storeManga(manga)
 			val data = Data.Builder()
@@ -396,26 +399,23 @@ class DownloadWorker @AssistedInject constructor(
 		}
 
 		suspend fun delete(id: UUID) {
-			WorkManagerHelper(workManager).deleteWork(id)
+			workManager.deleteWork(id)
 		}
 
 		suspend fun delete(ids: Collection<UUID>) {
 			val wm = workManager
-			val helper = WorkManagerHelper(wm)
 			ids.forEach { id -> wm.cancelWorkById(id).await() }
-			helper.deleteWorks(ids)
+			workManager.deleteWorks(ids)
 		}
 
 		suspend fun removeCompleted() {
-			val helper = WorkManagerHelper(workManager)
-			val finishedWorks = helper.getFinishedWorkInfosByTag(TAG)
-			helper.deleteWorks(finishedWorks.mapToSet { it.id })
+			val finishedWorks = workManager.awaitFinishedWorkInfosByTag(TAG)
+			workManager.deleteWorks(finishedWorks.mapToSet { it.id })
 		}
 
 		suspend fun updateConstraints() {
 			val constraints = createConstraints()
-			val helper = WorkManagerHelper(workManager)
-			val works = helper.getWorkInfosByTag(TAG)
+			val works = workManager.awaitWorkInfosByTag(TAG)
 			for (work in works) {
 				if (work.state.isFinished) {
 					continue
@@ -425,7 +425,7 @@ class DownloadWorker @AssistedInject constructor(
 					.addTag(TAG)
 					.setId(work.id)
 					.build()
-				helper.updateWork(request)
+				workManager.awaitUpdateWork(request)
 			}
 		}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt
new file mode 100644
index 000000000..9d7f65b22
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt
@@ -0,0 +1,164 @@
+package org.koitharu.kotatsu.explore.data
+
+import androidx.room.withTransaction
+import dagger.Reusable
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
+import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.move
+import java.util.Collections
+import java.util.EnumSet
+import javax.inject.Inject
+
+@Reusable
+class MangaSourcesRepository @Inject constructor(
+	private val db: MangaDatabase,
+	private val settings: AppSettings,
+) {
+
+	private val dao: MangaSourcesDao
+		get() = db.sourcesDao
+
+	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
+		remove(MangaSource.LOCAL)
+		if (!BuildConfig.DEBUG) {
+			remove(MangaSource.DUMMY)
+		}
+	}
+
+	val allMangaSources: Set<MangaSource>
+		get() = Collections.unmodifiableSet(remoteSources)
+
+	suspend fun getEnabledSources(): List<MangaSource> {
+		return dao.findAllEnabled().toSources(settings.isNsfwContentDisabled)
+	}
+
+	fun observeEnabledSources(): Flow<List<MangaSource>> = observeIsNsfwDisabled().flatMapLatest { skipNsfw ->
+		dao.observeEnabled().map {
+			it.toSources(skipNsfw)
+		}
+	}
+
+	fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
+		val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
+		for (entity in entities) {
+			val source = MangaSource(entity.source)
+			if (source in remoteSources) {
+				result.add(source to entity.isEnabled)
+			}
+		}
+		result
+	}
+
+	suspend fun setSourceEnabled(source: MangaSource, isEnabled: Boolean): ReversibleHandle {
+		dao.setEnabled(source.name, isEnabled)
+		return ReversibleHandle {
+			dao.setEnabled(source.name, !isEnabled)
+		}
+	}
+
+	suspend fun setSourcesEnabled(sources: Iterable<MangaSource>, isEnabled: Boolean) {
+		db.withTransaction {
+			for (s in sources) {
+				dao.setEnabled(s.name, isEnabled)
+			}
+		}
+	}
+
+	suspend fun disableAllSources() {
+		db.withTransaction {
+			assimilateNewSources()
+			dao.disableAllSources()
+		}
+	}
+
+	suspend fun setPosition(source: MangaSource, index: Int) {
+		db.withTransaction {
+			val all = dao.findAll().toMutableList()
+			val sourceIndex = all.indexOfFirst { x -> x.source == source.name }
+			if (sourceIndex !in all.indices) {
+				val entity = MangaSourceEntity(
+					source = source.name,
+					isEnabled = false,
+					sortKey = index,
+				)
+				all.add(index, entity)
+				dao.upsert(entity)
+			} else {
+				all.move(sourceIndex, index)
+			}
+			for ((i, e) in all.withIndex()) {
+				if (e.sortKey != i) {
+					dao.setSortKey(e.source, i)
+				}
+			}
+		}
+	}
+
+	fun observeNewSources(): Flow<Set<MangaSource>> = dao.observeAll().map { entities ->
+		val result = EnumSet.copyOf(remoteSources)
+		for (e in entities) {
+			result.remove(MangaSource(e.source))
+		}
+		result
+	}.distinctUntilChanged()
+
+	suspend fun getNewSources(): Set<MangaSource> {
+		val entities = dao.findAll()
+		val result = EnumSet.copyOf(remoteSources)
+		for (e in entities) {
+			result.remove(MangaSource(e.source))
+		}
+		return result
+	}
+
+	suspend fun assimilateNewSources(): Set<MangaSource> {
+		val new = getNewSources()
+		if (new.isEmpty()) {
+			return emptySet()
+		}
+		var maxSortKey = dao.getMaxSortKey()
+		val entities = new.map { x ->
+			MangaSourceEntity(
+				source = x.name,
+				isEnabled = false,
+				sortKey = ++maxSortKey,
+			)
+		}
+		dao.insertIfAbsent(entities)
+		return new
+	}
+
+	suspend fun isSetupRequired(): Boolean {
+		return dao.findAll().isEmpty()
+	}
+
+	private fun List<MangaSourceEntity>.toSources(skipNsfwSources: Boolean): List<MangaSource> {
+		val result = ArrayList<MangaSource>(size)
+		for (entity in this) {
+			val source = MangaSource(entity.source)
+			if (skipNsfwSources && source.contentType == ContentType.HENTAI) {
+				continue
+			}
+			if (source in remoteSources) {
+				result.add(source)
+			}
+		}
+		return result
+	}
+
+	private fun observeIsNsfwDisabled() = settings.observeAsFlow(AppSettings.KEY_DISABLE_NSFW) {
+		isNsfwContentDisabled
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt
index c91336c1c..c351e80cf 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt
@@ -4,34 +4,57 @@ import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.almostEquals
 import org.koitharu.kotatsu.core.util.ext.asArrayList
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.suggestions.domain.TagsBlacklist
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 class ExploreRepository @Inject constructor(
 	private val settings: AppSettings,
+	private val sourcesRepository: MangaSourcesRepository,
 	private val historyRepository: HistoryRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {
 
 	suspend fun findRandomManga(tagsLimit: Int): Manga {
-		val blacklistTagRegex = TagsBlacklist(settings.suggestionsTagsBlacklist, 0.4f)
+		val tagsBlacklist = TagsBlacklist(settings.suggestionsTagsBlacklist, 0.4f)
 		val tags = historyRepository.getPopularTags(tagsLimit).mapNotNull {
-			if (it in blacklistTagRegex) null else it.title
+			if (it in tagsBlacklist) null else it.title
 		}
-		val sources = settings.getMangaSources(includeHidden = false)
+		val sources = sourcesRepository.getEnabledSources()
 		check(sources.isNotEmpty()) { "No sources available" }
 		for (i in 0..4) {
-			val list = getList(sources.random(), tags, blacklistTagRegex)
+			val list = getList(sources.random(), tags, tagsBlacklist)
+			val manga = list.randomOrNull() ?: continue
+			val details = runCatchingCancellable {
+				mangaRepositoryFactory.create(manga.source).getDetails(manga)
+			}.getOrNull() ?: continue
+			if ((settings.isSuggestionsExcludeNsfw && details.isNsfw) || details in tagsBlacklist) {
+				continue
+			}
+			return details
+		}
+		throw NoSuchElementException()
+	}
+
+	suspend fun findRandomManga(source: MangaSource, tagsLimit: Int): Manga {
+		val tagsBlacklist = TagsBlacklist(settings.suggestionsTagsBlacklist, 0.4f)
+		val skipNsfw = settings.isSuggestionsExcludeNsfw && source.contentType != ContentType.HENTAI
+		val tags = historyRepository.getPopularTags(tagsLimit).mapNotNull {
+			if (it in tagsBlacklist) null else it.title
+		}
+		for (i in 0..4) {
+			val list = getList(source, tags, tagsBlacklist)
 			val manga = list.randomOrNull() ?: continue
 			val details = runCatchingCancellable {
 				mangaRepositoryFactory.create(manga.source).getDetails(manga)
 			}.getOrNull() ?: continue
-			if ((settings.isSuggestionsExcludeNsfw && details.isNsfw) || details in blacklistTagRegex) {
+			if ((skipNsfw && details.isNsfw) || details in tagsBlacklist) {
 				continue
 			}
 			return details
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/RecoverMangaUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/RecoverMangaUseCase.kt
new file mode 100644
index 000000000..50aecfc4e
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/RecoverMangaUseCase.kt
@@ -0,0 +1,52 @@
+package org.koitharu.kotatsu.explore.domain
+
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+
+class RecoverMangaUseCase @Inject constructor(
+	private val mangaDataRepository: MangaDataRepository,
+	private val repositoryFactory: MangaRepository.Factory,
+) {
+
+	suspend operator fun invoke(manga: Manga): Manga? = runCatchingCancellable {
+		if (manga.isLocal) {
+			return@runCatchingCancellable null
+		}
+		val repository = repositoryFactory.create(manga.source)
+		val list = repository.getList(offset = 0, query = manga.title)
+		val newManga = list.find { x -> x.title == manga.title }?.let {
+			repository.getDetails(it)
+		} ?: return@runCatchingCancellable null
+		val merged = merge(manga, newManga)
+		mangaDataRepository.storeManga(merged)
+		merged
+	}.onFailure {
+		it.printStackTraceDebug()
+	}.getOrNull()
+
+	private fun merge(
+		broken: Manga,
+		current: Manga,
+	) = Manga(
+		id = broken.id,
+		title = current.title,
+		altTitle = current.altTitle,
+		url = current.url,
+		publicUrl = current.publicUrl,
+		rating = current.rating,
+		isNsfw = current.isNsfw,
+		coverUrl = current.coverUrl,
+		tags = current.tags,
+		state = current.state,
+		author = current.author,
+		largeCoverUrl = current.largeCoverUrl,
+		description = current.description,
+		chapters = current.chapters,
+		source = current.source,
+	)
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
index bf58733d5..144d9b490 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
@@ -24,20 +24,24 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.ui.util.SpanSizeResolver
+import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 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.FragmentExploreBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
 import org.koitharu.kotatsu.explore.ui.adapter.ExploreAdapter
 import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
-import org.koitharu.kotatsu.explore.ui.model.ExploreItem
-import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
-import org.koitharu.kotatsu.history.ui.HistoryActivity
+import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import javax.inject.Inject
 
@@ -46,7 +50,7 @@ class ExploreFragment :
 	BaseFragment<FragmentExploreBinding>(),
 	RecyclerViewOwner,
 	ExploreListEventListener,
-	OnListItemClickListener<ExploreItem.Source> {
+	OnListItemClickListener<MangaSourceItem>, TipView.OnButtonClickListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -64,7 +68,9 @@ class ExploreFragment :
 
 	override fun onViewBindingCreated(binding: FragmentExploreBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this)
+		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this, this) { manga, view ->
+			startActivity(DetailsActivity.newIntent(view.context, manga))
+		}
 		with(binding.recyclerView) {
 			adapter = exploreAdapter
 			setHasFixedSize(true)
@@ -96,17 +102,28 @@ class ExploreFragment :
 		)
 	}
 
-	override fun onManageClick(view: View) {
+	override fun onListHeaderClick(item: ListHeader, view: View) {
 		startActivity(SettingsActivity.newManageSourcesIntent(view.context))
 	}
 
+	override fun onPrimaryButtonClick(tipView: TipView) {
+		when ((tipView.tag as? TipModel)?.key) {
+			ExploreViewModel.TIP_NEW_SOURCES -> NewSourcesDialogFragment.show(childFragmentManager)
+		}
+	}
+
+	override fun onSecondaryButtonClick(tipView: TipView) {
+		when ((tipView.tag as? TipModel)?.key) {
+			ExploreViewModel.TIP_NEW_SOURCES -> viewModel.discardNewSources()
+		}
+	}
+
 	override fun onClick(v: View) {
 		val intent = when (v.id) {
-			R.id.button_history -> HistoryActivity.newIntent(v.context)
 			R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)
 			R.id.button_bookmarks -> BookmarksActivity.newIntent(v.context)
-			R.id.button_suggestions -> SuggestionsActivity.newIntent(v.context)
-			R.id.button_favourites -> FavouriteCategoriesActivity.newIntent(v.context)
+			R.id.button_more -> SuggestionsActivity.newIntent(v.context)
+			R.id.button_downloads -> DownloadsActivity.newIntent(v.context)
 			R.id.button_random -> {
 				viewModel.openRandom()
 				return
@@ -117,12 +134,12 @@ class ExploreFragment :
 		startActivity(intent)
 	}
 
-	override fun onItemClick(item: ExploreItem.Source, view: View) {
+	override fun onItemClick(item: MangaSourceItem, view: View) {
 		val intent = MangaListActivity.newIntent(view.context, item.source)
 		startActivity(intent)
 	}
 
-	override fun onItemLongClick(item: ExploreItem.Source, view: View): Boolean {
+	override fun onItemLongClick(item: MangaSourceItem, view: View): Boolean {
 		val menu = PopupMenu(view.context, view)
 		menu.inflate(R.menu.popup_source)
 		menu.setOnMenuItemClickListener(SourceMenuListener(item))
@@ -132,7 +149,9 @@ class ExploreFragment :
 
 	override fun onRetryClick(error: Throwable) = Unit
 
-	override fun onEmptyActionClick() = onManageClick(requireView())
+	override fun onEmptyActionClick() {
+		startActivity(SettingsActivity.newManageSourcesIntent(context ?: return))
+	}
 
 	private fun onOpenManga(manga: Manga) {
 		val intent = DetailsActivity.newIntent(context ?: return, manga)
@@ -164,7 +183,7 @@ class ExploreFragment :
 	}
 
 	private inner class SourceMenuListener(
-		private val sourceItem: ExploreItem.Source,
+		private val sourceItem: MangaSourceItem,
 	) : PopupMenu.OnMenuItemClickListener {
 
 		override fun onMenuItemClick(item: MenuItem): Boolean {
@@ -182,9 +201,4 @@ class ExploreFragment :
 			return true
 		}
 	}
-
-	companion object {
-
-		fun newInstance() = ExploreFragment()
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreGridSpanSizeLookup.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreGridSpanSizeLookup.kt
index bb02ff6f9..8601f9f9e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreGridSpanSizeLookup.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreGridSpanSizeLookup.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.explore.ui
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup
 import org.koitharu.kotatsu.explore.ui.adapter.ExploreAdapter
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 
 class ExploreGridSpanSizeLookup(
 	private val adapter: ExploreAdapter,
@@ -11,6 +12,6 @@ class ExploreGridSpanSizeLookup(
 
 	override fun getSpanSize(position: Int): Int {
 		val itemType = adapter.getItemViewType(position)
-		return if (itemType == ExploreAdapter.ITEM_TYPE_SOURCE_GRID) 1 else layoutManager.spanCount
+		return if (itemType == ListItemType.EXPLORE_SOURCE_GRID.ordinal) 1 else layoutManager.spanCount
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt
index 0f163d92f..14836b6d4 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt
@@ -3,36 +3,45 @@ package org.koitharu.kotatsu.explore.ui
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
-import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+import org.koitharu.kotatsu.explore.ui.model.ExploreButtons
+import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
+import org.koitharu.kotatsu.explore.ui.model.RecommendationsItem
+import org.koitharu.kotatsu.list.ui.model.EmptyHint
+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.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
 import javax.inject.Inject
 
-private const val TIP_SUGGESTIONS = "suggestions"
-
 @HiltViewModel
 class ExploreViewModel @Inject constructor(
 	private val settings: AppSettings,
+	private val suggestionRepository: SuggestionRepository,
 	private val exploreRepository: ExploreRepository,
+	private val sourcesRepository: MangaSourcesRepository,
 ) : BaseViewModel() {
 
 	val isGrid = settings.observeAsStateFlow(
@@ -41,17 +50,23 @@ class ExploreViewModel @Inject constructor(
 		valueProducer = { isSourcesGridMode },
 	)
 
+	val isSuggestionsEnabled = settings.observeAsFlow(
+		key = AppSettings.KEY_SUGGESTIONS,
+		valueProducer = { isSuggestionsEnabled },
+	)
+
 	val onOpenManga = MutableEventFlow<Manga>()
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 	val onShowSuggestionsTip = MutableEventFlow<Unit>()
+	private val isRandomLoading = MutableStateFlow(false)
 
-	val content: StateFlow<List<ExploreItem>> = isLoading.flatMapLatest { loading ->
+	val content: StateFlow<List<ListModel>> = isLoading.flatMapLatest { loading ->
 		if (loading) {
-			flowOf(listOf(ExploreItem.Loading))
+			flowOf(getLoadingStateList())
 		} else {
 			createContentFlow()
 		}
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(ExploreItem.Loading))
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, getLoadingStateList())
 
 	init {
 		launchJob(Dispatchers.Default) {
@@ -62,22 +77,33 @@ class ExploreViewModel @Inject constructor(
 	}
 
 	fun openRandom() {
-		launchLoadingJob(Dispatchers.Default) {
-			val manga = exploreRepository.findRandomManga(tagsLimit = 8)
-			onOpenManga.call(manga)
+		if (isRandomLoading.value) {
+			return
+		}
+		launchJob(Dispatchers.Default) {
+			isRandomLoading.value = true
+			try {
+				val manga = exploreRepository.findRandomManga(tagsLimit = 8)
+				onOpenManga.call(manga)
+			} finally {
+				isRandomLoading.value = false
+			}
 		}
 	}
 
 	fun hideSource(source: MangaSource) {
 		launchJob(Dispatchers.Default) {
-			settings.hiddenSources += source.name
-			val rollback = ReversibleHandle {
-				settings.hiddenSources -= source.name
-			}
+			val rollback = sourcesRepository.setSourceEnabled(source, isEnabled = false)
 			onActionDone.call(ReversibleAction(R.string.source_disabled, rollback))
 		}
 	}
 
+	fun discardNewSources() {
+		launchJob(Dispatchers.Default) {
+			sourcesRepository.assimilateNewSources()
+		}
+	}
+
 	fun setGridMode(value: Boolean) {
 		settings.isSourcesGridMode = value
 	}
@@ -87,26 +113,44 @@ class ExploreViewModel @Inject constructor(
 		settings.closeTip(TIP_SUGGESTIONS)
 	}
 
-	private fun createContentFlow() = settings.observe()
-		.filter {
-			it == AppSettings.KEY_SOURCES_HIDDEN ||
-				it == AppSettings.KEY_SOURCES_ORDER ||
-				it == AppSettings.KEY_SUGGESTIONS
+	private fun createContentFlow() = combine(
+		sourcesRepository.observeEnabledSources(),
+		getSuggestionFlow(),
+		isGrid,
+		isRandomLoading,
+		sourcesRepository.observeNewSources(),
+	) { content, suggestions, grid, randomLoading, newSources ->
+		buildList(content, suggestions, grid, randomLoading, newSources)
+	}
+
+	private fun buildList(
+		sources: List<MangaSource>,
+		recommendation: Manga?,
+		isGrid: Boolean,
+		randomLoading: Boolean,
+		newSources: Set<MangaSource>,
+	): List<ListModel> {
+		val result = ArrayList<ListModel>(sources.size + 4)
+		result += ExploreButtons(randomLoading)
+		if (recommendation != null) {
+			result += ListHeader(R.string.suggestions)
+			result += RecommendationsItem(recommendation)
 		}
-		.onStart { emit("") }
-		.map { settings.getMangaSources(includeHidden = false) }
-		.combine(isGrid) { content, grid -> buildList(content, grid) }
-
-	private fun buildList(sources: List<MangaSource>, isGrid: Boolean): List<ExploreItem> {
-		val result = ArrayList<ExploreItem>(sources.size + 3)
-		result += ExploreItem.Buttons(
-			isSuggestionsEnabled = settings.isSuggestionsEnabled,
-		)
-		result += ExploreItem.Header(R.string.remote_sources, sources.isNotEmpty())
 		if (sources.isNotEmpty()) {
-			sources.mapTo(result) { ExploreItem.Source(it, isGrid) }
+			result += ListHeader(R.string.remote_sources, R.string.manage)
+			if (newSources.isNotEmpty()) {
+				result += TipModel(
+					key = TIP_NEW_SOURCES,
+					title = R.string.new_sources_text,
+					text = R.string.new_sources_text,
+					icon = R.drawable.ic_explore_normal,
+					primaryButtonText = R.string.manage,
+					secondaryButtonText = R.string.discard,
+				)
+			}
+			sources.mapTo(result) { MangaSourceItem(it, isGrid) }
 		} else {
-			result += ExploreItem.EmptyHint(
+			result += EmptyHint(
 				icon = R.drawable.ic_empty_common,
 				textPrimary = R.string.no_manga_sources,
 				textSecondary = R.string.no_manga_sources_text,
@@ -115,4 +159,25 @@ class ExploreViewModel @Inject constructor(
 		}
 		return result
 	}
+
+	private fun getLoadingStateList() = listOf(
+		ExploreButtons(isRandomLoading.value),
+		LoadingState,
+	)
+
+	private fun getSuggestionFlow() = isSuggestionsEnabled.mapLatest { isEnabled ->
+		if (isEnabled) {
+			runCatchingCancellable {
+				suggestionRepository.getRandom()
+			}.getOrNull()
+		} else {
+			null
+		}
+	}
+
+	companion object {
+
+		private const val TIP_SUGGESTIONS = "suggestions"
+		const val TIP_NEW_SOURCES = "new_sources"
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt
index f8386cda1..83d7ee149 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt
@@ -2,34 +2,38 @@ package org.koitharu.kotatsu.explore.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+import org.koitharu.kotatsu.core.ui.widgets.TipView
+import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.emptyHintAD
+import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.adapter.tipAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
 
 class ExploreAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: ExploreListEventListener,
-	clickListener: OnListItemClickListener<ExploreItem.Source>,
-) : AsyncListDifferDelegationAdapter<ExploreItem>(ExploreDiffCallback()) {
+	tipClickListener: TipView.OnButtonClickListener,
+	clickListener: OnListItemClickListener<MangaSourceItem>,
+	mangaClickListener: OnListItemClickListener<Manga>,
+) : BaseListAdapter<ListModel>() {
 
 	init {
-		delegatesManager
-			.addDelegate(ITEM_TYPE_BUTTONS, exploreButtonsAD(listener))
-			.addDelegate(ITEM_TYPE_HEADER, exploreSourcesHeaderAD(listener))
-			.addDelegate(ITEM_TYPE_SOURCE_LIST, exploreSourceListItemAD(coil, clickListener, lifecycleOwner))
-			.addDelegate(ITEM_TYPE_SOURCE_GRID, exploreSourceGridItemAD(coil, clickListener, lifecycleOwner))
-			.addDelegate(ITEM_TYPE_HINT, exploreEmptyHintListAD(listener))
-			.addDelegate(ITEM_TYPE_LOADING, exploreLoadingAD())
-	}
-
-	companion object {
-
-		const val ITEM_TYPE_BUTTONS = 0
-		const val ITEM_TYPE_HEADER = 1
-		const val ITEM_TYPE_SOURCE_LIST = 2
-		const val ITEM_TYPE_SOURCE_GRID = 3
-		const val ITEM_TYPE_HINT = 4
-		const val ITEM_TYPE_LOADING = 5
+		addDelegate(ListItemType.EXPLORE_BUTTONS, exploreButtonsAD(listener))
+		addDelegate(
+			ListItemType.EXPLORE_SUGGESTION,
+			exploreRecommendationItemAD(coil, listener, mangaClickListener, lifecycleOwner),
+		)
+		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
+		addDelegate(ListItemType.EXPLORE_SOURCE_LIST, exploreSourceListItemAD(coil, clickListener, lifecycleOwner))
+		addDelegate(ListItemType.EXPLORE_SOURCE_GRID, exploreSourceGridItemAD(coil, clickListener, lifecycleOwner))
+		addDelegate(ListItemType.HINT_EMPTY, emptyHintAD(coil, lifecycleOwner, listener))
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.TIP, tipAD(tipClickListener))
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
index bccedb039..630be6bb8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
@@ -1,72 +1,100 @@
 package org.koitharu.kotatsu.explore.ui.adapter
 
+import android.graphics.Color
 import android.view.View
-import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
-import org.koitharu.kotatsu.core.ui.image.FaviconFallbackDrawable
+import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
+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.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
-import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
+import org.koitharu.kotatsu.core.util.ext.resolveDp
 import org.koitharu.kotatsu.core.util.ext.source
-import org.koitharu.kotatsu.databinding.ItemEmptyCardBinding
+import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemExploreButtonsBinding
 import org.koitharu.kotatsu.databinding.ItemExploreSourceGridBinding
 import org.koitharu.kotatsu.databinding.ItemExploreSourceListBinding
-import org.koitharu.kotatsu.databinding.ItemHeaderButtonBinding
-import org.koitharu.kotatsu.explore.ui.model.ExploreItem
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.databinding.ItemRecommendationBinding
+import org.koitharu.kotatsu.explore.ui.model.ExploreButtons
+import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
+import org.koitharu.kotatsu.explore.ui.model.RecommendationsItem
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import com.google.android.material.R as materialR
 
 fun exploreButtonsAD(
 	clickListener: View.OnClickListener,
-) = adapterDelegateViewBinding<ExploreItem.Buttons, ExploreItem, ItemExploreButtonsBinding>(
+) = adapterDelegateViewBinding<ExploreButtons, ListModel, ItemExploreButtonsBinding>(
 	{ layoutInflater, parent -> ItemExploreButtonsBinding.inflate(layoutInflater, parent, false) },
 ) {
 
 	binding.buttonBookmarks.setOnClickListener(clickListener)
-	binding.buttonHistory.setOnClickListener(clickListener)
+	binding.buttonDownloads.setOnClickListener(clickListener)
 	binding.buttonLocal.setOnClickListener(clickListener)
-	binding.buttonSuggestions.setOnClickListener(clickListener)
-	binding.buttonFavourites.setOnClickListener(clickListener)
 	binding.buttonRandom.setOnClickListener(clickListener)
 
 	bind {
-		binding.buttonSuggestions.isVisible = item.isSuggestionsEnabled
+		if (item.isRandomLoading) {
+			val icon = CircularProgressDrawable(context)
+			icon.strokeWidth = context.resources.resolveDp(2f)
+			icon.setColorSchemeColors(context.getThemeColor(materialR.attr.colorPrimary, Color.DKGRAY))
+			binding.buttonRandom.icon = icon
+			icon.start()
+		} else {
+			binding.buttonRandom.setIconResource(R.drawable.ic_dice)
+		}
+		binding.buttonRandom.isClickable = !item.isRandomLoading
 	}
 }
 
-fun exploreSourcesHeaderAD(
-	listener: ExploreListEventListener,
-) = adapterDelegateViewBinding<ExploreItem.Header, ExploreItem, ItemHeaderButtonBinding>(
-	{ layoutInflater, parent -> ItemHeaderButtonBinding.inflate(layoutInflater, parent, false) },
+fun exploreRecommendationItemAD(
+	coil: ImageLoader,
+	clickListener: View.OnClickListener,
+	itemClickListener: OnListItemClickListener<Manga>,
+	lifecycleOwner: LifecycleOwner,
+) = adapterDelegateViewBinding<RecommendationsItem, ListModel, ItemRecommendationBinding>(
+	{ layoutInflater, parent -> ItemRecommendationBinding.inflate(layoutInflater, parent, false) },
 ) {
 
-	val listenerAdapter = View.OnClickListener {
-		listener.onManageClick(itemView)
+	binding.buttonMore.setOnClickListener(clickListener)
+	binding.root.setOnClickListener { v ->
+		itemClickListener.onItemClick(item.manga, v)
 	}
 
-	binding.buttonMore.setOnClickListener(listenerAdapter)
-
 	bind {
-		binding.textViewTitle.setText(item.titleResId)
-		binding.buttonMore.isVisible = item.isButtonVisible
+		binding.textViewTitle.text = item.manga.title
+		binding.textViewSubtitle.textAndVisible = item.summary
+		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)
+			transformations(TrimTransformation())
+			source(item.manga.source)
+			enqueueWith(coil)
+		}
+	}
+
+	onViewRecycled {
+		binding.imageViewCover.disposeImageRequest()
 	}
 }
 
 fun exploreSourceListItemAD(
 	coil: ImageLoader,
-	listener: OnListItemClickListener<ExploreItem.Source>,
+	listener: OnListItemClickListener<MangaSourceItem>,
 	lifecycleOwner: LifecycleOwner,
-) = adapterDelegateViewBinding<ExploreItem.Source, ExploreItem, ItemExploreSourceListBinding>(
+) = adapterDelegateViewBinding<MangaSourceItem, ListModel, ItemExploreSourceListBinding>(
 	{ layoutInflater, parent -> ItemExploreSourceListBinding.inflate(layoutInflater, parent, false) },
-	on = { item, _, _ -> item is ExploreItem.Source && !item.isGrid },
+	on = { item, _, _ -> item is MangaSourceItem && !item.isGrid },
 ) {
 
 	val eventListener = AdapterDelegateClickListenerAdapter(this, listener)
@@ -76,7 +104,7 @@ fun exploreSourceListItemAD(
 
 	bind {
 		binding.textViewTitle.text = item.source.title
-		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
+		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			fallback(fallbackIcon)
 			placeholder(fallbackIcon)
@@ -93,11 +121,11 @@ fun exploreSourceListItemAD(
 
 fun exploreSourceGridItemAD(
 	coil: ImageLoader,
-	listener: OnListItemClickListener<ExploreItem.Source>,
+	listener: OnListItemClickListener<MangaSourceItem>,
 	lifecycleOwner: LifecycleOwner,
-) = adapterDelegateViewBinding<ExploreItem.Source, ExploreItem, ItemExploreSourceGridBinding>(
+) = adapterDelegateViewBinding<MangaSourceItem, ListModel, ItemExploreSourceGridBinding>(
 	{ layoutInflater, parent -> ItemExploreSourceGridBinding.inflate(layoutInflater, parent, false) },
-	on = { item, _, _ -> item is ExploreItem.Source && item.isGrid },
+	on = { item, _, _ -> item is MangaSourceItem && item.isGrid },
 ) {
 
 	val eventListener = AdapterDelegateClickListenerAdapter(this, listener)
@@ -107,7 +135,7 @@ fun exploreSourceGridItemAD(
 
 	bind {
 		binding.textViewTitle.text = item.source.title
-		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
+		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Large, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			fallback(fallbackIcon)
 			placeholder(fallbackIcon)
@@ -121,21 +149,3 @@ fun exploreSourceGridItemAD(
 		binding.imageViewIcon.disposeImageRequest()
 	}
 }
-
-fun exploreEmptyHintListAD(
-	listener: ListStateHolderListener,
-) = adapterDelegateViewBinding<ExploreItem.EmptyHint, ExploreItem, ItemEmptyCardBinding>(
-	{ inflater, parent -> ItemEmptyCardBinding.inflate(inflater, parent, false) },
-) {
-
-	binding.buttonRetry.setOnClickListener { listener.onEmptyActionClick() }
-
-	bind {
-		binding.icon.setImageResource(item.icon)
-		binding.textPrimary.setText(item.textPrimary)
-		binding.textSecondary.setTextAndVisible(item.textSecondary)
-		binding.buttonRetry.setTextAndVisible(item.actionStringRes)
-	}
-}
-
-fun exploreLoadingAD() = adapterDelegate<ExploreItem.Loading, ExploreItem>(R.layout.item_loading_state) {}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreDiffCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreDiffCallback.kt
deleted file mode 100644
index d8bf22bd9..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreDiffCallback.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.explore.ui.adapter
-
-import androidx.recyclerview.widget.DiffUtil
-import org.koitharu.kotatsu.explore.ui.model.ExploreItem
-
-class ExploreDiffCallback : DiffUtil.ItemCallback<ExploreItem>() {
-
-	override fun areItemsTheSame(oldItem: ExploreItem, newItem: ExploreItem): Boolean {
-		return when {
-			oldItem.javaClass != newItem.javaClass -> false
-			oldItem is ExploreItem.Buttons && newItem is ExploreItem.Buttons -> true
-			oldItem is ExploreItem.Loading && newItem is ExploreItem.Loading -> true
-			oldItem is ExploreItem.EmptyHint && newItem is ExploreItem.EmptyHint -> true
-			oldItem is ExploreItem.Source && newItem is ExploreItem.Source -> {
-				oldItem.source == newItem.source && oldItem.isGrid == newItem.isGrid
-			}
-
-			oldItem is ExploreItem.Header && newItem is ExploreItem.Header -> {
-				oldItem.titleResId == newItem.titleResId
-			}
-
-			else -> false
-		}
-	}
-
-	override fun areContentsTheSame(oldItem: ExploreItem, newItem: ExploreItem): Boolean {
-		return oldItem == newItem
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt
index 4bd122086..2814e2709 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt
@@ -1,9 +1,7 @@
 package org.koitharu.kotatsu.explore.ui.adapter
 
 import android.view.View
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 
-interface ExploreListEventListener : ListStateHolderListener, View.OnClickListener {
-
-	fun onManageClick(view: View)
-}
\ No newline at end of file
+interface ExploreListEventListener : ListStateHolderListener, View.OnClickListener, ListHeaderClickListener
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/ExploreButtons.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/ExploreButtons.kt
new file mode 100644
index 000000000..0e4aa9c83
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/ExploreButtons.kt
@@ -0,0 +1,25 @@
+package org.koitharu.kotatsu.explore.ui.model
+
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+class ExploreButtons(
+	val isRandomLoading: Boolean,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ExploreButtons
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as ExploreButtons
+
+		return isRandomLoading == other.isRandomLoading
+	}
+
+	override fun hashCode(): Int {
+		return isRandomLoading.hashCode()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/ExploreItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/ExploreItem.kt
deleted file mode 100644
index 9449ee21a..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/ExploreItem.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.koitharu.kotatsu.explore.ui.model
-
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-sealed interface ExploreItem : ListModel {
-
-	class Buttons(
-		val isSuggestionsEnabled: Boolean
-	) : ExploreItem {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Buttons
-
-			return isSuggestionsEnabled == other.isSuggestionsEnabled
-		}
-
-		override fun hashCode(): Int {
-			return isSuggestionsEnabled.hashCode()
-		}
-	}
-
-	class Header(
-		@StringRes val titleResId: Int,
-		val isButtonVisible: Boolean,
-	) : ExploreItem {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Header
-
-			if (titleResId != other.titleResId) return false
-			return isButtonVisible == other.isButtonVisible
-		}
-
-		override fun hashCode(): Int {
-			var result = titleResId
-			result = 31 * result + isButtonVisible.hashCode()
-			return result
-		}
-	}
-
-	class Source(
-		val source: MangaSource,
-		val isGrid: Boolean,
-	) : ExploreItem {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Source
-
-			if (source != other.source) return false
-			return isGrid == other.isGrid
-		}
-
-		override fun hashCode(): Int {
-			var result = source.hashCode()
-			result = 31 * result + isGrid.hashCode()
-			return result
-		}
-	}
-
-	class EmptyHint(
-		@DrawableRes icon: Int,
-		@StringRes textPrimary: Int,
-		@StringRes textSecondary: Int,
-		@StringRes actionStringRes: Int,
-	) : EmptyState(icon, textPrimary, textSecondary, actionStringRes), ExploreItem
-
-	object Loading : ExploreItem {
-
-		override fun equals(other: Any?): Boolean = other === Loading
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/MangaSourceItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/MangaSourceItem.kt
new file mode 100644
index 000000000..fa0c0e9e5
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/MangaSourceItem.kt
@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.explore.ui.model
+
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+class MangaSourceItem(
+	val source: MangaSource,
+	val isGrid: Boolean,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is MangaSourceItem && other.source == source
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as MangaSourceItem
+
+		if (source != other.source) return false
+		return isGrid == other.isGrid
+	}
+
+	override fun hashCode(): Int {
+		var result = source.hashCode()
+		result = 31 * result + isGrid.hashCode()
+		return result
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/RecommendationsItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/RecommendationsItem.kt
new file mode 100644
index 000000000..9876def1f
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/model/RecommendationsItem.kt
@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.explore.ui.model
+
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+
+data class RecommendationsItem(
+	val manga: Manga
+) : ListModel {
+
+	val summary: String = manga.tags.joinToString { it.title }
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is RecommendationsItem
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
index d387a46ff..9cac803fc 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
@@ -1,6 +1,10 @@
 package org.koitharu.kotatsu.favourites.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -15,6 +19,9 @@ abstract class FavouriteCategoriesDao {
 	@Query("SELECT * FROM favourite_categories WHERE deleted_at = 0 ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<FavouriteCategoryEntity>>
 
+	@Query("SELECT * FROM favourite_categories WHERE deleted_at = 0 AND show_in_lib = 1 ORDER BY sort_key")
+	abstract fun observeAllForLibrary(): Flow<List<FavouriteCategoryEntity>>
+
 	@Query("SELECT * FROM favourite_categories WHERE category_id = :id AND deleted_at = 0")
 	abstract fun observe(id: Long): Flow<FavouriteCategoryEntity?>
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
index befd29a72..2f1e4b151 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
@@ -30,9 +30,7 @@ data class FavouriteCategoryEntity(
 		if (title != other.title) return false
 		if (order != other.order) return false
 		if (track != other.track) return false
-		if (isVisibleInLibrary != other.isVisibleInLibrary) return false
-
-		return true
+		return isVisibleInLibrary == other.isVisibleInLibrary
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index a21923ed5..04c149a16 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -67,6 +67,12 @@ class FavouritesRepository @Inject constructor(
 		}.distinctUntilChanged()
 	}
 
+	fun observeCategoriesForLibrary(): Flow<List<FavouriteCategory>> {
+		return db.favouriteCategoriesDao.observeAllForLibrary().mapItems {
+			it.toFavouriteCategory()
+		}.distinctUntilChanged()
+	}
+
 	fun observeCategoriesWithCovers(): Flow<Map<FavouriteCategory, List<Cover>>> {
 		return db.favouriteCategoriesDao.observeAll()
 			.map {
@@ -137,14 +143,6 @@ class FavouritesRepository @Inject constructor(
 		db.favouriteCategoriesDao.updateTracking(id, isTrackingEnabled)
 	}
 
-	suspend fun removeCategory(id: Long) {
-		db.withTransaction {
-			db.favouriteCategoriesDao.delete(id)
-			db.favouritesDao.deleteAll(id)
-		}
-		channels.deleteChannel(id)
-	}
-
 	suspend fun removeCategories(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/model/Cover.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/model/Cover.kt
index 293a318a9..1b44af3bb 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/model/Cover.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/model/Cover.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.favourites.domain.model
 
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.find
 
 class Cover(
 	val url: String,
@@ -8,7 +9,7 @@ class Cover(
 ) {
 
 	val mangaSource: MangaSource?
-		get() = if (source.isEmpty()) null else MangaSource.values().find { it.name == source }
+		get() = if (source.isEmpty()) null else MangaSource.entries.find(source)
 
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
index c62b36b1c..d629424f7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import com.google.android.material.R as materialR
 
 class CategoriesSelectionCallback(
@@ -25,21 +24,44 @@ class CategoriesSelectionCallback(
 	}
 
 	override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-		val isOneItem = controller.count == 1
-		menu.findItem(R.id.action_edit)?.isVisible = isOneItem
+		val categories = viewModel.getCategories(controller.peekCheckedIds())
+		var canShow = categories.isNotEmpty()
+		var canHide = canShow
+		for (cat in categories) {
+			if (cat.isVisibleInLibrary) {
+				canShow = false
+			} else {
+				canHide = false
+			}
+		}
+		menu.findItem(R.id.action_show)?.isVisible = canShow
+		menu.findItem(R.id.action_hide)?.isVisible = canHide
 		mode.title = controller.count.toString()
 		return true
 	}
 
 	override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
 		return when (item.itemId) {
-			R.id.action_edit -> {
+			/*R.id.action_view -> {
 				val id = controller.peekCheckedIds().singleOrNull() ?: return false
 				val context = recyclerView.context
-				val intent = FavouritesCategoryEditActivity.newIntent(context, id)
+				val category = viewModel.getCategory(id) ?: return false
+				val intent = FavouritesActivity.newIntent(context, category)
 				context.startActivity(intent)
 				mode.finish()
 				true
+			}*/
+
+			R.id.action_show -> {
+				viewModel.setIsVisible(controller.snapshot(), true)
+				mode.finish()
+				true
+			}
+
+			R.id.action_hide -> {
+				viewModel.setIsVisible(controller.snapshot(), false)
+				mode.finish()
+				true
 			}
 
 			R.id.action_remove -> {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
index e72e050fa..9f24171ad 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
@@ -3,16 +3,10 @@ package org.koitharu.kotatsu.favourites.ui.categories
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.transition.Fade
-import android.transition.TransitionManager
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -26,9 +20,7 @@ import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 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.ActivityCategoriesBinding
-import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -48,16 +40,14 @@ class FavouriteCategoriesActivity :
 
 	private val viewModel by viewModels<FavouritesCategoriesViewModel>()
 
-	private lateinit var exitReorderModeCallback: ExitReorderModeCallback
 	private lateinit var adapter: CategoriesAdapter
 	private lateinit var selectionController: ListSelectionController
-	private var reorderHelper: ItemTouchHelper? = null
+	private lateinit var reorderHelper: ItemTouchHelper
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		exitReorderModeCallback = ExitReorderModeCallback(viewModel)
 		adapter = CategoriesAdapter(coil, this, this, this)
 		selectionController = ListSelectionController(
 			activity = this,
@@ -65,62 +55,40 @@ class FavouriteCategoriesActivity :
 			registryOwner = this,
 			callback = CategoriesSelectionCallback(viewBinding.recyclerView, viewModel),
 		)
-		viewBinding.buttonDone.setOnClickListener(this)
 		selectionController.attachToRecyclerView(viewBinding.recyclerView)
 		viewBinding.recyclerView.setHasFixedSize(true)
 		viewBinding.recyclerView.adapter = adapter
 		viewBinding.fabAdd.setOnClickListener(this)
-		onBackPressedDispatcher.addCallback(exitReorderModeCallback)
 
-		viewModel.detalizedCategories.observe(this, ::onCategoriesChanged)
-		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
-		viewModel.isInReorderMode.observe(this, ::onReorderModeChanged)
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		super.onCreateOptionsMenu(menu)
-		menuInflater.inflate(R.menu.opt_categories, menu)
-		return true
-	}
-
-	override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-		menu.findItem(R.id.action_reorder)?.isVisible = !viewModel.isInReorderMode() && !viewModel.isEmpty()
-		return super.onPrepareOptionsMenu(menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		return when (item.itemId) {
-			R.id.action_reorder -> {
-				viewModel.setReorderMode(true)
-				true
-			}
-
-			else -> super.onOptionsItemSelected(item)
+		reorderHelper = ItemTouchHelper(ReorderHelperCallback()).apply {
+			attachToRecyclerView(viewBinding.recyclerView)
 		}
+
+		viewModel.categories.observe(this, ::onCategoriesChanged)
+		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
 	}
 
 	override fun onClick(v: View) {
 		when (v.id) {
-			R.id.button_done -> viewModel.setReorderMode(false)
 			R.id.fab_add -> startActivity(FavouritesCategoryEditActivity.newIntent(this))
 		}
 	}
 
 	override fun onItemClick(item: FavouriteCategory, view: View) {
-		if (viewModel.isInReorderMode() || selectionController.onItemClick(item.id)) {
+		if (selectionController.onItemClick(item.id)) {
 			return
 		}
-		val intent = FavouritesActivity.newIntent(this, item)
-		val options = scaleUpActivityOptionsOf(view)
-		startActivity(intent, options)
+		val intent = FavouritesCategoryEditActivity.newIntent(view.context, item.id)
+		startActivity(intent)
 	}
 
 	override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
-		return !viewModel.isInReorderMode() && selectionController.onItemLongClick(item.id)
+		return selectionController.onItemLongClick(item.id)
 	}
 
 	override fun onDragHandleTouch(holder: RecyclerView.ViewHolder): Boolean {
-		return reorderHelper?.startDrag(holder) != null
+		reorderHelper.startDrag(holder)
+		return true
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -147,28 +115,6 @@ class FavouriteCategoriesActivity :
 		invalidateOptionsMenu()
 	}
 
-	private fun onReorderModeChanged(isReorderMode: Boolean) {
-		val transition = Fade().apply {
-			duration = resources.getInteger(android.R.integer.config_shortAnimTime).toLong()
-		}
-		TransitionManager.beginDelayedTransition(viewBinding.toolbar, transition)
-		reorderHelper?.attachToRecyclerView(null)
-		reorderHelper = if (isReorderMode) {
-			selectionController.clear()
-			viewBinding.fabAdd.hide()
-			ItemTouchHelper(ReorderHelperCallback()).apply {
-				attachToRecyclerView(viewBinding.recyclerView)
-			}
-		} else {
-			viewBinding.fabAdd.show()
-			null
-		}
-		viewBinding.recyclerView.isNestedScrollingEnabled = !isReorderMode
-		invalidateOptionsMenu()
-		viewBinding.buttonDone.isVisible = isReorderMode
-		exitReorderModeCallback.isEnabled = isReorderMode
-	}
-
 	private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
 		ItemTouchHelper.DOWN or ItemTouchHelper.UP,
 		0,
@@ -202,14 +148,10 @@ class FavouriteCategoriesActivity :
 		}
 
 		override fun isLongPressDragEnabled(): Boolean = false
-	}
-
-	private class ExitReorderModeCallback(
-		private val viewModel: FavouritesCategoriesViewModel,
-	) : OnBackPressedCallback(viewModel.isInReorderMode()) {
 
-		override fun handleOnBackPressed() {
-			viewModel.setReorderMode(false)
+		override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+			super.onSelectedChanged(viewHolder, actionState)
+			viewBinding.recyclerView.isNestedScrollingEnabled = actionState == ItemTouchHelper.ACTION_STATE_IDLE
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index f7a397df0..e5fa046b3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -4,12 +4,12 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.requireValue
@@ -27,39 +27,29 @@ class FavouritesCategoriesViewModel @Inject constructor(
 ) : BaseViewModel() {
 
 	private var reorderJob: Job? = null
-	val isInReorderMode = MutableStateFlow(false)
 
-	val detalizedCategories = combine(
-		repository.observeCategoriesWithCovers(),
-		isInReorderMode,
-	) { list, reordering ->
-		list.map { (category, covers) ->
-			CategoryListModel(
-				mangaCount = covers.size,
-				covers = covers.take(3),
-				category = category,
-				isReorderMode = reordering,
-			)
-		}.ifEmpty {
-			listOf(
-				EmptyState(
-					icon = R.drawable.ic_empty_favourites,
-					textPrimary = R.string.text_empty_holder_primary,
-					textSecondary = R.string.empty_favourite_categories,
-					actionStringRes = 0,
-				),
-			)
-		}
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
-
-	fun deleteCategory(id: Long) {
-		launchJob {
-			repository.removeCategory(id)
-		}
-	}
+	val categories = repository.observeCategoriesWithCovers()
+		.map { list ->
+			list.map { (category, covers) ->
+				CategoryListModel(
+					mangaCount = covers.size,
+					covers = covers.take(3),
+					category = category,
+				)
+			}.ifEmpty {
+				listOf(
+					EmptyState(
+						icon = R.drawable.ic_empty_favourites,
+						textPrimary = R.string.text_empty_holder_primary,
+						textSecondary = R.string.empty_favourite_categories,
+						actionStringRes = 0,
+					),
+				)
+			}
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
 	fun deleteCategories(ids: Set<Long>) {
-		launchJob {
+		launchJob(Dispatchers.Default) {
 			repository.removeCategories(ids)
 		}
 	}
@@ -68,19 +58,13 @@ class FavouritesCategoriesViewModel @Inject constructor(
 		settings.isAllFavouritesVisible = isVisible
 	}
 
-	fun isInReorderMode(): Boolean = isInReorderMode.value
-
-	fun isEmpty(): Boolean = detalizedCategories.value.none { it is CategoryListModel }
-
-	fun setReorderMode(isReorderMode: Boolean) {
-		isInReorderMode.value = isReorderMode
-	}
+	fun isEmpty(): Boolean = categories.value.none { it is CategoryListModel }
 
 	fun reorderCategories(oldPos: Int, newPos: Int) {
 		val prevJob = reorderJob
 		reorderJob = launchJob(Dispatchers.Default) {
 			prevJob?.join()
-			val items = detalizedCategories.requireValue()
+			val items = categories.requireValue()
 			val ids = items.mapNotNullTo(ArrayList(items.size)) {
 				(it as? CategoryListModel)?.category?.id
 			}
@@ -89,4 +73,19 @@ class FavouritesCategoriesViewModel @Inject constructor(
 			repository.reorderCategories(ids)
 		}
 	}
+
+	fun setIsVisible(ids: Set<Long>, isVisible: Boolean) {
+		launchJob(Dispatchers.Default) {
+			for (id in ids) {
+				repository.updateCategory(id, isVisible)
+			}
+		}
+	}
+
+	fun getCategories(ids: Set<Long>): ArrayList<FavouriteCategory> {
+		val items = categories.requireValue()
+		return items.mapNotNullTo(ArrayList(ids.size)) { item ->
+			(item as? CategoryListModel)?.category?.takeIf { it.id in ids }
+		}
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoriesAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoriesAdapter.kt
index 741faa08a..7e0412abc 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoriesAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoriesAdapter.kt
@@ -1,61 +1,24 @@
 package org.koitharu.kotatsu.favourites.ui.categories.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import kotlin.jvm.internal.Intrinsics
 
 class CategoriesAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	onItemClickListener: FavouriteCategoriesListListener,
 	listListener: ListStateHolderListener,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		delegatesManager.addDelegate(categoryAD(coil, lifecycleOwner, onItemClickListener))
 			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listListener))
 			.addDelegate(loadingStateAD())
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem is CategoryListModel && newItem is CategoryListModel -> {
-					oldItem.category.id == newItem.category.id
-				}
-
-				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 CategoryListModel && newItem is CategoryListModel -> {
-					if (oldItem.category == newItem.category &&
-						oldItem.mangaCount == newItem.mangaCount &&
-						oldItem.covers == newItem.covers &&
-						oldItem.isReorderMode != newItem.isReorderMode
-					) {
-						Unit
-					} else {
-						super.getChangePayload(oldItem, newItem)
-					}
-				}
-
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
index 9ab263483..edcf8b85b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.favourites.ui.categories.adapter
 
+import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -25,6 +26,7 @@ import org.koitharu.kotatsu.databinding.ItemCategoryBinding
 import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
+@SuppressLint("ClickableViewAccessibility")
 fun categoryAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
@@ -33,10 +35,9 @@ fun categoryAD(
 	{ inflater, parent -> ItemCategoryBinding.inflate(inflater, parent, false) },
 ) {
 	val eventListener = object : OnClickListener, OnLongClickListener, OnTouchListener {
-		override fun onClick(v: View) = clickListener.onItemClick(item.category, binding.imageViewCover1)
-		override fun onLongClick(v: View) = clickListener.onItemLongClick(item.category, binding.imageViewCover1)
-		override fun onTouch(v: View?, event: MotionEvent): Boolean = item.isReorderMode &&
-			event.actionMasked == MotionEvent.ACTION_DOWN &&
+		override fun onClick(v: View) = clickListener.onItemClick(item.category, itemView)
+		override fun onLongClick(v: View) = clickListener.onItemLongClick(item.category, itemView)
+		override fun onTouch(v: View?, event: MotionEvent): Boolean = event.actionMasked == MotionEvent.ACTION_DOWN &&
 			clickListener.onDragHandleTouch(this@adapterDelegateViewBinding)
 	}
 	val backgroundColor = context.getThemeColor(android.R.attr.colorBackground)
@@ -57,10 +58,9 @@ fun categoryAD(
 	val crossFadeDuration = context.getAnimationDuration(R.integer.config_defaultAnimTime).toInt()
 	itemView.setOnClickListener(eventListener)
 	itemView.setOnLongClickListener(eventListener)
-	itemView.setOnTouchListener(eventListener)
+	binding.imageViewHandle.setOnTouchListener(eventListener)
 
 	bind { payloads ->
-		binding.imageViewHandle.isVisible = item.isReorderMode
 		if (payloads.isNotEmpty()) {
 			return@bind
 		}
@@ -74,6 +74,8 @@ fun categoryAD(
 				item.mangaCount,
 			)
 		}
+		binding.imageViewTracker.isVisible = item.category.isTrackingEnabled
+		binding.imageViewVisible.isVisible = item.category.isVisibleInLibrary
 		repeat(coverViews.size) { i ->
 			val cover = item.covers.getOrNull(i)
 			coverViews[i].newImageRequest(lifecycleOwner, cover?.url)?.run {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
index f09c775d1..bdb3d1f5e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
@@ -8,9 +8,12 @@ class CategoryListModel(
 	val mangaCount: Int,
 	val covers: List<Cover>,
 	val category: FavouriteCategory,
-	val isReorderMode: Boolean,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is CategoryListModel && other.category.id == category.id
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
@@ -18,20 +21,26 @@ class CategoryListModel(
 		other as CategoryListModel
 
 		if (mangaCount != other.mangaCount) return false
-		if (isReorderMode != other.isReorderMode) return false
 		if (covers != other.covers) return false
 		if (category.id != other.category.id) return false
 		if (category.title != other.category.title) return false
-		return category.order == other.category.order
+		// ignore the category.sortKey field
+		if (category.order != other.category.order) return false
+		if (category.createdAt != other.category.createdAt) return false
+		if (category.isTrackingEnabled != other.category.isTrackingEnabled) return false
+		return category.isVisibleInLibrary == other.category.isVisibleInLibrary
 	}
 
 	override fun hashCode(): Int {
 		var result = mangaCount
-		result = 31 * result + isReorderMode.hashCode()
 		result = 31 * result + covers.hashCode()
 		result = 31 * result + category.id.hashCode()
 		result = 31 * result + category.title.hashCode()
+		// ignore the category.sortKey field
 		result = 31 * result + category.order.hashCode()
+		result = 31 * result + category.createdAt.hashCode()
+		result = 31 * result + category.isTrackingEnabled.hashCode()
+		result = 31 * result + category.isVisibleInLibrary.hashCode()
 		return result
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteSheet.kt
similarity index 95%
rename from app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesSheet.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteSheet.kt
index 102abab0d..e79f9fcf7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesSheet.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteSheet.kt
@@ -23,7 +23,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
 @AndroidEntryPoint
-class FavouriteCategoriesSheet :
+class FavouriteSheet :
 	BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(),
 	OnListItemClickListener<MangaCategoryItem> {
 
@@ -53,7 +53,7 @@ class FavouriteCategoriesSheet :
 	}
 
 	override fun onItemClick(item: MangaCategoryItem, view: View) {
-		viewModel.setChecked(item.id, !item.isChecked)
+		viewModel.setChecked(item.category.id, !item.isChecked)
 	}
 
 	private fun onContentChanged(categories: List<ListModel>) {
@@ -72,7 +72,7 @@ class FavouriteCategoriesSheet :
 		fun show(fm: FragmentManager, manga: Manga) = Companion.show(fm, listOf(manga))
 
 		fun show(fm: FragmentManager, manga: Collection<Manga>) =
-			FavouriteCategoriesSheet().withArgs(1) {
+			FavouriteSheet().withArgs(1) {
 				putParcelableArrayList(
 					KEY_MANGA_LIST,
 					manga.mapTo(ArrayList(manga.size)) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
index 5f6566ceb..2603d5fbe 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesSheet.Companion.KEY_MANGA_LIST
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet.Companion.KEY_MANGA_LIST
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.CategoriesHeaderItem
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -37,8 +37,7 @@ class MangaCategoriesViewModel @Inject constructor(
 			add(header)
 			all.mapTo(this) {
 				MangaCategoryItem(
-					id = it.id,
-					name = it.title,
+					category = it,
 					isChecked = it.id in checked,
 				)
 			}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoriesAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoriesAdapter.kt
index e0578cf56..e8ab695a4 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoriesAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoriesAdapter.kt
@@ -1,44 +1,16 @@
 package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
 
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.favourites.ui.categories.select.model.CategoriesHeaderItem
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class MangaCategoriesAdapter(
 	clickListener: OnListItemClickListener<MangaCategoryItem>,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		delegatesManager.addDelegate(mangaCategoryAD(clickListener))
 			.addDelegate(categoriesHeaderAD())
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-		override fun areItemsTheSame(
-			oldItem: ListModel,
-			newItem: ListModel,
-		): Boolean = when {
-			oldItem is MangaCategoryItem && newItem is MangaCategoryItem -> oldItem.id == newItem.id
-			oldItem is CategoriesHeaderItem && newItem is CategoriesHeaderItem -> oldItem == newItem
-			else -> false
-		}
-
-		override fun areContentsTheSame(
-			oldItem: ListModel,
-			newItem: ListModel,
-		): Boolean = oldItem == newItem
-
-		override fun getChangePayload(
-			oldItem: ListModel,
-			newItem: ListModel,
-		): Any? {
-			if (oldItem is MangaCategoryItem && newItem is MangaCategoryItem && oldItem.isChecked != newItem.isChecked) {
-				return newItem.isChecked
-			}
-			return super.getChangePayload(oldItem, newItem)
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt
index 05f4b7505..cb21837a6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt
@@ -1,25 +1,28 @@
 package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
 
+import androidx.core.view.isVisible
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemCheckableNewBinding
+import org.koitharu.kotatsu.core.util.ext.setChecked
+import org.koitharu.kotatsu.databinding.ItemCategoryCheckableBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 fun mangaCategoryAD(
 	clickListener: OnListItemClickListener<MangaCategoryItem>,
-) = adapterDelegateViewBinding<MangaCategoryItem, ListModel, ItemCheckableNewBinding>(
-	{ inflater, parent -> ItemCheckableNewBinding.inflate(inflater, parent, false) },
+) = adapterDelegateViewBinding<MangaCategoryItem, ListModel, ItemCategoryCheckableBinding>(
+	{ inflater, parent -> ItemCategoryCheckableBinding.inflate(inflater, parent, false) },
 ) {
 
 	itemView.setOnClickListener {
 		clickListener.onItemClick(item, itemView)
 	}
 
-	bind {
-		with(binding.root) {
-			text = item.name
-			isChecked = item.isChecked
-		}
+	bind { payloads ->
+		binding.checkableImageView.setChecked(item.isChecked, ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED !in payloads)
+		binding.textViewTitle.text = item.category.title
+		binding.imageViewTracker.isVisible = item.category.isTrackingEnabled
+		binding.imageViewVisible.isVisible = item.category.isVisibleInLibrary
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/CategoriesHeaderItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/CategoriesHeaderItem.kt
index cde85e768..8f7f34bb0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/CategoriesHeaderItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/CategoriesHeaderItem.kt
@@ -4,5 +4,16 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class CategoriesHeaderItem : ListModel {
 
-	override fun equals(other: Any?): Boolean = other?.javaClass == CategoriesHeaderItem::class.java
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is CategoriesHeaderItem
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		return javaClass == other?.javaClass
+	}
+
+	override fun hashCode(): Int {
+		return javaClass.hashCode()
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/MangaCategoryItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/MangaCategoryItem.kt
index 721176233..29c78a142 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/MangaCategoryItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/model/MangaCategoryItem.kt
@@ -1,9 +1,23 @@
 package org.koitharu.kotatsu.favourites.ui.categories.select.model
 
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 data class MangaCategoryItem(
-	val id: Long,
-	val name: String,
+	val category: FavouriteCategory,
 	val isChecked: Boolean,
-) : ListModel
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is MangaCategoryItem && other.category.id == category.id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is MangaCategoryItem && previousState.isChecked != isChecked) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouriteTabModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouriteTabModel.kt
new file mode 100644
index 000000000..1a9b16276
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouriteTabModel.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+class FavouriteTabModel(
+	val id: Long,
+	val title: String,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is FavouriteTabModel && other.id == id
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as FavouriteTabModel
+
+		if (id != other.id) return false
+		return title == other.title
+	}
+
+	override fun hashCode(): Int {
+		var result = id.hashCode()
+		result = 31 * result + title.hashCode()
+		return result
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter.kt
new file mode 100644
index 000000000..c9daa207d
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter.kt
@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import kotlinx.coroutines.flow.FlowCollector
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
+import org.koitharu.kotatsu.parsers.util.replaceWith
+
+@Suppress("DEPRECATION")
+class FavouritesContainerAdapter(
+	fm: FragmentManager
+) : FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT),
+	FlowCollector<List<FavouriteTabModel>> {
+
+	private val dataSet = ArrayList<FavouriteTabModel>()
+
+	override fun getCount(): Int = dataSet.size
+
+	override fun getItem(position: Int): Fragment {
+		val item = dataSet[position]
+		return FavouritesListFragment.newInstance(item.id)
+	}
+
+	override fun getPageTitle(position: Int): CharSequence {
+		return dataSet[position].title
+	}
+
+	override suspend fun emit(value: List<FavouriteTabModel>) {
+		dataSet.replaceWith(value)
+		notifyDataSetChanged()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter2.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter2.kt
new file mode 100644
index 000000000..4afab1c9f
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerAdapter2.kt
@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.AdapterListUpdateCallback
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator.TabConfigurationStrategy
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.flow.FlowCollector
+import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import kotlin.coroutines.suspendCoroutine
+
+// FIXME migrate to ViewPager2 in FavouritesContainerFragment
+class FavouritesContainerAdapter2(fragment: Fragment) :
+	FragmentStateAdapter(fragment.childFragmentManager, fragment.viewLifecycleOwner.lifecycle),
+	TabConfigurationStrategy,
+	FlowCollector<List<FavouriteTabModel>> {
+
+	private val differ = AsyncListDiffer(
+		AdapterListUpdateCallback(this),
+		AsyncDifferConfig.Builder(ListModelDiffCallback<FavouriteTabModel>())
+			.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
+			.build(),
+	)
+
+	override fun getItemCount(): Int = differ.currentList.size
+
+	override fun getItemId(position: Int): Long {
+		return differ.currentList[position].id
+	}
+
+	override fun containsItem(itemId: Long): Boolean {
+		return differ.currentList.any { x -> x.id == itemId }
+	}
+
+	override fun createFragment(position: Int): Fragment {
+		val item = differ.currentList[position]
+		return FavouritesListFragment.newInstance(item.id)
+	}
+
+	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
+		val item = differ.currentList[position]
+		tab.text = item.title
+		tab.tag = item
+	}
+
+	override suspend fun emit(value: List<FavouriteTabModel>) = suspendCoroutine { cont ->
+		differ.submitList(value, ContinuationResumeRunnable(cont))
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt
new file mode 100644
index 000000000..efce0c7aa
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt
@@ -0,0 +1,107 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewStub
+import androidx.appcompat.view.ActionMode
+import androidx.core.graphics.Insets
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.fragment.app.viewModels
+import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.BaseFragment
+import org.koitharu.kotatsu.core.ui.util.ActionModeListener
+import org.koitharu.kotatsu.core.util.ext.addMenuProvider
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.setTabsEnabled
+import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
+import org.koitharu.kotatsu.databinding.FragmentFavouritesContainerBinding
+import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
+import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class FavouritesContainerFragment : BaseFragment<FragmentFavouritesContainerBinding>(), ActionModeListener,
+	ViewStub.OnInflateListener, View.OnClickListener {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private val viewModel: FavouritesContainerViewModel by viewModels()
+
+	override fun onCreateViewBinding(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	) = FragmentFavouritesContainerBinding.inflate(inflater, container, false)
+
+	override fun onViewBindingCreated(binding: FragmentFavouritesContainerBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		val adapter = FavouritesContainerAdapter(childFragmentManager)
+		binding.pager.adapter = adapter
+		binding.tabs.setupWithViewPager(binding.pager)
+		binding.pager.offscreenPageLimit = 1
+		binding.stubEmpty.setOnInflateListener(this)
+		actionModeDelegate.addListener(this)
+		viewModel.categories.observe(viewLifecycleOwner, adapter)
+		viewModel.isEmpty.observe(viewLifecycleOwner, ::onEmptyStateChanged)
+		addMenuProvider(FavouritesContainerMenuProvider(binding.root.context))
+	}
+
+	override fun onDestroyView() {
+		actionModeDelegate.removeListener(this)
+		super.onDestroyView()
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding?.tabs?.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+	}
+
+	override fun onActionModeStarted(mode: ActionMode) {
+		viewBinding?.run {
+			pager.isUserInputEnabled = false
+			tabs.setTabsEnabled(false)
+		}
+	}
+
+	override fun onActionModeFinished(mode: ActionMode) {
+		viewBinding?.run {
+			pager.isUserInputEnabled = true
+			tabs.setTabsEnabled(true)
+		}
+	}
+
+	override fun onInflate(stub: ViewStub?, inflated: View) {
+		val stubBinding = ItemEmptyStateBinding.bind(inflated)
+		stubBinding.icon.newImageRequest(viewLifecycleOwner, R.drawable.ic_empty_favourites)?.enqueueWith(coil)
+		stubBinding.textPrimary.setText(R.string.text_empty_holder_primary)
+		stubBinding.textSecondary.setTextAndVisible(R.string.empty_favourite_categories)
+		stubBinding.buttonRetry.setTextAndVisible(R.string.manage)
+		stubBinding.buttonRetry.setOnClickListener(this)
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_retry -> startActivity(
+				FavouriteCategoriesActivity.newIntent(v.context),
+			)
+		}
+	}
+
+	private fun onEmptyStateChanged(isEmpty: Boolean) {
+		viewBinding?.run {
+			pager.isGone = isEmpty
+			tabs.isGone = isEmpty
+			stubEmpty.isVisible = isEmpty
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerMenuProvider.kt
new file mode 100644
index 000000000..76f817c89
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerMenuProvider.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
+
+class FavouritesContainerMenuProvider(
+	private val context: Context,
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_favourites_container, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+		when (menuItem.itemId) {
+			R.id.action_manage -> {
+				context.startActivity(FavouriteCategoriesActivity.newIntent(context))
+			}
+
+			else -> return false
+		}
+		return true
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt
new file mode 100644
index 000000000..b80b45cce
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt
@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.favourites.ui.container
+
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.mapItems
+import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import javax.inject.Inject
+
+@HiltViewModel
+class FavouritesContainerViewModel @Inject constructor(
+	favouritesRepository: FavouritesRepository,
+) : BaseViewModel() {
+
+	private val categoriesStateFlow = favouritesRepository.observeCategoriesForLibrary()
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
+
+	val categories = categoriesStateFlow.filterNotNull()
+		.mapItems { FavouriteTabModel(it.id, it.title) }
+		.distinctUntilChanged()
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+
+	val isEmpty = categoriesStateFlow.map {
+		it?.isEmpty() == true
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
index 9e22b6a62..19d08a66b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
@@ -11,6 +11,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.model.titleRes
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.withArgs
@@ -31,7 +32,7 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 		if (viewModel.categoryId != NO_ID) {
 			addMenuProvider(FavouritesListMenuProvider(binding.root.context, viewModel))
 		}
-		viewModel.sortOrder.observe(viewLifecycleOwner) { activity?.invalidateOptionsMenu() }
+		viewModel.sortOrder.observe(viewLifecycleOwner, MenuInvalidator(requireActivity()))
 	}
 
 	override fun onScrolledToEnd() = Unit
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListMenuProvider.kt
index 4300d3e05..c6da76d8b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListMenuProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/list/FavouritesListMenuProvider.kt
@@ -38,7 +38,7 @@ class FavouritesListMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
 		if (menuItem.groupId == R.id.group_order) {
-			val order = enumValues<SortOrder>()[menuItem.order]
+			val order = SortOrder.entries[menuItem.order]
 			viewModel.setSortOrder(order)
 			return true
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt
index 74d7459fc..6c6b2387f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt
@@ -2,10 +2,11 @@ package org.koitharu.kotatsu.filter.ui
 
 import android.content.Context
 import androidx.recyclerview.widget.AsyncListDiffer.ListListener
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.filter.ui.model.FilterItem
-import org.koitharu.kotatsu.list.ui.adapter.listSimpleHeaderAD
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+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
@@ -13,16 +14,15 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 class FilterAdapter(
 	listener: OnFilterChangedListener,
 	listListener: ListListener<ListModel>,
-) : AsyncListDifferDelegationAdapter<ListModel>(FilterDiffCallback()), FastScroller.SectionIndexer {
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		delegatesManager
-			.addDelegate(filterSortDelegate(listener))
-			.addDelegate(filterTagDelegate(listener))
-			.addDelegate(listSimpleHeaderAD())
-			.addDelegate(loadingStateAD())
-			.addDelegate(loadingFooterAD())
-			.addDelegate(filterErrorDelegate())
+		addDelegate(ListItemType.FILTER_SORT, filterSortDelegate(listener))
+		addDelegate(ListItemType.FILTER_TAG, filterTagDelegate(listener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.FOOTER_ERROR, filterErrorDelegate())
 		differ.addListListener(listListener)
 	}
 
@@ -36,11 +36,4 @@ class FilterAdapter(
 		}
 		return null
 	}
-
-	companion object {
-
-		const val ITEM_TYPE_HEADER = 0
-		const val ITEM_TYPE_SORT = 1
-		const val ITEM_TYPE_TAG = 2
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt
index 9e000f6ec..30516882b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt
@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.filter.ui
 
+import android.view.View
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.SavedStateHandle
 import dagger.hilt.android.ViewModelLifecycle
@@ -95,6 +96,10 @@ class FilterCoordinator @Inject constructor(
 		}
 	}
 
+	override fun onListHeaderClick(item: ListHeader, view: View) {
+		reset()
+	}
+
 	fun observeAvailableTags(): Flow<Set<MangaTag>?> = flow {
 		if (!availableTagsDeferred.isCompleted) {
 			emit(emptySet())
@@ -202,13 +207,13 @@ class FilterCoordinator @Inject constructor(
 		val list = ArrayList<ListModel>(tags.size + sortOrders.size + 3)
 		if (query.isEmpty()) {
 			if (sortOrders.isNotEmpty()) {
-				list.add(ListHeader(R.string.sort_order, 0, null))
+				list.add(ListHeader(R.string.sort_order))
 				sortOrders.mapTo(list) {
 					FilterItem.Sort(it, isSelected = it == state.sortOrder)
 				}
 			}
 			if (allTags.isLoading || allTags.isError || tags.isNotEmpty()) {
-				list.add(ListHeader(R.string.genres, 0, null))
+				list.add(ListHeader(R.string.genres, if (state.tags.isEmpty()) 0 else R.string.reset))
 				tags.mapTo(list) {
 					FilterItem.Tag(it, isChecked = it in state.tags)
 				}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterDiffCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterDiffCallback.kt
deleted file mode 100644
index d3319c431..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterDiffCallback.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.filter.ui
-
-import androidx.recyclerview.widget.DiffUtil
-import org.koitharu.kotatsu.filter.ui.model.FilterItem
-import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-class FilterDiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-	override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-		return when {
-			oldItem === newItem -> true
-			oldItem.javaClass != newItem.javaClass -> false
-			oldItem is ListHeader && newItem is ListHeader -> {
-				oldItem == newItem
-			}
-
-			oldItem is FilterItem.Tag && newItem is FilterItem.Tag -> {
-				oldItem.tag == newItem.tag
-			}
-
-			oldItem is FilterItem.Sort && newItem is FilterItem.Sort -> {
-				oldItem.order == newItem.order
-			}
-
-			oldItem is FilterItem.Error && newItem is FilterItem.Error -> {
-				oldItem.textResId == newItem.textResId
-			}
-
-			else -> false
-		}
-	}
-
-	override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-		return oldItem == newItem
-	}
-
-	override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
-		val hasPayload = when {
-			oldItem is FilterItem.Tag && newItem is FilterItem.Tag -> {
-				oldItem.isChecked != newItem.isChecked
-			}
-
-			oldItem is FilterItem.Sort && newItem is FilterItem.Sort -> {
-				oldItem.isSelected != newItem.isSelected
-			}
-
-			else -> false
-		}
-		return if (hasPayload) Unit else super.getChangePayload(oldItem, newItem)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
index 1d31d888d..04e727258 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
@@ -14,6 +14,7 @@ import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.databinding.SheetFilterBinding
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class FilterSheetFragment :
@@ -31,7 +32,8 @@ class FilterSheetFragment :
 		addSheetCallback(this)
 		val adapter = FilterAdapter(filter, this)
 		binding.recyclerView.adapter = adapter
-		filter.filterItems.observe(viewLifecycleOwner, adapter::setItems)
+		filter.filterItems.observe(viewLifecycleOwner, adapter)
+		binding.recyclerView.addItemDecoration(TypedListSpacingDecoration(binding.root.context))
 
 		if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			binding.recyclerView.scrollIndicators = 0
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt
index bf3f15f93..b82e08a43 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt
@@ -1,8 +1,9 @@
 package org.koitharu.kotatsu.filter.ui
 
 import org.koitharu.kotatsu.filter.ui.model.FilterItem
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 
-interface OnFilterChangedListener {
+interface OnFilterChangedListener : ListHeaderClickListener {
 
 	fun onSortItemClick(item: FilterItem.Sort)
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt
index cf9dcd834..7e376dd55 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterHeaderModel.kt
@@ -1,14 +1,13 @@
 package org.koitharu.kotatsu.filter.ui.model
 
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class FilterHeaderModel(
 	val chips: Collection<ChipsView.ChipModel>,
 	val sortOrder: SortOrder?,
 	val hasSelectedTags: Boolean,
-) : ListModel {
+) {
 
 	val textSummary: String
 		get() = chips.mapNotNull { if (it.isChecked) it.title else null }.joinToString()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterItem.kt
index a2ad2cddb..e096ebc51 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/model/FilterItem.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.filter.ui.model
 
 import androidx.annotation.StringRes
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
@@ -12,6 +13,18 @@ sealed interface FilterItem : ListModel {
 		val isSelected: Boolean,
 	) : FilterItem {
 
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Sort && other.order == order
+		}
+
+		override fun getChangePayload(previousState: ListModel): Any? {
+			return if (previousState is Sort && previousState.isSelected != isSelected) {
+				ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+			} else {
+				super.getChangePayload(previousState)
+			}
+		}
+
 		override fun equals(other: Any?): Boolean {
 			if (this === other) return true
 			if (javaClass != other?.javaClass) return false
@@ -34,6 +47,18 @@ sealed interface FilterItem : ListModel {
 		val isChecked: Boolean,
 	) : FilterItem {
 
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Tag && other.tag == tag
+		}
+
+		override fun getChangePayload(previousState: ListModel): Any? {
+			return if (previousState is Tag && previousState.isChecked != isChecked) {
+				ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+			} else {
+				super.getChangePayload(previousState)
+			}
+		}
+
 		override fun equals(other: Any?): Boolean {
 			if (this === other) return true
 			if (javaClass != other?.javaClass) return false
@@ -55,6 +80,10 @@ sealed interface FilterItem : ListModel {
 		@StringRes val textResId: Int,
 	) : FilterItem {
 
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Error && textResId == other.textResId
+		}
+
 		override fun equals(other: Any?): Boolean {
 			if (this === other) return true
 			if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt
index 0e033ddd5..cc51633e6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt
@@ -4,10 +4,15 @@ 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.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
+import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 
 @Dao
 abstract class HistoryDao {
@@ -28,6 +33,22 @@ abstract class HistoryDao {
 	@Query("SELECT * FROM history WHERE deleted_at = 0 ORDER BY updated_at DESC LIMIT :limit")
 	abstract fun observeAll(limit: Int): Flow<List<HistoryWithManga>>
 
+	fun observeAll(order: HistoryOrder): Flow<List<HistoryWithManga>> {
+		val orderBy = when (order) {
+			HistoryOrder.UPDATED -> "history.updated_at DESC"
+			HistoryOrder.CREATED -> "history.created_at DESC"
+			HistoryOrder.PROGRESS -> "history.percent DESC"
+			HistoryOrder.ALPHABETIC -> "manga.title"
+		}
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery(
+			"SELECT * FROM history LEFT JOIN manga ON history.manga_id = manga.manga_id " +
+				"WHERE history.deleted_at = 0 GROUP BY history.manga_id ORDER BY $orderBy",
+		)
+		return observeAllImpl(query)
+	}
+
 	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM history WHERE deleted_at = 0)")
 	abstract suspend fun findAllManga(): List<MangaEntity>
 
@@ -111,4 +132,8 @@ abstract class HistoryDao {
 
 	@Query("UPDATE history SET deleted_at = :deletedAt WHERE created_at >= :minDate AND deleted_at = 0")
 	protected abstract suspend fun setDeletedAtAfter(minDate: Long, deletedAt: Long)
+
+	@Transaction
+	@RawQuery(observedEntities = [HistoryEntity::class])
+	protected abstract fun observeAllImpl(query: SupportSQLiteQuery): Flow<List<HistoryWithManga>>
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt
index 28f6bf451..4b9db3ecf 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt
@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.core.util.ext.mapItems
+import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -64,8 +65,8 @@ class HistoryRepository @Inject constructor(
 		}
 	}
 
-	fun observeAllWithHistory(): Flow<List<MangaWithHistory>> {
-		return db.historyDao.observeAll().mapItems {
+	fun observeAllWithHistory(order: HistoryOrder): Flow<List<MangaWithHistory>> {
+		return db.historyDao.observeAll(order).mapItems {
 			MangaWithHistory(
 				it.manga.toManga(it.tags.toMangaTags()),
 				it.history.toMangaHistory(),
@@ -114,7 +115,7 @@ class HistoryRepository @Inject constructor(
 	}
 
 	suspend fun getOne(manga: Manga): MangaHistory? {
-		return db.historyDao.find(manga.id)?.toMangaHistory()
+		return db.historyDao.find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
 	}
 
 	suspend fun getProgress(mangaId: Long): Float {
@@ -177,4 +178,17 @@ class HistoryRepository @Inject constructor(
 			}
 		}
 	}
+
+	private suspend fun HistoryEntity.recoverIfNeeded(manga: Manga): HistoryEntity {
+		val chapters = manga.chapters
+		if (chapters.isNullOrEmpty() || chapters.any { it.id == chapterId }) {
+			return this
+		}
+		val newChapterId = chapters.getOrNull(
+			(chapters.size * percent).toInt(),
+		)?.id ?: return this
+		val newEntity = copy(chapterId = newChapterId)
+		db.historyDao.update(newEntity)
+		return newEntity
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/model/HistoryOrder.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/model/HistoryOrder.kt
new file mode 100644
index 000000000..dd1fcd5b9
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/model/HistoryOrder.kt
@@ -0,0 +1,16 @@
+package org.koitharu.kotatsu.history.domain.model
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+
+enum class HistoryOrder(
+	@StringRes val titleResId: Int,
+) {
+
+	UPDATED(R.string.updated),
+	CREATED(R.string.order_added),
+	PROGRESS(R.string.progress),
+	ALPHABETIC(R.string.by_name);
+
+	fun isGroupingSupported() = this == UPDATED || this == CREATED || this == PROGRESS
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryActivity.kt
index e9b2dcda1..5c05fbf46 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryActivity.kt
@@ -29,7 +29,7 @@ class HistoryActivity :
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
 				setReorderingAllowed(true)
-				val fragment = HistoryListFragment.newInstance()
+				val fragment = HistoryListFragment()
 				replace(R.id.container, fragment)
 			}
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListAdapter.kt
index a17e0da8f..323eba0d3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListAdapter.kt
@@ -4,22 +4,24 @@ import android.content.Context
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
 
 class HistoryListAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-	listener: MangaListListener
-) : MangaListAdapter(coil, lifecycleOwner, listener), FastScroller.SectionIndexer {
+	listener: MangaListListener,
+	sizeResolver: ItemSizeResolver,
+) : MangaListAdapter(coil, lifecycleOwner, listener, sizeResolver), FastScroller.SectionIndexer {
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
 		val list = items
 		for (i in (0..position).reversed()) {
 			val item = list.getOrNull(i) ?: continue
-			if (item is DateTimeAgo) {
-				return item.format(context.resources)
+			if (item is ListHeader) {
+				return item.getText(context)
 			}
 		}
 		return null
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
index 47157c4a7..825115da3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
@@ -8,10 +8,12 @@ import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.list.ui.size.DynamicItemSizeResolver
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @AndroidEntryPoint
@@ -23,9 +25,9 @@ class HistoryListFragment : MangaListFragment() {
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		addMenuProvider(HistoryListMenuProvider(binding.root.context, viewModel))
-		viewModel.isGroupingEnabled.observe(viewLifecycleOwner) {
-			activity?.invalidateOptionsMenu()
-		}
+		val menuInvalidator = MenuInvalidator(requireActivity())
+		viewModel.isGroupingEnabled.observe(viewLifecycleOwner, menuInvalidator)
+		viewModel.sortOrder.observe(viewLifecycleOwner, menuInvalidator)
 	}
 
 	override fun onScrolledToEnd() = Unit
@@ -54,10 +56,10 @@ class HistoryListFragment : MangaListFragment() {
 		}
 	}
 
-	override fun onCreateAdapter() = HistoryListAdapter(coil, viewLifecycleOwner, this)
-
-	companion object {
-
-		fun newInstance() = HistoryListFragment()
-	}
+	override fun onCreateAdapter() = HistoryListAdapter(
+		coil,
+		viewLifecycleOwner,
+		this,
+		DynamicItemSizeResolver(resources, settings, adjustWidth = false),
+	)
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListMenuProvider.kt
index 00c5dee0b..c88046df8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListMenuProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListMenuProvider.kt
@@ -5,9 +5,15 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
-import com.google.android.material.R as materialR
+import androidx.core.view.forEach
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.dialog.RememberSelectionDialogListener
+import org.koitharu.kotatsu.core.util.ext.startOfDay
+import org.koitharu.kotatsu.history.domain.model.HistoryOrder
+import java.util.Date
+import java.util.concurrent.TimeUnit
+import com.google.android.material.R as materialR
 
 class HistoryListMenuProvider(
 	private val context: Context,
@@ -16,28 +22,70 @@ class HistoryListMenuProvider(
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_history, menu)
+		val subMenu = menu.findItem(R.id.action_order)?.subMenu ?: return
+		for (order in HistoryOrder.entries) {
+			subMenu.add(R.id.group_order, Menu.NONE, order.ordinal, order.titleResId)
+		}
+		subMenu.setGroupCheckable(R.id.group_order, true, true)
 	}
 
-	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
-		R.id.action_clear_history -> {
-			MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
-				.setTitle(R.string.clear_history)
-				.setMessage(R.string.text_clear_history_prompt)
-				.setIcon(R.drawable.ic_delete)
-				.setNegativeButton(android.R.string.cancel, null)
-				.setPositiveButton(R.string.clear) { _, _ ->
-					viewModel.clearHistory()
-				}.show()
-			true
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+		if (menuItem.groupId == R.id.group_order) {
+			val order = HistoryOrder.entries[menuItem.order]
+			viewModel.setSortOrder(order)
+			return true
 		}
-		R.id.action_history_grouping -> {
-			viewModel.setGrouping(!menuItem.isChecked)
-			true
+		return when (menuItem.itemId) {
+			R.id.action_clear_history -> {
+				showClearHistoryDialog()
+				true
+			}
+
+			R.id.action_history_grouping -> {
+				viewModel.setGrouping(!menuItem.isChecked)
+				true
+			}
+
+			else -> false
 		}
-		else -> false
 	}
 
 	override fun onPrepareMenu(menu: Menu) {
-		menu.findItem(R.id.action_history_grouping)?.isChecked = viewModel.isGroupingEnabled.value == true
+		val order = viewModel.sortOrder.value
+		menu.findItem(R.id.action_order)?.subMenu?.forEach { item ->
+			if (item.order == order.ordinal) {
+				item.isChecked = true
+			}
+		}
+		menu.findItem(R.id.action_history_grouping)?.run {
+			isChecked = viewModel.isGroupingEnabled.value == true
+			isEnabled = order.isGroupingSupported()
+		}
+	}
+
+	private fun showClearHistoryDialog() {
+		val selectionListener = RememberSelectionDialogListener(2)
+		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
+			.setTitle(R.string.clear_history)
+			.setSingleChoiceItems(
+				arrayOf(
+					context.getString(R.string.last_2_hours),
+					context.getString(R.string.today),
+					context.getString(R.string.clear_all_history),
+				),
+				selectionListener.selection,
+				selectionListener,
+			)
+			.setIcon(R.drawable.ic_delete)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.clear) { _, _ ->
+				val minDate = when (selectionListener.selection) {
+					0 -> System.currentTimeMillis() - TimeUnit.HOURS.toMillis(2)
+					1 -> Date().startOfDay()
+					2 -> 0L
+					else -> return@setPositiveButton
+				}
+				viewModel.clearHistory(minDate)
+			}.show()
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
index 673fbc87d..a7c68d9d5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
@@ -4,14 +4,18 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
@@ -20,10 +24,12 @@ import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.core.util.ext.onFirst
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.history.domain.model.MangaWithHistory
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 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
@@ -42,14 +48,25 @@ class HistoryListViewModel @Inject constructor(
 	downloadScheduler: DownloadWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
 
-	val isGroupingEnabled = settings.observeAsStateFlow(
-		scope = viewModelScope + Dispatchers.Default,
+	val sortOrder: StateFlow<HistoryOrder> = settings.observeAsStateFlow(
+		scope = viewModelScope + Dispatchers.IO,
+		key = AppSettings.KEY_HISTORY_ORDER,
+		valueProducer = { historySortOrder },
+	)
+
+	val isGroupingEnabled = settings.observeAsFlow(
 		key = AppSettings.KEY_HISTORY_GROUPING,
 		valueProducer = { isHistoryGroupingEnabled },
+	).combine(sortOrder) { g, s ->
+		g && s.isGroupingSupported()
+	}.stateIn(
+		scope = viewModelScope + Dispatchers.Default,
+		started = SharingStarted.Eagerly,
+		initialValue = settings.isHistoryGroupingEnabled && sortOrder.value.isGroupingSupported(),
 	)
 
 	override val content = combine(
-		repository.observeAllWithHistory(),
+		sortOrder.flatMapLatest { repository.observeAllWithHistory(it) },
 		isGroupingEnabled,
 		listMode,
 	) { list, grouped, mode ->
@@ -77,9 +94,20 @@ class HistoryListViewModel @Inject constructor(
 
 	override fun onRetry() = Unit
 
-	fun clearHistory() {
-		launchLoadingJob(Dispatchers.Default) {
-			repository.clear()
+	fun setSortOrder(order: HistoryOrder) {
+		settings.historySortOrder = order
+	}
+
+	fun clearHistory(minDate: Long) {
+		launchJob(Dispatchers.Default) {
+			val stringRes = if (minDate <= 0) {
+				repository.clear()
+				R.string.history_cleared
+			} else {
+				repository.deleteAfter(minDate)
+				R.string.removed_from_history
+			}
+			onActionDone.call(ReversibleAction(stringRes, null))
 		}
 	}
 
@@ -103,14 +131,17 @@ class HistoryListViewModel @Inject constructor(
 		mode: ListMode,
 	): List<ListModel> {
 		val result = ArrayList<ListModel>(if (grouped) (list.size * 1.4).toInt() else list.size + 1)
-		var prevDate: DateTimeAgo? = null
+		val order = sortOrder.value
+		var prevHeader: ListHeader? = null
 		for ((manga, history) in list) {
 			if (grouped) {
-				val date = timeAgo(history.updatedAt)
-				if (prevDate != date) {
-					result += date
+				val header = history.header(order)
+				if (header != prevHeader) {
+					if (header != null) {
+						result += header
+					}
+					prevHeader = header
 				}
-				prevDate = date
 			}
 			result += when (mode) {
 				ListMode.LIST -> manga.toListModel(extraProvider)
@@ -121,6 +152,21 @@ class HistoryListViewModel @Inject constructor(
 		return result
 	}
 
+	private fun MangaHistory.header(order: HistoryOrder): ListHeader? = when (order) {
+		HistoryOrder.UPDATED -> ListHeader(timeAgo(updatedAt))
+		HistoryOrder.CREATED -> ListHeader(timeAgo(createdAt))
+		HistoryOrder.PROGRESS -> ListHeader(
+			when (percent) {
+				1f -> R.string.status_completed
+				in 0f..0.01f -> R.string.status_planned
+				in 0f..1f -> R.string.status_reading
+				else -> R.string.unknown
+			},
+		)
+
+		HistoryOrder.ALPHABETIC -> null
+	}
+
 	private fun timeAgo(date: Date): DateTimeAgo {
 		val diff = (System.currentTimeMillis() - date.time).coerceAtLeast(0L)
 		val diffMinutes = TimeUnit.MILLISECONDS.toMinutes(diff).toInt()
@@ -130,6 +176,7 @@ class HistoryListViewModel @Inject constructor(
 			diffDays < 1 -> DateTimeAgo.Today
 			diffDays == 1 -> DateTimeAgo.Yesterday
 			diffDays < 6 -> DateTimeAgo.DaysAgo(diffDays)
+			diffDays < 200 -> DateTimeAgo.MonthsAgo(diffDays / 30)
 			else -> DateTimeAgo.LongAgo
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/ListModelDiffCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/ListModelDiffCallback.kt
new file mode 100644
index 000000000..3d2984a75
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/ListModelDiffCallback.kt
@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.list.ui
+
+import androidx.recyclerview.widget.DiffUtil
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+open class ListModelDiffCallback<T : ListModel> : DiffUtil.ItemCallback<T>() {
+
+	override fun areItemsTheSame(oldItem: T, newItem: T): Boolean {
+		return oldItem.areItemsTheSame(newItem)
+	}
+
+	override fun areContentsTheSame(oldItem: T, newItem: T): Boolean {
+		return oldItem == newItem
+	}
+
+	override fun getChangePayload(oldItem: T, newItem: T): Any? {
+		return newItem.getChangePayload(oldItem)
+	}
+
+	companion object : ListModelDiffCallback<ListModel>() {
+
+		val PAYLOAD_CHECKED_CHANGED = Any()
+		val PAYLOAD_NESTED_LIST_CHANGED = Any()
+		val PAYLOAD_PROGRESS_CHANGED = Any()
+		val PAYLOAD_ANYTHING_CHANGED = Any()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index 021f4d83a..cec2d1b95 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -22,19 +22,17 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.FitHeightGridLayoutManager
 import org.koitharu.kotatsu.core.ui.list.FitHeightLinearLayoutManager
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.PaginationScrollListener
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.ui.list.decor.TypedSpacingItemDecoration
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
-import org.koitharu.kotatsu.core.util.ext.clearItemDecorations
 import org.koitharu.kotatsu.core.util.ext.measureHeight
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
@@ -44,13 +42,15 @@ import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
-import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter.Companion.ITEM_TYPE_MANGA_GRID
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+import org.koitharu.kotatsu.list.ui.size.DynamicItemSizeResolver
 import org.koitharu.kotatsu.main.ui.MainActivity
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -71,14 +71,14 @@ abstract class MangaListFragment :
 	@Inject
 	lateinit var coil: ImageLoader
 
+	@Inject
+	lateinit var settings: AppSettings
+
 	private var listAdapter: MangaListAdapter? = null
 	private var paginationListener: PaginationScrollListener? = null
 	private var selectionController: ListSelectionController? = null
 	private var spanResolver: MangaListSpanResolver? = null
 	private val spanSizeLookup = SpanSizeLookup()
-	private val listCommitCallback = Runnable {
-		spanSizeLookup.invalidateCache()
-	}
 	open val isSwipeRefreshEnabled = true
 
 	protected abstract val viewModel: MangaListViewModel
@@ -109,6 +109,7 @@ abstract class MangaListFragment :
 			setHasFixedSize(true)
 			adapter = listAdapter
 			checkNotNull(selectionController).attachToRecyclerView(binding.recyclerView)
+			addItemDecoration(TypedListSpacingDecoration(context))
 			addOnScrollListener(paginationListener!!)
 			fastScroller.setFastScrollListener(this@MangaListFragment)
 		}
@@ -138,7 +139,9 @@ abstract class MangaListFragment :
 
 	override fun onItemClick(item: Manga, view: View) {
 		if (selectionController?.onItemClick(item.id) != true) {
-			startActivity(DetailsActivity.newIntent(context ?: return, item))
+			if ((activity as? MangaListActivity)?.showPreview(item) != true) {
+				startActivity(DetailsActivity.newIntent(context ?: return, item))
+			}
 		}
 	}
 
@@ -149,7 +152,7 @@ abstract class MangaListFragment :
 	override fun onReadClick(manga: Manga, view: View) {
 		if (selectionController?.onItemClick(manga.id) != true) {
 			val intent = IntentBuilder(view.context).manga(manga).build()
-			startActivity(intent, scaleUpActivityOptionsOf(view))
+			startActivity(intent)
 		}
 	}
 
@@ -166,8 +169,9 @@ abstract class MangaListFragment :
 		viewModel.onRefresh()
 	}
 
-	private fun onListChanged(list: List<ListModel>) {
-		listAdapter?.setItems(list, listCommitCallback)
+	private suspend fun onListChanged(list: List<ListModel>) {
+		listAdapter?.emit(list)
+		spanSizeLookup.invalidateCache()
 	}
 
 	private fun resolveException(e: Throwable) {
@@ -196,6 +200,7 @@ abstract class MangaListFragment :
 			coil = coil,
 			lifecycleOwner = viewLifecycleOwner,
 			listener = this,
+			sizeResolver = DynamicItemSizeResolver(resources, settings, adjustWidth = false)
 		)
 	}
 
@@ -238,24 +243,17 @@ abstract class MangaListFragment :
 	private fun onListModeChanged(mode: ListMode) {
 		spanSizeLookup.invalidateCache()
 		with(requireViewBinding().recyclerView) {
-			clearItemDecorations()
 			removeOnLayoutChangeListener(spanResolver)
 			when (mode) {
 				ListMode.LIST -> {
 					layoutManager = FitHeightLinearLayoutManager(context)
-					val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-					val decoration = TypedSpacingItemDecoration(
-						MangaListAdapter.ITEM_TYPE_MANGA_LIST to 0,
-						fallbackSpacing = spacing,
-					)
-					addItemDecoration(decoration)
+					updatePadding(left = 0, right = 0)
 				}
 
 				ListMode.DETAILED_LIST -> {
 					layoutManager = FitHeightLinearLayoutManager(context)
 					val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 					updatePadding(left = spacing, right = spacing)
-					addItemDecoration(SpacingItemDecoration(spacing))
 				}
 
 				ListMode.GRID -> {
@@ -263,12 +261,10 @@ abstract class MangaListFragment :
 						it.spanSizeLookup = spanSizeLookup
 					}
 					val spacing = resources.getDimensionPixelOffset(R.dimen.grid_spacing)
-					addItemDecoration(SpacingItemDecoration(spacing))
 					updatePadding(left = spacing, right = spacing)
 					addOnLayoutChangeListener(spanResolver)
 				}
 			}
-			selectionController?.attachToRecyclerView(requireViewBinding().recyclerView)
 		}
 	}
 
@@ -293,7 +289,7 @@ abstract class MangaListFragment :
 			}
 
 			R.id.action_favourite -> {
-				FavouriteCategoriesSheet.show(childFragmentManager, selectedItems)
+				FavouriteSheet.show(childFragmentManager, selectedItems)
 				mode.finish()
 				true
 			}
@@ -309,7 +305,7 @@ abstract class MangaListFragment :
 	}
 
 	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
-		requireViewBinding().recyclerView.invalidateItemDecorations()
+		viewBinding?.recyclerView?.invalidateItemDecorations()
 	}
 
 	override fun onFastScrollStart(fastScroller: FastScroller) {
@@ -341,10 +337,9 @@ abstract class MangaListFragment :
 		}
 
 		override fun getSpanSize(position: Int): Int {
-			val total =
-				(requireViewBinding().recyclerView.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
+			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
 			return when (listAdapter?.getItemViewType(position)) {
-				ITEM_TYPE_MANGA_GRID -> 1
+				ListItemType.MANGA_GRID.ordinal -> 1
 				else -> total
 			}
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
index 8c197fae9..500c31796 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 
 abstract class MangaListViewModel(
-	settings: AppSettings,
+	private val settings: AppSettings,
 	private val downloadScheduler: DownloadWorker.Scheduler,
 ) : BaseViewModel() {
 
@@ -46,4 +46,10 @@ abstract class MangaListViewModel(
 			onDownloadStarted.call(Unit)
 		}
 	}
+
+	fun List<Manga>.skipNsfwIfNeeded() = if (settings.isNsfwContentDisabled) {
+		filterNot { it.isNsfw }
+	} else {
+		this
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeader2AD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeader2AD.kt
deleted file mode 100644
index 518983bd4..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeader2AD.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.koitharu.kotatsu.list.ui.adapter
-
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
-import org.koitharu.kotatsu.databinding.FragmentFilterHeaderBinding
-import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.MangaTag
-
-@Deprecated("")
-fun listHeader2AD(
-	listener: MangaListListener,
-) = adapterDelegateViewBinding<FilterHeaderModel, ListModel, FragmentFilterHeaderBinding>(
-	{ layoutInflater, parent -> FragmentFilterHeaderBinding.inflate(layoutInflater, parent, false) },
-) {
-
-	var ignoreChecking = false
-	binding.chipsTags.setOnCheckedStateChangeListener { _, _ ->
-		if (!ignoreChecking) {
-			listener.onUpdateFilter(binding.chipsTags.getCheckedData(MangaTag::class.java))
-		}
-	}
-
-	bind { payloads ->
-		if (payloads.isNotEmpty()) {
-			if (context.isAnimationsEnabled) {
-				binding.scrollView.smoothScrollTo(0, 0)
-			} else {
-				binding.scrollView.scrollTo(0, 0)
-			}
-		}
-		ignoreChecking = true
-		binding.chipsTags.setChips(item.chips) // TODO use recyclerview
-		ignoreChecking = false
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
index 8076dc68b..dc3920031 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
 import org.koitharu.kotatsu.databinding.ItemHeaderButtonBinding
-import org.koitharu.kotatsu.databinding.ItemHeaderSingleBinding
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
@@ -20,15 +20,12 @@ fun listHeaderAD(
 
 	bind {
 		binding.textViewTitle.text = item.getText(context)
-		binding.buttonMore.setTextAndVisible(item.buttonTextRes)
-	}
-}
-
-fun listSimpleHeaderAD() = adapterDelegateViewBinding<ListHeader, ListModel, ItemHeaderSingleBinding>(
-	{ inflater, parent -> ItemHeaderSingleBinding.inflate(inflater, parent, false) },
-) {
-
-	bind {
-		binding.textViewTitle.text = item.getText(context)
+		if (item.buttonTextRes == 0) {
+			binding.buttonMore.isInvisible = true
+			binding.buttonMore.text = null
+		} else {
+			binding.buttonMore.setText(item.buttonTextRes)
+			binding.buttonMore.isVisible = true
+		}
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListItemType.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListItemType.kt
new file mode 100644
index 000000000..b12eb169f
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListItemType.kt
@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.list.ui.adapter
+
+enum class ListItemType {
+
+	FILTER_SORT,
+	FILTER_TAG,
+	HEADER,
+	MANGA_LIST,
+	MANGA_LIST_DETAILED,
+	MANGA_GRID,
+	MANGA_NESTED_GROUP,
+	FOOTER_LOADING,
+	FOOTER_ERROR,
+	STATE_LOADING,
+	STATE_ERROR,
+	STATE_EMPTY,
+	EXPLORE_BUTTONS,
+	EXPLORE_SOURCE_GRID,
+	EXPLORE_SOURCE_LIST,
+	EXPLORE_SUGGESTION,
+	TIP,
+	HINT_EMPTY,
+	PAGE_THUMB,
+	FEED,
+	DOWNLOAD,
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
index e47650a25..d86caff0c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
@@ -6,6 +6,7 @@ import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
@@ -13,16 +14,17 @@ import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemMangaGridBinding
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaGridModel
+import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
 import org.koitharu.kotatsu.parsers.model.Manga
 
 fun mangaGridItemAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
+	sizeResolver: ItemSizeResolver,
 	clickListener: OnListItemClickListener<Manga>,
-	sizeResolver: ItemSizeResolver?,
 ) = adapterDelegateViewBinding<MangaGridModel, ListModel, ItemMangaGridBinding>(
 	{ inflater, parent -> ItemMangaGridBinding.inflate(inflater, parent, false) },
 ) {
@@ -34,16 +36,17 @@ fun mangaGridItemAD(
 	itemView.setOnLongClickListener {
 		clickListener.onItemLongClick(item.manga, it)
 	}
-	sizeResolver?.attachToView(lifecycleOwner, itemView, binding.textViewTitle)
+	sizeResolver.attachToView(lifecycleOwner, itemView, binding.textViewTitle, binding.progressView)
 
 	bind { payloads ->
 		binding.textViewTitle.text = item.title
-		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
+		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
 			size(CoverSizeResolver(binding.imageViewCover))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
+			transformations(TrimTransformation())
 			allowRgb565(true)
 			source(item.source)
 			enqueueWith(coil)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
index 09a4809d6..c53e556d7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
@@ -1,107 +1,27 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
-import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
-import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.list.ui.model.MangaGridModel
-import org.koitharu.kotatsu.list.ui.model.MangaItemModel
-import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
-import org.koitharu.kotatsu.list.ui.model.MangaListModel
-import kotlin.jvm.internal.Intrinsics
+import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
 
 open class MangaListAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: MangaListListener,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+	sizeResolver: ItemSizeResolver,
+) : BaseListAdapter<ListModel>() {
 
 	init {
-		delegatesManager
-			.addDelegate(ITEM_TYPE_MANGA_LIST, mangaListItemAD(coil, lifecycleOwner, listener))
-			.addDelegate(ITEM_TYPE_MANGA_LIST_DETAILED, mangaListDetailedItemAD(coil, lifecycleOwner, listener))
-			.addDelegate(ITEM_TYPE_MANGA_GRID, mangaGridItemAD(coil, lifecycleOwner, listener, null))
-			.addDelegate(ITEM_TYPE_LOADING_FOOTER, loadingFooterAD())
-			.addDelegate(ITEM_TYPE_LOADING_STATE, loadingStateAD())
-			.addDelegate(ITEM_TYPE_DATE, relatedDateItemAD())
-			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
-			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(listener))
-			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
-			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD(listener))
-			.addDelegate(ITEM_TYPE_HEADER_2, listHeader2AD(listener))
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel) = when {
-			oldItem is MangaListModel && newItem is MangaListModel -> {
-				oldItem.id == newItem.id
-			}
-
-			oldItem is MangaListDetailedModel && newItem is MangaListDetailedModel -> {
-				oldItem.id == newItem.id
-			}
-
-			oldItem is MangaGridModel && newItem is MangaGridModel -> {
-				oldItem.id == newItem.id
-			}
-
-			oldItem is DateTimeAgo && newItem is DateTimeAgo -> {
-				oldItem == newItem
-			}
-
-			oldItem is ListHeader && newItem is ListHeader -> {
-				oldItem.textRes == newItem.textRes &&
-					oldItem.text == newItem.text &&
-					oldItem.dateTimeAgo == newItem.dateTimeAgo
-			}
-
-			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 (newItem) {
-				is MangaItemModel -> {
-					oldItem as MangaItemModel
-					if (oldItem.progress != newItem.progress) {
-						PAYLOAD_PROGRESS
-					} else {
-					}
-				}
-
-				is FilterHeaderModel -> Unit
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
-
-	companion object {
-
-		const val ITEM_TYPE_MANGA_LIST = 0
-		const val ITEM_TYPE_MANGA_LIST_DETAILED = 1
-		const val ITEM_TYPE_MANGA_GRID = 2
-		const val ITEM_TYPE_LOADING_FOOTER = 3
-		const val ITEM_TYPE_LOADING_STATE = 4
-		const val ITEM_TYPE_DATE = 5
-		const val ITEM_TYPE_ERROR_STATE = 6
-		const val ITEM_TYPE_ERROR_FOOTER = 7
-		const val ITEM_TYPE_EMPTY = 8
-		const val ITEM_TYPE_HEADER = 9
-		const val ITEM_TYPE_HEADER_2 = 10
-
-		val PAYLOAD_PROGRESS = Any()
+		addDelegate(ListItemType.MANGA_LIST, mangaListItemAD(coil, lifecycleOwner, listener))
+		addDelegate(ListItemType.MANGA_LIST_DETAILED, mangaListDetailedItemAD(coil, lifecycleOwner, listener))
+		addDelegate(ListItemType.MANGA_GRID, mangaGridItemAD(coil, lifecycleOwner, sizeResolver, listener))
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(listener))
+		addDelegate(ListItemType.FOOTER_ERROR, errorFooterAD(listener))
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
index 95396fca3..3506ef54c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
@@ -9,6 +9,7 @@ import com.google.android.material.chip.Chip
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
@@ -17,6 +18,7 @@ import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemMangaListDetailsBinding
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -51,12 +53,13 @@ fun mangaListDetailedItemAD(
 	bind { payloads ->
 		binding.textViewTitle.text = item.title
 		binding.textViewSubtitle.textAndVisible = item.subtitle
-		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
+		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.imageViewCover.newImageRequest(lifecycleOwner, item.coverUrl)?.run {
 			size(CoverSizeResolver(binding.imageViewCover))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
+			transformations(TrimTransformation())
 			allowRgb565(true)
 			source(item.source)
 			enqueueWith(coil)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
index 77f68418d..5d7f656dc 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
@@ -5,6 +5,7 @@ import coil.ImageLoader
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
@@ -40,6 +41,7 @@ fun mangaListItemAD(
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
+			transformations(TrimTransformation())
 			source(item.source)
 			enqueueWith(coil)
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/RelatedDateItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/RelatedDateItemAD.kt
deleted file mode 100644
index 3a615aab5..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/RelatedDateItemAD.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.list.ui.adapter
-
-import android.widget.TextView
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-fun relatedDateItemAD() = adapterDelegate<DateTimeAgo, ListModel>(R.layout.item_header) {
-
-	bind {
-		(itemView as TextView).text = item.format(context.resources)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TipAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TipAD.kt
new file mode 100644
index 000000000..bec674344
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TipAD.kt
@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.list.ui.adapter
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.core.ui.widgets.TipView
+import org.koitharu.kotatsu.databinding.ItemTip2Binding
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.TipModel
+
+fun tipAD(
+	listener: TipView.OnButtonClickListener,
+) = adapterDelegateViewBinding<TipModel, ListModel, ItemTip2Binding>(
+	{ layoutInflater, parent -> ItemTip2Binding.inflate(layoutInflater, parent, false) }
+) {
+
+	binding.root.onButtonClickListener = listener
+
+	bind {
+		with(binding.root) {
+			tag = item
+			setTitle(item.title)
+			setText(item.text)
+			setIcon(item.icon)
+			setPrimaryButtonText(item.primaryButtonText)
+			setSecondaryButtonText(item.secondaryButtonText)
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt
new file mode 100644
index 000000000..a540d43d8
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt
@@ -0,0 +1,57 @@
+package org.koitharu.kotatsu.list.ui.adapter
+
+import android.content.Context
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+import org.koitharu.kotatsu.R
+
+class TypedListSpacingDecoration(
+	context: Context,
+) : ItemDecoration() {
+
+	private val spacingList = context.resources.getDimensionPixelOffset(R.dimen.list_spacing)
+	private val spacingGrid = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing)
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State
+	) {
+		val itemType = parent.getChildViewHolder(view)?.itemViewType?.let {
+			ListItemType.entries.getOrNull(it)
+		}
+		when (itemType) {
+			ListItemType.FILTER_SORT,
+			ListItemType.FILTER_TAG -> outRect.set(0)
+
+			ListItemType.HEADER -> outRect.set(spacingList, 0, spacingList, 0)
+			ListItemType.MANGA_LIST -> outRect.set(0)
+			ListItemType.DOWNLOAD,
+			ListItemType.MANGA_LIST_DETAILED -> outRect.set(spacingList)
+
+			ListItemType.PAGE_THUMB,
+			ListItemType.MANGA_GRID -> outRect.set(spacingGrid)
+
+			ListItemType.FOOTER_LOADING,
+			ListItemType.FOOTER_ERROR,
+			ListItemType.STATE_LOADING,
+			ListItemType.STATE_ERROR,
+			ListItemType.STATE_EMPTY,
+			ListItemType.EXPLORE_BUTTONS,
+			ListItemType.EXPLORE_SOURCE_GRID,
+			ListItemType.EXPLORE_SOURCE_LIST,
+			ListItemType.EXPLORE_SUGGESTION,
+			ListItemType.MANGA_NESTED_GROUP,
+			null -> outRect.set(0)
+
+			ListItemType.TIP -> outRect.set(0) // TODO
+			ListItemType.HINT_EMPTY -> outRect.set(0) // TODO
+			ListItemType.FEED -> outRect.set(spacingList, 0, spacingList, 0)
+		}
+	}
+
+	private fun Rect.set(spacing: Int) = set(spacing, spacing, spacing, spacing)
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyHint.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyHint.kt
index cc42528eb..ee60ee256 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyHint.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyHint.kt
@@ -3,12 +3,16 @@ package org.koitharu.kotatsu.list.ui.model
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 
-class EmptyHint(
-	@DrawableRes icon: Int,
-	@StringRes textPrimary: Int,
-	@StringRes textSecondary: Int,
-	@StringRes actionStringRes: Int,
-) : EmptyState(icon, textPrimary, textSecondary, actionStringRes) {
+data class EmptyHint(
+	@DrawableRes val icon: Int,
+	@StringRes val textPrimary: Int,
+	@StringRes val textSecondary: Int,
+	@StringRes val actionStringRes: Int,
+) : ListModel {
 
 	fun toState() = EmptyState(icon, textPrimary, textSecondary, actionStringRes)
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is EmptyHint && textPrimary == other.textPrimary
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyState.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyState.kt
index ddef7eac6..e586eff44 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyState.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/EmptyState.kt
@@ -3,32 +3,14 @@ package org.koitharu.kotatsu.list.ui.model
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 
-open class EmptyState(
+data class EmptyState(
 	@DrawableRes val icon: Int,
 	@StringRes val textPrimary: Int,
 	@StringRes val textSecondary: Int,
 	@StringRes val actionStringRes: Int,
 ) : ListModel {
 
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as EmptyState
-
-		if (icon != other.icon) return false
-		if (textPrimary != other.textPrimary) return false
-		if (textSecondary != other.textSecondary) return false
-		if (actionStringRes != other.actionStringRes) return false
-
-		return true
-	}
-
-	override fun hashCode(): Int {
-		var result = icon
-		result = 31 * result + textPrimary
-		result = 31 * result + textSecondary
-		result = 31 * result + actionStringRes
-		return result
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is EmptyState
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorFooter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorFooter.kt
index 7bcaf03d8..4cdbb9c1b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorFooter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorFooter.kt
@@ -5,4 +5,9 @@ import androidx.annotation.DrawableRes
 data class ErrorFooter(
 	val exception: Throwable,
 	@DrawableRes val icon: Int
-) : ListModel
\ No newline at end of file
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ErrorFooter && exception == other.exception
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorState.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorState.kt
index 43f566555..9f1bf50a5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorState.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ErrorState.kt
@@ -8,4 +8,7 @@ data class ErrorState(
 	@DrawableRes val icon: Int,
 	val canRetry: Boolean,
 	@StringRes val buttonText: Int
-) : ListModel
\ No newline at end of file
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel) = other is ErrorState
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
index 1be8b5b74..e225c1f28 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
@@ -4,30 +4,31 @@ import android.content.Context
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 
-class ListHeader private constructor(
-	val text: CharSequence?,
-	@StringRes val textRes: Int,
-	val dateTimeAgo: DateTimeAgo?,
+@Suppress("DataClassPrivateConstructor")
+data class ListHeader private constructor(
+	private val text: CharSequence?,
+	@StringRes private val textRes: Int,
+	private val dateTimeAgo: DateTimeAgo?,
 	@StringRes val buttonTextRes: Int,
 	val payload: Any?,
 ) : ListModel {
 
 	constructor(
 		text: CharSequence,
-		@StringRes buttonTextRes: Int,
-		payload: Any?,
+		@StringRes buttonTextRes: Int = 0,
+		payload: Any? = null,
 	) : this(text, 0, null, buttonTextRes, payload)
 
 	constructor(
 		@StringRes textRes: Int,
-		@StringRes buttonTextRes: Int,
-		payload: Any?,
+		@StringRes buttonTextRes: Int = 0,
+		payload: Any? = null,
 	) : this(null, textRes, null, buttonTextRes, payload)
 
 	constructor(
 		dateTimeAgo: DateTimeAgo,
-		@StringRes buttonTextRes: Int,
-		payload: Any?,
+		@StringRes buttonTextRes: Int = 0,
+		payload: Any? = null,
 	) : this(null, 0, dateTimeAgo, buttonTextRes, payload)
 
 	fun getText(context: Context): CharSequence? = when {
@@ -36,25 +37,7 @@ class ListHeader private constructor(
 		else -> dateTimeAgo?.format(context.resources)
 	}
 
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as ListHeader
-
-		if (text != other.text) return false
-		if (textRes != other.textRes) return false
-		if (dateTimeAgo != other.dateTimeAgo) return false
-		if (buttonTextRes != other.buttonTextRes) return false
-		return payload == other.payload
-	}
-
-	override fun hashCode(): Int {
-		var result = text?.hashCode() ?: 0
-		result = 31 * result + textRes
-		result = 31 * result + (dateTimeAgo?.hashCode() ?: 0)
-		result = 31 * result + buttonTextRes
-		result = 31 * result + (payload?.hashCode() ?: 0)
-		return result
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ListHeader && text == other.text && dateTimeAgo == other.dateTimeAgo && textRes == other.textRes
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModel.kt
index ba16c8278..1f92be769 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModel.kt
@@ -3,4 +3,8 @@ package org.koitharu.kotatsu.list.ui.model
 interface ListModel {
 
 	override fun equals(other: Any?): Boolean
+
+	fun areItemsTheSame(other: ListModel): Boolean
+
+	fun getChangePayload(previousState: ListModel): Any? = null
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
index aa6014626..066d1a6f2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
@@ -61,7 +61,11 @@ suspend fun Manga.toGridModel(
 suspend fun List<Manga>.toUi(
 	mode: ListMode,
 	extraProvider: ListExtraProvider,
-): List<MangaItemModel> = toUi(ArrayList(size), mode, extraProvider)
+): List<MangaItemModel> = if (isEmpty()) {
+	emptyList()
+} else {
+	toUi(ArrayList(size), mode, extraProvider)
+}
 
 suspend fun <C : MutableCollection<in MangaItemModel>> List<Manga>.toUi(
 	destination: C,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingFooter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingFooter.kt
index c7c336a7a..7030d059d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingFooter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingFooter.kt
@@ -1,19 +1,10 @@
 package org.koitharu.kotatsu.list.ui.model
 
-class LoadingFooter @JvmOverloads constructor(
+data class LoadingFooter @JvmOverloads constructor(
 	val key: Int = 0,
 ) : ListModel {
 
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as LoadingFooter
-
-		return key == other.key
-	}
-
-	override fun hashCode(): Int {
-		return key
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is LoadingFooter && key == other.key
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingState.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingState.kt
index ae0a3088e..36fa63418 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingState.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/LoadingState.kt
@@ -3,4 +3,8 @@ package org.koitharu.kotatsu.list.ui.model
 object LoadingState : ListModel {
 
 	override fun equals(other: Any?): Boolean = other === LoadingState
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is LoadingState
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
index 97a414879..2b94795c6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
@@ -9,4 +9,4 @@ data class MangaGridModel(
 	override val manga: Manga,
 	override val counter: Int,
 	override val progress: Float,
-) : MangaItemModel
\ No newline at end of file
+) : MangaItemModel()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt
index 2d4710a70..95ea83b60 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt
@@ -1,17 +1,31 @@
 package org.koitharu.kotatsu.list.ui.model
 
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
-sealed interface MangaItemModel : ListModel {
+sealed class MangaItemModel : ListModel {
 
-	val id: Long
-	val manga: Manga
-	val title: String
-	val coverUrl: String
-	val counter: Int
-	val progress: Float
+	abstract val id: Long
+	abstract val manga: Manga
+	abstract val title: String
+	abstract val coverUrl: String
+	abstract val counter: Int
+	abstract val progress: Float
 
 	val source: MangaSource
 		get() = manga.source
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is MangaItemModel && other.javaClass == javaClass && id == other.id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return when {
+			previousState !is MangaItemModel -> super.getChangePayload(previousState)
+			progress != previousState.progress -> ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED
+			counter != previousState.counter -> ListModelDiffCallback.PAYLOAD_ANYTHING_CHANGED
+			else -> null
+		}
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
index 1d246ebb2..e64c47ada 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
@@ -12,4 +12,4 @@ data class MangaListDetailedModel(
 	override val counter: Int,
 	override val progress: Float,
 	val tags: List<ChipsView.ChipModel>,
-) : MangaItemModel
+) : MangaItemModel()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
index 71ac5743c..54b0a800a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
@@ -10,4 +10,4 @@ data class MangaListModel(
 	override val manga: Manga,
 	override val counter: Int,
 	override val progress: Float,
-) : MangaItemModel
\ No newline at end of file
+) : MangaItemModel()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/TipModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/TipModel.kt
new file mode 100644
index 000000000..a3eb66045
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/TipModel.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.list.ui.model
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+data class TipModel(
+	val key: String,
+	@StringRes val title: Int,
+	@StringRes val text: Int,
+	@DrawableRes val icon: Int,
+	@StringRes val primaryButtonText: Int,
+	@StringRes val secondaryButtonText: Int,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is TipModel && other.key == key
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt
new file mode 100644
index 000000000..2849030df
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt
@@ -0,0 +1,165 @@
+package org.koitharu.kotatsu.list.ui.preview
+
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.fragment.app.viewModels
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.request.SuccessResult
+import coil.util.CoilUtils
+import com.google.android.material.chip.Chip
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.BaseFragment
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.crossfade
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
+import org.koitharu.kotatsu.core.util.ext.textAndVisible
+import org.koitharu.kotatsu.databinding.FragmentPreviewBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.filter.ui.FilterOwner
+import org.koitharu.kotatsu.filter.ui.model.FilterItem
+import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.search.ui.SearchActivity
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class PreviewFragment : BaseFragment<FragmentPreviewBinding>(), View.OnClickListener, ChipsView.OnChipClickListener {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private val viewModel: PreviewViewModel by viewModels()
+
+	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPreviewBinding {
+		return FragmentPreviewBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewBindingCreated(binding: FragmentPreviewBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		binding.buttonClose.isVisible = activity is MangaListActivity
+		binding.buttonClose.setOnClickListener(this)
+		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+		binding.chipsTags.onChipClickListener = this
+		binding.textViewAuthor.setOnClickListener(this)
+		binding.imageViewCover.setOnClickListener(this)
+		binding.buttonOpen.setOnClickListener(this)
+
+		viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
+		viewModel.tagsChips.observe(viewLifecycleOwner, ::onTagsChipsChanged)
+		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
+	}
+
+	override fun onClick(v: View) {
+		val manga = viewModel.manga.value
+		when (v.id) {
+			R.id.button_close -> closeSelf()
+			R.id.button_open -> startActivity(
+				DetailsActivity.newIntent(v.context, manga),
+			)
+
+			R.id.textView_author -> startActivity(
+				SearchActivity.newIntent(
+					context = v.context,
+					source = manga.source,
+					query = manga.author ?: return,
+				),
+			)
+
+			R.id.imageView_cover -> startActivity(
+				ImageActivity.newIntent(
+					v.context,
+					manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl },
+					manga.source,
+				),
+				scaleUpActivityOptionsOf(v),
+			)
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) = Unit
+
+	override fun onChipClick(chip: Chip, data: Any?) {
+		val tag = data as? MangaTag ?: return
+		val filter = (activity as? FilterOwner)?.filter
+		if (filter == null) {
+			startActivity(MangaListActivity.newIntent(requireContext(), setOf(tag)))
+		} else {
+			filter.onTagItemClick(FilterItem.Tag(tag, false))
+			closeSelf()
+		}
+	}
+
+	private fun onMangaUpdated(manga: Manga) {
+		with(requireViewBinding()) {
+			// Main
+			loadCover(manga)
+			textViewTitle.text = manga.title
+			textViewSubtitle.textAndVisible = manga.altTitle
+			textViewAuthor.textAndVisible = manga.author
+			if (manga.hasRating) {
+				ratingBar.rating = manga.rating * ratingBar.numStars
+				ratingBar.isVisible = true
+			} else {
+				ratingBar.isVisible = false
+			}
+		}
+	}
+
+	private fun onDescriptionChanged(description: CharSequence?) {
+		val tv = viewBinding?.textViewDescription ?: return
+		when {
+			description == null -> tv.setText(R.string.loading_)
+			description.isBlank() -> tv.setText(R.string.no_description)
+			else -> tv.setText(description, TextView.BufferType.NORMAL)
+		}
+	}
+
+	private fun loadCover(manga: Manga) {
+		val imageUrl = manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }
+		val lastResult = CoilUtils.result(requireViewBinding().imageViewCover)
+		if (lastResult is SuccessResult && lastResult.request.data == imageUrl) {
+			return
+		}
+		val request = ImageRequest.Builder(context ?: return)
+			.target(requireViewBinding().imageViewCover)
+			.size(CoverSizeResolver(requireViewBinding().imageViewCover))
+			.data(imageUrl)
+			.tag(manga.source)
+			.crossfade(requireContext())
+			.lifecycle(viewLifecycleOwner)
+			.placeholderMemoryCacheKey(manga.coverUrl)
+		val previousDrawable = lastResult?.drawable
+		if (previousDrawable != null) {
+			request.fallback(previousDrawable)
+				.placeholder(previousDrawable)
+				.error(previousDrawable)
+		} else {
+			request.fallback(R.drawable.ic_placeholder)
+				.placeholder(R.drawable.ic_placeholder)
+				.error(R.drawable.ic_error_placeholder)
+		}
+		request.enqueueWith(coil)
+	}
+
+	private fun onTagsChipsChanged(chips: List<ChipsView.ChipModel>) {
+		requireViewBinding().chipsTags.setChips(chips)
+	}
+
+	private fun closeSelf() {
+		((activity as? MangaListActivity)?.hidePreview())
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt
new file mode 100644
index 000000000..a2856fd3f
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt
@@ -0,0 +1,85 @@
+package org.koitharu.kotatsu.list.ui.preview
+
+import android.text.Html
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
+import androidx.core.text.getSpans
+import androidx.core.text.parseAsHtml
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.core.util.ext.sanitize
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import javax.inject.Inject
+
+@HiltViewModel
+class PreviewViewModel @Inject constructor(
+	savedStateHandle: SavedStateHandle,
+	private val extraProvider: ListExtraProvider,
+	private val repositoryFactory: MangaRepository.Factory,
+	private val imageGetter: Html.ImageGetter,
+) : BaseViewModel() {
+
+	val manga = MutableStateFlow(
+		savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga,
+	)
+
+	val description = manga
+		.distinctUntilChangedBy { it.description.orEmpty() }
+		.transformLatest {
+			val description = it.description
+			if (description.isNullOrEmpty()) {
+				emit(null)
+			} else {
+				emit(description.parseAsHtml().filterSpans().sanitize())
+				emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
+			}
+		}.combine(isLoading) { desc, loading ->
+			if (loading) null else desc ?: ""
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.WhileSubscribed(5000), null)
+
+	val tagsChips = manga.map {
+		it.tags.map { tag ->
+			ChipsView.ChipModel(
+				title = tag.title,
+				tint = extraProvider.getTagTint(tag),
+				icon = 0,
+				data = tag,
+				isCheckable = false,
+				isChecked = false,
+			)
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+
+	init {
+		launchLoadingJob(Dispatchers.Default) {
+			val repo = repositoryFactory.create(manga.value.source)
+			manga.value = repo.getDetails(manga.value)
+		}
+	}
+
+	private fun Spanned.filterSpans(): CharSequence {
+		val spannable = SpannableString.valueOf(this)
+		val spans = spannable.getSpans<ForegroundColorSpan>()
+		for (span in spans) {
+			spannable.removeSpan(span)
+		}
+		return spannable.trim()
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/ItemSizeResolver.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/DynamicItemSizeResolver.kt
similarity index 66%
rename from app/src/main/kotlin/org/koitharu/kotatsu/list/ui/ItemSizeResolver.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/DynamicItemSizeResolver.kt
index 64747aedd..a26cf770f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/ItemSizeResolver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/DynamicItemSizeResolver.kt
@@ -1,29 +1,38 @@
-package org.koitharu.kotatsu.list.ui
+package org.koitharu.kotatsu.list.ui.size
 
 import android.content.SharedPreferences
 import android.content.res.Resources
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.StyleRes
-import androidx.core.view.updateLayoutParams
 import androidx.core.widget.TextViewCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import kotlin.math.roundToInt
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.history.ui.util.ReadingProgressView
+import kotlin.math.roundToInt
 
-class ItemSizeResolver(resources: Resources, private val settings: AppSettings) {
+class DynamicItemSizeResolver(
+	resources: Resources,
+	private val settings: AppSettings,
+	private val adjustWidth: Boolean,
+) : ItemSizeResolver {
 
 	private val gridWidth = resources.getDimension(R.dimen.preferred_grid_width)
 	private val scaleFactor: Float
 		get() = settings.gridSize / 100f
 
-	val cellWidth: Int
+	override val cellWidth: Int
 		get() = (gridWidth * scaleFactor).roundToInt()
 
-	fun attachToView(lifecycleOwner: LifecycleOwner, view: View, textView: TextView?) {
-		val observer = SizeObserver(view, textView)
+	override fun attachToView(
+		lifecycleOwner: LifecycleOwner,
+		view: View,
+		textView: TextView?,
+		progressView: ReadingProgressView?
+	) {
+		val observer = SizeObserver(view, textView, progressView)
 		view.addOnAttachStateChangeListener(observer)
 		lifecycleOwner.lifecycle.addObserver(observer)
 		if (view.isAttachedToWindow) {
@@ -34,6 +43,7 @@ class ItemSizeResolver(resources: Resources, private val settings: AppSettings)
 	private inner class SizeObserver(
 		private val view: View,
 		private val textView: TextView?,
+		private val progressView: ReadingProgressView?,
 	) : DefaultLifecycleObserver, SharedPreferences.OnSharedPreferenceChangeListener, View.OnAttachStateChangeListener {
 
 		private val widthThreshold = view.resources.getDimensionPixelSize(R.dimen.small_grid_width)
@@ -65,8 +75,29 @@ class ItemSizeResolver(resources: Resources, private val settings: AppSettings)
 		fun update() {
 			val newWidth = cellWidth
 			textView?.adjustTextAppearance(newWidth)
-			view.updateLayoutParams {
-				width = newWidth
+			if (adjustWidth) {
+				val lp = view.layoutParams
+				if (lp.width != newWidth) {
+					lp.width = newWidth
+					view.layoutParams = lp
+				}
+			}
+			progressView?.adjustSize(newWidth)
+		}
+
+		private fun ReadingProgressView.adjustSize(width: Int) {
+			val lp = layoutParams
+			val size = resources.getDimensionPixelSize(
+				if (width < widthThreshold) {
+					R.dimen.card_indicator_size_small
+				} else {
+					R.dimen.card_indicator_size
+				},
+			)
+			if (lp.width != size || lp.height != size) {
+				lp.width = size
+				lp.height = size
+				layoutParams = lp
 			}
 		}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/ItemSizeResolver.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/ItemSizeResolver.kt
new file mode 100644
index 000000000..de44dff58
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/ItemSizeResolver.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.list.ui.size
+
+import android.view.View
+import android.widget.TextView
+import androidx.lifecycle.LifecycleOwner
+import org.koitharu.kotatsu.history.ui.util.ReadingProgressView
+
+interface ItemSizeResolver {
+
+	val cellWidth: Int
+
+	fun attachToView(
+		lifecycleOwner: LifecycleOwner,
+		view: View,
+		textView: TextView?,
+		progressView: ReadingProgressView?,
+	)
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/StaticItemSizeResolver.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/StaticItemSizeResolver.kt
new file mode 100644
index 000000000..e4f1bc919
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/size/StaticItemSizeResolver.kt
@@ -0,0 +1,56 @@
+package org.koitharu.kotatsu.list.ui.size
+
+import android.view.View
+import android.widget.TextView
+import androidx.core.view.updateLayoutParams
+import androidx.core.widget.TextViewCompat
+import androidx.lifecycle.LifecycleOwner
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.history.ui.util.ReadingProgressView
+
+class StaticItemSizeResolver(
+	override val cellWidth: Int,
+) : ItemSizeResolver {
+
+	private var widthThreshold: Int = -1
+	private var textAppearanceResId = R.style.TextAppearance_Kotatsu_GridTitle
+
+	override fun attachToView(
+		lifecycleOwner: LifecycleOwner,
+		view: View,
+		textView: TextView?,
+		progressView: ReadingProgressView?
+	) {
+		if (widthThreshold == -1) {
+			widthThreshold = view.resources.getDimensionPixelSize(R.dimen.small_grid_width)
+			textAppearanceResId = if (cellWidth < widthThreshold) {
+				R.style.TextAppearance_Kotatsu_GridTitle_Small
+			} else {
+				R.style.TextAppearance_Kotatsu_GridTitle
+			}
+		}
+		if (textView != null) {
+			TextViewCompat.setTextAppearance(textView, textAppearanceResId)
+		}
+		view.updateLayoutParams {
+			width = cellWidth
+		}
+		progressView?.adjustSize()
+	}
+
+	private fun ReadingProgressView.adjustSize() {
+		val lp = layoutParams
+		val size = resources.getDimensionPixelSize(
+			if (cellWidth < widthThreshold) {
+				R.dimen.card_indicator_size_small
+			} else {
+				R.dimen.card_indicator_size
+			},
+		)
+		if (lp.width != size || lp.height != size) {
+			lp.width = size
+			lp.height = size
+			layoutParams = lp
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt
index 439cdc847..a5eb18cb8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt
@@ -15,7 +15,10 @@ import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.CompositeMutex
+import org.koitharu.kotatsu.core.util.ext.children
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
+import org.koitharu.kotatsu.core.util.ext.filterWith
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.local.data.input.LocalMangaInput
 import org.koitharu.kotatsu.local.data.output.LocalMangaOutput
 import org.koitharu.kotatsu.local.data.output.LocalMangaUtil
@@ -27,9 +30,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.io.File
-import java.io.FilenameFilter
 import java.util.EnumSet
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -129,9 +130,6 @@ class LocalMangaRepository @Inject constructor(
 
 	suspend fun findSavedManga(remoteManga: Manga): LocalManga? {
 		val files = getAllFiles()
-		if (files.isEmpty()) {
-			return null
-		}
 		return channelFlow {
 			for (file in files) {
 				launch {
@@ -153,6 +151,8 @@ class LocalMangaRepository @Inject constructor(
 
 	override suspend fun getTags() = emptySet<MangaTag>()
 
+	override suspend fun getRelated(seed: Manga): List<Manga> = emptyList()
+
 	suspend fun getOutputDir(manga: Manga): File? {
 		val defaultDir = storageManager.getDefaultWriteableDir()
 		if (defaultDir != null && LocalMangaOutput.get(defaultDir, manga) != null) {
@@ -171,7 +171,7 @@ class LocalMangaRepository @Inject constructor(
 		val dirs = storageManager.getWriteableDirs()
 		runInterruptible(Dispatchers.IO) {
 			dirs.flatMap { dir ->
-				dir.listFiles(TempFileFilter())?.toList().orEmpty()
+				dir.children().filterWith(TempFileFilter())
 			}.forEach { file ->
 				file.deleteRecursively()
 			}
@@ -188,7 +188,7 @@ class LocalMangaRepository @Inject constructor(
 	}
 
 	private suspend fun getRawList(): ArrayList<LocalManga> {
-		val files = getAllFiles()
+		val files = getAllFiles().toList() // TODO remove toList()
 		return coroutineScope {
 			val dispatcher = Dispatchers.IO.limitedParallelism(MAX_PARALLELISM)
 			files.map { file ->
@@ -199,8 +199,8 @@ class LocalMangaRepository @Inject constructor(
 		}.filterNotNullTo(ArrayList(files.size))
 	}
 
-	private suspend fun getAllFiles() = storageManager.getReadableDirs().flatMap { dir ->
-		dir.listFiles()?.toList().orEmpty()
+	private suspend fun getAllFiles() = storageManager.getReadableDirs().asSequence().flatMap { dir ->
+		dir.children()
 	}
 
 	private fun Collection<LocalManga>.unwrap(): List<Manga> = map { it.manga }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalStorageManager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalStorageManager.kt
index 37170b478..be4fe6e69 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalStorageManager.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalStorageManager.kt
@@ -17,7 +17,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.computeSize
 import org.koitharu.kotatsu.core.util.ext.getStorageName
 import org.koitharu.kotatsu.core.util.ext.resolveFile
-import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.io.File
 import javax.inject.Inject
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/MangaIndex.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/MangaIndex.kt
index 6d08885af..a6a1c4bdc 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/MangaIndex.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/MangaIndex.kt
@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.find
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
@@ -67,7 +68,7 @@ class MangaIndex(source: String?) {
 			isNsfw = json.getBooleanOrDefault("nsfw", false),
 			coverUrl = json.getString("cover"),
 			state = json.getStringOrNull("state")?.let { stateString ->
-				MangaState.values().find { it.name == stateString }
+				MangaState.entries.find(stateString)
 			},
 			description = json.getStringOrNull("description"),
 			tags = json.getJSONArray("tags").mapJSONToSet { x ->
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/TempFileFilter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/TempFileFilter.kt
index 696a433b2..abd269f15 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/TempFileFilter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/TempFileFilter.kt
@@ -1,11 +1,16 @@
 package org.koitharu.kotatsu.local.data
 
 import java.io.File
+import java.io.FileFilter
 import java.io.FilenameFilter
 
-class TempFileFilter : FilenameFilter {
+class TempFileFilter : FilenameFilter, FileFilter {
 
 	override fun accept(dir: File, name: String): Boolean {
 		return name.endsWith(".tmp", ignoreCase = true)
 	}
+
+	override fun accept(file: File): Boolean {
+		return file.name.endsWith(".tmp", ignoreCase = true)
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt
index c2cac2c60..bdfe8adf7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt
@@ -4,6 +4,7 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
+import org.koitharu.kotatsu.core.util.AlphanumComparator
 import org.koitharu.kotatsu.core.util.ext.listFilesRecursive
 import org.koitharu.kotatsu.core.util.ext.longHashCode
 import org.koitharu.kotatsu.core.util.ext.toListSorted
@@ -88,7 +89,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 		val file = chapter.url.toUri().toFile()
 		if (file.isDirectory) {
 			file.listFilesRecursive(ImageFileFilter())
-				.toListSorted(compareBy(org.koitharu.kotatsu.core.util.AlphanumComparator()) { x -> x.name })
+				.toListSorted(compareBy(AlphanumComparator()) { x -> x.name })
 				.map {
 					val pageUri = it.toUri().toString()
 					MangaPage(
@@ -104,7 +105,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 					.asSequence()
 					.filter { x -> !x.isDirectory }
 					.map { it.name }
-					.toListSorted(org.koitharu.kotatsu.core.util.AlphanumComparator())
+					.toListSorted(AlphanumComparator())
 					.map {
 						val pageUri = zipUri(file, it)
 						MangaPage(
@@ -121,7 +122,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 	private fun String.toHumanReadable() = replace("_", " ").toCamelCase()
 
 	private fun getChaptersFiles(): List<File> = root.listFilesRecursive(CbzFilter())
-		.toListSorted(compareBy(org.koitharu.kotatsu.core.util.AlphanumComparator()) { x -> x.name })
+		.toListSorted(compareBy(AlphanumComparator()) { x -> x.name })
 
 	private fun findFirstImageEntry(): String? {
 		val filter = ImageFileFilter()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaUtil.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaUtil.kt
index 8c9da3c62..baa354cfa 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaUtil.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaUtil.kt
@@ -4,7 +4,6 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.local.data.MangaIndex
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportDialogFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportDialogFragment.kt
index 7436ccc65..370bd0328 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportDialogFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportDialogFragment.kt
@@ -12,7 +12,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
 import org.koitharu.kotatsu.databinding.DialogImportBinding
-import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
 
 class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.OnClickListener {
 
@@ -22,9 +21,6 @@ class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.On
 	private val importDirCall = registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) {
 		startImport(listOfNotNull(it))
 	}
-	private val backupSelectCall = registerForActivityResult(ActivityResultContracts.OpenDocument()) {
-		restoreBackup(it)
-	}
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): DialogImportBinding {
 		return DialogImportBinding.inflate(inflater, container, false)
@@ -41,14 +37,12 @@ class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.On
 		super.onViewBindingCreated(binding, savedInstanceState)
 		binding.buttonDir.setOnClickListener(this)
 		binding.buttonFile.setOnClickListener(this)
-		binding.buttonBackup.setOnClickListener(this)
 	}
 
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_file -> importFileCall.launch(arrayOf("*/*"))
 			R.id.button_dir -> importDirCall.launch(null)
-			R.id.button_backup -> backupSelectCall.launch(arrayOf("*/*"))
 		}
 	}
 
@@ -62,13 +56,6 @@ class ImportDialogFragment : AlertDialogFragment<DialogImportBinding>(), View.On
 		dismiss()
 	}
 
-	private fun restoreBackup(uri: Uri?) {
-		if (uri != null) {
-			RestoreDialogFragment.show(parentFragmentManager, uri)
-			dismiss()
-		}
-	}
-
 	companion object {
 
 		private const val TAG = "ImportDialogFragment"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportWorker.kt
index fc719ae5b..5a4d600c3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportWorker.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportWorker.kt
@@ -1,13 +1,12 @@
 package org.koitharu.kotatsu.local.ui
 
 import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.net.Uri
-import android.os.Build
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.hilt.work.HiltWorker
 import androidx.work.Constraints
@@ -39,9 +38,7 @@ class ImportWorker @AssistedInject constructor(
 	private val coil: ImageLoader
 ) : CoroutineWorker(appContext, params) {
 
-	private val notificationManager by lazy {
-		applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-	}
+	private val notificationManager by lazy { NotificationManagerCompat.from(appContext) }
 
 	override suspend fun doWork(): Result {
 		val uri = inputData.getString(DATA_URI)?.toUriOrNull() ?: return Result.failure()
@@ -49,21 +46,23 @@ class ImportWorker @AssistedInject constructor(
 		val result = runCatchingCancellable {
 			importer.import(uri).manga
 		}
-		val notification = buildNotification(result)
-		notificationManager.notify(uri.hashCode(), notification)
+		if (notificationManager.areNotificationsEnabled()) {
+			val notification = buildNotification(result)
+			notificationManager.notify(uri.hashCode(), notification)
+		}
 		return Result.success()
 	}
 
 	override suspend fun getForegroundInfo(): ForegroundInfo {
 		val title = applicationContext.getString(R.string.importing_manga)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val channel = NotificationChannel(CHANNEL_ID, title, NotificationManager.IMPORTANCE_LOW)
-			channel.setShowBadge(false)
-			channel.enableVibration(false)
-			channel.setSound(null, null)
-			channel.enableLights(false)
-			notificationManager.createNotificationChannel(channel)
-		}
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+			.setName(title)
+			.setShowBadge(false)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		notificationManager.createNotificationChannel(channel)
 
 		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
 			.setContentTitle(title)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt
index 09a87391e..b26447821 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt
@@ -1,11 +1,11 @@
 package org.koitharu.kotatsu.local.ui
 
-import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
-import android.os.Build
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
@@ -67,15 +67,15 @@ class LocalChaptersRemoveService : CoroutineIntentService() {
 
 	private fun startForeground() {
 		val title = getString(R.string.local_manga_processing)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-			val channel = NotificationChannel(CHANNEL_ID, title, NotificationManager.IMPORTANCE_LOW)
-			channel.setShowBadge(false)
-			channel.enableVibration(false)
-			channel.setSound(null, null)
-			channel.enableLights(false)
-			manager.createNotificationChannel(channel)
-		}
+		val manager = NotificationManagerCompat.from(this)
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+			.setName(title)
+			.setShowBadge(false)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		manager.createNotificationChannel(channel)
 
 		val notification = NotificationCompat.Builder(this, CHANNEL_ID)
 			.setContentTitle(title)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
index 04b7ed947..0cd62a9c6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.filter.ui.FilterCoordinator
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.model.EmptyState
@@ -29,6 +30,7 @@ class LocalListViewModel @Inject constructor(
 	downloadScheduler: DownloadWorker.Scheduler,
 	listExtraProvider: ListExtraProvider,
 	private val deleteLocalMangaUseCase: DeleteLocalMangaUseCase,
+	exploreRepository: ExploreRepository,
 	@LocalStorageChanges private val localStorageChanges: SharedFlow<LocalManga?>,
 ) : RemoteListViewModel(
 	savedStateHandle,
@@ -37,6 +39,7 @@ class LocalListViewModel @Inject constructor(
 	settings,
 	listExtraProvider,
 	downloadScheduler,
+	exploreRepository,
 ), SharedPreferences.OnSharedPreferenceChangeListener {
 
 	val onMangaRemoved = MutableEventFlow<Unit>()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
index e2edc3295..233dde479 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -4,18 +4,15 @@ import android.Manifest
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.Bundle
-import android.util.SparseIntArray
+import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.OnBackPressedCallback
-import androidx.activity.result.ActivityResultCallback
 import androidx.activity.viewModels
 import androidx.appcompat.view.ActionMode
 import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.util.size
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.inputmethod.EditorInfoCompat
@@ -39,21 +36,20 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.os.VoiceInputContract
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
+import org.koitharu.kotatsu.core.ui.util.OptionsMenuBadgeHelper
 import org.koitharu.kotatsu.core.ui.widgets.SlidingBottomNavigationView
-import org.koitharu.kotatsu.core.util.ext.drawableEnd
 import org.koitharu.kotatsu.core.util.ext.hideKeyboard
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.resolve
 import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.core.util.ext.setNavigationBarTransparentCompat
-import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.databinding.ActivityMainBinding
 import org.koitharu.kotatsu.details.service.MangaPrefetchService
 import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.history.ui.HistoryListFragment
 import org.koitharu.kotatsu.local.ui.LocalStorageCleanupWorker
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
@@ -66,32 +62,26 @@ import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionFragment
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
-import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
+import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.about.AppUpdateDialog
 import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
-import org.koitharu.kotatsu.shelf.ui.ShelfFragment
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
 private const val TAG_SEARCH = "search"
 
 @AndroidEntryPoint
-class MainActivity :
-	BaseActivity<ActivityMainBinding>(),
-	AppBarOwner,
-	BottomNavOwner,
-	View.OnClickListener,
-	View.OnFocusChangeListener,
-	SearchSuggestionListener,
-	MainNavigationDelegate.OnFragmentChangedListener {
+class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNavOwner, View.OnClickListener,
+	View.OnFocusChangeListener, SearchSuggestionListener, MainNavigationDelegate.OnFragmentChangedListener {
 
 	@Inject
 	lateinit var settings: AppSettings
 
 	private val viewModel by viewModels<MainViewModel>()
 	private val searchSuggestionViewModel by viewModels<SearchSuggestionViewModel>()
-	private val voiceInputLauncher = registerForActivityResult(VoiceInputContract(), VoiceInputCallback())
 	private val closeSearchCallback = CloseSearchCallback()
 	private lateinit var navigationDelegate: MainNavigationDelegate
+	private lateinit var appUpdateBadge: OptionsMenuBadgeHelper
 
 	override val appBar: AppBarLayout
 		get() = viewBinding.appbar
@@ -122,7 +112,6 @@ class MainActivity :
 
 		viewBinding.fab?.setOnClickListener(this)
 		viewBinding.navRail?.headerView?.setOnClickListener(this)
-		viewBinding.searchView.isVoiceSearchEnabled = voiceInputLauncher.resolve(this, null) != null
 
 		navigationDelegate = MainNavigationDelegate(
 			navBar = checkNotNull(bottomNav ?: viewBinding.navRail),
@@ -131,6 +120,8 @@ class MainActivity :
 		navigationDelegate.addOnFragmentChangedListener(this)
 		navigationDelegate.onCreate()
 
+		appUpdateBadge = OptionsMenuBadgeHelper(viewBinding.toolbar, R.id.action_app_update)
+
 		onBackPressedDispatcher.addCallback(ExitCallback(this, viewBinding.container))
 		onBackPressedDispatcher.addCallback(navigationDelegate)
 		onBackPressedDispatcher.addCallback(closeSearchCallback)
@@ -144,6 +135,8 @@ class MainActivity :
 		viewModel.isLoading.observe(this, this::onLoadingStateChanged)
 		viewModel.isResumeEnabled.observe(this, this::onResumeEnabledChanged)
 		viewModel.counters.observe(this, ::onCountersChanged)
+		viewModel.appUpdate.observe(this, MenuInvalidator(this))
+		viewModel.onFirstStart.observeEvent(this) { OnboardDialogFragment.showWelcome(supportFragmentManager) }
 		viewModel.isFeedAvailable.observe(this, ::onFeedAvailabilityChanged)
 		searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged)
 	}
@@ -162,18 +155,54 @@ class MainActivity :
 		}
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		if (item.itemId == android.R.id.home && !isSearchOpened()) {
+	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+		super.onCreateOptionsMenu(menu)
+		menuInflater.inflate(R.menu.opt_main, menu)
+		return true
+	}
+
+	override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+		if (menu == null) {
+			return false
+		}
+		menu.findItem(R.id.action_incognito)?.isChecked = searchSuggestionViewModel.isIncognitoModeEnabled.value
+		val hasAppUpdate = viewModel.appUpdate.value != null
+		menu.findItem(R.id.action_app_update)?.isVisible = hasAppUpdate
+		appUpdateBadge.setBadgeVisible(hasAppUpdate)
+		return super.onPrepareOptionsMenu(menu)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+		android.R.id.home -> if (isSearchOpened()) {
+			super.onOptionsItemSelected(item)
+		} else {
 			viewBinding.searchView.requestFocus()
-			return true
+			true
 		}
-		return super.onOptionsItemSelected(item)
+
+		R.id.action_settings -> {
+			startActivity(SettingsActivity.newIntent(this))
+			true
+		}
+
+		R.id.action_incognito -> {
+			viewModel.setIncognitoMode(!item.isChecked)
+			true
+		}
+
+		R.id.action_app_update -> {
+			viewModel.appUpdate.value?.also {
+				AppUpdateDialog(this)
+					.show(it)
+			} != null
+		}
+
+		else -> super.onOptionsItemSelected(item)
 	}
 
 	override fun onClick(v: View) {
 		when (v.id) {
-			R.id.fab -> viewModel.openLastReader()
-			R.id.railFab -> viewModel.openLastReader()
+			R.id.fab, R.id.railFab -> viewModel.openLastReader()
 		}
 	}
 
@@ -220,19 +249,6 @@ class MainActivity :
 		searchSuggestionViewModel.onQueryChanged(query)
 	}
 
-	override fun onVoiceSearchClick() {
-		val options = viewBinding.searchView.drawableEnd?.bounds?.let { bounds ->
-			ActivityOptionsCompat.makeScaleUpAnimation(
-				viewBinding.searchView,
-				bounds.centerX(),
-				bounds.centerY(),
-				bounds.width(),
-				bounds.height(),
-			)
-		}
-		voiceInputLauncher.tryLaunch(viewBinding.searchView.hint?.toString(), options)
-	}
-
 	override fun onSourceToggle(source: MangaSource, isEnabled: Boolean) {
 		searchSuggestionViewModel.onSourceToggle(source, isEnabled)
 	}
@@ -262,11 +278,10 @@ class MainActivity :
 		startActivity(IntentBuilder(this).manga(manga).build(), options)
 	}
 
-	private fun onCountersChanged(counters: SparseIntArray) {
+	private fun onCountersChanged(counters: IntArray) {
 		repeat(counters.size) { i ->
-			val id = counters.keyAt(i)
-			val counter = counters.valueAt(i)
-			navigationDelegate.setCounter(id, counter)
+			val counter = counters[i]
+			navigationDelegate.setCounterAt(i, counter)
 		}
 	}
 
@@ -282,6 +297,7 @@ class MainActivity :
 			options and EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING.inv()
 		}
 		viewBinding.searchView.imeOptions = options
+		invalidateMenu()
 	}
 
 	private fun onLoadingStateChanged(isLoading: Boolean) {
@@ -309,15 +325,6 @@ class MainActivity :
 
 	private fun onFirstStart() {
 		lifecycleScope.launch(Dispatchers.Main) { // not a default `Main.immediate` dispatcher
-			when {
-				!settings.isSourcesSelected -> withResumed {
-					OnboardDialogFragment.showWelcome(supportFragmentManager)
-				}
-
-				settings.newSources.isNotEmpty() -> withResumed {
-					NewSourcesDialogFragment.show(supportFragmentManager)
-				}
-			}
 			withContext(Dispatchers.Default) {
 				LocalStorageCleanupWorker.enqueue(applicationContext)
 			}
@@ -334,12 +341,7 @@ class MainActivity :
 		isSearchOpened: Boolean = isSearchOpened(),
 	) {
 		val fab = viewBinding.fab ?: return
-		if (
-			isResumeEnabled &&
-			!actionModeDelegate.isActionModeStarted &&
-			!isSearchOpened &&
-			topFragment is ShelfFragment
-		) {
+		if (isResumeEnabled && !actionModeDelegate.isActionModeStarted && !isSearchOpened && topFragment is HistoryListFragment) {
 			if (!fab.isVisible) {
 				fab.show()
 			}
@@ -364,7 +366,7 @@ class MainActivity :
 		viewBinding.toolbarCard.background = if (isOpened) {
 			null
 		} else {
-			ContextCompat.getDrawable(this, R.drawable.toolbar_background)
+			ContextCompat.getDrawable(this, R.drawable.search_bar_background)
 		}
 		val padding = if (isOpened) 0 else resources.getDimensionPixelOffset(R.dimen.margin_normal)
 		viewBinding.appbar.updatePadding(left = padding, right = padding)
@@ -372,27 +374,22 @@ class MainActivity :
 		supportActionBar?.setHomeAsUpIndicator(
 			if (isOpened) materialR.drawable.abc_ic_ab_back_material else materialR.drawable.abc_ic_search_api_material,
 		)
+		viewBinding.searchView.setHintCompat(
+			if (isOpened) R.string.search_hint else R.string.search_manga,
+		)
 		bottomNav?.showOrHide(!isOpened)
 	}
 
 	private fun requestNotificationsPermission() {
-		if (
-			Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
-			ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PERMISSION_GRANTED
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && ContextCompat.checkSelfPermission(
+				this,
+				Manifest.permission.POST_NOTIFICATIONS,
+			) != PERMISSION_GRANTED
 		) {
 			ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.POST_NOTIFICATIONS), 1)
 		}
 	}
 
-	private inner class VoiceInputCallback : ActivityResultCallback<String?> {
-
-		override fun onActivityResult(result: String?) {
-			if (result != null) {
-				viewBinding.searchView.query = result
-			}
-		}
-	}
-
 	private inner class CloseSearchCallback : OnBackPressedCallback(false) {
 
 		override fun handleOnBackPressed() {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
index f30082e18..9397bfee8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
@@ -6,15 +6,15 @@ import androidx.annotation.IdRes
 import androidx.core.view.iterator
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentTransaction
 import com.google.android.material.navigation.NavigationBarView
+import com.google.android.material.transition.MaterialFadeThrough
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.util.ext.firstVisibleItemPosition
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.explore.ui.ExploreFragment
-import org.koitharu.kotatsu.settings.tools.ToolsFragment
-import org.koitharu.kotatsu.shelf.ui.ShelfFragment
+import org.koitharu.kotatsu.favourites.ui.container.FavouritesContainerFragment
+import org.koitharu.kotatsu.history.ui.HistoryListFragment
 import org.koitharu.kotatsu.tracker.ui.feed.FeedFragment
 import java.util.LinkedList
 
@@ -53,7 +53,7 @@ class MainNavigationDelegate(
 	}
 
 	override fun handleOnBackPressed() {
-		navBar.selectedItemId = R.id.nav_shelf
+		navBar.selectedItemId = R.id.nav_history
 	}
 
 	fun onCreate() {
@@ -66,6 +66,11 @@ class MainNavigationDelegate(
 		} ?: onNavigationItemSelected(navBar.selectedItemId)
 	}
 
+	fun setCounterAt(position: Int, counter: Int) {
+		val id = navBar.menu.getItem(position).itemId
+		setCounter(id, counter)
+	}
+
 	fun setCounter(@IdRes id: Int, counter: Int) {
 		if (counter == 0) {
 			navBar.getBadge(id)?.isVisible = false
@@ -99,20 +104,20 @@ class MainNavigationDelegate(
 	private fun onNavigationItemSelected(@IdRes itemId: Int): Boolean {
 		return setPrimaryFragment(
 			when (itemId) {
-				R.id.nav_shelf -> ShelfFragment.newInstance()
-				R.id.nav_explore -> ExploreFragment.newInstance()
-				R.id.nav_feed -> FeedFragment.newInstance()
-				R.id.nav_tools -> ToolsFragment.newInstance()
+				R.id.nav_history -> HistoryListFragment()
+				R.id.nav_favourites -> FavouritesContainerFragment()
+				R.id.nav_explore -> ExploreFragment()
+				R.id.nav_feed -> FeedFragment()
 				else -> return false
 			},
 		)
 	}
 
 	private fun getItemId(fragment: Fragment) = when (fragment) {
-		is ShelfFragment -> R.id.nav_shelf
+		is HistoryListFragment -> R.id.nav_history
+		is FavouritesContainerFragment -> R.id.nav_favourites
 		is ExploreFragment -> R.id.nav_explore
 		is FeedFragment -> R.id.nav_feed
-		is ToolsFragment -> R.id.nav_tools
 		else -> 0
 	}
 
@@ -120,17 +125,17 @@ class MainNavigationDelegate(
 		if (fragmentManager.isStateSaved) {
 			return false
 		}
+		fragment.enterTransition = MaterialFadeThrough()
 		fragmentManager.beginTransaction()
 			.setReorderingAllowed(true)
 			.replace(R.id.container, fragment, TAG_PRIMARY)
-			.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 			.commit()
 		onFragmentChanged(fragment, fromUser = true)
 		return true
 	}
 
 	private fun onFragmentChanged(fragment: Fragment, fromUser: Boolean) {
-		isEnabled = fragment !is ShelfFragment
+		isEnabled = fragment !is HistoryListFragment
 		listeners.forEach { it.onFragmentChanged(fragment, fromUser) }
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainViewModel.kt
index cbec456a3..9b1757cb7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainViewModel.kt
@@ -1,15 +1,14 @@
 package org.koitharu.kotatsu.main.ui
 
-import android.util.SparseIntArray
-import androidx.core.util.set
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.github.AppUpdateRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -17,6 +16,7 @@ import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.main.domain.ReadingResumeEnabledUseCase
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -28,11 +28,13 @@ class MainViewModel @Inject constructor(
 	private val historyRepository: HistoryRepository,
 	private val appUpdateRepository: AppUpdateRepository,
 	trackingRepository: TrackingRepository,
-	settings: AppSettings,
+	private val settings: AppSettings,
 	readingResumeEnabledUseCase: ReadingResumeEnabledUseCase,
+	private val sourcesRepository: MangaSourcesRepository,
 ) : BaseViewModel() {
 
 	val onOpenReader = MutableEventFlow<Manga>()
+	val onFirstStart = MutableEventFlow<Unit>()
 
 	val isResumeEnabled = readingResumeEnabledUseCase().stateIn(
 		scope = viewModelScope + Dispatchers.Default,
@@ -46,24 +48,28 @@ class MainViewModel @Inject constructor(
 		valueProducer = { isTrackerEnabled },
 	)
 
+	val appUpdate = appUpdateRepository.observeAvailableUpdate()
+
 	val counters = combine(
-		appUpdateRepository.observeAvailableUpdate(),
 		trackingRepository.observeUpdatedMangaCount(),
-	) { appUpdate, tracks ->
-		val a = SparseIntArray(2)
-		a[R.id.nav_tools] = if (appUpdate != null) 1 else 0
-		a[R.id.nav_feed] = tracks
-		a
+		observeNewSourcesCount(),
+	) { tracks, newSources ->
+		intArrayOf(0, 0, newSources, tracks)
 	}.stateIn(
 		scope = viewModelScope + Dispatchers.Default,
 		started = SharingStarted.WhileSubscribed(5000),
-		initialValue = SparseIntArray(0),
+		initialValue = IntArray(4),
 	)
 
 	init {
 		launchJob {
 			appUpdateRepository.fetchUpdate()
 		}
+		launchJob(Dispatchers.Default) {
+			if (sourcesRepository.isSetupRequired()) {
+				onFirstStart.call(Unit)
+			}
+		}
 	}
 
 	fun openLastReader() {
@@ -72,4 +78,12 @@ class MainViewModel @Inject constructor(
 			onOpenReader.call(manga)
 		}
 	}
+
+	fun setIncognitoMode(isEnabled: Boolean) {
+		settings.isIncognitoModeEnabled = isEnabled
+	}
+
+	private fun observeNewSourcesCount() = sourcesRepository.observeNewSources()
+		.map { if (sourcesRepository.isSetupRequired()) 0 else it.size }
+		.distinctUntilChanged()
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt
index 7403c9019..aa49d0786 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt
@@ -20,10 +20,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.sync.withPermit
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okio.source
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
@@ -39,6 +40,7 @@ import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.ramAvailable
 import org.koitharu.kotatsu.core.util.ext.withProgress
 import org.koitharu.kotatsu.core.util.progress.ProgressDeferred
+import org.koitharu.kotatsu.core.zip.ZipPool
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.model.MangaPage
@@ -47,7 +49,6 @@ import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import java.io.File
 import java.util.LinkedList
 import java.util.concurrent.atomic.AtomicInteger
-import java.util.zip.ZipFile
 import javax.inject.Inject
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
@@ -70,10 +71,12 @@ class PageLoader @Inject constructor(
 	val loaderScope = RetainedLifecycleCoroutineScope(lifecycle) + InternalErrorHandler() + Dispatchers.Default
 
 	private val tasks = LongSparseArray<ProgressDeferred<File, Float>>()
+	private val semaphore = Semaphore(3)
 	private val convertLock = Mutex()
 	private val prefetchLock = Mutex()
 	private var repository: MangaRepository? = null
 	private val prefetchQueue = LinkedList<MangaPage>()
+	private val zipPool = ZipPool(2)
 	private val counter = AtomicInteger(0)
 	private var prefetchQueueLimit = PREFETCH_LIMIT_DEFAULT // TODO adaptive
 
@@ -81,6 +84,7 @@ class PageLoader @Inject constructor(
 		synchronized(tasks) {
 			tasks.clear()
 		}
+		zipPool.evictAll()
 	}
 
 	fun isPrefetchApplicable(): Boolean {
@@ -190,20 +194,15 @@ class PageLoader @Inject constructor(
 		}
 	}
 
-	private suspend fun loadPageImpl(page: MangaPage, progress: MutableStateFlow<Float>): File {
+	private suspend fun loadPageImpl(page: MangaPage, progress: MutableStateFlow<Float>): File = semaphore.withPermit {
 		val pageUrl = getPageUrl(page)
 		check(pageUrl.isNotBlank()) { "Cannot obtain full image url" }
 		val uri = Uri.parse(pageUrl)
 		return if (CbzFilter.isUriSupported(uri)) {
 			runInterruptible(Dispatchers.IO) {
-				ZipFile(uri.schemeSpecificPart)
-			}.use { zip ->
-				runInterruptible(Dispatchers.IO) {
-					val entry = zip.getEntry(uri.fragment)
-					zip.getInputStream(entry)
-				}.use {
-					cache.put(pageUrl, it.source())
-				}
+				zipPool[uri]
+			}.use {
+				cache.put(pageUrl, it)
 			}
 		} else {
 			val request = createPageRequest(page, pageUrl)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
index b312c9b12..0b75aedaf 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
@@ -44,7 +44,7 @@ class PageSaveHelper @Inject constructor(
 		val pageFile = pageLoader.loadPage(page, force = false)
 		val proposedName = getProposedFileName(pageUrl, pageFile)
 		val destination = withContext(Dispatchers.Main) {
-			suspendCancellableCoroutine<Uri> { cont ->
+			suspendCancellableCoroutine { cont ->
 				continuation = cont
 				saveLauncher.launch(proposedName)
 			}.also {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
index 0bae31cc5..fc6f6c6ab 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
@@ -101,7 +101,7 @@ class ReaderViewModel @Inject constructor(
 	val manga: DoubleManga?
 		get() = mangaData.value
 
-	val readerAnimation = settings.observeAsStateFlow(
+	val pageAnimation = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_READER_ANIMATION,
 		valueProducer = { readerAnimation },
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
index 8bbe5f972..15a80a2a2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt
@@ -20,7 +20,7 @@ import com.google.android.material.slider.Slider
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPages
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPage
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.decodeRegion
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
@@ -152,7 +152,7 @@ class ColorFilterConfigActivity :
 
 		fun newIntent(context: Context, manga: Manga, page: MangaPage) =
 			Intent(context, ColorFilterConfigActivity::class.java)
-				.putExtra(EXTRA_MANGA, ParcelableManga(manga, false))
-				.putExtra(EXTRA_PAGES, ParcelableMangaPages(listOf(page)))
+				.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
+				.putExtra(EXTRA_PAGES, ParcelableMangaPage(page))
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt
index 00ac1a23d..fc7c5e25d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt
@@ -5,7 +5,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPages
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPage
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
@@ -26,7 +26,7 @@ class ColorFilterConfigViewModel @Inject constructor(
 	private var initialColorFilter: ReaderColorFilter? = null
 	val colorFilter = MutableStateFlow<ReaderColorFilter?>(null)
 	val onDismiss = MutableEventFlow<Unit>()
-	val preview = savedStateHandle.require<ParcelableMangaPages>(ColorFilterConfigActivity.EXTRA_PAGES).pages.first()
+	val preview = savedStateHandle.require<ParcelableMangaPage>(ColorFilterConfigActivity.EXTRA_PAGES).page
 
 	val isChanged: Boolean
 		get() = colorFilter.value != initialColorFilter
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt
index c1b5f5f4b..4c404680d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.reader.ui.config
 
 import android.content.SharedPreferences
+import android.view.View
 import androidx.lifecycle.MediatorLiveData
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -31,6 +32,11 @@ class ReaderSettings(
 	val isPagesNumbersEnabled: Boolean
 		get() = settings.isPagesNumbersEnabled
 
+	fun applyBackground(view: View) {
+		val bg = settings.readerBackground
+		view.background = bg.resolve(view.context)
+	}
+
 	override fun onInactive() {
 		super.onInactive()
 		settings.unsubscribe(internalObserver)
@@ -64,7 +70,12 @@ class ReaderSettings(
 		}
 
 		override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-			if (key == AppSettings.KEY_ZOOM_MODE || key == AppSettings.KEY_PAGES_NUMBERS || key == AppSettings.KEY_WEBTOON_ZOOM) {
+			if (
+				key == AppSettings.KEY_ZOOM_MODE ||
+				key == AppSettings.KEY_PAGES_NUMBERS ||
+				key == AppSettings.KEY_WEBTOON_ZOOM ||
+				key == AppSettings.KEY_READER_BACKGROUND
+			) {
 				notifyChanged()
 			}
 		}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt
index a5f032ff6..b4b94ffb7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt
@@ -13,7 +13,7 @@ import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
 abstract class BasePageHolder<B : ViewBinding>(
 	protected val binding: B,
 	loader: PageLoader,
-	settings: ReaderSettings,
+	private val settings: ReaderSettings,
 	networkState: NetworkState,
 	exceptionResolver: ExceptionResolver,
 ) : RecyclerView.ViewHolder(binding.root), PageHolderDelegate.Callback {
@@ -28,6 +28,10 @@ abstract class BasePageHolder<B : ViewBinding>(
 	var boundData: ReaderPage? = null
 		private set
 
+	override fun onConfigChanged() {
+		settings.applyBackground(itemView)
+	}
+
 	fun requireData(): ReaderPage {
 		return checkNotNull(boundData) { "Calling requireData() before bind()" }
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt
index 293928fb5..d8b6688be 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.core.graphics.Insets
 import androidx.fragment.app.activityViewModels
 import androidx.viewbinding.ViewBinding
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
+import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel
@@ -54,6 +56,10 @@ abstract class BaseReaderFragment<B : ViewBinding> : BaseFragment<B>() {
 		"Adapter was not created or already destroyed"
 	}
 
+	protected fun isAnimationEnabled(): Boolean {
+		return context?.isAnimationsEnabled == true && viewModel.pageAnimation.value != ReaderAnimation.NONE
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
 
 	abstract fun switchPageBy(delta: Int)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
index 617e79839..1935d104a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
@@ -18,10 +18,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.config.ReaderSettings
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.io.File
 import java.io.IOException
 
@@ -39,6 +39,10 @@ class PageHolderDelegate(
 	private var file: File? = null
 	private var error: Throwable? = null
 
+	init {
+		callback.onConfigChanged()
+	}
+
 	fun onBind(page: MangaPage) {
 		val prevJob = job
 		job = scope.launch {
@@ -107,6 +111,7 @@ class PageHolderDelegate(
 		if (state == State.SHOWN) {
 			callback.onImageShowing(readerSettings)
 		}
+		callback.onConfigChanged()
 	}
 
 	private fun tryConvert(file: File, e: Exception) {
@@ -178,5 +183,7 @@ class PageHolderDelegate(
 		fun onImageShown()
 
 		fun onProgressChanged(progress: Int)
+
+		fun onConfigChanged()
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt
index beed525cd..73a7f1107 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt
@@ -11,8 +11,8 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.resetTransformations
@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
+import org.koitharu.kotatsu.reader.ui.pager.standard.NoAnimPageTransformer
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
 import javax.inject.Inject
 import kotlin.math.absoluteValue
@@ -48,8 +49,12 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 			doOnPageChanged(::notifyPageChanged)
 		}
 
-		viewModel.readerAnimation.observe(viewLifecycleOwner) {
-			val transformer = if (it) ReversedPageAnimTransformer() else null
+		viewModel.pageAnimation.observe(viewLifecycleOwner) {
+			val transformer = when (it) {
+				ReaderAnimation.NONE -> NoAnimPageTransformer()
+				ReaderAnimation.DEFAULT -> null
+				ReaderAnimation.ADVANCED -> ReversedPageAnimTransformer()
+			}
 			binding.pager.setPageTransformer(transformer)
 			if (transformer == null) {
 				binding.pager.recyclerView?.children?.forEach { v ->
@@ -74,7 +79,7 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().pager) {
-			setCurrentItem(currentItem - delta, context.isAnimationsEnabled)
+			setCurrentItem(currentItem - delta, isAnimationEnabled())
 		}
 	}
 
@@ -82,7 +87,7 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 		with(requireViewBinding().pager) {
 			setCurrentItem(
 				reversed(position),
-				smooth && context.isAnimationsEnabled && (currentItem - position).absoluteValue < PagerReaderFragment.SMOOTH_SCROLL_LIMIT,
+				smooth && isAnimationEnabled() && (currentItem - position).absoluteValue < PagerReaderFragment.SMOOTH_SCROLL_LIMIT,
 			)
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt
new file mode 100644
index 000000000..2ce4317a1
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/NoAnimPageTransformer.kt
@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.reader.ui.pager.standard
+
+import android.view.View
+import androidx.viewpager2.widget.ViewPager2
+
+class NoAnimPageTransformer : ViewPager2.PageTransformer {
+
+	override fun transformPage(page: View, position: Float) {
+		page.translationX = when {
+			position in -0.5f..0.5f -> -position * page.width.toFloat()
+			position > 0 -> page.width.toFloat()
+			else -> -page.width.toFloat()
+		}
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt
index a9c656113..5d5c7f6a5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt
@@ -11,8 +11,8 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.resetTransformations
@@ -47,8 +47,12 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 			doOnPageChanged(::notifyPageChanged)
 		}
 
-		viewModel.readerAnimation.observe(viewLifecycleOwner) {
-			val transformer = if (it) PageAnimTransformer() else null
+		viewModel.pageAnimation.observe(viewLifecycleOwner) {
+			val transformer = when (it) {
+				ReaderAnimation.NONE -> NoAnimPageTransformer()
+				ReaderAnimation.DEFAULT -> null
+				ReaderAnimation.ADVANCED -> PageAnimTransformer()
+			}
 			binding.pager.setPageTransformer(transformer)
 			if (transformer == null) {
 				binding.pager.recyclerView?.children?.forEach { view ->
@@ -95,7 +99,7 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().pager) {
-			setCurrentItem(currentItem + delta, context.isAnimationsEnabled)
+			setCurrentItem(currentItem + delta, isAnimationEnabled())
 		}
 	}
 
@@ -103,7 +107,7 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>()
 		with(requireViewBinding().pager) {
 			setCurrentItem(
 				position,
-				smooth && context.isAnimationsEnabled && (currentItem - position).absoluteValue < SMOOTH_SCROLL_LIMIT,
+				smooth && isAnimationEnabled() && (currentItem - position).absoluteValue < SMOOTH_SCROLL_LIMIT,
 			)
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
index 78836411a..789f3cc02 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.util.ext.findCenterViewPosition
 import org.koitharu.kotatsu.core.util.ext.firstVisibleItemPosition
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.databinding.FragmentReaderWebtoonBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
@@ -111,7 +110,7 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().recyclerView) {
-			if (context.isAnimationsEnabled) {
+			if (isAnimationEnabled()) {
 				smoothScrollBy(0, (height * 0.9).toInt() * delta, scrollInterpolator)
 			} else {
 				nestedScrollBy(0, (height * 0.9).toInt() * delta)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/MangaPageFetcher.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/MangaPageFetcher.kt
index 393f6398d..812df6484 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/MangaPageFetcher.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/MangaPageFetcher.kt
@@ -57,17 +57,19 @@ class MangaPageFetcher(
 	private suspend fun loadPage(pageUrl: String): SourceResult {
 		val uri = pageUrl.toUri()
 		return if (CbzFilter.isUriSupported(uri)) {
-			val zip = runInterruptible(Dispatchers.IO) { ZipFile(uri.schemeSpecificPart) }
-			val entry = runInterruptible(Dispatchers.IO) { zip.getEntry(uri.fragment) }
-			return SourceResult(
-				source = ImageSource(
-					source = zip.getInputStream(entry).source().withExtraCloseable(zip).buffer(),
-					context = context,
-					metadata = MangaPageMetadata(page),
-				),
-				mimeType = null,
-				dataSource = DataSource.DISK,
-			)
+			runInterruptible(Dispatchers.IO) {
+				val zip = ZipFile(uri.schemeSpecificPart)
+				val entry = zip.getEntry(uri.fragment)
+				SourceResult(
+					source = ImageSource(
+						source = zip.getInputStream(entry).source().withExtraCloseable(zip).buffer(),
+						context = context,
+						metadata = MangaPageMetadata(page),
+					),
+					mimeType = null,
+					dataSource = DataSource.DISK,
+				)
+			}
 		} else {
 			val request = PageLoader.createPageRequest(page, pageUrl)
 			imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use { response ->
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt
index f413b9615..304f59234 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PageThumbnail.kt
@@ -13,6 +13,10 @@ class PageThumbnail(
 	val number
 		get() = page.index + 1
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is PageThumbnail && page == other.page
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
index 0658e52f0..2a555539f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
@@ -16,7 +16,6 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.list.BoundsScrollListener
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetBehavior
 import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetCallback
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
@@ -29,6 +28,8 @@ import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetPagesBinding
 import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
@@ -74,9 +75,7 @@ class PagesThumbnailsSheet :
 			clickListener = this@PagesThumbnailsSheet,
 		)
 		with(binding.recyclerView) {
-			addItemDecoration(
-				SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),
-			)
+			addItemDecoration(TypedListSpacingDecoration(context))
 			adapter = thumbnailsAdapter
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver?.setGridSize(settings.gridSize / 100f, this)
@@ -103,7 +102,7 @@ class PagesThumbnailsSheet :
 		} else {
 			val state = ReaderState(item.page.chapterId, item.page.index, 0)
 			val intent = IntentBuilder(view.context).manga(viewModel.manga).state(state).build()
-			startActivity(intent, scaleUpActivityOptionsOf(view))
+			startActivity(intent)
 		}
 		dismiss()
 	}
@@ -171,7 +170,7 @@ class PagesThumbnailsSheet :
 		override fun getSpanSize(position: Int): Int {
 			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
 			return when (thumbnailsAdapter?.getItemViewType(position)) {
-				PageThumbnailAdapter.ITEM_TYPE_THUMBNAIL -> 1
+				ListItemType.PAGE_THUMB.ordinal -> 1
 				else -> total
 			}
 		}
@@ -192,7 +191,7 @@ class PagesThumbnailsSheet :
 
 		fun show(fm: FragmentManager, manga: Manga, chapterId: Long, currentPage: Int = -1) {
 			PagesThumbnailsSheet().withArgs(3) {
-				putParcelable(ARG_MANGA, ParcelableManga(manga, true))
+				putParcelable(ARG_MANGA, ParcelableManga(manga, withChapters = true))
 				putLong(ARG_CHAPTER_ID, chapterId)
 				putInt(ARG_CURRENT_PAGE, currentPage)
 			}.showDistinct(fm, TAG)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsViewModel.kt
index 7fee3bf49..18d41b1ef 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsViewModel.kt
@@ -95,7 +95,7 @@ class PagesThumbnailsViewModel @Inject constructor(
 			for (page in snapshot) {
 				if (page.chapterId != previousChapterId) {
 					chaptersLoader.peekChapter(page.chapterId)?.let {
-						add(ListHeader(it.name, 0, null))
+						add(ListHeader(it.name))
 					}
 					previousChapterId = page.chapterId
 				}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
index 1b197fdb6..c0f1cf253 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
@@ -2,28 +2,27 @@ package org.koitharu.kotatsu.reader.ui.thumbnails.adapter
 
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+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.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 
 class PageThumbnailAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<PageThumbnail>,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()), FastScroller.SectionIndexer {
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		delegatesManager.addDelegate(ITEM_TYPE_THUMBNAIL, pageThumbnailAD(coil, lifecycleOwner, clickListener))
-			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD(null))
-			.addDelegate(ITEM_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.PAGE_THUMB, pageThumbnailAD(coil, lifecycleOwner, clickListener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(null))
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
@@ -36,38 +35,4 @@ class PageThumbnailAdapter(
 		}
 		return null
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem is PageThumbnail && newItem is PageThumbnail -> {
-					oldItem.page == newItem.page
-				}
-
-				oldItem is ListHeader && newItem is ListHeader -> {
-					oldItem.textRes == newItem.textRes &&
-						oldItem.text == newItem.text &&
-						oldItem.dateTimeAgo == newItem.dateTimeAgo
-				}
-
-				oldItem is LoadingFooter && newItem is LoadingFooter -> {
-					oldItem.key == newItem.key
-				}
-
-				else -> oldItem.javaClass == newItem.javaClass
-			}
-		}
-
-		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return oldItem == newItem
-		}
-	}
-
-	companion object {
-
-		const val ITEM_TYPE_THUMBNAIL = 0
-		const val ITEM_TYPE_HEADER = 1
-		const val ITEM_LOADING = 2
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
index 0c87936b3..a8b94f00e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
@@ -12,9 +12,13 @@ import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentListBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.FilterSheetFragment
 import org.koitharu.kotatsu.filter.ui.MangaFilter
@@ -35,6 +39,10 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		addMenuProvider(RemoteListMenuProvider())
+		viewModel.isRandomLoading.observe(viewLifecycleOwner, MenuInvalidator(requireActivity()))
+		viewModel.onOpenManga.observeEvent(viewLifecycleOwner) {
+			startActivity(DetailsActivity.newIntent(binding.root.context, it))
+		}
 	}
 
 	override fun onScrolledToEnd() {
@@ -75,6 +83,11 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 				true
 			}
 
+			R.id.action_random -> {
+				viewModel.openRandom()
+				true
+			}
+
 			R.id.action_filter -> {
 				onFilterClick(null)
 				true
@@ -83,6 +96,11 @@ class RemoteListFragment : MangaListFragment(), FilterOwner {
 			else -> false
 		}
 
+		override fun onPrepareMenu(menu: Menu) {
+			super.onPrepareMenu(menu)
+			menu.findItem(R.id.action_random)?.isEnabled = !viewModel.isRandomLoading.value
+		}
+
 		override fun onQueryTextSubmit(query: String?): Boolean {
 			if (query.isNullOrEmpty()) {
 				return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
index ef37f77fb..84b58dfb3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
@@ -13,16 +13,19 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.filter.ui.FilterCoordinator
 import org.koitharu.kotatsu.filter.ui.MangaFilter
 import org.koitharu.kotatsu.filter.ui.model.FilterState
@@ -49,17 +52,22 @@ open class RemoteListViewModel @Inject constructor(
 	settings: AppSettings,
 	listExtraProvider: ListExtraProvider,
 	downloadScheduler: DownloadWorker.Scheduler,
+	private val exploreRepository: ExploreRepository,
 ) : MangaListViewModel(settings, downloadScheduler), MangaFilter by filter {
 
 	val source = savedStateHandle.require<MangaSource>(RemoteListFragment.ARG_SOURCE)
+	val isRandomLoading = MutableStateFlow(false)
+	val onOpenManga = MutableEventFlow<Manga>()
+
 	private val repository = mangaRepositoryFactory.create(source)
 	private val mangaList = MutableStateFlow<List<Manga>?>(null)
 	private val hasNextPage = MutableStateFlow(false)
 	private val listError = MutableStateFlow<Throwable?>(null)
 	private var loadingJob: Job? = null
+	private var randomJob: Job? = null
 
 	override val content = combine(
-		mangaList,
+		mangaList.map { it?.skipNsfwIfNeeded() },
 		listMode,
 		listError,
 		hasNextPage,
@@ -149,4 +157,16 @@ open class RemoteListViewModel @Inject constructor(
 		textSecondary = 0,
 		actionStringRes = if (canResetFilter) R.string.reset_filter else 0,
 	)
+
+	fun openRandom() {
+		if (randomJob?.isActive == true) {
+			return
+		}
+		randomJob = launchLoadingJob(Dispatchers.Default) {
+			isRandomLoading.value = true
+			val manga = exploreRepository.findRandomManga(source, 16)
+			onOpenManga.call(manga)
+			isRandomLoading.value = false
+		}
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerManga.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerManga.kt
index b00da2c8d..94151906d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerManga.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerManga.kt
@@ -10,6 +10,10 @@ class ScrobblerManga(
 	val url: String,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ScrobblerManga && other.id == id
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
@@ -20,9 +24,7 @@ class ScrobblerManga(
 		if (name != other.name) return false
 		if (altName != other.altName) return false
 		if (cover != other.cover) return false
-		if (url != other.url) return false
-
-		return true
+		return url == other.url
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerUser.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerUser.kt
index 73f37ce3e..89037e4a2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerUser.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblerUser.kt
@@ -16,9 +16,7 @@ class ScrobblerUser(
 		if (id != other.id) return false
 		if (nickname != other.nickname) return false
 		if (avatar != other.avatar) return false
-		if (service != other.service) return false
-
-		return true
+		return service == other.service
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingInfo.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingInfo.kt
index 5dd798f33..828a2c607 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingInfo.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingInfo.kt
@@ -16,6 +16,10 @@ class ScrobblingInfo(
 	val externalUrl: String,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ScrobblingInfo && other.scrobbler == scrobbler
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
@@ -32,9 +36,7 @@ class ScrobblingInfo(
 		if (title != other.title) return false
 		if (coverUrl != other.coverUrl) return false
 		if (description != other.description) return false
-		if (externalUrl != other.externalUrl) return false
-
-		return true
+		return externalUrl == other.externalUrl
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingStatus.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingStatus.kt
index 70118d585..33ac263f2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingStatus.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/model/ScrobblingStatus.kt
@@ -4,10 +4,9 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 
 enum class ScrobblingStatus : ListModel {
 
-	PLANNED,
-	READING,
-	RE_READING,
-	COMPLETED,
-	ON_HOLD,
-	DROPPED,
+	PLANNED, READING, RE_READING, COMPLETED, ON_HOLD, DROPPED;
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ScrobblingStatus && other.ordinal == ordinal
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt
index 0afdf0dcb..7b8d28d1b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt
@@ -14,7 +14,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.decor.TypedSpacingItemDecoration
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
@@ -22,11 +21,11 @@ import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.ActivityScrobblerConfigBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerUser
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.scrobbling.common.ui.config.adapter.ScrobblingMangaAdapter
-import org.koitharu.kotatsu.tracker.ui.feed.adapter.FeedAdapter
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
@@ -55,10 +54,7 @@ class ScrobblerConfigActivity : BaseActivity<ActivityScrobblerConfigBinding>(),
 			val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 			paddingHorizontal = spacing
 			paddingVertical = resources.getDimensionPixelOffset(R.dimen.grid_spacing_outer)
-			val decoration = TypedSpacingItemDecoration(
-				FeedAdapter.ITEM_TYPE_FEED to 0,
-				fallbackSpacing = spacing,
-			)
+			val decoration = TypedListSpacingDecoration(context)
 			addItemDecoration(decoration)
 		}
 		viewBinding.imageViewAvatar.setOnClickListener(this)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigViewModel.kt
index 029d7ce1e..c18aaca7a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigViewModel.kt
@@ -84,7 +84,7 @@ class ScrobblerConfigViewModel @Inject constructor(
 			)
 		}
 		val grouped = list.groupBy { it.status }
-		val statuses = enumValues<ScrobblingStatus>()
+		val statuses = ScrobblingStatus.entries
 		val result = ArrayList<ListModel>(list.size + statuses.size)
 		for (st in statuses) {
 			val subList = grouped[st]
@@ -102,7 +102,7 @@ class ScrobblerConfigViewModel @Inject constructor(
 	): ScrobblerService {
 		val serviceId = savedStateHandle.get<Int>(ScrobblerConfigActivity.EXTRA_SERVICE_ID) ?: 0
 		if (serviceId != 0) {
-			return enumValues<ScrobblerService>().first { it.id == serviceId }
+			return ScrobblerService.entries.first { it.id == serviceId }
 		}
 		val uri = savedStateHandle.require<Uri>(BaseActivity.EXTRA_DATA)
 		return when (uri.host) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/adapter/ScrobblingMangaAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/adapter/ScrobblingMangaAdapter.kt
index 4e0c4e913..9efa98bb5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/adapter/ScrobblingMangaAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/adapter/ScrobblingMangaAdapter.kt
@@ -1,48 +1,22 @@
 package org.koitharu.kotatsu.scrobbling.common.ui.config.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
-import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
-import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
 
 class ScrobblingMangaAdapter(
 	clickListener: OnListItemClickListener<ScrobblingInfo>,
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		delegatesManager.addDelegate(scrobblingMangaAD(clickListener, coil, lifecycleOwner))
 			.addDelegate(scrobblingHeaderAD())
 			.addDelegate(emptyStateListAD(coil, lifecycleOwner, null))
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem is ScrobblingInfo && newItem is ScrobblingInfo -> {
-					oldItem.targetId == newItem.targetId && oldItem.mangaId == newItem.mangaId
-				}
-
-				oldItem is ScrobblingStatus && newItem is ScrobblingStatus -> {
-					oldItem.ordinal == newItem.ordinal
-				}
-
-				oldItem is EmptyState && newItem is EmptyState -> true
-
-				else -> false
-			}
-		}
-
-		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return oldItem == newItem
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorSheet.kt
index ba4a89330..c729e8600 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorSheet.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorSheet.kt
@@ -84,7 +84,6 @@ class ScrobblingSelectorSheet :
 				tab.select()
 			}
 		}
-		viewModel.searchQuery.observe(viewLifecycleOwner, ::onSearchQueryChanged)
 	}
 
 	override fun onDestroyView() {
@@ -157,10 +156,6 @@ class ScrobblingSelectorSheet :
 		menuItem.expandActionView()
 	}
 
-	private fun onSearchQueryChanged(query: String?) {
-
-	}
-
 	private fun onError(e: Throwable) {
 		Toast.makeText(requireContext(), e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
 		if (viewModel.isEmpty) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/adapter/ScrobblerSelectorAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/adapter/ScrobblerSelectorAdapter.kt
index c39a79846..b730e0790 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/adapter/ScrobblerSelectorAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/adapter/ScrobblerSelectorAdapter.kt
@@ -1,25 +1,21 @@
 package org.koitharu.kotatsu.scrobbling.common.ui.selector.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 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.scrobbling.common.domain.model.ScrobblerManga
-import org.koitharu.kotatsu.scrobbling.common.ui.selector.model.ScrobblerHint
-import kotlin.jvm.internal.Intrinsics
 
 class ScrobblerSelectorAdapter(
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
 	clickListener: OnListItemClickListener<ScrobblerManga>,
 	stateHolderListener: ListStateHolderListener,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		delegatesManager.addDelegate(loadingStateAD())
@@ -27,21 +23,4 @@ class ScrobblerSelectorAdapter(
 			.addDelegate(loadingFooterAD())
 			.addDelegate(scrobblerHintAD(stateHolderListener))
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem === newItem -> true
-				oldItem is ScrobblerManga && newItem is ScrobblerManga -> oldItem.id == newItem.id
-				oldItem is ScrobblerHint && newItem is ScrobblerHint -> oldItem.textPrimary == newItem.textPrimary
-				oldItem is LoadingFooter && newItem is LoadingFooter -> oldItem.key == newItem.key
-				else -> false
-			}
-		}
-
-		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return Intrinsics.areEqual(oldItem, newItem)
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/model/ScrobblerHint.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/model/ScrobblerHint.kt
index 83c122fa7..ec2342521 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/model/ScrobblerHint.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/model/ScrobblerHint.kt
@@ -12,6 +12,10 @@ class ScrobblerHint(
 	@StringRes val actionStringRes: Int,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ScrobblerHint && other.textPrimary == textPrimary
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
@@ -22,9 +26,7 @@ class ScrobblerHint(
 		if (textPrimary != other.textPrimary) return false
 		if (textSecondary != other.textSecondary) return false
 		if (error != other.error) return false
-		if (actionStringRes != other.actionStringRes) return false
-
-		return true
+		return actionStringRes == other.actionStringRes
 	}
 
 	override fun hashCode(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
index 79c106a80..f6cc9e9ec 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.search.domain
 
-import android.annotation.SuppressLint
 import android.app.SearchManager
 import android.content.Context
 import android.provider.SearchRecentSuggestions
@@ -8,55 +7,43 @@ import dagger.Reusable
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTag
-import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.levenshteinDistance
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import javax.inject.Inject
 
 @Reusable
 class MangaSearchRepository @Inject constructor(
-	private val settings: AppSettings,
 	private val db: MangaDatabase,
+	private val sourcesRepository: MangaSourcesRepository,
 	@ApplicationContext private val context: Context,
 	private val recentSuggestions: SearchRecentSuggestions,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val settings: AppSettings,
 ) {
 
-	fun globalSearch(query: String, concurrency: Int = DEFAULT_CONCURRENCY): Flow<Manga> =
-		settings.getMangaSources(includeHidden = false).asFlow()
-			.flatMapMerge(concurrency) { source ->
-				runCatchingCancellable {
-					mangaRepositoryFactory.create(source).getList(
-						offset = 0,
-						query = query,
-					)
-				}.getOrElse {
-					emptyList()
-				}.asFlow()
-			}.filter {
-				match(it, query)
-			}
-
 	suspend fun getMangaSuggestion(query: String, limit: Int, source: MangaSource?): List<Manga> {
 		if (query.isEmpty()) {
 			return emptyList()
 		}
+		val skipNsfw = settings.isNsfwContentDisabled
 		return if (source != null) {
 			db.mangaDao.searchByTitle("%$query%", source.name, limit)
 		} else {
 			db.mangaDao.searchByTitle("%$query%", limit)
-		}.map { it.toManga() }
+		}.let {
+			if (skipNsfw) it.filterNot { x -> x.manga.isNsfw } else it
+		}
+			.map { it.toManga() }
 			.sortedBy { x -> x.title.levenshteinDistance(query) }
 	}
 
@@ -66,7 +53,7 @@ class MangaSearchRepository @Inject constructor(
 	): List<String> = withContext(Dispatchers.IO) {
 		context.contentResolver.query(
 			MangaSuggestionsProvider.QUERY_URI,
-			SUGGESTION_PROJECTION,
+			arrayOf(SearchManager.SUGGEST_COLUMN_QUERY),
 			"${SearchManager.SUGGEST_COLUMN_QUERY} LIKE ?",
 			arrayOf("%$query%"),
 			"date DESC",
@@ -101,8 +88,11 @@ class MangaSearchRepository @Inject constructor(
 		if (query.length < 3) {
 			return emptyList()
 		}
-		val sources = settings.remoteMangaSources
-			.filter { x -> x.title.contains(query, ignoreCase = true) }
+		val skipNsfw = settings.isNsfwContentDisabled
+		val sources = sourcesRepository.allMangaSources
+			.filter { x ->
+				(x.contentType != ContentType.HENTAI || !skipNsfw) && x.title.contains(query, ignoreCase = true)
+			}
 		return if (limit == 0) {
 			sources
 		} else {
@@ -129,33 +119,10 @@ class MangaSearchRepository @Inject constructor(
 	suspend fun getSearchHistoryCount(): Int = withContext(Dispatchers.IO) {
 		context.contentResolver.query(
 			MangaSuggestionsProvider.QUERY_URI,
-			SUGGESTION_PROJECTION,
+			arrayOf(SearchManager.SUGGEST_COLUMN_QUERY),
 			null,
 			arrayOfNulls(1),
 			null,
 		)?.use { cursor -> cursor.count } ?: 0
 	}
-
-	private companion object {
-
-		private val REGEX_SPACE = Regex("\\s+")
-		val SUGGESTION_PROJECTION = arrayOf(SearchManager.SUGGEST_COLUMN_QUERY)
-
-		@SuppressLint("DefaultLocale")
-		fun match(manga: Manga, query: String): Boolean {
-			val words = HashSet<String>()
-			words += manga.title.lowercase().split(REGEX_SPACE)
-			words += manga.altTitle?.lowercase()?.split(REGEX_SPACE).orEmpty()
-			val words2 = query.lowercase().split(REGEX_SPACE).toSet()
-			for (w in words) {
-				for (w2 in words2) {
-					val diff = w.levenshteinDistance(w2) / ((w.length + w2.length) / 2f)
-					if (diff < 0.5) {
-						return true
-					}
-				}
-			}
-			return false
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
index e5c3320a7..85cf6523a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
@@ -6,8 +6,10 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import androidx.core.graphics.Insets
+import androidx.core.os.bundleOf
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.google.android.material.appbar.AppBarLayout
 import dagger.hilt.android.AndroidEntryPoint
@@ -15,7 +17,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
+import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
@@ -27,8 +31,10 @@ import org.koitharu.kotatsu.filter.ui.FilterHeaderFragment
 import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.FilterSheetFragment
 import org.koitharu.kotatsu.filter.ui.MangaFilter
+import org.koitharu.kotatsu.list.ui.preview.PreviewFragment
 import org.koitharu.kotatsu.local.ui.LocalListFragment
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
@@ -56,7 +62,7 @@ class MangaListActivity :
 			finishAfterTransition()
 			return
 		}
-		viewBinding.chipSort?.setOnClickListener(this)
+		viewBinding.buttonOrder?.setOnClickListener(this)
 		title = if (source == MangaSource.LOCAL) getString(R.string.local_storage) else source.title
 		initList(source, tags)
 	}
@@ -66,17 +72,25 @@ class MangaListActivity :
 			left = insets.left,
 			right = insets.right,
 		)
-		viewBinding.cardFilter?.updateLayoutParams<MarginLayoutParams> {
+		viewBinding.cardSide?.updateLayoutParams<MarginLayoutParams> {
 			bottomMargin = marginStart + insets.bottom
+			topMargin = marginStart + insets.top
 		}
 	}
 
 	override fun onClick(v: View) {
 		when (v.id) {
-			R.id.chip_sort -> FilterSheetFragment.show(supportFragmentManager)
+			R.id.button_order -> FilterSheetFragment.show(supportFragmentManager)
 		}
 	}
 
+	fun showPreview(manga: Manga): Boolean = setSideFragment(
+		PreviewFragment::class.java,
+		bundleOf(MangaIntent.KEY_MANGA to ParcelableManga(manga, true)),
+	)
+
+	fun hidePreview() = setSideFragment(FilterSheetFragment::class.java, null)
+
 	private fun initList(source: MangaSource, tags: Set<MangaTag>?) {
 		val fm = supportFragmentManager
 		val existingFragment = fm.findFragmentById(R.id.container)
@@ -100,12 +114,9 @@ class MangaListActivity :
 	}
 
 	private fun initFilter(filterOwner: FilterOwner) {
-		if (viewBinding.containerFilter != null) {
-			if (supportFragmentManager.findFragmentById(R.id.container_filter) == null) {
-				supportFragmentManager.commit {
-					setReorderingAllowed(true)
-					replace(R.id.container_filter, FilterSheetFragment::class.java, null)
-				}
+		if (viewBinding.containerSide != null) {
+			if (supportFragmentManager.findFragmentById(R.id.container_side) == null) {
+				setSideFragment(FilterSheetFragment::class.java, null)
 			}
 		} else if (viewBinding.containerFilterHeader != null) {
 			if (supportFragmentManager.findFragmentById(R.id.container_filter_header) == null) {
@@ -116,7 +127,7 @@ class MangaListActivity :
 			}
 		}
 		val filter = filterOwner.filter
-		val chipSort = viewBinding.chipSort
+		val chipSort = viewBinding.buttonOrder
 		if (chipSort != null) {
 			filter.header.observe(this) {
 				chipSort.setTextAndVisible(it.sortOrder?.titleRes ?: 0)
@@ -135,6 +146,16 @@ class MangaListActivity :
 		return supportFragmentManager.findFragmentById(R.id.container) as? FilterOwner
 	}
 
+	private fun setSideFragment(cls: Class<out Fragment>, args: Bundle?) = if (viewBinding.containerSide != null) {
+		supportFragmentManager.commit {
+			setReorderingAllowed(true)
+			replace(R.id.container_side, cls, args)
+		}
+		true
+	} else {
+		false
+	}
+
 	private class ApplyFilterRunnable(
 		private val filterOwner: FilterOwner,
 		private val tags: Set<MangaTag>,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt
index 3871a0cfc..8d2514df3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt
@@ -27,11 +27,11 @@ import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.ActivitySearchMultiBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesSheet
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.size.DynamicItemSizeResolver
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
@@ -60,11 +60,12 @@ class MultiSearchActivity :
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySearchMultiBinding.inflate(layoutInflater))
 		window.statusBarColor = ContextCompat.getColor(this, R.color.dim_statusbar)
+		title = viewModel.query
 
 		val itemCLickListener = OnListItemClickListener<MultiSearchListModel> { item, view ->
-			startActivity(SearchActivity.newIntent(view.context, item.source, viewModel.query.value))
+			startActivity(SearchActivity.newIntent(view.context, item.source, viewModel.query))
 		}
-		val sizeResolver = ItemSizeResolver(resources, settings)
+		val sizeResolver = DynamicItemSizeResolver(resources, settings, adjustWidth = true)
 		val selectionDecoration = MangaSelectionDecoration(this)
 		selectionController = ListSelectionController(
 			activity = this,
@@ -88,7 +89,6 @@ class MultiSearchActivity :
 			setSubtitle(R.string.search_results)
 		}
 
-		viewModel.query.observe(this) { title = it }
 		viewModel.list.observe(this) { adapter.items = it }
 		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
 		viewModel.onDownloadStarted.observeEvent(this, DownloadStartedObserver(viewBinding.recyclerView))
@@ -118,7 +118,7 @@ class MultiSearchActivity :
 	override fun onReadClick(manga: Manga, view: View) {
 		if (!selectionController.onItemClick(manga.id)) {
 			val intent = IntentBuilder(this).manga(manga).build()
-			startActivity(intent, scaleUpActivityOptionsOf(view))
+			startActivity(intent)
 		}
 	}
 
@@ -130,7 +130,7 @@ class MultiSearchActivity :
 	}
 
 	override fun onRetryClick(error: Throwable) {
-		viewModel.doSearch(viewModel.query.value)
+		viewModel.retry()
 	}
 
 	override fun onUpdateFilter(tags: Set<MangaTag>) = Unit
@@ -159,7 +159,7 @@ class MultiSearchActivity :
 			}
 
 			R.id.action_favourite -> {
-				FavouriteCategoriesSheet.show(supportFragmentManager, collectSelectedItems())
+				FavouriteSheet.show(supportFragmentManager, collectSelectedItems())
 				mode.finish()
 				true
 			}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchListModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchListModel.kt
index 8f6ed856e..83d6c9dc2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchListModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchListModel.kt
@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.search.ui.multi
 
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaItemModel
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -11,6 +12,18 @@ class MultiSearchListModel(
 	val error: Throwable?,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is MultiSearchListModel && source == other.source
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is MultiSearchListModel && previousState.list != list) {
+			ListModelDiffCallback.PAYLOAD_NESTED_LIST_CHANGED
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt
index 06d28f85a..f9252b55c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt
@@ -1,30 +1,33 @@
 package org.koitharu.kotatsu.search.ui.multi
 
+import androidx.annotation.CheckResult
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.runningFold
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
-import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
 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.call
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -33,7 +36,6 @@ import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 private const val MAX_PARALLELISM = 4
@@ -43,20 +45,22 @@ private const val MIN_HAS_MORE_ITEMS = 8
 class MultiSearchViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val extraProvider: ListExtraProvider,
-	private val settings: AppSettings,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val downloadScheduler: DownloadWorker.Scheduler,
+	private val sourcesRepository: MangaSourcesRepository,
 ) : BaseViewModel() {
 
-	private var searchJob: Job? = null
-	private val listData = MutableStateFlow<List<MultiSearchListModel>>(emptyList())
-	private val loadingData = MutableStateFlow(false)
 	val onDownloadStarted = MutableEventFlow<Unit>()
+	val query = savedStateHandle.get<String>(MultiSearchActivity.EXTRA_QUERY).orEmpty()
+
+	private val retryCounter = MutableStateFlow(0)
+	private val listData = retryCounter.flatMapLatest {
+		searchImpl(query).withLoading().withErrorHandling()
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
-	val query = MutableStateFlow(savedStateHandle.get<String>(MultiSearchActivity.EXTRA_QUERY).orEmpty())
 	val list: StateFlow<List<ListModel>> = combine(
-		listData,
-		loadingData,
+		listData.filterNotNull(),
+		isLoading,
 	) { list, loading ->
 		when {
 			list.isEmpty() -> listOf(
@@ -76,13 +80,10 @@ class MultiSearchViewModel @Inject constructor(
 		}
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
-	init {
-		doSearch(query.value)
-	}
-
 	fun getItems(ids: Set<Long>): Set<Manga> {
+		val snapshot = listData.value ?: return emptySet()
 		val result = HashSet<Manga>(ids.size)
-		listData.value.forEach { x ->
+		snapshot.forEach { x ->
 			for (item in x.list) {
 				if (item.id in ids) {
 					result.add(item.manga)
@@ -92,21 +93,8 @@ class MultiSearchViewModel @Inject constructor(
 		return result
 	}
 
-	fun doSearch(q: String) {
-		val prevJob = searchJob
-		searchJob = launchJob(Dispatchers.Default) {
-			prevJob?.cancelAndJoin()
-			try {
-				listData.value = emptyList()
-				loadingData.value = true
-				query.value = q
-				searchImpl(q)
-			} catch (e: CancellationException) {
-				throw e
-			} finally {
-				loadingData.value = false
-			}
-		}
+	fun retry() {
+		retryCounter.value = retryCounter.value + 1
 	}
 
 	fun download(items: Set<Manga>) {
@@ -116,13 +104,14 @@ class MultiSearchViewModel @Inject constructor(
 		}
 	}
 
-	private suspend fun searchImpl(q: String) = coroutineScope {
-		val sources = settings.getMangaSources(includeHidden = false)
-		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
-		val deferredList = sources.map { source ->
-			async(dispatcher) {
-				runCatchingCancellable {
-					withTimeout(8_000) {
+	@CheckResult
+	private fun searchImpl(q: String): Flow<List<MultiSearchListModel>> = channelFlow {
+		val sources = sourcesRepository.getEnabledSources()
+		val semaphore = Semaphore(MAX_PARALLELISM)
+		for (source in sources) {
+			launch {
+				val item = runCatchingCancellable {
+					semaphore.withPermit {
 						mangaRepositoryFactory.create(source).getList(offset = 0, query = q)
 							.toUi(ListMode.GRID, extraProvider)
 					}
@@ -139,12 +128,11 @@ class MultiSearchViewModel @Inject constructor(
 						MultiSearchListModel(source, true, emptyList(), error)
 					},
 				)
+				if (item != null) {
+					send(item)
+				}
 			}
 		}
-		for (deferred in deferredList) {
-			deferred.await()?.let { item ->
-				listData.update { x -> x + item }
-			}
-		}
-	}
+	}.runningFold<MultiSearchListModel, List<MultiSearchListModel>?>(null) { list, item -> list.orEmpty() + item }
+		.filterNotNull()
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/MultiSearchAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/MultiSearchAdapter.kt
index 5abb41e8c..dd86aa7c0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/MultiSearchAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/MultiSearchAdapter.kt
@@ -1,12 +1,10 @@
 package org.koitharu.kotatsu.search.ui.multi.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
@@ -14,9 +12,8 @@ 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.list.ui.size.ItemSizeResolver
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchListModel
-import kotlin.jvm.internal.Intrinsics
 
 class MultiSearchAdapter(
 	lifecycleOwner: LifecycleOwner,
@@ -25,7 +22,7 @@ class MultiSearchAdapter(
 	itemClickListener: OnListItemClickListener<MultiSearchListModel>,
 	sizeResolver: ItemSizeResolver,
 	selectionDecoration: MangaSelectionDecoration,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		val pool = RecycledViewPool()
@@ -46,25 +43,4 @@ class MultiSearchAdapter(
 			.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 MultiSearchListModel && newItem is MultiSearchListModel -> {
-					oldItem.source == newItem.source
-				}
-
-				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)
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/SearchResultsAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/SearchResultsAD.kt
index 9bd049052..6f945677f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/SearchResultsAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/SearchResultsAD.kt
@@ -14,10 +14,10 @@ import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemListGroupBinding
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchListModel
 
@@ -35,7 +35,7 @@ fun searchResultsAD(
 
 	binding.recyclerView.setRecycledViewPool(sharedPool)
 	val adapter = ListDelegationAdapter(
-		mangaGridItemAD(coil, lifecycleOwner, listener, sizeResolver),
+		mangaGridItemAD(coil, lifecycleOwner, sizeResolver, listener),
 	)
 	binding.recyclerView.addItemDecoration(selectionDecoration)
 	binding.recyclerView.adapter = adapter
@@ -47,8 +47,8 @@ fun searchResultsAD(
 	bind {
 		binding.textViewTitle.text = item.source.title
 		binding.buttonMore.isVisible = item.hasMore
-		adapter.notifyDataSetChanged()
 		adapter.items = item.list
+		adapter.notifyDataSetChanged()
 		binding.recyclerView.isGone = item.list.isEmpty()
 		binding.textViewError.textAndVisible = item.error?.getDisplayMessage(context.resources)
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt
index 804e00f19..b5436848e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.os.VoiceInputContract
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -26,6 +27,11 @@ class SearchSuggestionFragment :
 	lateinit var coil: ImageLoader
 
 	private val viewModel by activityViewModels<SearchSuggestionViewModel>()
+	private val voiceInputLauncher = registerForActivityResult(VoiceInputContract()) { result ->
+		if (result != null) {
+			viewModel.onQueryChanged(result)
+		}
+	}
 
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
@@ -39,7 +45,7 @@ class SearchSuggestionFragment :
 			lifecycleOwner = viewLifecycleOwner,
 			listener = requireActivity() as SearchSuggestionListener,
 		)
-		addMenuProvider(SearchSuggestionMenuProvider(binding.root.context, viewModel))
+		addMenuProvider(SearchSuggestionMenuProvider(binding.root.context, voiceInputLauncher, viewModel))
 		binding.root.adapter = adapter
 		binding.root.setHasFixedSize(true)
 		viewModel.suggestion.observe(viewLifecycleOwner) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
index cef229058..0a35e13a7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
@@ -17,6 +17,4 @@ interface SearchSuggestionListener {
 	fun onSourceClick(source: MangaSource)
 
 	fun onTagClick(tag: MangaTag)
-
-	fun onVoiceSearchClick()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionMenuProvider.kt
index 036d7ce32..12d58adf9 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionMenuProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionMenuProvider.kt
@@ -4,13 +4,17 @@ import android.content.Context
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import androidx.activity.result.ActivityResultLauncher
 import androidx.core.view.MenuProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.resolve
+import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import com.google.android.material.R as materialR
 
 class SearchSuggestionMenuProvider(
 	private val context: Context,
+	private val voiceInputLauncher: ActivityResultLauncher<String?>,
 	private val viewModel: SearchSuggestionViewModel,
 ) : MenuProvider {
 
@@ -24,10 +28,20 @@ class SearchSuggestionMenuProvider(
 				clearSearchHistory()
 				true
 			}
+
+			R.id.action_voice_search -> {
+				voiceInputLauncher.tryLaunch(context.getString(R.string.search_manga), null)
+			}
+
 			else -> false
 		}
 	}
 
+	override fun onPrepareMenu(menu: Menu) {
+		super.onPrepareMenu(menu)
+		menu.findItem(R.id.action_voice_search)?.isVisible = voiceInputLauncher.resolve(context, null) != null
+	}
+
 	private fun clearSearchHistory() {
 		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
 			.setTitle(R.string.clear_search_history)
@@ -38,4 +52,4 @@ class SearchSuggestionMenuProvider(
 				viewModel.clearSearchHistory()
 			}.show()
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
index d44357b08..46c523bff 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
@@ -11,14 +11,16 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.toEnumSet
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
@@ -35,6 +37,7 @@ private const val MAX_SOURCES_ITEMS = 6
 class SearchSuggestionViewModel @Inject constructor(
 	private val repository: MangaSearchRepository,
 	private val settings: AppSettings,
+	private val sourcesRepository: MangaSourcesRepository,
 ) : BaseViewModel() {
 
 	private val query = MutableStateFlow("")
@@ -72,10 +75,8 @@ class SearchSuggestionViewModel @Inject constructor(
 	}
 
 	fun onSourceToggle(source: MangaSource, isEnabled: Boolean) {
-		settings.hiddenSources = if (isEnabled) {
-			settings.hiddenSources - source.name
-		} else {
-			settings.hiddenSources + source.name
+		launchJob(Dispatchers.Default) {
+			sourcesRepository.setSourceEnabled(source, isEnabled)
 		}
 	}
 
@@ -90,10 +91,10 @@ class SearchSuggestionViewModel @Inject constructor(
 		suggestionJob?.cancel()
 		suggestionJob = combine(
 			query.debounce(DEBOUNCE_TIMEOUT),
-			settings.observeAsFlow(AppSettings.KEY_SOURCES_HIDDEN) { hiddenSources },
+			sourcesRepository.observeEnabledSources().map { it.toEnumSet() },
 			::Pair,
-		).mapLatest { (searchQuery, hiddenSources) ->
-			buildSearchSuggestion(searchQuery, hiddenSources)
+		).mapLatest { (searchQuery, enabledSources) ->
+			buildSearchSuggestion(searchQuery, enabledSources)
 		}.distinctUntilChanged()
 			.onEach {
 				suggestion.value = it
@@ -102,7 +103,7 @@ class SearchSuggestionViewModel @Inject constructor(
 
 	private suspend fun buildSearchSuggestion(
 		searchQuery: String,
-		hiddenSources: Set<String>,
+		enabledSources: Set<MangaSource>,
 	): List<SearchSuggestionItem> = coroutineScope {
 		val queriesDeferred = async {
 			repository.getQuerySuggestion(searchQuery, MAX_QUERY_ITEMS)
@@ -127,7 +128,7 @@ class SearchSuggestionViewModel @Inject constructor(
 				add(SearchSuggestionItem.MangaList(mangaList))
 			}
 			queries.mapTo(this) { SearchSuggestionItem.RecentQuery(it) }
-			sources.mapTo(this) { SearchSuggestionItem.Source(it, it.name !in hiddenSources) }
+			sources.mapTo(this) { SearchSuggestionItem.Source(it, it in enabledSources) }
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt
index 121ef63f7..bd255e3cd 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt
@@ -1,12 +1,10 @@
 package org.koitharu.kotatsu.search.ui.suggestion.adapter
 
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
-import kotlin.jvm.internal.Intrinsics
 
 const val SEARCH_SUGGESTION_ITEM_TYPE_QUERY = 0
 
@@ -14,7 +12,7 @@ class SearchSuggestionAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: SearchSuggestionListener,
-) : AsyncListDifferDelegationAdapter<SearchSuggestionItem>(DiffCallback()) {
+) : BaseListAdapter<SearchSuggestionItem>() {
 
 	init {
 		delegatesManager
@@ -23,35 +21,4 @@ class SearchSuggestionAdapter(
 			.addDelegate(searchSuggestionTagsAD(listener))
 			.addDelegate(searchSuggestionMangaListAD(coil, lifecycleOwner, listener))
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<SearchSuggestionItem>() {
-
-		override fun areItemsTheSame(
-			oldItem: SearchSuggestionItem,
-			newItem: SearchSuggestionItem,
-		): Boolean = when {
-			oldItem is SearchSuggestionItem.RecentQuery && newItem is SearchSuggestionItem.RecentQuery -> {
-				oldItem.query == newItem.query
-			}
-			oldItem is SearchSuggestionItem.Source && newItem is SearchSuggestionItem.Source -> {
-				oldItem.source == newItem.source
-			}
-			else -> oldItem.javaClass == newItem.javaClass
-		}
-
-		override fun areContentsTheSame(
-			oldItem: SearchSuggestionItem,
-			newItem: SearchSuggestionItem,
-		): Boolean = Intrinsics.areEqual(oldItem, newItem)
-
-		override fun getChangePayload(oldItem: SearchSuggestionItem, newItem: SearchSuggestionItem): Any? {
-			return when {
-				oldItem is SearchSuggestionItem.MangaList && newItem is SearchSuggestionItem.MangaList -> Unit
-				oldItem is SearchSuggestionItem.Source && newItem is SearchSuggestionItem.Source -> {
-					if (oldItem.isEnabled != newItem.isEnabled) Unit else super.getChangePayload(oldItem, newItem)
-				}
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionSourceAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionSourceAD.kt
index 6552643a1..8d05c03ec 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionSourceAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionSourceAD.kt
@@ -1,10 +1,12 @@
 package org.koitharu.kotatsu.search.ui.suggestion.adapter
 
+import androidx.core.text.buildSpannedString
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
-import org.koitharu.kotatsu.core.ui.image.FaviconFallbackDrawable
+import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
@@ -12,6 +14,7 @@ import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemSearchSuggestionSourceBinding
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+import org.koitharu.kotatsu.settings.sources.adapter.appendNsfwLabel
 
 fun searchSuggestionSourceAD(
 	coil: ImageLoader,
@@ -29,9 +32,17 @@ fun searchSuggestionSourceAD(
 	}
 
 	bind {
-		binding.textViewTitle.text = item.source.title
+		binding.textViewTitle.text = if (item.isNsfw) {
+			buildSpannedString {
+				append(item.source.title)
+				append(' ')
+				appendNsfwLabel(context)
+			}
+		} else {
+			item.source.title
+		}
 		binding.switchLocal.isChecked = item.isEnabled
-		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
+		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewCover.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			fallback(fallbackIcon)
 			placeholder(fallbackIcon)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
index 8d720e2d1..9bf285e5d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
@@ -1,91 +1,66 @@
 package org.koitharu.kotatsu.search.ui.suggestion.model
 
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.areItemsEquals
 
-sealed interface SearchSuggestionItem {
+sealed interface SearchSuggestionItem : ListModel {
 
-	class MangaList(
+	data class MangaList(
 		val items: List<Manga>,
 	) : SearchSuggestionItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as MangaList
-
-			return items.areItemsEquals(other.items) { a, b ->
-				a.title == b.title && a.coverUrl == b.coverUrl
-			}
-		}
-
-		override fun hashCode(): Int {
-			return items.fold(0) { acc, t ->
-				var r = 31 * acc + t.title.hashCode()
-				r = 31 * r + t.coverUrl.hashCode()
-				r
-			}
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is MangaList
 		}
 	}
 
-	class RecentQuery(
+	data class RecentQuery(
 		val query: String,
 	) : SearchSuggestionItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as RecentQuery
-
-			return query == other.query
-		}
-
-		override fun hashCode(): Int {
-			return query.hashCode()
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is RecentQuery && query == other.query
 		}
 	}
 
-	class Source(
+	data class Source(
 		val source: MangaSource,
 		val isEnabled: Boolean,
 	) : SearchSuggestionItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
+		val isNsfw: Boolean
+			get() = source.contentType == ContentType.HENTAI
 
-			other as Source
-
-			if (source != other.source) return false
-			return isEnabled == other.isEnabled
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Source && other.source == source
 		}
 
-		override fun hashCode(): Int {
-			var result = source.hashCode()
-			result = 31 * result + isEnabled.hashCode()
-			return result
+		override fun getChangePayload(previousState: ListModel): Any? {
+			if (previousState !is Source) {
+				return super.getChangePayload(previousState)
+			}
+			return if (isEnabled != previousState.isEnabled) {
+				ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+			} else {
+				null
+			}
 		}
 	}
 
-	class Tags(
+	data class Tags(
 		val tags: List<ChipsView.ChipModel>,
 	) : SearchSuggestionItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Tags
-
-			return tags == other.tags
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Tags
 		}
 
-		override fun hashCode(): Int {
-			return tags.hashCode()
+		override fun getChangePayload(previousState: ListModel): Any {
+			return ListModelDiffCallback.PAYLOAD_NESTED_LIST_CHANGED
 		}
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
index 417e48d94..8b8feff81 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
@@ -13,6 +13,8 @@ import android.view.SoundEffectConstants
 import android.view.accessibility.AccessibilityEvent
 import android.view.inputmethod.EditorInfo
 import androidx.annotation.AttrRes
+import androidx.annotation.CheckResult
+import androidx.annotation.StringRes
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
 import org.koitharu.kotatsu.R
@@ -31,19 +33,12 @@ class SearchEditText @JvmOverloads constructor(
 
 	var searchSuggestionListener: SearchSuggestionListener? = null
 	private val clearIcon = ContextCompat.getDrawable(context, materialR.drawable.abc_ic_clear_material)
-	private val voiceIcon = ContextCompat.getDrawable(context, R.drawable.ic_voice_input)
 	private var isEmpty = text.isNullOrEmpty()
 
 	init {
-		wrapHint()
+		hint = wrapHint()
 	}
 
-	var isVoiceSearchEnabled: Boolean = false
-		set(value) {
-			field = value
-			updateActionIcon()
-		}
-
 	var query: String
 		get() = text?.trim()?.toString().orEmpty()
 		set(value) {
@@ -114,17 +109,19 @@ class SearchEditText @JvmOverloads constructor(
 		text?.clear()
 	}
 
+	fun setHintCompat(@StringRes resId: Int) {
+		hint = wrapHint(context.getString(resId))
+	}
+
 	private fun onActionIconClick() {
 		when {
 			!text.isNullOrEmpty() -> text?.clear()
-			isVoiceSearchEnabled -> searchSuggestionListener?.onVoiceSearchClick()
 		}
 	}
 
 	private fun updateActionIcon() {
 		val icon = when {
 			!text.isNullOrEmpty() -> clearIcon
-			isVoiceSearchEnabled -> voiceIcon
 			else -> null
 		}
 		if (icon !== drawableEnd) {
@@ -132,15 +129,16 @@ class SearchEditText @JvmOverloads constructor(
 		}
 	}
 
-	private fun wrapHint() {
-		val rawHint = hint?.toString() ?: return
+	@CheckResult
+	private fun wrapHint(raw: CharSequence? = hint): SpannableString? {
+		val rawHint = raw?.toString() ?: return null
 		val formatted = SpannableString(rawHint)
 		formatted.setSpan(
-			TextAppearanceSpan(context, materialR.style.TextAppearance_Material3_SearchView),
+			TextAppearanceSpan(context, R.style.TextAppearance_Kotatsu_SearchView),
 			0,
 			formatted.length,
 			Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
 		)
-		hint = formatted
+		return formatted
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
index 5905e7f17..039293ce6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
@@ -49,7 +49,7 @@ class AppearanceSettingsFragment :
 			}
 		}
 		findPreference<ListPreference>(AppSettings.KEY_LIST_MODE)?.run {
-			entryValues = ListMode.values().names()
+			entryValues = ListMode.entries.names()
 			setDefaultValueCompat(ListMode.GRID.name)
 		}
 		findPreference<ActivityListPreference>(AppSettings.KEY_APP_LOCALE)?.run {
@@ -102,7 +102,7 @@ class AppearanceSettingsFragment :
 	}
 
 	private fun initLocalePicker(preference: ListPreference) {
-		val locales = resources.getLocalesConfig()
+		val locales = preference.context.getLocalesConfig()
 			.toList()
 			.sortedWith(LocaleComparator(preference.context))
 		preference.entries = Array(locales.size + 1) { i ->
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/NetworkSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/NetworkSettingsFragment.kt
index 48d6f6407..72a5251d2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/NetworkSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/NetworkSettingsFragment.kt
@@ -29,12 +29,7 @@ class NetworkSettingsFragment :
 		addPreferencesFromResource(R.xml.pref_network)
 		findPreference<Preference>(AppSettings.KEY_PREFETCH_CONTENT)?.isVisible = contentCache.isCachingEnabled
 		findPreference<ListPreference>(AppSettings.KEY_DOH)?.run {
-			entryValues = arrayOf(
-				DoHProvider.NONE,
-				DoHProvider.GOOGLE,
-				DoHProvider.CLOUDFLARE,
-				DoHProvider.ADGUARD,
-			).names()
+			entryValues = DoHProvider.entries.names()
 			setDefaultValueCompat(DoHProvider.NONE.name)
 		}
 		bindProxySummary()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt
index 672073926..a605cb80f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ReaderSettingsFragment.kt
@@ -10,6 +10,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ReaderAnimation
+import org.koitharu.kotatsu.core.prefs.ReaderBackground
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat
@@ -24,23 +26,22 @@ class ReaderSettingsFragment :
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_reader)
 		findPreference<ListPreference>(AppSettings.KEY_READER_MODE)?.run {
-			entryValues = arrayOf(
-				ReaderMode.STANDARD,
-				ReaderMode.REVERSED,
-				ReaderMode.WEBTOON,
-			).names()
+			entryValues = ReaderMode.entries.names()
 			setDefaultValueCompat(ReaderMode.STANDARD.name)
 		}
+		findPreference<ListPreference>(AppSettings.KEY_READER_BACKGROUND)?.run {
+			entryValues = ReaderBackground.entries.names()
+			setDefaultValueCompat(ReaderBackground.DEFAULT.name)
+		}
+		findPreference<ListPreference>(AppSettings.KEY_READER_ANIMATION)?.run {
+			entryValues = ReaderAnimation.entries.names()
+			setDefaultValueCompat(ReaderAnimation.DEFAULT.name)
+		}
 		findPreference<MultiSelectListPreference>(AppSettings.KEY_READER_SWITCHERS)?.run {
 			summaryProvider = MultiSummaryProvider(R.string.gestures_only)
 		}
 		findPreference<ListPreference>(AppSettings.KEY_ZOOM_MODE)?.run {
-			entryValues = arrayOf(
-				ZoomMode.FIT_CENTER,
-				ZoomMode.FIT_HEIGHT,
-				ZoomMode.FIT_WIDTH,
-				ZoomMode.KEEP_START,
-			).names()
+			entryValues = ZoomMode.entries.names()
 			setDefaultValueCompat(ZoomMode.FIT_CENTER.name)
 		}
 		updateReaderModeDependency()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsFragment.kt
index 63c2a1d75..f095ec6c7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsFragment.kt
@@ -1,16 +1,21 @@
 package org.koitharu.kotatsu.settings
 
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.StringRes
+import androidx.fragment.app.viewModels
 import androidx.preference.Preference
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
+import org.koitharu.kotatsu.core.util.ext.observe
 
-class RootSettingsFragment : BasePreferenceFragment(0), SharedPreferences.OnSharedPreferenceChangeListener {
+@AndroidEntryPoint
+class RootSettingsFragment : BasePreferenceFragment(0) {
+
+	private val viewModel: RootSettingsViewModel by viewModels()
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_root)
@@ -22,23 +27,18 @@ class RootSettingsFragment : BasePreferenceFragment(0), SharedPreferences.OnShar
 		bindPreferenceSummary("tracker", R.string.track_sources, R.string.notifications_settings)
 		bindPreferenceSummary("services", R.string.suggestions, R.string.sync, R.string.tracking)
 		findPreference<Preference>("about")?.summary = getString(R.string.app_version, BuildConfig.VERSION_NAME)
-		bindRemoteSourcesSummary()
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		settings.subscribe(this)
-	}
-
-	override fun onDestroyView() {
-		settings.unsubscribe(this)
-		super.onDestroyView()
-	}
-
-	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-		when (key) {
-			AppSettings.KEY_SOURCES_HIDDEN -> {
-				bindRemoteSourcesSummary()
+		findPreference<Preference>(AppSettings.KEY_REMOTE_SOURCES)?.let { pref ->
+			val total = viewModel.totalSourcesCount
+			viewModel.enabledSourcesCount.observe(viewLifecycleOwner) {
+				pref.summary = if (it >= 0) {
+					getString(R.string.enabled_d_of_d, it, total)
+				} else {
+					resources.getQuantityString(R.plurals.items, total, total)
+				}
 			}
 		}
 	}
@@ -46,11 +46,4 @@ class RootSettingsFragment : BasePreferenceFragment(0), SharedPreferences.OnShar
 	private fun bindPreferenceSummary(key: String, @StringRes vararg items: Int) {
 		findPreference<Preference>(key)?.summary = items.joinToString { getString(it) }
 	}
-
-	private fun bindRemoteSourcesSummary() {
-		findPreference<Preference>(AppSettings.KEY_REMOTE_SOURCES)?.run {
-			val total = settings.remoteMangaSources.size
-			summary = getString(R.string.enabled_d_of_d, total - settings.hiddenSources.size, total)
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsViewModel.kt
new file mode 100644
index 000000000..9ede5f2f8
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/RootSettingsViewModel.kt
@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.settings
+
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import javax.inject.Inject
+
+@HiltViewModel
+class RootSettingsViewModel @Inject constructor(
+	sourcesRepository: MangaSourcesRepository,
+) : BaseViewModel() {
+
+	val totalSourcesCount = sourcesRepository.allMangaSources.size
+
+	val enabledSourcesCount = sourcesRepository.observeEnabledSources()
+		.map { it.size }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, -1)
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt
index 7af612d70..c73d73c9e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt
@@ -30,8 +30,9 @@ import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.about.AboutSettingsFragment
 import org.koitharu.kotatsu.settings.sources.SourceSettingsFragment
-import org.koitharu.kotatsu.settings.sources.SourcesListFragment
+import org.koitharu.kotatsu.settings.sources.SourcesManageFragment
 import org.koitharu.kotatsu.settings.tracker.TrackerSettingsFragment
+import org.koitharu.kotatsu.settings.userdata.UserDataSettingsFragment
 
 @AndroidEntryPoint
 class SettingsActivity :
@@ -154,7 +155,7 @@ class SettingsActivity :
 				intent.getSerializableExtraCompat(EXTRA_SOURCE) as? MangaSource ?: MangaSource.LOCAL,
 			)
 
-			ACTION_MANAGE_SOURCES -> SourcesListFragment()
+			ACTION_MANAGE_SOURCES -> SourcesManageFragment()
 			Intent.ACTION_VIEW -> {
 				when (intent.data?.host) {
 					HOST_ABOUT -> AboutSettingsFragment()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SuggestionsSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SuggestionsSettingsFragment.kt
index f7be5bdcd..ed6f8ed14 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SuggestionsSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SuggestionsSettingsFragment.kt
@@ -25,6 +25,9 @@ class SuggestionsSettingsFragment :
 	@Inject
 	lateinit var tagsCompletionProvider: TagsAutoCompleteProvider
 
+	@Inject
+	lateinit var suggestionsScheduler: SuggestionsWorker.Scheduler
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		settings.subscribe(this)
@@ -53,7 +56,7 @@ class SuggestionsSettingsFragment :
 	private fun onSuggestionsEnabled() {
 		lifecycleScope.launch {
 			if (repository.isEmpty()) {
-				SuggestionsWorker.startNow(context ?: return@launch)
+				suggestionsScheduler.startNow()
 			}
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
index 27c9bbcb0..3822f0da3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
@@ -13,7 +13,12 @@ import org.koitharu.kotatsu.core.backup.BackupRepository
 import org.koitharu.kotatsu.core.backup.BackupZipInput
 import org.koitharu.kotatsu.core.backup.BackupZipOutput
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import java.io.*
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import java.io.File
+import java.io.FileDescriptor
+import java.io.FileInputStream
+import java.io.InputStream
+import java.io.OutputStream
 
 class AppBackupAgent : BackupAgent() {
 
@@ -31,7 +36,8 @@ class AppBackupAgent : BackupAgent() {
 
 	override fun onFullBackup(data: FullBackupDataOutput) {
 		super.onFullBackup(data)
-		val file = createBackupFile(this, BackupRepository(MangaDatabase(applicationContext)))
+		val file =
+			createBackupFile(this, BackupRepository(MangaDatabase(applicationContext), AppSettings(applicationContext)))
 		try {
 			fullBackupFile(file, data)
 		} finally {
@@ -48,7 +54,7 @@ class AppBackupAgent : BackupAgent() {
 		mtime: Long
 	) {
 		if (destination?.name?.endsWith(".bk.zip") == true) {
-			restoreBackupFile(data.fileDescriptor, size, BackupRepository(MangaDatabase(applicationContext)))
+			restoreBackupFile(data.fileDescriptor, size, BackupRepository(MangaDatabase(applicationContext), AppSettings(applicationContext)))
 			destination.delete()
 		} else {
 			super.onRestoreFile(data, size, destination, type, mode, mtime)
@@ -62,6 +68,8 @@ class AppBackupAgent : BackupAgent() {
 			backup.put(repository.dumpHistory())
 			backup.put(repository.dumpCategories())
 			backup.put(repository.dumpFavourites())
+			backup.put(repository.dumpBookmarks())
+			backup.put(repository.dumpSettings())
 			backup.finish()
 			backup.file
 		}
@@ -78,9 +86,11 @@ class AppBackupAgent : BackupAgent() {
 		val backup = BackupZipInput(tempFile)
 		try {
 			runBlocking {
-				repository.restoreHistory(backup.getEntry(BackupEntry.HISTORY))
-				repository.restoreCategories(backup.getEntry(BackupEntry.CATEGORIES))
-				repository.restoreFavourites(backup.getEntry(BackupEntry.FAVOURITES))
+				backup.getEntry(BackupEntry.HISTORY)?.let { repository.restoreHistory(it) }
+				backup.getEntry(BackupEntry.CATEGORIES)?.let { repository.restoreCategories(it) }
+				backup.getEntry(BackupEntry.FAVOURITES)?.let { repository.restoreFavourites(it) }
+				backup.getEntry(BackupEntry.BOOKMARKS)?.let { repository.restoreBookmarks(it) }
+				backup.getEntry(BackupEntry.SETTINGS)?.let { repository.restoreSettings(it) }
 			}
 		} finally {
 			backup.close()
@@ -102,4 +112,4 @@ class AppBackupAgent : BackupAgent() {
 			bytes = read(buffer, 0, buffer.size.coerceAtMost(bytesLeft))
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt
index 8c60b385f..2a0db9416 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt
@@ -29,13 +29,18 @@ class BackupViewModel @Inject constructor(
 				progress.value = 0f
 				backup.put(repository.dumpHistory())
 
-				progress.value = 0.3f
+				progress.value = 0.2f
 				backup.put(repository.dumpCategories())
 
-				progress.value = 0.6f
+				progress.value = 0.4f
 				backup.put(repository.dumpFavourites())
 
-				progress.value = 0.9f
+				progress.value = 0.6f
+				backup.put(repository.dumpBookmarks())
+
+				progress.value = 0.8f
+				backup.put(repository.dumpSettings())
+
 				backup.finish()
 				progress.value = 1f
 				backup.close()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreDialogFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreDialogFragment.kt
index c697a63fa..903b1ad30 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreDialogFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreDialogFragment.kt
@@ -67,8 +67,15 @@ class RestoreDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 	private fun onRestoreDone(result: CompositeResult) {
 		val builder = MaterialAlertDialogBuilder(context ?: return)
 		when {
-			result.isAllSuccess -> builder.setTitle(R.string.data_restored)
-				.setMessage(R.string.data_restored_success)
+			result.isEmpty -> {
+				builder.setTitle(R.string.data_not_restored)
+					.setMessage(R.string.data_not_restored_text)
+			}
+
+			result.isAllSuccess -> {
+				builder.setTitle(R.string.data_restored)
+					.setMessage(R.string.data_restored_success)
+			}
 
 			result.isAllFailed -> builder.setTitle(R.string.error)
 				.setMessage(
@@ -85,6 +92,7 @@ class RestoreDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 		dismiss()
 	}
 
+
 	companion object {
 
 		const val ARG_FILE = "file"
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt
index 01b55c951..fa0b1279b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt
@@ -48,13 +48,29 @@ class RestoreViewModel @Inject constructor(
 				val result = CompositeResult()
 
 				progress.value = 0f
-				result += repository.restoreHistory(backup.getEntry(BackupEntry.HISTORY))
+				backup.getEntry(BackupEntry.HISTORY)?.let {
+					result += repository.restoreHistory(it)
+				}
+
+				progress.value = 0.2f
+				backup.getEntry(BackupEntry.CATEGORIES)?.let {
+					result += repository.restoreCategories(it)
+				}
 
-				progress.value = 0.3f
-				result += repository.restoreCategories(backup.getEntry(BackupEntry.CATEGORIES))
+				progress.value = 0.4f
+				backup.getEntry(BackupEntry.FAVOURITES)?.let {
+					result += repository.restoreFavourites(it)
+				}
 
 				progress.value = 0.6f
-				result += repository.restoreFavourites(backup.getEntry(BackupEntry.FAVOURITES))
+				backup.getEntry(BackupEntry.BOOKMARKS)?.let {
+					result += repository.restoreBookmarks(it)
+				}
+
+				progress.value = 0.8f
+				backup.getEntry(BackupEntry.SETTINGS)?.let {
+					result += repository.restoreSettings(it)
+				}
 
 				progress.value = 1f
 				onRestoreDone.call(result)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt
index b35024a20..c364ff800 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt
@@ -9,7 +9,6 @@ import androidx.fragment.app.viewModels
 import coil.ImageLoader
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -39,8 +38,7 @@ class NewSourcesDialogFragment :
 		binding.recyclerView.adapter = adapter
 		binding.textViewTitle.setText(R.string.new_sources_text)
 
-		viewModel.sources.filterNotNull()
-			.observe(viewLifecycleOwner) { adapter.items = it }
+		viewModel.content.observe(viewLifecycleOwner) { adapter.items = it }
 	}
 
 	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
@@ -51,7 +49,6 @@ class NewSourcesDialogFragment :
 	}
 
 	override fun onClick(dialog: DialogInterface, which: Int) {
-		viewModel.apply()
 		dialog.dismiss()
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt
index bec1e8f3d..f9ca6be3c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt
@@ -1,74 +1,53 @@
 package org.koitharu.kotatsu.settings.newsources
 
-import androidx.annotation.WorkerThread
-import androidx.core.os.LocaleListCompat
+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.ensureActive
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.model.getLocaleTitle
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.util.ext.mapToSet
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 import javax.inject.Inject
 
 @HiltViewModel
 class NewSourcesViewModel @Inject constructor(
+	private val repository: MangaSourcesRepository,
 	private val settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val initialList = settings.newSources
-	val sources = MutableStateFlow<List<SourceConfigItem>?>(null)
-	private var listUpdateJob: Job? = null
-
-	init {
-		listUpdateJob = launchJob(Dispatchers.Default) {
-			sources.value = buildList()
-		}
+	private val newSources = SuspendLazy {
+		repository.assimilateNewSources()
 	}
-
-	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
-		val prevJob = listUpdateJob
-		listUpdateJob = launchJob(Dispatchers.Default) {
-			if (isEnabled) {
-				settings.hiddenSources -= item.source.name
-			} else {
-				settings.hiddenSources += item.source.name
+	val content: StateFlow<List<SourceConfigItem>> = repository.observeAll()
+		.map { sources ->
+			val new = newSources.get()
+			val skipNsfw = settings.isNsfwContentDisabled
+			sources.mapNotNull { (source, enabled) ->
+				if (source in new) {
+					SourceConfigItem.SourceItem(
+						source = source,
+						isEnabled = enabled,
+						summary = source.getLocaleTitle(),
+						isDraggable = false,
+						isAvailable = !skipNsfw || source.contentType != ContentType.HENTAI,
+					)
+				} else {
+					null
+				}
 			}
-			prevJob?.cancelAndJoin()
-			val list = buildList()
-			ensureActive()
-			sources.value = list
-		}
-	}
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, emptyList())
 
-	fun apply() {
-		settings.markKnownSources(initialList)
-	}
-
-	@WorkerThread
-	private fun buildList(): List<SourceConfigItem.SourceItem> {
-		val locales = LocaleListCompat.getDefault().mapToSet { it.language }
-		val pendingHidden = HashSet<String>()
-		return initialList.map {
-			val locale = it.locale
-			val isEnabledByLocale = locale == null || locale in locales
-			if (!isEnabledByLocale) {
-				pendingHidden += it.name
-			}
-			SourceConfigItem.SourceItem(
-				source = it,
-				summary = it.getLocaleTitle(),
-				isEnabled = isEnabledByLocale,
-				isDraggable = false,
-			)
-		}.also {
-			if (pendingHidden.isNotEmpty()) {
-				settings.hiddenSources += pendingHidden
-			}
+	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
+		launchJob(Dispatchers.Default) {
+			repository.setSourceEnabled(item.source, isEnabled)
 		}
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt
index 17b7aaf0d..6f9039bac 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt
@@ -2,8 +2,7 @@ package org.koitharu.kotatsu.settings.newsources
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigDiffCallback
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
 import org.koitharu.kotatsu.settings.sources.adapter.sourceConfigItemCheckableDelegate
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
@@ -12,7 +11,6 @@ class SourcesSelectAdapter(
 	listener: SourceConfigListener,
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) : AsyncListDifferDelegationAdapter<SourceConfigItem>(
-	SourceConfigDiffCallback(),
+) : BaseListAdapter<SourceConfigItem>(
 	sourceConfigItemCheckableDelegate(listener, coil, lifecycleOwner),
 )
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
index 14ac39e54..931025253 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
@@ -4,6 +4,7 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -45,9 +46,7 @@ class OnboardDialogFragment :
 		if (isWelcome) {
 			builder.setTitle(R.string.welcome)
 		} else {
-			builder
-				.setTitle(R.string.remote_sources)
-				.setNegativeButton(android.R.string.cancel, this)
+			builder.setTitle(R.string.remote_sources)
 		}
 		return builder
 	}
@@ -56,19 +55,21 @@ class OnboardDialogFragment :
 		super.onViewBindingCreated(binding, savedInstanceState)
 		val adapter = SourceLocalesAdapter(this)
 		binding.recyclerView.adapter = adapter
-		binding.textViewTitle.setText(R.string.onboard_text)
-		viewModel.list.observe(viewLifecycleOwner) {
-			adapter.items = it.orEmpty()
+		if (isWelcome) {
+			binding.textViewTitle.setText(R.string.onboard_text)
+		} else {
+			binding.textViewTitle.isVisible = false
 		}
+		viewModel.list.observe(viewLifecycleOwner, adapter)
 	}
 
 	override fun onItemCheckedChanged(item: SourceLocale, isChecked: Boolean) {
 		viewModel.setItemChecked(item.key, isChecked)
 	}
 
-	override fun onClick(dialog: DialogInterface?, which: Int) {
+	override fun onClick(dialog: DialogInterface, which: Int) {
 		when (which) {
-			DialogInterface.BUTTON_POSITIVE -> viewModel.apply()
+			DialogInterface.BUTTON_POSITIVE -> dialog.dismiss()
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
index 4707da3cc..e8f413216 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
@@ -1,15 +1,16 @@
 package org.koitharu.kotatsu.settings.onboard
 
+import androidx.annotation.WorkerThread
 import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.map
 import org.koitharu.kotatsu.core.util.ext.mapToSet
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
-import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import java.util.Locale
@@ -17,31 +18,34 @@ import javax.inject.Inject
 
 @HiltViewModel
 class OnboardViewModel @Inject constructor(
-	private val settings: AppSettings,
+	private val repository: MangaSourcesRepository,
 ) : BaseViewModel() {
 
-	private val allSources = settings.remoteMangaSources
-
+	private val allSources = repository.allMangaSources
 	private val locales = allSources.groupBy { it.locale }
-
-	private val selectedLocales = locales.keys.toMutableSet()
-
+	private val selectedLocales = HashSet<String?>()
 	val list = MutableStateFlow<List<SourceLocale>?>(null)
+	private var updateJob: Job
 
 	init {
-		if (settings.isSourcesSelected) {
-			selectedLocales.removeAll(settings.hiddenSources.mapNotNullToSet { x -> MangaSource(x).locale })
-		} else {
-			val deviceLocales = LocaleListCompat.getDefault().mapToSet { x ->
-				x.language
-			}
-			selectedLocales.retainAll(deviceLocales)
-			if (selectedLocales.isEmpty()) {
-				selectedLocales += "en"
+		updateJob = launchJob(Dispatchers.Default) {
+			if (repository.isSetupRequired()) {
+				val deviceLocales = LocaleListCompat.getDefault().mapToSet { x ->
+					x.language
+				}
+				selectedLocales.addAll(deviceLocales)
+				if (selectedLocales.isEmpty()) {
+					selectedLocales += "en"
+				}
+				selectedLocales += null
+			} else {
+				selectedLocales.addAll(
+					repository.getEnabledSources().mapNotNullToSet { x -> x.locale },
+				)
 			}
-			selectedLocales += null
+			rebuildList()
+			repository.assimilateNewSources()
 		}
-		rebuildList()
 	}
 
 	fun setItemChecked(key: String?, isChecked: Boolean) {
@@ -51,17 +55,17 @@ class OnboardViewModel @Inject constructor(
 			selectedLocales.remove(key)
 		}
 		if (isModified) {
-			rebuildList()
+			val prevJob = updateJob
+			updateJob = launchJob(Dispatchers.Default) {
+				prevJob.join()
+				val sources = allSources.filter { x -> x.locale == key }
+				repository.setSourcesEnabled(sources, isChecked)
+				rebuildList()
+			}
 		}
 	}
 
-	fun apply() {
-		settings.hiddenSources = allSources.filterNot { x ->
-			x.locale in selectedLocales
-		}.mapToSet { x -> x.name }
-		settings.markKnownSources(settings.newSources)
-	}
-
+	@WorkerThread
 	private fun rebuildList() {
 		list.value = locales.map { (key, srcs) ->
 			val locale = if (key != null) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt
index 0bfac9dda..a90329b74 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt
@@ -1,27 +1,13 @@
 package org.koitharu.kotatsu.settings.onboard.adapter
 
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 
 class SourceLocalesAdapter(
 	listener: SourceLocaleListener,
-) : AsyncListDifferDelegationAdapter<SourceLocale>(DiffCallback()) {
+) : BaseListAdapter<SourceLocale>() {
 
 	init {
 		delegatesManager.addDelegate(sourceLocaleAD(listener))
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<SourceLocale>() {
-
-		override fun areItemsTheSame(
-			oldItem: SourceLocale,
-			newItem: SourceLocale,
-		): Boolean = oldItem.key == newItem.key
-
-		override fun areContentsTheSame(
-			oldItem: SourceLocale,
-			newItem: SourceLocale,
-		): Boolean = oldItem == newItem
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt
index e4f8aefa8..ff8ea75c3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt
@@ -1,5 +1,7 @@
 package org.koitharu.kotatsu.settings.onboard.model
 
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import java.util.Locale
 
 data class SourceLocale(
@@ -7,7 +9,19 @@ data class SourceLocale(
 	val title: String?,
 	val summary: String?,
 	val isChecked: Boolean,
-) : Comparable<SourceLocale> {
+) : ListModel, Comparable<SourceLocale> {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is SourceLocale && key == other.key
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is SourceLocale && previousState.isChecked != isChecked) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
 
 	override fun compareTo(other: SourceLocale): Int {
 		return when {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageFragment.kt
similarity index 90%
rename from app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesListFragment.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageFragment.kt
index 413bea9a2..7ca673d46 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesListFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageFragment.kt
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
@@ -26,13 +27,14 @@ import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentSettingsSourcesBinding
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
 import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigAdapter
 import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class SourcesListFragment :
+class SourcesManageFragment :
 	BaseFragment<FragmentSettingsSourcesBinding>(),
 	SourceConfigListener,
 	RecyclerViewOwner {
@@ -40,8 +42,11 @@ class SourcesListFragment :
 	@Inject
 	lateinit var coil: ImageLoader
 
+	@Inject
+	lateinit var settings: AppSettings
+
 	private var reorderHelper: ItemTouchHelper? = null
-	private val viewModel by viewModels<SourcesListViewModel>()
+	private val viewModel by viewModels<SourcesManageViewModel>()
 
 	override val recyclerView: RecyclerView
 		get() = requireViewBinding().recyclerView
@@ -61,9 +66,7 @@ class SourcesListFragment :
 				it.attachToRecyclerView(this)
 			}
 		}
-		viewModel.items.observe(viewLifecycleOwner) {
-			sourcesAdapter.items = it
-		}
+		viewModel.content.observe(viewLifecycleOwner, sourcesAdapter)
 		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 		addMenuProvider(SourcesMenuProvider())
 	}
@@ -124,9 +127,24 @@ class SourcesListFragment :
 				true
 			}
 
+			R.id.action_locales -> {
+				OnboardDialogFragment.show(childFragmentManager)
+				true
+			}
+
+			R.id.action_no_nsfw -> {
+				settings.isNsfwContentDisabled = !menuItem.isChecked
+				true
+			}
+
 			else -> false
 		}
 
+		override fun onPrepareMenu(menu: Menu) {
+			super.onPrepareMenu(menu)
+			menu.findItem(R.id.action_no_nsfw).isChecked = settings.isNsfwContentDisabled
+		}
+
 		override fun onMenuItemActionExpand(item: MenuItem): Boolean {
 			(activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
 			return true
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageViewModel.kt
similarity index 55%
rename from app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesListViewModel.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageViewModel.kt
index 5ba8cd767..c1d24059c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesListViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageViewModel.kt
@@ -1,25 +1,34 @@
 package org.koitharu.kotatsu.settings.sources
 
+import androidx.annotation.CheckResult
 import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.getLocaleTitle
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
+import org.koitharu.kotatsu.core.util.AlphanumComparator
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.map
+import org.koitharu.kotatsu.core.util.ext.toEnumSet
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.parsers.util.move
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 import java.util.Locale
@@ -32,128 +41,124 @@ private const val KEY_ENABLED = "!"
 private const val TIP_REORDER = "src_reorder"
 
 @HiltViewModel
-class SourcesListViewModel @Inject constructor(
+class SourcesManageViewModel @Inject constructor(
 	private val settings: AppSettings,
+	private val repository: MangaSourcesRepository,
 ) : BaseViewModel() {
 
-	val items = MutableStateFlow<List<SourceConfigItem>>(emptyList())
-	val onActionDone = MutableEventFlow<ReversibleAction>()
+	private val expandedGroups = MutableStateFlow(emptySet<String?>())
+	private var searchQuery = MutableStateFlow<String?>(null)
 	private val mutex = Mutex()
 
-	private val expandedGroups = HashSet<String?>()
-	private var searchQuery: String? = null
+	val content = combine(
+		repository.observeEnabledSources(),
+		expandedGroups,
+		searchQuery,
+		observeTip(),
+		settings.observeAsFlow(AppSettings.KEY_DISABLE_NSFW) { isNsfwContentDisabled },
+	) { sources, groups, query, tip, noNsfw ->
+		buildList(sources, groups, query, tip, noNsfw)
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
-	init {
-		launchAtomicJob(Dispatchers.Default) {
-			buildList()
-		}
-	}
+	val onActionDone = MutableEventFlow<ReversibleAction>()
 
 	fun reorderSources(oldPos: Int, newPos: Int): Boolean {
-		val snapshot = items.value.toMutableList()
-		if ((snapshot[oldPos] as? SourceConfigItem.SourceItem)?.isEnabled != true) return false
-		if ((snapshot[newPos] as? SourceConfigItem.SourceItem)?.isEnabled != true) return false
+		val snapshot = content.value
+		val item = (snapshot[oldPos] as? SourceConfigItem.SourceItem) ?: return false
+		if ((snapshot[newPos] as? SourceConfigItem.SourceItem)?.isDraggable != true) return false
 		launchAtomicJob(Dispatchers.Default) {
-			snapshot.move(oldPos, newPos)
-			settings.sourcesOrder = snapshot.mapNotNull {
-				(it as? SourceConfigItem.SourceItem)?.source?.name
+			var targetPosition = 0
+			for ((i, x) in snapshot.withIndex()) {
+				if (i == newPos) {
+					break
+				}
+				if (x is SourceConfigItem.SourceItem) {
+					targetPosition++
+				}
 			}
-			buildList()
+			repository.setPosition(item.source, targetPosition)
 		}
 		return true
 	}
 
 	fun canReorder(oldPos: Int, newPos: Int): Boolean {
-		val snapshot = items.value.toMutableList()
+		val snapshot = content.value
 		if ((snapshot[oldPos] as? SourceConfigItem.SourceItem)?.isEnabled != true) return false
 		return (snapshot[newPos] as? SourceConfigItem.SourceItem)?.isEnabled == true
 	}
 
 	fun setEnabled(source: MangaSource, isEnabled: Boolean) {
 		launchAtomicJob(Dispatchers.Default) {
-			settings.hiddenSources = if (isEnabled) {
-				settings.hiddenSources - source.name
-			} else {
-				settings.hiddenSources + source.name
-			}
-			if (isEnabled) {
-				settings.markKnownSources(setOf(source))
-			} else {
-				val rollback = ReversibleHandle {
-					setEnabled(source, true)
-				}
+			val rollback = repository.setSourceEnabled(source, isEnabled)
+			if (!isEnabled) {
 				onActionDone.call(ReversibleAction(R.string.source_disabled, rollback))
 			}
-			buildList()
 		}
 	}
 
 	fun disableAll() {
 		launchAtomicJob(Dispatchers.Default) {
-			settings.hiddenSources = settings.getMangaSources(includeHidden = true).mapToSet {
-				it.name
-			}
-			buildList()
+			repository.disableAllSources()
 		}
 	}
 
 	fun expandOrCollapse(headerId: String?) {
-		launchAtomicJob {
-			if (headerId in expandedGroups) {
-				expandedGroups.remove(headerId)
-			} else {
-				expandedGroups.add(headerId)
-			}
-			buildList()
+		val expanded = expandedGroups.value
+		expandedGroups.value = if (headerId in expanded) {
+			expanded - headerId
+		} else {
+			expanded + headerId
 		}
 	}
 
 	fun performSearch(query: String?) {
-		launchAtomicJob {
-			searchQuery = query?.trim()
-			buildList()
-		}
+		searchQuery.value = query?.trim()
 	}
 
 	fun onTipClosed(item: SourceConfigItem.Tip) {
 		launchAtomicJob(Dispatchers.Default) {
 			settings.closeTip(item.key)
-			buildList()
 		}
 	}
 
-	private suspend fun buildList() = runInterruptible(Dispatchers.Default) {
-		val sources = settings.getMangaSources(includeHidden = true)
-		val hiddenSources = settings.hiddenSources
-		val query = searchQuery
+	@CheckResult
+	private fun buildList(
+		enabledSources: List<MangaSource>,
+		expanded: Set<String?>,
+		query: String?,
+		withTip: Boolean,
+		isNsfwDisabled: Boolean,
+	): List<SourceConfigItem> {
+		val allSources = repository.allMangaSources
+		val enabledSet = enabledSources.toEnumSet()
 		if (!query.isNullOrEmpty()) {
-			items.value = sources.mapNotNull {
+			return allSources.mapNotNull {
 				if (!it.title.contains(query, ignoreCase = true)) {
 					return@mapNotNull null
 				}
 				SourceConfigItem.SourceItem(
 					source = it,
 					summary = it.getLocaleTitle(),
-					isEnabled = it.name !in hiddenSources,
+					isEnabled = it in enabledSet,
 					isDraggable = false,
+					isAvailable = !isNsfwDisabled || !it.isNsfw(),
 				)
 			}.ifEmpty {
 				listOf(SourceConfigItem.EmptySearchResult)
 			}
-			return@runInterruptible
 		}
-		val map = sources.groupByTo(TreeMap(LocaleKeyComparator())) {
-			if (it.name !in hiddenSources) {
+		val map = allSources.groupByTo(TreeMap(LocaleKeyComparator())) {
+			if (it in enabledSet) {
 				KEY_ENABLED
 			} else {
 				it.locale
 			}
 		}
-		val result = ArrayList<SourceConfigItem>(sources.size + map.size + 2)
-		val enabledSources = map.remove(KEY_ENABLED)
-		if (!enabledSources.isNullOrEmpty()) {
+		map.remove(KEY_ENABLED)
+		val result = ArrayList<SourceConfigItem>(allSources.size + map.size + 2)
+		if (enabledSources.isNotEmpty()) {
 			result += SourceConfigItem.Header(R.string.enabled_sources)
-			if (settings.isTipEnabled(TIP_REORDER)) {
+			if (withTip) {
 				result += SourceConfigItem.Tip(TIP_REORDER, R.drawable.ic_tap_reorder, R.string.sources_reorder_tip)
 			}
 			enabledSources.mapTo(result) {
@@ -162,14 +167,16 @@ class SourcesListViewModel @Inject constructor(
 					summary = it.getLocaleTitle(),
 					isEnabled = true,
 					isDraggable = true,
+					isAvailable = false,
 				)
 			}
 		}
-		if (enabledSources?.size != sources.size) {
+		if (enabledSources.size != allSources.size) {
 			result += SourceConfigItem.Header(R.string.available_sources)
+			val comparator = compareBy<MangaSource, String>(AlphanumComparator()) { it.name }
 			for ((key, list) in map) {
-				list.sortBy { it.ordinal }
-				val isExpanded = key in expandedGroups
+				list.sortWith(comparator)
+				val isExpanded = key in expanded
 				result += SourceConfigItem.LocaleGroup(
 					localeId = key,
 					title = getLocaleTitle(key),
@@ -182,12 +189,13 @@ class SourcesListViewModel @Inject constructor(
 							summary = null,
 							isEnabled = false,
 							isDraggable = false,
+							isAvailable = !isNsfwDisabled || !it.isNsfw(),
 						)
 					}
 				}
 			}
 		}
-		items.value = result
+		return result
 	}
 
 	private fun getLocaleTitle(localeKey: String?): String? {
@@ -195,15 +203,21 @@ class SourcesListViewModel @Inject constructor(
 		return locale.getDisplayLanguage(locale).toTitleCase(locale)
 	}
 
-	private inline fun launchAtomicJob(
+	private fun launchAtomicJob(
 		context: CoroutineContext = EmptyCoroutineContext,
-		crossinline block: suspend CoroutineScope.() -> Unit
-	) = launchJob(context) {
+		block: suspend CoroutineScope.() -> Unit
+	) = launchJob(start = CoroutineStart.ATOMIC) {
 		mutex.withLock {
-			block()
+			withContext(context, block)
 		}
 	}
 
+	private fun observeTip() = settings.observeAsFlow(AppSettings.KEY_TIPS_CLOSED) {
+		isTipEnabled(TIP_REORDER)
+	}
+
+	private fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
+
 	private class LocaleKeyComparator : Comparator<String?> {
 
 		private val deviceLocales = LocaleListCompat.getAdjustedDefault()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapter.kt
index 2c6be9c77..ef10593e4 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapter.kt
@@ -2,15 +2,14 @@ package org.koitharu.kotatsu.settings.sources.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
 
 class SourceConfigAdapter(
 	listener: SourceConfigListener,
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) : AsyncListDifferDelegationAdapter<SourceConfigItem>(
-	SourceConfigDiffCallback(),
+) : BaseListAdapter<SourceConfigItem>(
 	sourceConfigHeaderDelegate(),
 	sourceConfigGroupDelegate(listener),
 	sourceConfigItemDelegate2(listener, coil, lifecycleOwner),
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt
index bef802851..e8973929d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt
@@ -1,6 +1,14 @@
 package org.koitharu.kotatsu.settings.sources.adapter
 
+import android.content.Context
+import android.graphics.Color
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
+import android.text.style.RelativeSizeSpan
+import android.text.style.SuperscriptSpan
 import android.view.View
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
@@ -9,11 +17,12 @@ import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
-import org.koitharu.kotatsu.core.ui.image.FaviconFallbackDrawable
+import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.list.OnTipCloseListener
 import org.koitharu.kotatsu.core.util.ext.crossfade
 import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
@@ -63,10 +72,19 @@ fun sourceConfigItemCheckableDelegate(
 	}
 
 	bind {
-		binding.textViewTitle.text = item.source.title
+		binding.textViewTitle.text = if (item.isNsfw) {
+			buildSpannedString {
+				append(item.source.title)
+				append(' ')
+				appendNsfwLabel(context)
+			}
+		} else {
+			item.source.title
+		}
 		binding.switchToggle.isChecked = item.isEnabled
+		binding.switchToggle.isEnabled = item.isAvailable
 		binding.textViewDescription.textAndVisible = item.summary
-		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
+		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			crossfade(context)
 			error(fallbackIcon)
@@ -102,12 +120,20 @@ fun sourceConfigItemDelegate2(
 	binding.imageViewConfig.setOnClickListener(eventListener)
 
 	bind {
-		binding.textViewTitle.text = item.source.title
-		binding.imageViewAdd.isGone = item.isEnabled
+		binding.textViewTitle.text = if (item.isNsfw) {
+			buildSpannedString {
+				append(item.source.title)
+				append(' ')
+				appendNsfwLabel(context)
+			}
+		} else {
+			item.source.title
+		}
+		binding.imageViewAdd.isGone = item.isEnabled || !item.isAvailable
 		binding.imageViewRemove.isVisible = item.isEnabled
 		binding.imageViewConfig.isVisible = item.isEnabled
 		binding.textViewDescription.textAndVisible = item.summary
-		val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
+		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			crossfade(context)
 			error(fallbackIcon)
@@ -142,3 +168,11 @@ fun sourceConfigTipDelegate(
 fun sourceConfigEmptySearchDelegate() = adapterDelegate<SourceConfigItem.EmptySearchResult, SourceConfigItem>(
 	R.layout.item_sources_empty,
 ) { }
+
+fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
+	ForegroundColorSpan(context.getThemeColor(com.google.android.material.R.attr.colorError, Color.RED)),
+	RelativeSizeSpan(0.74f),
+	SuperscriptSpan(),
+) {
+	append(context.getString(R.string.nsfw))
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigDiffCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigDiffCallback.kt
deleted file mode 100644
index 9f57bca90..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigDiffCallback.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.koitharu.kotatsu.settings.sources.adapter
-
-import androidx.recyclerview.widget.DiffUtil
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem.EmptySearchResult
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem.Header
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem.LocaleGroup
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem.SourceItem
-
-class SourceConfigDiffCallback : DiffUtil.ItemCallback<SourceConfigItem>() {
-
-	override fun areItemsTheSame(oldItem: SourceConfigItem, newItem: SourceConfigItem): Boolean {
-		return when {
-			oldItem.javaClass != newItem.javaClass -> false
-			oldItem is LocaleGroup && newItem is LocaleGroup -> {
-				oldItem.localeId == newItem.localeId
-			}
-
-			oldItem is SourceItem && newItem is SourceItem -> {
-				oldItem.source == newItem.source
-			}
-
-			oldItem is Header && newItem is Header -> {
-				oldItem.titleResId == newItem.titleResId
-			}
-
-			oldItem == EmptySearchResult && newItem == EmptySearchResult -> {
-				true
-			}
-
-			oldItem is SourceConfigItem.Tip && newItem is SourceConfigItem.Tip -> {
-				oldItem.key == newItem.key
-			}
-
-			else -> false
-		}
-	}
-
-	override fun areContentsTheSame(oldItem: SourceConfigItem, newItem: SourceConfigItem): Boolean {
-		return oldItem == newItem
-	}
-
-	override fun getChangePayload(oldItem: SourceConfigItem, newItem: SourceConfigItem) = Unit
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
index 150e71faa..4239c03fb 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
@@ -18,7 +18,6 @@ import org.koitharu.kotatsu.browser.BrowserCallback
 import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.browser.ProgressChromeClient
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
-import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt
index f178bffd9..d1feb36db 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/model/SourceConfigItem.kt
@@ -2,107 +2,84 @@ package org.koitharu.kotatsu.settings.sources.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
-sealed interface SourceConfigItem {
+sealed interface SourceConfigItem : ListModel {
 
-	class Header(
+	data class Header(
 		@StringRes val titleResId: Int,
 	) : SourceConfigItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-			other as Header
-			return titleResId == other.titleResId
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Header && other.titleResId == titleResId
 		}
-
-		override fun hashCode(): Int = titleResId
 	}
 
-	class LocaleGroup(
+	data class LocaleGroup(
 		val localeId: String?,
 		val title: String?,
 		val isExpanded: Boolean,
 	) : SourceConfigItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as LocaleGroup
-
-			if (localeId != other.localeId) return false
-			if (title != other.title) return false
-			if (isExpanded != other.isExpanded) return false
-
-			return true
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is LocaleGroup && other.localeId == localeId
 		}
 
-		override fun hashCode(): Int {
-			var result = localeId?.hashCode() ?: 0
-			result = 31 * result + (title?.hashCode() ?: 0)
-			result = 31 * result + isExpanded.hashCode()
-			return result
+		override fun getChangePayload(previousState: ListModel): Any? {
+			return if (previousState is LocaleGroup && previousState.isExpanded != isExpanded) {
+				ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+			} else {
+				super.getChangePayload(previousState)
+			}
 		}
 	}
 
-	class SourceItem(
+	data class SourceItem(
 		val source: MangaSource,
 		val isEnabled: Boolean,
 		val summary: String?,
 		val isDraggable: Boolean,
+		val isAvailable: Boolean,
 	) : SourceConfigItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as SourceItem
+		val isNsfw: Boolean
+			get() = source.contentType == ContentType.HENTAI
 
-			if (source != other.source) return false
-			if (summary != other.summary) return false
-			if (isEnabled != other.isEnabled) return false
-			if (isDraggable != other.isDraggable) return false
-
-			return true
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is SourceItem && other.source == source
 		}
 
-		override fun hashCode(): Int {
-			var result = source.hashCode()
-			result = 31 * result + summary.hashCode()
-			result = 31 * result + isEnabled.hashCode()
-			result = 31 * result + isDraggable.hashCode()
-			return result
+		override fun getChangePayload(previousState: ListModel): Any? {
+			return if (previousState is SourceItem && previousState.isEnabled != isEnabled) {
+				ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+			} else {
+				super.getChangePayload(previousState)
+			}
 		}
 	}
 
-	class Tip(
+	data class Tip(
 		val key: String,
 		@DrawableRes val iconResId: Int,
 		@StringRes val textResId: Int,
 	) : SourceConfigItem {
 
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Tip
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is Tip && other.key == key
+		}
+	}
 
-			if (key != other.key) return false
-			if (iconResId != other.iconResId) return false
-			if (textResId != other.textResId) return false
+	object EmptySearchResult : SourceConfigItem {
 
-			return true
+		override fun equals(other: Any?): Boolean {
+			return other === EmptySearchResult
 		}
 
-		override fun hashCode(): Int {
-			var result = key.hashCode()
-			result = 31 * result + iconResId
-			result = 31 * result + textResId
-			return result
+		override fun areItemsTheSame(other: ListModel): Boolean {
+			return other is EmptySearchResult
 		}
 	}
-
-	object EmptySearchResult : SourceConfigItem
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/DirectoryModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/DirectoryModel.kt
index b6226aa03..401ae7452 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/DirectoryModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/DirectoryModel.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.settings.storage
 
 import androidx.annotation.StringRes
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import java.io.File
 
@@ -12,6 +13,18 @@ class DirectoryModel(
 	val isAvailable: Boolean,
 ) : ListModel {
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is DirectoryModel && other.file == file && other.title == title && other.titleRes == titleRes
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is DirectoryModel && previousState.isChecked != isChecked) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/MangaDirectorySelectViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/MangaDirectorySelectViewModel.kt
index 2b1a679de..7985c9bda 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/MangaDirectorySelectViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/MangaDirectorySelectViewModel.kt
@@ -4,7 +4,6 @@ import android.net.Uri
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import okio.FileNotFoundException
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/directories/MangaDirectoriesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/directories/MangaDirectoriesViewModel.kt
index 6d1b22853..bad65b98f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/directories/MangaDirectoriesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/directories/MangaDirectoriesViewModel.kt
@@ -6,7 +6,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.flow.MutableStateFlow
-import okio.FileNotFoundException
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.local.data.LocalStorageManager
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt
deleted file mode 100644
index f0ecacc4d..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.koitharu.kotatsu.settings.tools
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.CompoundButton
-import androidx.core.graphics.Insets
-import androidx.core.net.toUri
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
-import androidx.fragment.app.viewModels
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.github.AppVersion
-import org.koitharu.kotatsu.core.ui.BaseFragment
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.setChecked
-import org.koitharu.kotatsu.databinding.FragmentToolsBinding
-import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
-import org.koitharu.kotatsu.settings.SettingsActivity
-import org.koitharu.kotatsu.settings.about.AppUpdateDialog
-
-@AndroidEntryPoint
-class ToolsFragment :
-	BaseFragment<FragmentToolsBinding>(),
-	CompoundButton.OnCheckedChangeListener,
-	View.OnClickListener {
-
-	private val viewModel by viewModels<ToolsViewModel>()
-
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentToolsBinding {
-		return FragmentToolsBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: FragmentToolsBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		binding.buttonSettings.setOnClickListener(this)
-		binding.buttonDownloads.setOnClickListener(this)
-		binding.cardUpdate.buttonChangelog.setOnClickListener(this)
-		binding.cardUpdate.buttonDownload.setOnClickListener(this)
-		binding.switchIncognito.setOnCheckedChangeListener(this)
-		binding.memoryUsageView.setManageButtonOnClickListener(this)
-
-		viewModel.isIncognitoModeEnabled.observe(viewLifecycleOwner) {
-			binding.switchIncognito.setChecked(it, false)
-		}
-		viewModel.storageUsage.observe(viewLifecycleOwner) {
-			binding.memoryUsageView.bind(it)
-		}
-		viewModel.appUpdate.observe(viewLifecycleOwner, ::onAppUpdateAvailable)
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_settings -> startActivity(SettingsActivity.newIntent(v.context))
-			R.id.button_manage -> startActivity(SettingsActivity.newHistorySettingsIntent(v.context))
-			R.id.button_downloads -> startActivity(DownloadsActivity.newIntent(v.context))
-			R.id.button_download -> {
-				val url = viewModel.appUpdate.value?.apkUrl ?: return
-				val intent = Intent(Intent.ACTION_VIEW)
-				intent.data = url.toUri()
-				startActivity(Intent.createChooser(intent, getString(R.string.open_in_browser)))
-			}
-
-			R.id.button_changelog -> {
-				val version = viewModel.appUpdate.value ?: return
-				AppUpdateDialog(v.context).show(version)
-			}
-		}
-	}
-
-	override fun onCheckedChanged(button: CompoundButton?, isChecked: Boolean) {
-		viewModel.toggleIncognitoMode(isChecked)
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().root.updatePadding(
-			bottom = insets.bottom,
-		)
-	}
-
-	private fun onAppUpdateAvailable(version: AppVersion?) {
-		if (version == null) {
-			requireViewBinding().cardUpdate.root.isVisible = false
-			return
-		}
-		requireViewBinding().cardUpdate.textSecondary.text = getString(R.string.new_version_s, version.name)
-		requireViewBinding().cardUpdate.root.isVisible = true
-	}
-
-	companion object {
-
-		fun newInstance() = ToolsFragment()
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/ToolsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/ToolsViewModel.kt
deleted file mode 100644
index 9d0289bb0..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/ToolsViewModel.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.koitharu.kotatsu.settings.tools
-
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.core.github.AppUpdateRepository
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.local.data.CacheDir
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.settings.tools.model.StorageUsage
-import javax.inject.Inject
-
-@HiltViewModel
-class ToolsViewModel @Inject constructor(
-	private val storageManager: LocalStorageManager,
-	private val settings: AppSettings,
-	appUpdateRepository: AppUpdateRepository,
-) : BaseViewModel() {
-
-	val appUpdate = appUpdateRepository.observeAvailableUpdate()
-
-	val storageUsage: StateFlow<StorageUsage?> = flow {
-		emit(collectStorageUsage())
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
-
-	val isIncognitoModeEnabled = settings.observeAsStateFlow(
-		scope = viewModelScope + Dispatchers.Default,
-		key = AppSettings.KEY_INCOGNITO_MODE,
-		valueProducer = { isIncognitoModeEnabled },
-	)
-
-	fun toggleIncognitoMode(isEnabled: Boolean) {
-		settings.isIncognitoModeEnabled = isEnabled
-	}
-
-	private suspend fun collectStorageUsage(): StorageUsage {
-		val pagesCacheSize = storageManager.computeCacheSize(CacheDir.PAGES)
-		val otherCacheSize = storageManager.computeCacheSize() - pagesCacheSize
-		val storageSize = storageManager.computeStorageSize()
-		val availableSpace = storageManager.computeAvailableSize()
-		val totalBytes = pagesCacheSize + otherCacheSize + storageSize + availableSpace
-		return StorageUsage(
-			savedManga = StorageUsage.Item(
-				bytes = storageSize,
-				percent = (storageSize.toDouble() / totalBytes).toFloat(),
-			),
-			pagesCache = StorageUsage.Item(
-				bytes = pagesCacheSize,
-				percent = (pagesCacheSize.toDouble() / totalBytes).toFloat(),
-			),
-			otherCache = StorageUsage.Item(
-				bytes = otherCacheSize,
-				percent = (otherCacheSize.toDouble() / totalBytes).toFloat(),
-			),
-			available = StorageUsage.Item(
-				bytes = availableSpace,
-				percent = (availableSpace.toDouble() / totalBytes).toFloat(),
-			),
-		)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/model/StorageUsage.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/model/StorageUsage.kt
deleted file mode 100644
index 0cb0a3c7b..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/model/StorageUsage.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.settings.tools.model
-
-class StorageUsage(
-	val savedManga: Item,
-	val pagesCache: Item,
-	val otherCache: Item,
-	val available: Item,
-) {
-
-	class Item(
-		val bytes: Long,
-		val percent: Float,
-	)
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt
deleted file mode 100644
index 0328e5534..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tools/views/MemoryUsageView.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.koitharu.kotatsu.settings.tools.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.LinearLayout
-import androidx.annotation.ColorInt
-import androidx.annotation.StringRes
-import androidx.core.graphics.ColorUtils
-import androidx.core.widget.TextViewCompat
-import com.google.android.material.color.MaterialColors
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.widgets.SegmentedBarView
-import org.koitharu.kotatsu.core.util.FileSize
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import org.koitharu.kotatsu.databinding.LayoutMemoryUsageBinding
-import org.koitharu.kotatsu.settings.tools.model.StorageUsage
-
-class MemoryUsageView @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
-
-	private val binding = LayoutMemoryUsageBinding.inflate(LayoutInflater.from(context), this)
-	private val labelPattern = context.getString(R.string.memory_usage_pattern)
-
-	init {
-		orientation = VERTICAL
-		bind(null)
-	}
-
-	fun setManageButtonOnClickListener(listener: OnClickListener?) {
-		binding.buttonManage.setOnClickListener(listener)
-	}
-
-	fun bind(usage: StorageUsage?) {
-		val storageSegment = SegmentedBarView.Segment(usage?.savedManga?.percent ?: 0f, segmentColor(1))
-		val pagesSegment = SegmentedBarView.Segment(usage?.pagesCache?.percent ?: 0f, segmentColor(2))
-		val otherSegment = SegmentedBarView.Segment(usage?.otherCache?.percent ?: 0f, segmentColor(3))
-
-		with(binding) {
-			bar.animateSegments(listOf(storageSegment, pagesSegment, otherSegment).filter { it.percent > 0f })
-			labelStorage.text = formatLabel(usage?.savedManga, R.string.saved_manga)
-			labelPagesCache.text = formatLabel(usage?.pagesCache, R.string.pages_cache)
-			labelOtherCache.text = formatLabel(usage?.otherCache, R.string.other_cache)
-			labelAvailable.text = formatLabel(usage?.available, R.string.available, R.string.available)
-
-			TextViewCompat.setCompoundDrawableTintList(labelStorage, ColorStateList.valueOf(storageSegment.color))
-			TextViewCompat.setCompoundDrawableTintList(labelPagesCache, ColorStateList.valueOf(pagesSegment.color))
-			TextViewCompat.setCompoundDrawableTintList(labelOtherCache, ColorStateList.valueOf(otherSegment.color))
-		}
-	}
-
-	private fun formatLabel(
-		item: StorageUsage.Item?,
-		@StringRes labelResId: Int,
-		@StringRes emptyResId: Int = R.string.computing_,
-	): String {
-		return if (item != null) {
-			labelPattern.format(
-				FileSize.BYTES.format(context, item.bytes),
-				context.getString(labelResId),
-			)
-		} else {
-			context.getString(emptyResId)
-		}
-	}
-
-	@ColorInt
-	private fun segmentColor(i: Int): Int {
-		val hue = (93.6f * i) % 360
-		val color = ColorUtils.HSLToColor(floatArrayOf(hue, 0.4f, 0.6f))
-		val backgroundColor = context.getThemeColor(com.google.android.material.R.attr.colorSecondaryContainer)
-		return MaterialColors.harmonize(color, backgroundColor)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tracker/categories/TrackerCategoriesConfigAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tracker/categories/TrackerCategoriesConfigAdapter.kt
index af0ebbf85..8b811c710 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/tracker/categories/TrackerCategoriesConfigAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/tracker/categories/TrackerCategoriesConfigAdapter.kt
@@ -1,32 +1,11 @@
 package org.koitharu.kotatsu.settings.tracker.categories
 
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 
 class TrackerCategoriesConfigAdapter(
 	listener: OnListItemClickListener<FavouriteCategory>,
-) : AsyncListDifferDelegationAdapter<FavouriteCategory>(DiffCallback()) {
-
-	init {
-		delegatesManager.addDelegate(trackerCategoryAD(listener))
-	}
-
-	class DiffCallback : DiffUtil.ItemCallback<FavouriteCategory>() {
-
-		override fun areItemsTheSame(oldItem: FavouriteCategory, newItem: FavouriteCategory): Boolean {
-			return oldItem.id == newItem.id
-		}
-
-		override fun areContentsTheSame(oldItem: FavouriteCategory, newItem: FavouriteCategory): Boolean {
-			return oldItem.isTrackingEnabled == newItem.isTrackingEnabled && oldItem.title == newItem.title
-		}
-
-		override fun getChangePayload(oldItem: FavouriteCategory, newItem: FavouriteCategory): Any? {
-			return if (oldItem.isTrackingEnabled == newItem.isTrackingEnabled) {
-				super.getChangePayload(oldItem, newItem)
-			} else Unit
-		}
-	}
-}
+) : BaseListAdapter<FavouriteCategory>(
+	trackerCategoryAD(listener),
+)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/StorageUsage.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/StorageUsage.kt
new file mode 100644
index 000000000..5d3f2c80a
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/StorageUsage.kt
@@ -0,0 +1,51 @@
+package org.koitharu.kotatsu.settings.userdata
+
+class StorageUsage(
+	val savedManga: Item,
+	val pagesCache: Item,
+	val otherCache: Item,
+	val available: Item,
+) {
+
+	class Item(
+		val bytes: Long,
+		val percent: Float,
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Item
+
+			if (bytes != other.bytes) return false
+			return percent == other.percent
+		}
+
+		override fun hashCode(): Int {
+			var result = bytes.hashCode()
+			result = 31 * result + percent.hashCode()
+			return result
+		}
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as StorageUsage
+
+		if (savedManga != other.savedManga) return false
+		if (pagesCache != other.pagesCache) return false
+		if (otherCache != other.otherCache) return false
+		return available == other.available
+	}
+
+	override fun hashCode(): Int {
+		var result = savedManga.hashCode()
+		result = 31 * result + pagesCache.hashCode()
+		result = 31 * result + otherCache.hashCode()
+		result = 31 * result + available.hashCode()
+		return result
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/StorageUsagePreference.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/StorageUsagePreference.kt
new file mode 100644
index 000000000..20f114981
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/StorageUsagePreference.kt
@@ -0,0 +1,107 @@
+package org.koitharu.kotatsu.settings.userdata
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.StringRes
+import androidx.core.graphics.ColorUtils
+import androidx.core.widget.TextViewCompat
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
+import com.google.android.material.color.MaterialColors
+import kotlinx.coroutines.flow.FlowCollector
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.widgets.SegmentedBarView
+import org.koitharu.kotatsu.core.util.FileSize
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.databinding.PreferenceMemoryUsageBinding
+import com.google.android.material.R as materialR
+
+class StorageUsagePreference @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+) : Preference(context, attrs), FlowCollector<StorageUsage?> {
+
+	private val labelPattern = context.getString(R.string.memory_usage_pattern)
+	private var usage: StorageUsage? = null
+
+	init {
+		layoutResource = R.layout.preference_memory_usage
+		isSelectable = false
+		isPersistent = false
+	}
+
+	override fun onBindViewHolder(holder: PreferenceViewHolder) {
+		super.onBindViewHolder(holder)
+		val binding = PreferenceMemoryUsageBinding.bind(holder.itemView)
+		val storageSegment = SegmentedBarView.Segment(
+			usage?.savedManga?.percent ?: 0f,
+			segmentColor(materialR.attr.colorPrimary),
+		)
+		val pagesSegment = SegmentedBarView.Segment(
+			usage?.pagesCache?.percent ?: 0f,
+			segmentColor(materialR.attr.colorSecondary),
+		)
+		val otherSegment = SegmentedBarView.Segment(
+			usage?.otherCache?.percent ?: 0f,
+			segmentColor(materialR.attr.colorTertiary),
+		)
+
+		with(binding) {
+			bar.animateSegments(listOf(storageSegment, pagesSegment, otherSegment).filter { it.percent > 0f })
+			labelStorage.text = formatLabel(usage?.savedManga, R.string.saved_manga)
+			labelPagesCache.text = formatLabel(usage?.pagesCache, R.string.pages_cache)
+			labelOtherCache.text = formatLabel(usage?.otherCache, R.string.other_cache)
+			labelAvailable.text = formatLabel(usage?.available, R.string.available, R.string.available)
+
+			TextViewCompat.setCompoundDrawableTintList(labelStorage, ColorStateList.valueOf(storageSegment.color))
+			TextViewCompat.setCompoundDrawableTintList(labelPagesCache, ColorStateList.valueOf(pagesSegment.color))
+			TextViewCompat.setCompoundDrawableTintList(labelOtherCache, ColorStateList.valueOf(otherSegment.color))
+		}
+	}
+
+	override suspend fun emit(value: StorageUsage?) {
+		usage = value
+		notifyChanged()
+	}
+
+	private fun formatLabel(
+		item: StorageUsage.Item?,
+		@StringRes labelResId: Int,
+		@StringRes emptyResId: Int = R.string.computing_,
+	): String {
+		return if (item != null) {
+			labelPattern.format(
+				FileSize.BYTES.format(context, item.bytes),
+				context.getString(labelResId),
+			)
+		} else {
+			context.getString(emptyResId)
+		}
+	}
+
+	private fun getHue(hex: String): Float {
+		val r = (hex.substring(0, 2).toInt(16)).toFloat()
+		val g = (hex.substring(2, 4).toInt(16)).toFloat()
+		val b = (hex.substring(4, 6).toInt(16)).toFloat()
+
+		var hue = 0F
+		if ((r >= g) && (g >= b)) {
+			hue = 60 * (g - b) / (r - b)
+		} else if ((g > r) && (r >= b)) {
+			hue = 60 * (2 - (r - b) / (g - b))
+		}
+		return hue
+	}
+
+	@ColorInt
+	private fun segmentColor(@AttrRes resId: Int): Int {
+		val colorHex = String.format("%06x", context.getThemeColor(resId))
+		val hue = getHue(colorHex)
+		val color = ColorUtils.HSLToColor(floatArrayOf(hue, 0.5f, 0.5f))
+		val backgroundColor = context.getThemeColor(materialR.attr.colorSurfaceContainerHigh)
+		return MaterialColors.harmonize(color, backgroundColor)
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsFragment.kt
similarity index 87%
rename from app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsFragment.kt
index 0a8ddd561..d3694aa6a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsFragment.kt
@@ -1,6 +1,5 @@
-package org.koitharu.kotatsu.settings
+package org.koitharu.kotatsu.settings.userdata
 
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
@@ -8,6 +7,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.view.postDelayed
 import androidx.fragment.app.viewModels
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
@@ -21,11 +22,12 @@ import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
+import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.settings.backup.BackupDialogFragment
 import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
@@ -40,6 +42,9 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 	@Inject
 	lateinit var appShortcutManager: AppShortcutManager
 
+	@Inject
+	lateinit var activityRecreationHandle: ActivityRecreationHandle
+
 	private val viewModel: UserDataSettingsViewModel by viewModels()
 
 	private val backupSelectCall = registerForActivityResult(
@@ -78,6 +83,9 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 				}
 			}
 		}
+		findPreference<StorageUsagePreference>("storage_usage")?.let { pref ->
+			viewModel.storageUsage.observe(viewLifecycleOwner, pref)
+		}
 		viewModel.loadingKeys.observe(viewLifecycleOwner) { keys ->
 			preferenceScreen.forEach { pref ->
 				pref.isEnabled = pref.key !in keys
@@ -131,10 +139,7 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 			}
 
 			AppSettings.KEY_RESTORE -> {
-				try {
-					backupSelectCall.launch(arrayOf("*/*"))
-				} catch (e: ActivityNotFoundException) {
-					e.printStackTraceDebug()
+				if (!backupSelectCall.tryLaunch(arrayOf("*/*"))) {
 					Snackbar.make(
 						listView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT,
 					).show()
@@ -163,6 +168,19 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 				findPreference<TwoStatePreference>(AppSettings.KEY_PROTECT_APP)
 					?.isChecked = !settings.appPassword.isNullOrEmpty()
 			}
+
+			AppSettings.KEY_THEME -> {
+				AppCompatDelegate.setDefaultNightMode(settings.theme)
+			}
+
+			AppSettings.KEY_COLOR_THEME,
+			AppSettings.KEY_THEME_AMOLED -> {
+				postRestart()
+			}
+
+			AppSettings.KEY_APP_LOCALE -> {
+				AppCompatDelegate.setApplicationLocales(settings.appLocales)
+			}
 		}
 	}
 
@@ -201,4 +219,11 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 				viewModel.clearCookies()
 			}.show()
 	}
+
+	private fun postRestart() {
+		view?.postDelayed(400) {
+			activityRecreationHandle.recreateAll()
+		}
+	}
+
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsViewModel.kt
similarity index 69%
rename from app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsViewModel.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsViewModel.kt
index 5739402ae..ff4b3a87a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsViewModel.kt
@@ -1,7 +1,9 @@
-package org.koitharu.kotatsu.settings
+package org.koitharu.kotatsu.settings.userdata
 
 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.update
 import kotlinx.coroutines.runInterruptible
@@ -36,9 +38,12 @@ class UserDataSettingsViewModel @Inject constructor(
 	val feedItemsCount = MutableStateFlow(-1)
 	val httpCacheSize = MutableStateFlow(-1L)
 	val cacheSizes = EnumMap<CacheDir, MutableStateFlow<Long>>(CacheDir::class.java)
+	val storageUsage = MutableStateFlow<StorageUsage?>(null)
+
+	private var storageUsageJob: Job? = null
 
 	init {
-		CacheDir.values().forEach {
+		CacheDir.entries.forEach {
 			cacheSizes[it] = MutableStateFlow(-1L)
 		}
 		launchJob(Dispatchers.Default) {
@@ -47,7 +52,7 @@ class UserDataSettingsViewModel @Inject constructor(
 		launchJob(Dispatchers.Default) {
 			feedItemsCount.value = trackingRepository.getLogsCount()
 		}
-		CacheDir.values().forEach { cache ->
+		CacheDir.entries.forEach { cache ->
 			launchJob(Dispatchers.Default) {
 				checkNotNull(cacheSizes[cache]).value = storageManager.computeCacheSize(cache)
 			}
@@ -55,6 +60,7 @@ class UserDataSettingsViewModel @Inject constructor(
 		launchJob(Dispatchers.Default) {
 			httpCacheSize.value = runInterruptible { httpCache.size() }
 		}
+		loadStorageUsage()
 	}
 
 	fun clearCache(key: String, cache: CacheDir) {
@@ -63,6 +69,7 @@ class UserDataSettingsViewModel @Inject constructor(
 				loadingKeys.update { it + key }
 				storageManager.clearCache(cache)
 				checkNotNull(cacheSizes[cache]).value = storageManager.computeCacheSize(cache)
+				loadStorageUsage()
 			} finally {
 				loadingKeys.update { it - key }
 			}
@@ -78,6 +85,7 @@ class UserDataSettingsViewModel @Inject constructor(
 					httpCache.size()
 				}
 				httpCacheSize.value = size
+				loadStorageUsage()
 			} finally {
 				loadingKeys.update { it - AppSettings.KEY_HTTP_CACHE_CLEAR }
 			}
@@ -106,4 +114,34 @@ class UserDataSettingsViewModel @Inject constructor(
 			onActionDone.call(ReversibleAction(R.string.updates_feed_cleared, null))
 		}
 	}
+
+	private fun loadStorageUsage() {
+		val prevJob = storageUsageJob
+		storageUsageJob = launchJob(Dispatchers.Default) {
+			prevJob?.cancelAndJoin()
+			val pagesCacheSize = storageManager.computeCacheSize(CacheDir.PAGES)
+			val otherCacheSize = storageManager.computeCacheSize() - pagesCacheSize
+			val storageSize = storageManager.computeStorageSize()
+			val availableSpace = storageManager.computeAvailableSize()
+			val totalBytes = pagesCacheSize + otherCacheSize + storageSize + availableSpace
+			storageUsage.value = StorageUsage(
+				savedManga = StorageUsage.Item(
+					bytes = storageSize,
+					percent = (storageSize.toDouble() / totalBytes).toFloat(),
+				),
+				pagesCache = StorageUsage.Item(
+					bytes = pagesCacheSize,
+					percent = (pagesCacheSize.toDouble() / totalBytes).toFloat(),
+				),
+				otherCache = StorageUsage.Item(
+					bytes = otherCacheSize,
+					percent = (otherCacheSize.toDouble() / totalBytes).toFloat(),
+				),
+				available = StorageUsage.Item(
+					bytes = availableSpace,
+					percent = (availableSpace.toDouble() / totalBytes).toFloat(),
+				),
+			)
+		}
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/PasswordSummaryProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/PasswordSummaryProvider.kt
index 5d6068aca..b787333c7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/PasswordSummaryProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/PasswordSummaryProvider.kt
@@ -4,7 +4,7 @@ import android.text.TextUtils
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 
-class PasswordSummaryProvider() : Preference.SummaryProvider<EditTextPreference> {
+class PasswordSummaryProvider : Preference.SummaryProvider<EditTextPreference> {
 
 	private val delegate = EditTextPreference.SimpleSummaryProvider.getInstance()
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/PeriodicWorkScheduler.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/PeriodicWorkScheduler.kt
index 850020ebd..5b37d5dfd 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/PeriodicWorkScheduler.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/PeriodicWorkScheduler.kt
@@ -1,12 +1,10 @@
 package org.koitharu.kotatsu.settings.work
 
-import android.content.Context
-
 interface PeriodicWorkScheduler {
 
-	suspend fun schedule(context: Context)
+	suspend fun schedule()
 
-	suspend fun unschedule(context: Context)
+	suspend fun unschedule()
 
-	suspend fun isScheduled(context: Context): Boolean
+	suspend fun isScheduled(): Boolean
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/WorkScheduleManager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/WorkScheduleManager.kt
index f806ab6e3..a941c9847 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/WorkScheduleManager.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/work/WorkScheduleManager.kt
@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.settings.work
 
-import android.content.Context
 import android.content.SharedPreferences
-import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -12,37 +10,49 @@ import org.koitharu.kotatsu.tracker.work.TrackWorker
 import javax.inject.Inject
 
 class WorkScheduleManager @Inject constructor(
-	@ApplicationContext private val context: Context,
 	private val settings: AppSettings,
+	private val suggestionScheduler: SuggestionsWorker.Scheduler,
+	private val trackerScheduler: TrackWorker.Scheduler,
 ) : SharedPreferences.OnSharedPreferenceChangeListener {
 
 	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
 		when (key) {
-			AppSettings.KEY_TRACKER_ENABLED -> updateWorker(TrackWorker, settings.isTrackerEnabled)
-			AppSettings.KEY_SUGGESTIONS -> updateWorker(SuggestionsWorker, settings.isSuggestionsEnabled)
+			AppSettings.KEY_TRACKER_ENABLED,
+			AppSettings.KEY_TRACKER_WIFI_ONLY -> updateWorker(
+				scheduler = trackerScheduler,
+				isEnabled = settings.isTrackerEnabled,
+				force = key != AppSettings.KEY_TRACKER_ENABLED,
+			)
+
+			AppSettings.KEY_SUGGESTIONS,
+			AppSettings.KEY_SUGGESTIONS_WIFI_ONLY -> updateWorker(
+				scheduler = suggestionScheduler,
+				isEnabled = settings.isSuggestionsEnabled,
+				force = key != AppSettings.KEY_SUGGESTIONS,
+			)
 		}
 	}
 
 	fun init() {
 		settings.subscribe(this)
 		processLifecycleScope.launch(Dispatchers.Default) {
-			updateWorkerImpl(TrackWorker, settings.isTrackerEnabled)
-			updateWorkerImpl(SuggestionsWorker, settings.isSuggestionsEnabled)
+			updateWorkerImpl(trackerScheduler, settings.isTrackerEnabled, false)
+			updateWorkerImpl(suggestionScheduler, settings.isSuggestionsEnabled, false)
 		}
 	}
 
-	private fun updateWorker(scheduler: PeriodicWorkScheduler, isEnabled: Boolean) {
+	private fun updateWorker(scheduler: PeriodicWorkScheduler, isEnabled: Boolean, force: Boolean) {
 		processLifecycleScope.launch(Dispatchers.Default) {
-			updateWorkerImpl(scheduler, isEnabled)
+			updateWorkerImpl(scheduler, isEnabled, force)
 		}
 	}
 
-	private suspend fun updateWorkerImpl(scheduler: PeriodicWorkScheduler, isEnabled: Boolean) {
-		if (scheduler.isScheduled(context) != isEnabled) {
+	private suspend fun updateWorkerImpl(scheduler: PeriodicWorkScheduler, isEnabled: Boolean, force: Boolean) {
+		if (force || scheduler.isScheduled() != isEnabled) {
 			if (isEnabled) {
-				scheduler.schedule(context)
+				scheduler.schedule()
 			} else {
-				scheduler.unschedule(context)
+				scheduler.unschedule()
 			}
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/ShelfContentObserveUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/ShelfContentObserveUseCase.kt
deleted file mode 100644
index 6bdaf89ac..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/ShelfContentObserveUseCase.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.koitharu.kotatsu.shelf.domain
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.flow.onStart
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
-import org.koitharu.kotatsu.favourites.data.toMangaList
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import org.koitharu.kotatsu.local.data.LocalMangaRepository
-import org.koitharu.kotatsu.local.data.LocalStorageChanges
-import org.koitharu.kotatsu.local.domain.model.LocalManga
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.shelf.domain.model.ShelfContent
-import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
-import org.koitharu.kotatsu.tracker.domain.TrackingRepository
-import javax.inject.Inject
-
-@Suppress("SameParameterValue")
-class ShelfContentObserveUseCase @Inject constructor(
-	private val localMangaRepository: LocalMangaRepository,
-	private val historyRepository: HistoryRepository,
-	private val trackingRepository: TrackingRepository,
-	private val suggestionRepository: SuggestionRepository,
-	private val db: MangaDatabase,
-	private val settings: AppSettings,
-	@LocalStorageChanges private val localStorageChanges: SharedFlow<LocalManga?>,
-) {
-
-	operator fun invoke(): Flow<ShelfContent> = combine(
-		historyRepository.observeAll(20),
-		observeLocalManga(SortOrder.UPDATED, 20),
-		observeFavourites(),
-		trackingRepository.observeUpdatedManga(),
-		suggestionRepository.observeAll(20),
-	) { history, local, favorites, updated, suggestions ->
-		ShelfContent(history, favorites, updated, local, suggestions)
-	}
-
-	private fun observeLocalManga(sortOrder: SortOrder, limit: Int): Flow<List<Manga>> {
-		return combine<LocalManga?, String, Any?>(
-			localStorageChanges,
-			settings.observe().filter { it == AppSettings.KEY_LOCAL_MANGA_DIRS }.onStart { emit("") }
-		) { a, b -> a to b }
-			.onStart { emit(null) }
-			.mapLatest {
-				localMangaRepository.getList(0, null, sortOrder).take(limit)
-			}.distinctUntilChanged()
-	}
-
-	private fun observeFavourites(): Flow<Map<FavouriteCategory, List<Manga>>> {
-		return db.favouriteCategoriesDao.observeAll()
-			.flatMapLatest { categories ->
-				val cats = categories.filter { it.isVisibleInLibrary }
-				if (cats.isEmpty()) {
-					flowOf(emptyMap())
-				} else {
-					observeCategoriesContent(cats)
-				}
-			}
-	}
-
-	private fun observeCategoriesContent(
-		categories: List<FavouriteCategoryEntity>,
-	) = combine<Pair<FavouriteCategory, List<Manga>>, Map<FavouriteCategory, List<Manga>>>(
-		categories.map { cat ->
-			val category = cat.toFavouriteCategory()
-			db.favouritesDao.observeAll(category.id, category.order)
-				.map { category to it.toMangaList() }
-		},
-	) { array -> array.toMap() }
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/model/ShelfContent.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/model/ShelfContent.kt
deleted file mode 100644
index 39c88010f..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/model/ShelfContent.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.shelf.domain.model
-
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.parsers.model.Manga
-
-class ShelfContent(
-	val history: List<Manga>,
-	val favourites: Map<FavouriteCategory, List<Manga>>,
-	val updated: List<Manga>,
-	val local: List<Manga>,
-	val suggestions: List<Manga>,
-) {
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as ShelfContent
-
-		if (history != other.history) return false
-		if (favourites != other.favourites) return false
-		if (updated != other.updated) return false
-		if (local != other.local) return false
-		return suggestions == other.suggestions
-	}
-
-	override fun hashCode(): Int {
-		var result = history.hashCode()
-		result = 31 * result + favourites.hashCode()
-		result = 31 * result + updated.hashCode()
-		result = 31 * result + local.hashCode()
-		result = 31 * result + suggestions.hashCode()
-		return result
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/model/ShelfSection.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/model/ShelfSection.kt
deleted file mode 100644
index ecdd14b7d..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/domain/model/ShelfSection.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.shelf.domain.model
-
-enum class ShelfSection {
-
-	HISTORY, LOCAL, UPDATED, FAVORITES, SUGGESTIONS;
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt
deleted file mode 100644
index 50e2073af..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfFragment.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui
-
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.graphics.Insets
-import androidx.core.view.updatePadding
-import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.RecyclerView
-import coil.ImageLoader
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseFragment
-import org.koitharu.kotatsu.core.ui.list.NestedScrollStateHandle
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
-import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
-import org.koitharu.kotatsu.core.util.ext.addMenuProvider
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.databinding.FragmentShelfBinding
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
-import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
-import org.koitharu.kotatsu.history.ui.HistoryActivity
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.search.ui.MangaListActivity
-import org.koitharu.kotatsu.shelf.ui.adapter.ShelfAdapter
-import org.koitharu.kotatsu.shelf.ui.adapter.ShelfListEventListener
-import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
-import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
-import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ShelfFragment :
-	BaseFragment<FragmentShelfBinding>(),
-	RecyclerViewOwner,
-	ShelfListEventListener {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	@Inject
-	lateinit var settings: AppSettings
-
-	private var nestedScrollStateHandle: NestedScrollStateHandle? = null
-	private val viewModel by viewModels<ShelfViewModel>()
-	private var adapter: ShelfAdapter? = null
-	private var selectionController: SectionedSelectionController<ShelfSectionModel>? = null
-
-	override val recyclerView: RecyclerView
-		get() = requireViewBinding().recyclerView
-
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentShelfBinding {
-		return FragmentShelfBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: FragmentShelfBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		nestedScrollStateHandle = NestedScrollStateHandle(savedInstanceState, KEY_NESTED_SCROLL)
-		val sizeResolver = ItemSizeResolver(resources, settings)
-		selectionController = SectionedSelectionController(
-			activity = requireActivity(),
-			owner = this,
-			callback = ShelfSelectionCallback(binding.recyclerView, childFragmentManager, viewModel),
-		)
-		adapter = ShelfAdapter(
-			lifecycleOwner = viewLifecycleOwner,
-			coil = coil,
-			listener = this,
-			sizeResolver = sizeResolver,
-			selectionController = checkNotNull(selectionController),
-			nestedScrollStateHandle = checkNotNull(nestedScrollStateHandle),
-		)
-		binding.recyclerView.adapter = adapter
-		binding.recyclerView.setHasFixedSize(true)
-		addMenuProvider(ShelfMenuProvider(binding.root.context, childFragmentManager, viewModel))
-
-		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
-		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
-		viewModel.onDownloadStarted.observeEvent(viewLifecycleOwner, DownloadStartedObserver(binding.recyclerView))
-	}
-
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		nestedScrollStateHandle?.onSaveInstanceState(outState)
-	}
-
-	override fun onDestroyView() {
-		super.onDestroyView()
-		adapter = null
-		selectionController = null
-		nestedScrollStateHandle = null
-	}
-
-	override fun onItemClick(item: Manga, section: ShelfSectionModel, view: View) {
-		if (selectionController?.onItemClick(section, item.id) != true) {
-			val intent = DetailsActivity.newIntent(view.context, item)
-			startActivity(intent)
-		}
-	}
-
-	override fun onItemLongClick(item: Manga, section: ShelfSectionModel, view: View): Boolean {
-		return selectionController?.onItemLongClick(section, item.id) ?: false
-	}
-
-	override fun onSectionClick(section: ShelfSectionModel, view: View) {
-		selectionController?.clear()
-		val intent = when (section) {
-			is ShelfSectionModel.History -> HistoryActivity.newIntent(view.context)
-			is ShelfSectionModel.Favourites -> FavouritesActivity.newIntent(view.context, section.category)
-			is ShelfSectionModel.Updated -> UpdatesActivity.newIntent(view.context)
-			is ShelfSectionModel.Local -> MangaListActivity.newIntent(view.context, MangaSource.LOCAL)
-			is ShelfSectionModel.Suggestions -> SuggestionsActivity.newIntent(view.context)
-		}
-		startActivity(intent)
-	}
-
-	override fun onRetryClick(error: Throwable) = Unit
-
-	override fun onEmptyActionClick() {
-		val action = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			Settings.Panel.ACTION_INTERNET_CONNECTIVITY
-		} else {
-			Settings.ACTION_WIRELESS_SETTINGS
-		}
-		startActivity(Intent(action))
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		requireViewBinding().recyclerView.updatePadding(
-			bottom = insets.bottom,
-		)
-	}
-
-	private fun onListChanged(list: List<ListModel>) {
-		adapter?.items = list
-	}
-
-	companion object {
-
-		private const val KEY_NESTED_SCROLL = "nested_scroll"
-
-		fun newInstance() = ShelfFragment()
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt
deleted file mode 100644
index 842699dfc..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui
-
-import android.content.Context
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import androidx.core.view.MenuProvider
-import androidx.fragment.app.FragmentManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.dialog.RememberSelectionDialogListener
-import org.koitharu.kotatsu.core.util.ext.startOfDay
-import org.koitharu.kotatsu.local.ui.ImportDialogFragment
-import org.koitharu.kotatsu.shelf.ui.config.ShelfSettingsActivity
-import org.koitharu.kotatsu.shelf.ui.config.size.ShelfSizeBottomSheet
-import java.util.Date
-import java.util.concurrent.TimeUnit
-import com.google.android.material.R as materialR
-
-class ShelfMenuProvider(
-	private val context: Context,
-	private val fragmentManager: FragmentManager,
-	private val viewModel: ShelfViewModel,
-) : MenuProvider {
-
-	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-		menuInflater.inflate(R.menu.opt_shelf, menu)
-	}
-
-	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-		return when (menuItem.itemId) {
-			R.id.action_clear_history -> {
-				showClearHistoryDialog()
-				true
-			}
-
-			R.id.action_grid_size -> {
-				ShelfSizeBottomSheet.show(fragmentManager)
-				true
-			}
-
-			R.id.action_import -> {
-				ImportDialogFragment.show(fragmentManager)
-				true
-			}
-
-			R.id.action_categories -> {
-				context.startActivity(ShelfSettingsActivity.newIntent(context))
-				true
-			}
-
-			else -> false
-		}
-	}
-
-	private fun showClearHistoryDialog() {
-		val selectionListener = RememberSelectionDialogListener(2)
-		MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
-			.setTitle(R.string.clear_history)
-			.setSingleChoiceItems(
-				arrayOf(
-					context.getString(R.string.last_2_hours),
-					context.getString(R.string.today),
-					context.getString(R.string.clear_all_history),
-				),
-				selectionListener.selection,
-				selectionListener,
-			)
-			.setIcon(R.drawable.ic_delete)
-			.setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.clear) { _, _ ->
-				val minDate = when (selectionListener.selection) {
-					0 -> System.currentTimeMillis() - TimeUnit.HOURS.toMillis(2)
-					1 -> Date().startOfDay()
-					2 -> 0L
-					else -> return@setPositiveButton
-				}
-				viewModel.clearHistory(minDate)
-			}.show()
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfSelectionCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfSelectionCallback.kt
deleted file mode 100644
index 204dd7599..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfSelectionCallback.kt
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui
-
-import android.content.Context
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.view.ActionMode
-import androidx.fragment.app.FragmentManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
-import org.koitharu.kotatsu.core.util.ShareHelper
-import org.koitharu.kotatsu.core.util.ext.invalidateNestedItemDecorations
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesSheet
-import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.flattenTo
-import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
-
-class ShelfSelectionCallback(
-	private val recyclerView: RecyclerView,
-	private val fragmentManager: FragmentManager,
-	private val viewModel: ShelfViewModel,
-) : SectionedSelectionController.Callback<ShelfSectionModel> {
-
-	private val context: Context
-		get() = recyclerView.context
-
-	override fun onCreateActionMode(
-		controller: SectionedSelectionController<ShelfSectionModel>,
-		mode: ActionMode,
-		menu: Menu,
-	): Boolean {
-		mode.menuInflater.inflate(R.menu.mode_shelf, menu)
-		return true
-	}
-
-	override fun onPrepareActionMode(
-		controller: SectionedSelectionController<ShelfSectionModel>,
-		mode: ActionMode,
-		menu: Menu,
-	): Boolean {
-		val checkedIds = controller.peekCheckedIds().entries
-		val singleKey = checkedIds.singleOrNull { (_, ids) -> ids.isNotEmpty() }?.key
-		menu.findItem(R.id.action_remove)?.isVisible = singleKey != null &&
-			singleKey !is ShelfSectionModel.Updated &&
-			singleKey !is ShelfSectionModel.Suggestions
-		menu.findItem(R.id.action_save)?.isVisible = singleKey !is ShelfSectionModel.Local
-		return super.onPrepareActionMode(controller, mode, menu)
-	}
-
-	override fun onActionItemClicked(
-		controller: SectionedSelectionController<ShelfSectionModel>,
-		mode: ActionMode,
-		item: MenuItem,
-	): Boolean {
-		return when (item.itemId) {
-			R.id.action_share -> {
-				ShareHelper(context).shareMangaLinks(collectSelectedItems(controller))
-				mode.finish()
-				true
-			}
-
-			R.id.action_favourite -> {
-				FavouriteCategoriesSheet.show(fragmentManager, collectSelectedItems(controller))
-				mode.finish()
-				true
-			}
-
-			R.id.action_save -> {
-				viewModel.download(collectSelectedItems(controller))
-				mode.finish()
-				true
-			}
-
-			R.id.action_remove -> {
-				val (group, ids) = controller.snapshot().entries.singleOrNull { it.value.isNotEmpty() } ?: return false
-				when (group) {
-					is ShelfSectionModel.Favourites -> viewModel.removeFromFavourites(group.category, ids)
-					is ShelfSectionModel.History -> viewModel.removeFromHistory(ids)
-					is ShelfSectionModel.Updated -> return false
-					is ShelfSectionModel.Local -> {
-						showDeletionConfirm(ids, mode)
-						return true
-					}
-
-					is ShelfSectionModel.Suggestions -> return false
-				}
-				mode.finish()
-				true
-			}
-
-			else -> false
-		}
-	}
-
-	override fun onSelectionChanged(controller: SectionedSelectionController<ShelfSectionModel>, count: Int) {
-		recyclerView.invalidateNestedItemDecorations()
-	}
-
-	override fun onCreateItemDecoration(
-		controller: SectionedSelectionController<ShelfSectionModel>,
-		section: ShelfSectionModel,
-	): AbstractSelectionItemDecoration = MangaSelectionDecoration(context)
-
-	private fun collectSelectedItemsMap(
-		controller: SectionedSelectionController<ShelfSectionModel>,
-	): Map<ShelfSectionModel, Set<Manga>> {
-		val snapshot = controller.peekCheckedIds()
-		if (snapshot.isEmpty()) {
-			return emptyMap()
-		}
-		return snapshot.mapValues { (_, ids) -> viewModel.getManga(ids) }
-	}
-
-	private fun collectSelectedItems(
-		controller: SectionedSelectionController<ShelfSectionModel>,
-	): Set<Manga> {
-		val snapshot = controller.peekCheckedIds()
-		if (snapshot.isEmpty()) {
-			return emptySet()
-		}
-		return viewModel.getManga(snapshot.values.flattenTo(HashSet()))
-	}
-
-	private fun showDeletionConfirm(ids: Set<Long>, mode: ActionMode) {
-		if (ids.isEmpty()) {
-			return
-		}
-		MaterialAlertDialogBuilder(context)
-			.setTitle(R.string.delete_manga)
-			.setMessage(context.getString(R.string.text_delete_local_manga_batch))
-			.setPositiveButton(R.string.delete) { _, _ ->
-				viewModel.deleteLocal(ids)
-				mode.finish()
-			}
-			.setNegativeButton(android.R.string.cancel, null)
-			.show()
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt
deleted file mode 100644
index 16ea86002..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui
-
-import androidx.collection.ArraySet
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.os.NetworkState
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.ListMode
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
-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.download.ui.worker.DownloadWorker
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.history.data.HistoryRepository
-import org.koitharu.kotatsu.list.domain.ListExtraProvider
-import org.koitharu.kotatsu.list.ui.model.EmptyHint
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.list.ui.model.toErrorState
-import org.koitharu.kotatsu.list.ui.model.toGridModel
-import org.koitharu.kotatsu.list.ui.model.toUi
-import org.koitharu.kotatsu.local.domain.DeleteLocalMangaUseCase
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.shelf.domain.ShelfContentObserveUseCase
-import org.koitharu.kotatsu.shelf.domain.model.ShelfContent
-import org.koitharu.kotatsu.shelf.domain.model.ShelfSection
-import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
-import org.koitharu.kotatsu.sync.domain.SyncController
-import javax.inject.Inject
-
-@HiltViewModel
-class ShelfViewModel @Inject constructor(
-	private val historyRepository: HistoryRepository,
-	private val favouritesRepository: FavouritesRepository,
-	private val settings: AppSettings,
-	private val downloadScheduler: DownloadWorker.Scheduler,
-	private val deleteLocalMangaUseCase: DeleteLocalMangaUseCase,
-	private val listExtraProvider: ListExtraProvider,
-	shelfContentObserveUseCase: ShelfContentObserveUseCase,
-	syncController: SyncController,
-	networkState: NetworkState,
-) : BaseViewModel() {
-
-	val onActionDone = MutableEventFlow<ReversibleAction>()
-	val onDownloadStarted = MutableEventFlow<Unit>()
-
-	val content: StateFlow<List<ListModel>> = combine(
-		settings.observeAsFlow(AppSettings.KEY_SHELF_SECTIONS) { shelfSections },
-		settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled },
-		settings.observeAsFlow(AppSettings.KEY_SUGGESTIONS) { isSuggestionsEnabled },
-		networkState,
-		shelfContentObserveUseCase(),
-	) { sections, isTrackerEnabled, isSuggestionsEnabled, isConnected, content ->
-		mapList(content, isTrackerEnabled, isSuggestionsEnabled, sections, isConnected)
-	}.catch { e ->
-		emit(listOf(e.toErrorState(canRetry = false)))
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
-
-	init {
-		launchJob(Dispatchers.Default) {
-			syncController.requestFullSync()
-		}
-	}
-
-	fun removeFromFavourites(category: FavouriteCategory, ids: Set<Long>) {
-		if (ids.isEmpty()) {
-			return
-		}
-		launchJob(Dispatchers.Default) {
-			val handle = favouritesRepository.removeFromCategory(category.id, ids)
-			onActionDone.call(ReversibleAction(R.string.removed_from_favourites, handle))
-		}
-	}
-
-	fun removeFromHistory(ids: Set<Long>) {
-		if (ids.isEmpty()) {
-			return
-		}
-		launchJob(Dispatchers.Default) {
-			val handle = historyRepository.delete(ids)
-			onActionDone.call(ReversibleAction(R.string.removed_from_history, handle))
-		}
-	}
-
-	fun deleteLocal(ids: Set<Long>) {
-		launchLoadingJob(Dispatchers.Default) {
-			deleteLocalMangaUseCase(ids)
-			onActionDone.call(ReversibleAction(R.string.removal_completed, null))
-		}
-	}
-
-	fun clearHistory(minDate: Long) {
-		launchJob(Dispatchers.Default) {
-			val stringRes = if (minDate <= 0) {
-				historyRepository.clear()
-				R.string.history_cleared
-			} else {
-				historyRepository.deleteAfter(minDate)
-				R.string.removed_from_history
-			}
-			onActionDone.call(ReversibleAction(stringRes, null))
-		}
-	}
-
-	fun getManga(ids: Set<Long>): Set<Manga> {
-		val snapshot = content.value
-		val result = ArraySet<Manga>(ids.size)
-		for (section in snapshot) {
-			if (section !is ShelfSectionModel) {
-				continue
-			}
-			for (item in section.items) {
-				if (item.id in ids) {
-					result.add(item.manga)
-					if (result.size == ids.size) {
-						return result
-					}
-				}
-			}
-		}
-		return result
-	}
-
-	fun download(items: Set<Manga>) {
-		launchJob(Dispatchers.Default) {
-			downloadScheduler.schedule(items)
-			onDownloadStarted.call(Unit)
-		}
-	}
-
-	private suspend fun mapList(
-		content: ShelfContent,
-		isTrackerEnabled: Boolean,
-		isSuggestionsEnabled: Boolean,
-		sections: List<ShelfSection>,
-		isNetworkAvailable: Boolean,
-	): List<ListModel> {
-		val result = ArrayList<ListModel>(content.favourites.keys.size + sections.size)
-		if (isNetworkAvailable) {
-			for (section in sections) {
-				when (section) {
-					ShelfSection.HISTORY -> mapHistory(result, content.history)
-					ShelfSection.LOCAL -> mapLocal(result, content.local)
-					ShelfSection.UPDATED -> if (isTrackerEnabled) {
-						mapUpdated(result, content.updated)
-					}
-
-					ShelfSection.FAVORITES -> mapFavourites(result, content.favourites)
-					ShelfSection.SUGGESTIONS -> if (isSuggestionsEnabled) {
-						mapSuggestions(result, content.suggestions)
-					}
-				}
-			}
-		} else {
-			result += EmptyHint(
-				icon = R.drawable.ic_empty_common,
-				textPrimary = R.string.network_unavailable,
-				textSecondary = R.string.network_unavailable_hint,
-				actionStringRes = R.string.manage,
-			)
-			for (section in sections) {
-				when (section) {
-					ShelfSection.HISTORY -> mapHistory(
-						result,
-						content.history.filter { it.source == MangaSource.LOCAL },
-					)
-
-					ShelfSection.LOCAL -> mapLocal(result, content.local)
-					ShelfSection.UPDATED -> Unit
-					ShelfSection.FAVORITES -> Unit
-					ShelfSection.SUGGESTIONS -> Unit
-				}
-			}
-		}
-		if (result.isEmpty()) {
-			result += EmptyState(
-				icon = R.drawable.ic_empty_history,
-				textPrimary = R.string.text_shelf_holder_primary,
-				textSecondary = R.string.text_shelf_holder_secondary,
-				actionStringRes = 0,
-			)
-		} else {
-			val one = result.singleOrNull()
-			if (one is EmptyHint) {
-				result[0] = one.toState()
-			}
-		}
-		return result
-	}
-
-	private suspend fun mapHistory(
-		destination: MutableList<in ShelfSectionModel.History>,
-		list: List<Manga>,
-	) {
-		if (list.isEmpty()) {
-			return
-		}
-		destination += ShelfSectionModel.History(
-			items = list.map { manga ->
-				manga.toGridModel(listExtraProvider)
-			},
-			showAllButtonText = R.string.show_all,
-		)
-	}
-
-	private suspend fun mapUpdated(
-		destination: MutableList<in ShelfSectionModel.Updated>,
-		updated: List<Manga>,
-	) {
-		if (updated.isEmpty()) {
-			return
-		}
-		settings.isReadingIndicatorsEnabled
-		destination += ShelfSectionModel.Updated(
-			items = updated.map { manga ->
-				manga.toGridModel(listExtraProvider)
-			},
-			showAllButtonText = R.string.show_all,
-		)
-	}
-
-	private suspend fun mapLocal(
-		destination: MutableList<in ShelfSectionModel.Local>,
-		local: List<Manga>,
-	) {
-		if (local.isEmpty()) {
-			return
-		}
-		destination += ShelfSectionModel.Local(
-			items = local.toUi(ListMode.GRID, listExtraProvider),
-			showAllButtonText = R.string.show_all,
-		)
-	}
-
-	private suspend fun mapSuggestions(
-		destination: MutableList<in ShelfSectionModel.Suggestions>,
-		suggestions: List<Manga>,
-	) {
-		if (suggestions.isEmpty()) {
-			return
-		}
-		destination += ShelfSectionModel.Suggestions(
-			items = suggestions.toUi(ListMode.GRID, listExtraProvider),
-			showAllButtonText = R.string.show_all,
-		)
-	}
-
-	private suspend fun mapFavourites(
-		destination: MutableList<in ShelfSectionModel.Favourites>,
-		favourites: Map<FavouriteCategory, List<Manga>>,
-	) {
-		if (favourites.isEmpty()) {
-			return
-		}
-		for ((category, list) in favourites) {
-			if (list.isNotEmpty()) {
-				destination += ShelfSectionModel.Favourites(
-					items = list.toUi(ListMode.GRID, listExtraProvider),
-					category = category,
-					showAllButtonText = R.string.show_all,
-				)
-			}
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/MangaItemDiffCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/MangaItemDiffCallback.kt
deleted file mode 100644
index a934dbd52..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/MangaItemDiffCallback.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.adapter
-
-import androidx.recyclerview.widget.DiffUtil
-import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.MangaItemModel
-import kotlin.jvm.internal.Intrinsics
-
-class MangaItemDiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-	override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-		oldItem as MangaItemModel
-		newItem as MangaItemModel
-		return oldItem.javaClass == newItem.javaClass && oldItem.id == newItem.id
-	}
-
-	override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-		return Intrinsics.areEqual(oldItem, newItem)
-	}
-
-	override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
-		oldItem as MangaItemModel
-		newItem as MangaItemModel
-		return when {
-			oldItem.progress != newItem.progress -> MangaListAdapter.PAYLOAD_PROGRESS
-			oldItem.counter != newItem.counter -> Unit
-			else -> super.getChangePayload(oldItem, newItem)
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ScrollKeepObserver.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ScrollKeepObserver.kt
deleted file mode 100644
index 322210205..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ScrollKeepObserver.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.adapter
-
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-
-class ScrollKeepObserver(
-	private val recyclerView: RecyclerView,
-) : RecyclerView.AdapterDataObserver() {
-
-	private val layoutManager: LinearLayoutManager
-		get() = recyclerView.layoutManager as LinearLayoutManager
-
-	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
-		val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
-		val position = minOf(toPosition, fromPosition) // if items are swapping positions may be swapped too
-		if (firstVisiblePosition != RecyclerView.NO_POSITION && (position == 0 || position < firstVisiblePosition)) {
-			postScroll(position)
-		}
-	}
-
-	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-		val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
-		if (firstVisiblePosition != RecyclerView.NO_POSITION && (positionStart == 0 || positionStart < firstVisiblePosition)) {
-			postScroll(positionStart)
-		}
-	}
-
-	private fun postScroll(targetPosition: Int) {
-		recyclerView.post {
-			layoutManager.scrollToPositionWithOffset(targetPosition, 0)
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfAdapter.kt
deleted file mode 100644
index 85baded5e..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfAdapter.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.adapter
-
-import android.content.Context
-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.core.ui.list.NestedScrollStateHandle
-import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
-import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
-import org.koitharu.kotatsu.list.ui.adapter.emptyHintAD
-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.shelf.ui.model.ShelfSectionModel
-import kotlin.jvm.internal.Intrinsics
-
-class ShelfAdapter(
-	lifecycleOwner: LifecycleOwner,
-	coil: ImageLoader,
-	listener: ShelfListEventListener,
-	sizeResolver: ItemSizeResolver,
-	selectionController: SectionedSelectionController<ShelfSectionModel>,
-	nestedScrollStateHandle: NestedScrollStateHandle,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()), FastScroller.SectionIndexer {
-
-	init {
-		val pool = RecyclerView.RecycledViewPool()
-		delegatesManager
-			.addDelegate(
-				shelfGroupAD(
-					sharedPool = pool,
-					lifecycleOwner = lifecycleOwner,
-					coil = coil,
-					sizeResolver = sizeResolver,
-					selectionController = selectionController,
-					listener = listener,
-					nestedScrollStateHandle = nestedScrollStateHandle,
-				),
-			)
-			.addDelegate(loadingStateAD())
-			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyHintAD(coil, lifecycleOwner, listener))
-			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
-			.addDelegate(errorStateListAD(listener))
-	}
-
-	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		val item = items.getOrNull(position) as? ShelfSectionModel ?: return null
-		return item.getTitle(context.resources)
-	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return when {
-				oldItem is ShelfSectionModel && newItem is ShelfSectionModel -> {
-					oldItem.key == newItem.key
-				}
-
-				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 ShelfSectionModel && newItem is ShelfSectionModel -> Unit
-				else -> super.getChangePayload(oldItem, newItem)
-			}
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfGroupAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfGroupAD.kt
deleted file mode 100644
index c0e561475..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfGroupAD.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.adapter
-
-import android.view.View
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.list.NestedScrollStateHandle
-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.util.ext.removeItemDecoration
-import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
-import org.koitharu.kotatsu.databinding.ItemListGroupBinding
-import org.koitharu.kotatsu.list.ui.ItemSizeResolver
-import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
-
-fun shelfGroupAD(
-	sharedPool: RecyclerView.RecycledViewPool,
-	lifecycleOwner: LifecycleOwner,
-	coil: ImageLoader,
-	sizeResolver: ItemSizeResolver,
-	selectionController: SectionedSelectionController<ShelfSectionModel>,
-	listener: ShelfListEventListener,
-	nestedScrollStateHandle: NestedScrollStateHandle,
-) = adapterDelegateViewBinding<ShelfSectionModel, ListModel, ItemListGroupBinding>(
-	{ layoutInflater, parent -> ItemListGroupBinding.inflate(layoutInflater, parent, false) },
-) {
-	val listenerAdapter = object : OnListItemClickListener<Manga>, View.OnClickListener {
-		override fun onItemClick(item: Manga, view: View) {
-			listener.onItemClick(item, this@adapterDelegateViewBinding.item, view)
-		}
-
-		override fun onItemLongClick(item: Manga, view: View): Boolean {
-			return listener.onItemLongClick(item, this@adapterDelegateViewBinding.item, view)
-		}
-
-		override fun onClick(v: View?) {
-			listener.onSectionClick(item, itemView)
-		}
-	}
-
-	val adapter = AsyncListDifferDelegationAdapter(
-		MangaItemDiffCallback(),
-		mangaGridItemAD(coil, lifecycleOwner, listenerAdapter, sizeResolver),
-	)
-	adapter.stateRestorationPolicy = RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY
-	adapter.registerAdapterDataObserver(ScrollKeepObserver(binding.recyclerView))
-	binding.recyclerView.setRecycledViewPool(sharedPool)
-	binding.recyclerView.adapter = adapter
-	val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
-	binding.recyclerView.addItemDecoration(spacingDecoration)
-	binding.buttonMore.setOnClickListener(listenerAdapter)
-	val stateController = nestedScrollStateHandle.attach(binding.recyclerView)
-
-	bind {
-		selectionController.attachToRecyclerView(item, binding.recyclerView)
-		binding.textViewTitle.text = item.getTitle(context.resources)
-		binding.buttonMore.setTextAndVisible(item.showAllButtonText)
-		adapter.items = item.items
-		stateController.onBind(bindingAdapterPosition)
-	}
-
-	onViewRecycled {
-		stateController.onRecycled()
-		adapter.items = emptyList()
-		binding.recyclerView.removeItemDecoration(AbstractSelectionItemDecoration::class.java)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfListEventListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfListEventListener.kt
deleted file mode 100644
index af34933d2..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/adapter/ShelfListEventListener.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.adapter
-
-import android.view.View
-import org.koitharu.kotatsu.shelf.ui.model.ShelfSectionModel
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.parsers.model.Manga
-
-interface ShelfListEventListener : ListStateHolderListener {
-
-	fun onItemClick(item: Manga, section: ShelfSectionModel, view: View)
-
-	fun onItemLongClick(item: Manga, section: ShelfSectionModel, view: View): Boolean
-
-	fun onSectionClick(section: ShelfSectionModel, view: View)
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsActivity.kt
deleted file mode 100644
index e8c8f346f..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsActivity.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.viewModels
-import androidx.core.graphics.Insets
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.databinding.ActivityShelfSettingsBinding
-import com.google.android.material.R as materialR
-
-@AndroidEntryPoint
-class ShelfSettingsActivity :
-	BaseActivity<ActivityShelfSettingsBinding>(),
-	View.OnClickListener, ShelfSettingsListener {
-
-	private val viewModel by viewModels<ShelfSettingsViewModel>()
-	private lateinit var reorderHelper: ItemTouchHelper
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityShelfSettingsBinding.inflate(layoutInflater))
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
-		}
-		viewBinding.buttonDone.setOnClickListener(this)
-		val settingsAdapter = ShelfSettingsAdapter(this)
-		with(viewBinding.recyclerView) {
-			setHasFixedSize(true)
-			adapter = settingsAdapter
-			reorderHelper = ItemTouchHelper(SectionsReorderCallback()).also {
-				it.attachToRecyclerView(this)
-			}
-		}
-		viewModel.content.observe(this) { settingsAdapter.items = it }
-	}
-
-	override fun onItemCheckedChanged(item: ShelfSettingsItemModel, isChecked: Boolean) {
-		viewModel.setItemChecked(item, isChecked)
-	}
-
-	override fun onDragHandleTouch(holder: RecyclerView.ViewHolder) {
-		reorderHelper.startDrag(holder)
-	}
-
-	override fun onClick(v: View?) {
-		finishAfterTransition()
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-		)
-		viewBinding.recyclerView.updatePadding(
-			bottom = insets.bottom,
-		)
-		viewBinding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			topMargin = insets.top
-		}
-	}
-
-	private inner class SectionsReorderCallback : ItemTouchHelper.SimpleCallback(
-		ItemTouchHelper.DOWN or ItemTouchHelper.UP,
-		0,
-	) {
-
-		override fun onMove(
-			recyclerView: RecyclerView,
-			viewHolder: RecyclerView.ViewHolder,
-			target: RecyclerView.ViewHolder,
-		): Boolean = viewHolder.itemViewType == target.itemViewType && viewModel.reorderSections(
-			viewHolder.bindingAdapterPosition,
-			target.bindingAdapterPosition,
-		)
-
-		override fun canDropOver(
-			recyclerView: RecyclerView,
-			current: RecyclerView.ViewHolder,
-			target: RecyclerView.ViewHolder,
-		): Boolean = current.itemViewType == target.itemViewType
-
-		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
-
-		override fun isLongPressDragEnabled() = false
-	}
-
-	companion object {
-
-		fun newIntent(context: Context) = Intent(context, ShelfSettingsActivity::class.java)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsAdapter.kt
deleted file mode 100644
index 19aaa81cf..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsAdapter.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config
-
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-
-class ShelfSettingsAdapter(
-	listener: ShelfSettingsListener,
-) : AsyncListDifferDelegationAdapter<ShelfSettingsItemModel>(DiffCallback()) {
-
-	init {
-		delegatesManager.addDelegate(shelfCategoryAD(listener))
-			.addDelegate(shelfSectionAD(listener))
-	}
-
-	class DiffCallback : DiffUtil.ItemCallback<ShelfSettingsItemModel>() {
-
-		override fun areItemsTheSame(oldItem: ShelfSettingsItemModel, newItem: ShelfSettingsItemModel): Boolean {
-			return when {
-				oldItem is ShelfSettingsItemModel.Section && newItem is ShelfSettingsItemModel.Section -> {
-					oldItem.section == newItem.section
-				}
-
-				oldItem is ShelfSettingsItemModel.FavouriteCategory && newItem is ShelfSettingsItemModel.FavouriteCategory -> {
-					oldItem.id == newItem.id
-				}
-
-				else -> false
-			}
-		}
-
-		override fun areContentsTheSame(oldItem: ShelfSettingsItemModel, newItem: ShelfSettingsItemModel): Boolean {
-			return oldItem == newItem
-		}
-
-		override fun getChangePayload(oldItem: ShelfSettingsItemModel, newItem: ShelfSettingsItemModel): Any? {
-			return if (oldItem.isChecked == newItem.isChecked) {
-				super.getChangePayload(oldItem, newItem)
-			} else Unit
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsAdapterDelegates.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsAdapterDelegates.kt
deleted file mode 100644
index 736aa125f..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsAdapterDelegates.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config
-
-import android.annotation.SuppressLint
-import android.view.MotionEvent
-import android.view.View
-import android.widget.CompoundButton
-import androidx.core.view.updatePaddingRelative
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.setChecked
-import org.koitharu.kotatsu.databinding.ItemCategoryCheckableMultipleBinding
-import org.koitharu.kotatsu.databinding.ItemShelfSectionDraggableBinding
-import org.koitharu.kotatsu.shelf.domain.model.ShelfSection
-
-@SuppressLint("ClickableViewAccessibility")
-fun shelfSectionAD(
-	listener: ShelfSettingsListener,
-) =
-	adapterDelegateViewBinding<ShelfSettingsItemModel.Section, ShelfSettingsItemModel, ItemShelfSectionDraggableBinding>(
-		{ layoutInflater, parent -> ItemShelfSectionDraggableBinding.inflate(layoutInflater, parent, false) },
-	) {
-
-		val eventListener = object :
-			View.OnTouchListener,
-			CompoundButton.OnCheckedChangeListener {
-
-			override fun onTouch(v: View?, event: MotionEvent): Boolean {
-				return if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-					listener.onDragHandleTouch(this@adapterDelegateViewBinding)
-					true
-				} else {
-					false
-				}
-			}
-
-			override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
-				listener.onItemCheckedChanged(item, isChecked)
-			}
-		}
-
-		binding.switchToggle.setOnCheckedChangeListener(eventListener)
-		binding.imageViewHandle.setOnTouchListener(eventListener)
-
-		bind { payloads ->
-			binding.textViewTitle.setText(item.section.titleResId)
-			binding.switchToggle.setChecked(item.isChecked, payloads.isNotEmpty())
-		}
-	}
-
-fun shelfCategoryAD(
-	listener: ShelfSettingsListener,
-) =
-	adapterDelegateViewBinding<ShelfSettingsItemModel.FavouriteCategory, ShelfSettingsItemModel, ItemCategoryCheckableMultipleBinding>(
-		{ layoutInflater, parent -> ItemCategoryCheckableMultipleBinding.inflate(layoutInflater, parent, false) },
-	) {
-		itemView.setOnClickListener {
-			listener.onItemCheckedChanged(item, !item.isChecked)
-		}
-		binding.root.updatePaddingRelative(
-			start = binding.root.paddingStart * 2,
-			end = binding.root.paddingStart,
-		)
-
-		bind { payloads ->
-			binding.root.text = item.title
-			binding.root.setChecked(item.isChecked, payloads.isNotEmpty())
-		}
-	}
-
-private val ShelfSection.titleResId: Int
-	get() = when (this) {
-		ShelfSection.HISTORY -> R.string.history
-		ShelfSection.LOCAL -> R.string.local_storage
-		ShelfSection.UPDATED -> R.string.updated
-		ShelfSection.FAVORITES -> R.string.favourites
-		ShelfSection.SUGGESTIONS -> R.string.suggestions
-	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsItemModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsItemModel.kt
deleted file mode 100644
index c45d6bee3..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsItemModel.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config
-
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.shelf.domain.model.ShelfSection
-
-sealed interface ShelfSettingsItemModel : ListModel {
-
-	val isChecked: Boolean
-
-	class Section(
-		val section: ShelfSection,
-		override val isChecked: Boolean,
-	) : ShelfSettingsItemModel {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Section
-
-			if (section != other.section) return false
-			return isChecked == other.isChecked
-		}
-
-		override fun hashCode(): Int {
-			var result = section.hashCode()
-			result = 31 * result + isChecked.hashCode()
-			return result
-		}
-	}
-
-	class FavouriteCategory(
-		val id: Long,
-		val title: String,
-		override val isChecked: Boolean,
-	) : ShelfSettingsItemModel {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as FavouriteCategory
-
-			if (id != other.id) return false
-			if (title != other.title) return false
-			return isChecked == other.isChecked
-		}
-
-		override fun hashCode(): Int {
-			var result = id.hashCode()
-			result = 31 * result + title.hashCode()
-			result = 31 * result + isChecked.hashCode()
-			return result
-		}
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsListener.kt
deleted file mode 100644
index b8fa749a1..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsListener.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config
-
-import androidx.recyclerview.widget.RecyclerView
-
-interface ShelfSettingsListener {
-
-	fun onItemCheckedChanged(item: ShelfSettingsItemModel, isChecked: Boolean)
-
-	fun onDragHandleTouch(holder: RecyclerView.ViewHolder)
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsViewModel.kt
deleted file mode 100644
index 4df55a1d1..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/ShelfSettingsViewModel.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config
-
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.parsers.util.move
-import org.koitharu.kotatsu.shelf.domain.model.ShelfSection
-import javax.inject.Inject
-
-@HiltViewModel
-class ShelfSettingsViewModel @Inject constructor(
-	private val favouritesRepository: FavouritesRepository,
-	private val settings: AppSettings,
-) : BaseViewModel() {
-
-	val content = combine(
-		settings.observeAsFlow(AppSettings.KEY_SHELF_SECTIONS) { shelfSections },
-		settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled },
-		favouritesRepository.observeCategories(),
-	) { sections, isTrackerEnabled, categories ->
-		buildList(sections, isTrackerEnabled, categories)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
-
-	private var updateJob: Job? = null
-
-	fun setItemChecked(item: ShelfSettingsItemModel, isChecked: Boolean) {
-		val prevJob = updateJob
-		updateJob = launchJob(Dispatchers.Default) {
-			prevJob?.join()
-			when (item) {
-				is ShelfSettingsItemModel.FavouriteCategory -> {
-					favouritesRepository.updateCategory(item.id, isChecked)
-				}
-
-				is ShelfSettingsItemModel.Section -> {
-					val sections = settings.shelfSections
-					settings.shelfSections = if (isChecked) {
-						sections + item.section
-					} else {
-						if (sections.size > 1) {
-							sections - item.section
-						} else {
-							return@launchJob
-						}
-					}
-				}
-			}
-		}
-	}
-
-	fun reorderSections(oldPos: Int, newPos: Int): Boolean {
-		val snapshot = content.value.toMutableList()
-		snapshot.move(oldPos, newPos)
-		settings.shelfSections = snapshot.sections()
-		return true
-	}
-
-	private fun buildList(
-		sections: List<ShelfSection>,
-		isTrackerEnabled: Boolean,
-		categories: List<FavouriteCategory>
-	): List<ShelfSettingsItemModel> {
-		val result = ArrayList<ShelfSettingsItemModel>()
-		val sectionsList = ShelfSection.values().toMutableList()
-		if (!isTrackerEnabled) {
-			sectionsList.remove(ShelfSection.UPDATED)
-		}
-		for (section in sections) {
-			if (sectionsList.remove(section)) {
-				result.addSection(section, true, categories)
-			}
-		}
-		for (section in sectionsList) {
-			result.addSection(section, false, categories)
-		}
-		return result
-	}
-
-	private fun MutableList<in ShelfSettingsItemModel>.addSection(
-		section: ShelfSection,
-		isEnabled: Boolean,
-		favouriteCategories: List<FavouriteCategory>,
-	) {
-		add(ShelfSettingsItemModel.Section(section, isEnabled))
-		if (isEnabled && section == ShelfSection.FAVORITES) {
-			favouriteCategories.mapTo(this) {
-				ShelfSettingsItemModel.FavouriteCategory(
-					id = it.id,
-					title = it.title,
-					isChecked = it.isVisibleInLibrary,
-				)
-			}
-		}
-	}
-
-	private fun List<ShelfSettingsItemModel>.sections(): List<ShelfSection> {
-		return mapNotNull { (it as? ShelfSettingsItemModel.Section)?.takeIf { x -> x.isChecked }?.section }
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt
deleted file mode 100644
index 26f74d59b..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.config.size
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
-import com.google.android.material.slider.LabelFormatter
-import com.google.android.material.slider.Slider
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseBottomSheet
-import org.koitharu.kotatsu.core.util.ext.setValueRounded
-import org.koitharu.kotatsu.core.util.progress.IntPercentLabelFormatter
-import org.koitharu.kotatsu.databinding.SheetShelfSizeBinding
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ShelfSizeBottomSheet :
-	BaseBottomSheet<SheetShelfSizeBinding>(),
-	Slider.OnChangeListener,
-	View.OnClickListener {
-
-	@Inject
-	lateinit var settings: AppSettings
-	private var labelFormatter: LabelFormatter? = null
-
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetShelfSizeBinding {
-		return SheetShelfSizeBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: SheetShelfSizeBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		labelFormatter = IntPercentLabelFormatter(binding.root.context)
-		binding.sliderGrid.addOnChangeListener(this)
-		binding.buttonSmall.setOnClickListener(this)
-		binding.buttonLarge.setOnClickListener(this)
-
-		binding.sliderGrid.setValueRounded(settings.gridSize.toFloat())
-	}
-
-	override fun onDestroyView() {
-		labelFormatter = null
-		super.onDestroyView()
-	}
-
-	override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
-		settings.gridSize = value.toInt()
-		requireViewBinding().textViewLabel.text = labelFormatter?.getFormattedValue(value)
-	}
-
-	override fun onClick(v: View) {
-		val slider = requireViewBinding().sliderGrid
-		when (v.id) {
-			R.id.button_small -> slider.setValueRounded(slider.value - slider.stepSize)
-			R.id.button_large -> slider.setValueRounded(slider.value + slider.stepSize)
-		}
-	}
-
-	companion object {
-
-		private const val TAG = "ShelfSizeBottomSheet"
-
-		fun show(fm: FragmentManager) = ShelfSizeBottomSheet().show(fm, TAG)
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/model/ShelfSectionModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/model/ShelfSectionModel.kt
deleted file mode 100644
index 168087d10..000000000
--- a/app/src/main/kotlin/org/koitharu/kotatsu/shelf/ui/model/ShelfSectionModel.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.koitharu.kotatsu.shelf.ui.model
-
-import android.content.res.Resources
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.MangaItemModel
-
-sealed interface ShelfSectionModel : ListModel {
-
-	val items: List<MangaItemModel>
-
-	@get:StringRes
-	val showAllButtonText: Int
-
-	val key: String
-	fun getTitle(resources: Resources): CharSequence
-
-	override fun toString(): String
-
-	class History(
-		override val items: List<MangaItemModel>,
-		override val showAllButtonText: Int,
-	) : ShelfSectionModel {
-
-		override val key = "history"
-
-		override fun getTitle(resources: Resources) = resources.getString(R.string.history)
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as History
-
-			if (showAllButtonText != other.showAllButtonText) return false
-			return items == other.items
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + showAllButtonText.hashCode()
-			return result
-		}
-
-		override fun toString(): String = key
-	}
-
-	class Favourites(
-		override val items: List<MangaItemModel>,
-		val category: FavouriteCategory,
-		override val showAllButtonText: Int,
-	) : ShelfSectionModel {
-
-		override val key = "fav_${category.id}"
-
-		override fun getTitle(resources: Resources) = category.title
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Favourites
-
-			if (category != other.category) return false
-			if (showAllButtonText != other.showAllButtonText) return false
-			return items == other.items
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + category.hashCode()
-			result = 31 * result + showAllButtonText.hashCode()
-			return result
-		}
-
-		override fun toString(): String = key
-	}
-
-	class Updated(
-		override val items: List<MangaItemModel>,
-		override val showAllButtonText: Int,
-	) : ShelfSectionModel {
-
-		override val key = "upd"
-
-		override fun getTitle(resources: Resources) = resources.getString(R.string.updated)
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Updated
-
-			if (items != other.items) return false
-			return showAllButtonText == other.showAllButtonText
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + showAllButtonText
-			return result
-		}
-
-		override fun toString(): String = key
-	}
-
-	class Local(
-		override val items: List<MangaItemModel>,
-		override val showAllButtonText: Int,
-	) : ShelfSectionModel {
-
-		override val key = "local"
-
-		override fun getTitle(resources: Resources) = resources.getString(R.string.local_storage)
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Local
-
-			if (items != other.items) return false
-			return showAllButtonText == other.showAllButtonText
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + showAllButtonText
-			return result
-		}
-
-		override fun toString(): String = key
-	}
-
-	class Suggestions(
-		override val items: List<MangaItemModel>,
-		override val showAllButtonText: Int,
-	) : ShelfSectionModel {
-
-		override val key = "suggestions"
-
-		override fun getTitle(resources: Resources) = resources.getString(R.string.suggestions)
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Suggestions
-
-			if (items != other.items) return false
-			return showAllButtonText == other.showAllButtonText
-		}
-
-		override fun hashCode(): Int {
-			var result = items.hashCode()
-			result = 31 * result + showAllButtonText
-			return result
-		}
-
-		override fun toString(): String = key
-	}
-}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/data/SuggestionDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/data/SuggestionDao.kt
index cb77f7a68..4c55cd299 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/data/SuggestionDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/data/SuggestionDao.kt
@@ -19,6 +19,10 @@ abstract class SuggestionDao {
 	@Query("SELECT * FROM suggestions ORDER BY relevance DESC LIMIT :limit")
 	abstract fun observeAll(limit: Int): Flow<List<SuggestionWithManga>>
 
+	@Transaction
+	@Query("SELECT * FROM suggestions ORDER BY RANDOM() LIMIT 1")
+	abstract suspend fun getRandom(): SuggestionWithManga?
+
 	@Query("SELECT COUNT(*) FROM suggestions")
 	abstract suspend fun count(): Int
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
index 873d7750e..1759239d2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/domain/SuggestionRepository.kt
@@ -28,6 +28,12 @@ class SuggestionRepository @Inject constructor(
 		}
 	}
 
+	suspend fun getRandom(): Manga? {
+		return db.suggestionDao.getRandom()?.let {
+			it.manga.toManga(it.tags.toMangaTags())
+		}
+	}
+
 	suspend fun clear() {
 		db.suggestionDao.deleteAll()
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsFragment.kt
index 17fdb6830..b0f2888e9 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsFragment.kt
@@ -40,7 +40,7 @@ class SuggestionsFragment : MangaListFragment() {
 
 		override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
 			R.id.action_update -> {
-				SuggestionsWorker.startNow(requireContext())
+				viewModel.updateSuggestions()
 				Snackbar.make(
 					requireViewBinding().recyclerView,
 					R.string.feed_will_update_soon,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt
index 40338a217..2f9510b30 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt
@@ -28,6 +28,7 @@ class SuggestionsViewModel @Inject constructor(
 	settings: AppSettings,
 	private val extraProvider: ListExtraProvider,
 	downloadScheduler: DownloadWorker.Scheduler,
+	private val suggestionsScheduler: SuggestionsWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
 
 	override val content = combine(
@@ -57,4 +58,8 @@ class SuggestionsViewModel @Inject constructor(
 	override fun onRefresh() = Unit
 
 	override fun onRetry() = Unit
+
+	fun updateSuggestions() {
+		suggestionsScheduler.startNow()
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
index e8e2700f4..dc37f78ca 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
@@ -1,12 +1,11 @@
 package org.koitharu.kotatsu.suggestions.ui
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.os.Build
 import androidx.annotation.FloatRange
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.text.buildSpannedString
@@ -27,6 +26,7 @@ import androidx.work.await
 import androidx.work.workDataOf
 import coil.ImageLoader
 import coil.request.ImageRequest
+import dagger.Reusable
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CancellationException
@@ -35,13 +35,17 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.distinctById
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.WorkManagerHelper
 import org.koitharu.kotatsu.core.util.ext.almostEquals
 import org.koitharu.kotatsu.core.util.ext.asArrayList
+import org.koitharu.kotatsu.core.util.ext.awaitUniqueWorkInfoByName
 import org.koitharu.kotatsu.core.util.ext.flatten
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.sanitize
@@ -49,6 +53,7 @@ import org.koitharu.kotatsu.core.util.ext.takeMostFrequent
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
 import org.koitharu.kotatsu.core.util.ext.trySetForeground
 import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -62,6 +67,7 @@ import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion
 import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
 import org.koitharu.kotatsu.suggestions.domain.TagsBlacklist
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 import kotlin.math.pow
 import kotlin.random.Random
 
@@ -75,8 +81,11 @@ class SuggestionsWorker @AssistedInject constructor(
 	private val favouritesRepository: FavouritesRepository,
 	private val appSettings: AppSettings,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val sourcesRepository: MangaSourcesRepository,
 ) : CoroutineWorker(appContext, params) {
 
+	private val notificationManager by lazy { NotificationManagerCompat.from(appContext) }
+
 	override suspend fun doWork(): Result {
 		trySetForeground()
 		if (!appSettings.isSuggestionsEnabled) {
@@ -89,20 +98,15 @@ class SuggestionsWorker @AssistedInject constructor(
 	}
 
 	override suspend fun getForegroundInfo(): ForegroundInfo {
-		val manager = applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 		val title = applicationContext.getString(R.string.suggestions_updating)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val channel = NotificationChannel(
-				WORKER_CHANNEL_ID,
-				title,
-				NotificationManager.IMPORTANCE_LOW,
-			)
-			channel.setShowBadge(false)
-			channel.enableVibration(false)
-			channel.setSound(null, null)
-			channel.enableLights(false)
-			manager.createNotificationChannel(channel)
-		}
+		val channel = NotificationChannelCompat.Builder(WORKER_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+			.setName(title)
+			.setShowBadge(true)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(true)
+			.build()
+		notificationManager.createNotificationChannel(channel)
 
 		val notification = NotificationCompat.Builder(applicationContext, WORKER_CHANNEL_ID)
 			.setContentTitle(title)
@@ -124,17 +128,20 @@ class SuggestionsWorker @AssistedInject constructor(
 			historyRepository.getList(0, 20) +
 				favouritesRepository.getLastManga(20)
 			).distinctById()
-		val sources = appSettings.getMangaSources(includeHidden = false)
+		val sources = sourcesRepository.getEnabledSources()
 		if (seed.isEmpty() || sources.isEmpty()) {
 			return 0
 		}
 		val tagsBlacklist = TagsBlacklist(appSettings.suggestionsTagsBlacklist, TAG_EQ_THRESHOLD)
 		val tags = seed.flatMap { it.tags.map { x -> x.title } }.takeMostFrequent(10)
 
+		val semaphore = Semaphore(MAX_PARALLELISM)
 		val producer = channelFlow {
 			for (it in sources.shuffled()) {
 				launch {
-					send(getList(it, tags, tagsBlacklist))
+					semaphore.withPermit {
+						send(getList(it, tags, tagsBlacklist))
+					}
 				}
 			}
 		}
@@ -156,6 +163,9 @@ class SuggestionsWorker @AssistedInject constructor(
 					val manga = suggestions[Random.nextInt(0, suggestions.size / 3)]
 					val details = mangaRepositoryFactory.create(manga.manga.source)
 						.getDetails(manga.manga)
+					if (details.chapters.isNullOrEmpty()) {
+						continue
+					}
 					if (details.rating > 0 && details.rating < RATING_MIN) {
 						continue
 					}
@@ -198,23 +208,25 @@ class SuggestionsWorker @AssistedInject constructor(
 		}
 		list.shuffle()
 		list.take(MAX_SOURCE_RESULTS)
-	}.onFailure {
-		it.printStackTraceDebug()
+	}.onFailure { e ->
+		if (e is CloudFlareProtectedException) {
+			CaptchaNotifier(applicationContext).notify(e)
+		}
+		e.printStackTraceDebug()
 	}.getOrDefault(emptyList())
 
 	private suspend fun showNotification(manga: Manga) {
-		val manager = applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val channel = NotificationChannel(
-				MANGA_CHANNEL_ID,
-				applicationContext.getString(R.string.suggestions),
-				NotificationManager.IMPORTANCE_DEFAULT,
-			)
-			channel.description = applicationContext.getString(R.string.suggestions_summary)
-			channel.enableLights(true)
-			channel.setShowBadge(true)
-			manager.createNotificationChannel(channel)
+		if (!notificationManager.areNotificationsEnabled()) {
+			return
 		}
+		val channel = NotificationChannelCompat.Builder(MANGA_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_DEFAULT)
+			.setName(applicationContext.getString(R.string.suggestions))
+			.setDescription(applicationContext.getString(R.string.suggestions_summary))
+			.setLightsEnabled(true)
+			.setShowBadge(true)
+			.build()
+		notificationManager.createNotificationChannel(channel)
+
 		val id = manga.url.hashCode()
 		val title = applicationContext.getString(R.string.suggestion_manga, manga.title)
 		val builder = NotificationCompat.Builder(applicationContext, MANGA_CHANNEL_ID)
@@ -239,6 +251,15 @@ class SuggestionsWorker @AssistedInject constructor(
 						append(tagsText)
 						appendLine()
 						append(description)
+						val chaptersCount = manga.chapters?.size ?: 0
+						appendLine()
+						append(
+							applicationContext.resources.getQuantityString(
+								R.plurals.chapters,
+								chaptersCount,
+								chaptersCount,
+							),
+						)
 					},
 				)
 				style.setBigContentTitle(title)
@@ -284,7 +305,7 @@ class SuggestionsWorker @AssistedInject constructor(
 				),
 			)
 		}
-		manager.notify(TAG, id, builder.build())
+		notificationManager.notify(TAG, id, builder.build())
 	}
 
 	@FloatRange(from = 0.0, to = 1.0)
@@ -306,55 +327,36 @@ class SuggestionsWorker @AssistedInject constructor(
 		return -1
 	}
 
-	companion object : PeriodicWorkScheduler {
-
-		private const val TAG = "suggestions"
-		private const val TAG_ONESHOT = "suggestions_oneshot"
-		private const val DATA_COUNT = "count"
-		private const val WORKER_CHANNEL_ID = "suggestion_worker"
-		private const val MANGA_CHANNEL_ID = "suggestions"
-		private const val WORKER_NOTIFICATION_ID = 36
-		private const val MAX_RESULTS = 80
-		private const val MAX_SOURCE_RESULTS = 14
-		private const val MAX_RAW_RESULTS = 200
-		private const val TAG_EQ_THRESHOLD = 0.4f
-		private const val RATING_MIN = 0.5f
+	@Reusable
+	class Scheduler @Inject constructor(
+		private val workManager: WorkManager,
+		private val settings: AppSettings,
+	) : PeriodicWorkScheduler {
 
-		private val preferredSortOrders = listOf(
-			SortOrder.UPDATED,
-			SortOrder.NEWEST,
-			SortOrder.POPULARITY,
-			SortOrder.RATING,
-		)
-
-		override suspend fun schedule(context: Context) {
-			val constraints = Constraints.Builder()
-				.setRequiredNetworkType(NetworkType.UNMETERED)
-				.setRequiresBatteryNotLow(true)
-				.build()
+		override suspend fun schedule() {
 			val request = PeriodicWorkRequestBuilder<SuggestionsWorker>(6, TimeUnit.HOURS)
-				.setConstraints(constraints)
+				.setConstraints(createConstraints())
 				.addTag(TAG)
 				.setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
 				.build()
-			WorkManager.getInstance(context)
-				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.KEEP, request)
+			workManager
+				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.UPDATE, request)
 				.await()
 		}
 
-		override suspend fun unschedule(context: Context) {
-			WorkManager.getInstance(context)
+		override suspend fun unschedule() {
+			workManager
 				.cancelUniqueWork(TAG)
 				.await()
 		}
 
-		override suspend fun isScheduled(context: Context): Boolean {
-			return WorkManagerHelper(WorkManager.getInstance(context))
-				.getUniqueWorkInfoByName(TAG)
+		override suspend fun isScheduled(): Boolean {
+			return workManager
+				.awaitUniqueWorkInfoByName(TAG)
 				.any { !it.state.isFinished }
 		}
 
-		fun startNow(context: Context) {
+		fun startNow() {
 			val constraints = Constraints.Builder()
 				.setRequiredNetworkType(NetworkType.CONNECTED)
 				.build()
@@ -363,8 +365,35 @@ class SuggestionsWorker @AssistedInject constructor(
 				.addTag(TAG_ONESHOT)
 				.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
 				.build()
-			WorkManager.getInstance(context)
-				.enqueue(request)
+			workManager.enqueue(request)
 		}
+
+		private fun createConstraints() = Constraints.Builder()
+			.setRequiredNetworkType(if (settings.isSuggestionsWiFiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED)
+			.setRequiresBatteryNotLow(true)
+			.build()
+	}
+
+	private companion object {
+
+		const val TAG = "suggestions"
+		const val TAG_ONESHOT = "suggestions_oneshot"
+		const val DATA_COUNT = "count"
+		const val WORKER_CHANNEL_ID = "suggestion_worker"
+		const val MANGA_CHANNEL_ID = "suggestions"
+		const val WORKER_NOTIFICATION_ID = 36
+		const val MAX_RESULTS = 80
+		const val MAX_PARALLELISM = 3
+		const val MAX_SOURCE_RESULTS = 14
+		const val MAX_RAW_RESULTS = 200
+		const val TAG_EQ_THRESHOLD = 0.4f
+		const val RATING_MIN = 0.5f
+
+		val preferredSortOrders = listOf(
+			SortOrder.UPDATED,
+			SortOrder.NEWEST,
+			SortOrder.POPULARITY,
+			SortOrder.RATING,
+		)
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TracksDao.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TracksDao.kt
index 4a9770fc8..357a98c57 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TracksDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TracksDao.kt
@@ -37,6 +37,10 @@ abstract class TracksDao {
 	@Query("SELECT manga.* FROM tracks LEFT JOIN manga ON manga.manga_id = tracks.manga_id WHERE chapters_new > 0 ORDER BY chapters_new DESC")
 	abstract fun observeUpdatedManga(): Flow<List<MangaWithTags>>
 
+	@Transaction
+	@Query("SELECT manga.* FROM tracks LEFT JOIN manga ON manga.manga_id = tracks.manga_id WHERE chapters_new > 0 ORDER BY chapters_new DESC LIMIT :limit")
+	abstract fun observeUpdatedManga(limit: Int): Flow<List<MangaWithTags>>
+
 	@Query("DELETE FROM tracks")
 	abstract suspend fun clear()
 
@@ -49,7 +53,7 @@ abstract class TracksDao {
 	@Query("DELETE FROM tracks WHERE manga_id = :mangaId")
 	abstract suspend fun delete(mangaId: Long)
 
-	@Query("DELETE FROM tracks WHERE manga_id NOT IN (SELECT manga_id FROM history UNION SELECT manga_id FROM favourites)")
+	@Query("DELETE FROM tracks WHERE manga_id NOT IN (SELECT manga_id FROM history UNION SELECT manga_id FROM favourites WHERE category_id IN (SELECT category_id FROM favourite_categories WHERE track = 1))")
 	abstract suspend fun gc()
 
 	@Upsert
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt
index fcc8f996a..d23950b8b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt
@@ -25,7 +25,7 @@ class Tracker @Inject constructor(
 		if (sources.isEmpty()) {
 			return emptyList()
 		}
-		val knownIds = HashSet<Manga>()
+		val knownManga = HashSet<Long>()
 		val result = ArrayList<TrackingItem>()
 		// Favourites
 		if (AppSettings.TRACK_FAVOURITES in sources) {
@@ -42,7 +42,7 @@ class Tracker @Inject constructor(
 					null
 				}
 				for (track in categoryTracks) {
-					if (knownIds.add(track.manga)) {
+					if (knownManga.add(track.manga.id)) {
 						result.add(TrackingItem(track, channelId))
 					}
 				}
@@ -58,7 +58,7 @@ class Tracker @Inject constructor(
 				null
 			}
 			for (track in historyTracks) {
-				if (knownIds.add(track.manga)) {
+				if (knownManga.add(track.manga.id)) {
 					result.add(TrackingItem(track, channelId))
 				}
 			}
@@ -67,11 +67,15 @@ class Tracker @Inject constructor(
 		return result
 	}
 
+	suspend fun getTracks(ids: Set<Long>): List<TrackingItem> {
+		return getAllTracks().filterTo(ArrayList(ids.size)) { x -> x.tracking.manga.id in ids }
+	}
+
 	suspend fun gc() {
 		repository.gc()
 	}
 
-	suspend fun fetchUpdates(track: MangaTracking, commit: Boolean): MangaUpdates {
+	suspend fun fetchUpdates(track: MangaTracking, commit: Boolean): MangaUpdates.Success {
 		val manga = mangaRepositoryFactory.create(track.manga.source).getDetails(track.manga)
 		val updates = compare(track, manga, getBranch(manga))
 		if (commit) {
@@ -103,24 +107,24 @@ class Tracker @Inject constructor(
 	/**
 	 * The main functionality of tracker: check new chapters in [manga] comparing to the [track]
 	 */
-	private fun compare(track: MangaTracking, manga: Manga, branch: String?): MangaUpdates {
+	private fun compare(track: MangaTracking, manga: Manga, branch: String?): MangaUpdates.Success {
 		if (track.isEmpty()) {
 			// first check or manga was empty on last check
-			return MangaUpdates(manga, emptyList(), isValid = false)
+			return MangaUpdates.Success(manga, emptyList(), isValid = false)
 		}
 		val chapters = requireNotNull(manga.getChapters(branch))
 		val newChapters = chapters.takeLastWhile { x -> x.id != track.lastChapterId }
 		return when {
 			newChapters.isEmpty() -> {
-				MangaUpdates(manga, emptyList(), isValid = chapters.lastOrNull()?.id == track.lastChapterId)
+				MangaUpdates.Success(manga, emptyList(), isValid = chapters.lastOrNull()?.id == track.lastChapterId)
 			}
 
 			newChapters.size == chapters.size -> {
-				MangaUpdates(manga, emptyList(), isValid = false)
+				MangaUpdates.Success(manga, emptyList(), isValid = false)
 			}
 
 			else -> {
-				MangaUpdates(manga, newChapters, isValid = true)
+				MangaUpdates.Success(manga, newChapters, isValid = true)
 			}
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
index f0a7b8968..8114c5159 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.toManga
@@ -33,6 +34,8 @@ class TrackingRepository @Inject constructor(
 	private val db: MangaDatabase,
 ) {
 
+	private var isGcCalled = false
+
 	suspend fun getNewChaptersCount(mangaId: Long): Int {
 		return db.tracksDao.findNewChapters(mangaId) ?: 0
 	}
@@ -43,12 +46,17 @@ class TrackingRepository @Inject constructor(
 
 	fun observeUpdatedMangaCount(): Flow<Int> {
 		return db.tracksDao.observeNewChapters().map { list -> list.count { it > 0 } }
+			.onStart { gcIfNotCalled() }
 	}
 
-	fun observeUpdatedManga(): Flow<List<Manga>> {
-		return db.tracksDao.observeUpdatedManga()
-			.mapItems { it.toManga() }
+	fun observeUpdatedManga(limit: Int = 0): Flow<List<Manga>> {
+		return if (limit == 0) {
+			db.tracksDao.observeUpdatedManga()
+		} else {
+			db.tracksDao.observeUpdatedManga(limit)
+		}.mapItems { it.toManga() }
 			.distinctUntilChanged()
+			.onStart { gcIfNotCalled() }
 	}
 
 	suspend fun getTracks(mangaList: Collection<Manga>): List<MangaTracking> {
@@ -94,6 +102,8 @@ class TrackingRepository @Inject constructor(
 				val countersMap = counters.toMutableMap()
 				entities.map { x -> x.toTrackingLogItem(countersMap) }
 			}
+		}.onStart {
+			gcIfNotCalled()
 		}
 	}
 
@@ -104,13 +114,11 @@ class TrackingRepository @Inject constructor(
 	suspend fun clearCounters() = db.tracksDao.clearCounters()
 
 	suspend fun gc() {
-		db.withTransaction {
-			db.tracksDao.gc()
-			db.trackLogsDao.gc()
-		}
+		db.tracksDao.gc()
+		db.trackLogsDao.gc()
 	}
 
-	suspend fun saveUpdates(updates: MangaUpdates) {
+	suspend fun saveUpdates(updates: MangaUpdates.Success) {
 		db.withTransaction {
 			val track = getOrCreateTrack(updates.manga.id).mergeWith(updates)
 			db.tracksDao.upsert(track)
@@ -191,7 +199,7 @@ class TrackingRepository @Inject constructor(
 		)
 	}
 
-	private suspend fun updatePercent(updates: MangaUpdates) {
+	private suspend fun updatePercent(updates: MangaUpdates.Success) {
 		val history = db.historyDao.find(updates.manga.id) ?: return
 		val chapters = updates.manga.chapters
 		if (chapters.isNullOrEmpty()) {
@@ -206,7 +214,7 @@ class TrackingRepository @Inject constructor(
 		db.historyDao.update(history.copy(percent = newPercent))
 	}
 
-	private fun TrackEntity.mergeWith(updates: MangaUpdates): TrackEntity {
+	private fun TrackEntity.mergeWith(updates: MangaUpdates.Success): TrackEntity {
 		val chapters = updates.manga.chapters.orEmpty()
 		return TrackEntity(
 			mangaId = mangaId,
@@ -218,5 +226,12 @@ class TrackingRepository @Inject constructor(
 		)
 	}
 
+	private suspend fun gcIfNotCalled() {
+		if (!isGcCalled) {
+			gc()
+			isGcCalled = true
+		}
+	}
+
 	private fun Collection<MangaEntity>.toMangaList() = map { it.toManga(emptySet()) }
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaTracking.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaTracking.kt
index 74c964ec8..be931ad98 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaTracking.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaTracking.kt
@@ -21,9 +21,7 @@ class MangaTracking(
 
 		if (manga != other.manga) return false
 		if (lastChapterId != other.lastChapterId) return false
-		if (lastCheck != other.lastCheck) return false
-
-		return true
+		return lastCheck == other.lastCheck
 	}
 
 	override fun hashCode(): Int {
@@ -32,4 +30,4 @@ class MangaTracking(
 		result = 31 * result + (lastCheck?.hashCode() ?: 0)
 		return result
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaUpdates.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaUpdates.kt
index 937f06808..b1c2da4a5 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaUpdates.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaUpdates.kt
@@ -1,13 +1,27 @@
 package org.koitharu.kotatsu.tracker.domain.model
 
+import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
-class MangaUpdates(
-	val manga: Manga,
-	val newChapters: List<MangaChapter>,
-	val isValid: Boolean,
-) {
+sealed interface MangaUpdates {
 
-	fun isNotEmpty() = newChapters.isNotEmpty()
-}
\ No newline at end of file
+	val manga: Manga
+
+	class Success(
+		override val manga: Manga,
+		val newChapters: List<MangaChapter>,
+		val isValid: Boolean,
+	) : MangaUpdates {
+
+		fun isNotEmpty() = newChapters.isNotEmpty()
+	}
+
+	class Failure(
+		override val manga: Manga,
+		val error: Throwable?,
+	) : MangaUpdates {
+
+		fun shouldRetry() = error is TooManyRequestExceptions
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt
index 588e22677..faa8594c4 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt
@@ -15,21 +15,21 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.PaginationScrollListener
-import org.koitharu.kotatsu.core.ui.list.decor.TypedSpacingItemDecoration
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentFeedBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
 import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.tracker.ui.feed.adapter.FeedAdapter
-import org.koitharu.kotatsu.tracker.work.TrackWorker
+import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -52,27 +52,18 @@ class FeedFragment :
 
 	override fun onViewBindingCreated(binding: FragmentFeedBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		feedAdapter = FeedAdapter(coil, viewLifecycleOwner, this)
+		val sizeResolver = StaticItemSizeResolver(resources.getDimensionPixelSize(R.dimen.smaller_grid_width))
+		feedAdapter = FeedAdapter(coil, viewLifecycleOwner, this, sizeResolver)
 		with(binding.recyclerView) {
 			adapter = feedAdapter
 			setHasFixedSize(true)
 			addOnScrollListener(PaginationScrollListener(4, this@FeedFragment))
-			val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-			val decoration = TypedSpacingItemDecoration(
-				FeedAdapter.ITEM_TYPE_FEED to 0,
-				fallbackSpacing = spacing,
-			)
-			addItemDecoration(decoration)
-		}
-		with(binding.swipeRefreshLayout) {
-			setProgressBackgroundColorSchemeColor(context.getThemeColor(com.google.android.material.R.attr.colorPrimary))
-			setColorSchemeColors(context.getThemeColor(com.google.android.material.R.attr.colorOnPrimary))
-			setOnRefreshListener(this@FeedFragment)
+			addItemDecoration(TypedListSpacingDecoration(context))
 		}
+		binding.swipeRefreshLayout.setOnRefreshListener(this)
 		addMenuProvider(
 			FeedMenuProvider(
 				binding.recyclerView,
-				(activity as? BottomNavOwner)?.bottomNav,
 				viewModel,
 			),
 		)
@@ -82,8 +73,7 @@ class FeedFragment :
 		viewModel.onFeedCleared.observeEvent(viewLifecycleOwner) {
 			onFeedCleared()
 		}
-		TrackWorker.observeIsRunning(binding.root.context.applicationContext)
-			.observe(viewLifecycleOwner, this::onIsTrackerRunningChanged)
+		viewModel.isRunning.observe(viewLifecycleOwner, this::onIsTrackerRunningChanged)
 	}
 
 	override fun onDestroyView() {
@@ -98,7 +88,7 @@ class FeedFragment :
 	}
 
 	override fun onRefresh() {
-		TrackWorker.startNow(context ?: return)
+		viewModel.update()
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -109,7 +99,10 @@ class FeedFragment :
 
 	override fun onEmptyActionClick() = Unit
 
-	override fun onListHeaderClick(item: ListHeader, view: View) = Unit
+	override fun onListHeaderClick(item: ListHeader, view: View) {
+		val context = view.context
+		context.startActivity(UpdatesActivity.newIntent(context))
+	}
 
 	private fun onListChanged(list: List<ListModel>) {
 		feedAdapter?.items = list
@@ -140,9 +133,4 @@ class FeedFragment :
 	override fun onReadClick(manga: Manga, view: View) = Unit
 
 	override fun onTagClick(manga: Manga, tag: MangaTag, view: View) = Unit
-
-	companion object {
-
-		fun newInstance() = FeedFragment()
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedMenuProvider.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedMenuProvider.kt
index 88d888039..9ec9c545b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedMenuProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedMenuProvider.kt
@@ -8,12 +8,10 @@ import android.view.View
 import androidx.core.view.MenuProvider
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.dialog.CheckBoxAlertDialog
-import org.koitharu.kotatsu.settings.SettingsActivity
-import org.koitharu.kotatsu.tracker.work.TrackWorker
+import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
 
 class FeedMenuProvider(
 	private val snackbarHost: View,
-	private val anchorView: View?,
 	private val viewModel: FeedViewModel,
 ) : MenuProvider {
 
@@ -26,7 +24,7 @@ class FeedMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
 		R.id.action_update -> {
-			TrackWorker.startNow(context)
+			viewModel.update()
 			true
 		}
 
@@ -43,9 +41,8 @@ class FeedMenuProvider(
 			true
 		}
 
-		R.id.action_settings -> {
-			val intent = SettingsActivity.newTrackerSettingsIntent(context)
-			context.startActivity(intent)
+		R.id.action_updated -> {
+			context.startActivity(UpdatesActivity.newIntent(context))
 			true
 		}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedViewModel.kt
index ce1c89b3a..7550fad36 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedViewModel.kt
@@ -5,21 +5,28 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.daysDiff
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
 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.toUi
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.tracker.domain.model.TrackingLogItem
+import org.koitharu.kotatsu.tracker.ui.feed.model.UpdatedMangaHeader
 import org.koitharu.kotatsu.tracker.ui.feed.model.toFeedItem
+import org.koitharu.kotatsu.tracker.work.TrackWorker
 import java.util.Date
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -30,28 +37,44 @@ private const val PAGE_SIZE = 20
 @HiltViewModel
 class FeedViewModel @Inject constructor(
 	private val repository: TrackingRepository,
+	private val scheduler: TrackWorker.Scheduler,
+	private val listExtraProvider: ListExtraProvider,
 ) : BaseViewModel() {
 
 	private val limit = MutableStateFlow(PAGE_SIZE)
 	private val isReady = AtomicBoolean(false)
 
+	val isRunning = scheduler.observeIsRunning()
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
+
 	val onFeedCleared = MutableEventFlow<Unit>()
-	val content = repository.observeTrackingLog(limit)
-		.map { list ->
-			if (list.isEmpty()) {
-				listOf(
-					EmptyState(
-						icon = R.drawable.ic_empty_feed,
-						textPrimary = R.string.text_empty_holder_primary,
-						textSecondary = R.string.text_feed_holder,
-						actionStringRes = 0,
-					),
-				)
-			} else {
-				isReady.set(true)
-				list.mapList()
-			}
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+	val content = combine(
+		observeHeader(),
+		repository.observeTrackingLog(limit),
+	) { header, list ->
+		val result = ArrayList<ListModel>((list.size * 1.4).toInt().coerceAtLeast(2))
+		if (header != null) {
+			result += header
+		}
+		if (list.isEmpty()) {
+			result += EmptyState(
+				icon = R.drawable.ic_empty_feed,
+				textPrimary = R.string.text_empty_holder_primary,
+				textSecondary = R.string.text_feed_holder,
+				actionStringRes = 0,
+			)
+		} else {
+			isReady.set(true)
+			list.mapListTo(result)
+		}
+		result
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+
+	init {
+		launchJob(Dispatchers.Default) {
+			repository.gc()
+		}
+	}
 
 	fun clearFeed(clearCounters: Boolean) {
 		launchLoadingJob(Dispatchers.Default) {
@@ -69,18 +92,28 @@ class FeedViewModel @Inject constructor(
 		}
 	}
 
-	private fun List<TrackingLogItem>.mapList(): List<ListModel> {
-		val destination = ArrayList<ListModel>((size * 1.4).toInt())
+	fun update() {
+		scheduler.startNow()
+	}
+
+	private fun List<TrackingLogItem>.mapListTo(destination: MutableList<ListModel>) {
 		var prevDate: DateTimeAgo? = null
 		for (item in this) {
 			val date = timeAgo(item.createdAt)
 			if (prevDate != date) {
-				destination += date
+				destination += ListHeader(date)
 			}
 			prevDate = date
 			destination += item.toFeedItem()
 		}
-		return destination
+	}
+
+	private fun observeHeader() = repository.observeUpdatedManga(10).map { mangaList ->
+		if (mangaList.isEmpty()) {
+			null
+		} else {
+			UpdatedMangaHeader(mangaList.toUi(ListMode.GRID, listExtraProvider))
+		}
 	}
 
 	private fun timeAgo(date: Date): DateTimeAgo {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/FeedAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/FeedAdapter.kt
index 063e17d8c..e39f5055d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/FeedAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/FeedAdapter.kt
@@ -2,83 +2,56 @@ package org.koitharu.kotatsu.tracker.ui.feed.adapter
 
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.errorFooterAD
 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.adapter.relatedDateItemAD
+import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.tracker.ui.feed.model.FeedItem
-import kotlin.jvm.internal.Intrinsics
+import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
 
 class FeedAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: MangaListListener,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()), FastScroller.SectionIndexer {
+	sizeResolver: ItemSizeResolver,
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		delegatesManager
-			.addDelegate(ITEM_TYPE_FEED, feedItemAD(coil, lifecycleOwner, listener))
-			.addDelegate(ITEM_TYPE_LOADING_FOOTER, loadingFooterAD())
-			.addDelegate(ITEM_TYPE_LOADING_STATE, loadingStateAD())
-			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(listener))
-			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
-			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
-			.addDelegate(ITEM_TYPE_DATE_HEADER, relatedDateItemAD())
+		addDelegate(ListItemType.FEED, feedItemAD(coil, lifecycleOwner, listener))
+		addDelegate(
+			ListItemType.MANGA_NESTED_GROUP,
+			updatedMangaAD(
+				lifecycleOwner = lifecycleOwner,
+				coil = coil,
+				sizeResolver = sizeResolver,
+				listener = listener,
+				headerClickListener = listener,
+			),
+		)
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.FOOTER_ERROR, errorFooterAD(listener))
+		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(listener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(listener))
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
 		val list = items
 		for (i in (0..position).reversed()) {
 			val item = list.getOrNull(i) ?: continue
-			if (item is DateTimeAgo) {
-				return item.format(context.resources)
+			if (item is ListHeader) {
+				return item.getText(context)
 			}
 		}
 		return null
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel) = when {
-			oldItem is FeedItem && newItem is FeedItem -> {
-				oldItem.id == newItem.id
-			}
-
-			oldItem is DateTimeAgo && newItem is DateTimeAgo -> {
-				oldItem == newItem
-			}
-
-			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)
-		}
-	}
-
-	companion object {
-
-		const val ITEM_TYPE_FEED = 0
-		const val ITEM_TYPE_LOADING_FOOTER = 1
-		const val ITEM_TYPE_LOADING_STATE = 2
-		const val ITEM_TYPE_ERROR_STATE = 3
-		const val ITEM_TYPE_ERROR_FOOTER = 4
-		const val ITEM_TYPE_EMPTY = 5
-		const val ITEM_TYPE_HEADER = 6
-		const val ITEM_TYPE_DATE_HEADER = 7
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt
new file mode 100644
index 000000000..13c59d044
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt
@@ -0,0 +1,44 @@
+package org.koitharu.kotatsu.tracker.ui.feed.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.databinding.ItemListGroupBinding
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.size.ItemSizeResolver
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.tracker.ui.feed.model.UpdatedMangaHeader
+
+fun updatedMangaAD(
+	lifecycleOwner: LifecycleOwner,
+	coil: ImageLoader,
+	sizeResolver: ItemSizeResolver,
+	listener: OnListItemClickListener<Manga>,
+	headerClickListener: ListHeaderClickListener,
+) = adapterDelegateViewBinding<UpdatedMangaHeader, ListModel, ItemListGroupBinding>(
+	{ layoutInflater, parent -> ItemListGroupBinding.inflate(layoutInflater, parent, false) },
+) {
+
+	val adapter = BaseListAdapter<ListModel>()
+		.addDelegate(ListItemType.MANGA_GRID, mangaGridItemAD(coil, lifecycleOwner, sizeResolver, listener))
+	binding.recyclerView.adapter = adapter
+	val spacing = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing)
+	binding.recyclerView.addItemDecoration(SpacingItemDecoration(spacing))
+	binding.buttonMore.setOnClickListener { v ->
+		headerClickListener.onListHeaderClick(ListHeader(0, payload = item), v)
+	}
+	binding.textViewTitle.setText(R.string.updates)
+	binding.buttonMore.setText(R.string.more)
+
+	bind {
+		adapter.items = item.list
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/FeedItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/FeedItem.kt
index 90e97624d..dd7d20d6b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/FeedItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/FeedItem.kt
@@ -3,11 +3,40 @@ package org.koitharu.kotatsu.tracker.ui.feed.model
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
-data class FeedItem(
+class FeedItem(
 	val id: Long,
 	val imageUrl: String,
 	val title: String,
 	val manga: Manga,
 	val count: Int,
 	val isNew: Boolean,
-) : ListModel
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is FeedItem && other.id == id
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as FeedItem
+
+		if (id != other.id) return false
+		if (imageUrl != other.imageUrl) return false
+		if (title != other.title) return false
+		if (manga != other.manga) return false
+		if (count != other.count) return false
+		return isNew == other.isNew
+	}
+
+	override fun hashCode(): Int {
+		var result = id.hashCode()
+		result = 31 * result + imageUrl.hashCode()
+		result = 31 * result + title.hashCode()
+		result = 31 * result + manga.hashCode()
+		result = 31 * result + count
+		result = 31 * result + isNew.hashCode()
+		return result
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/UpdatedMangaHeader.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/UpdatedMangaHeader.kt
new file mode 100644
index 000000000..71e2ce8de
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/UpdatedMangaHeader.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.tracker.ui.feed.model
+
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+
+data class UpdatedMangaHeader(
+	val list: List<MangaItemModel>,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is UpdatedMangaHeader
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any {
+		return ListModelDiffCallback.PAYLOAD_NESTED_LIST_CHANGED
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt
index fedfd6bbe..6c14436df 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/updates/UpdatesViewModel.kt
@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.onFirst
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
-import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
@@ -27,7 +26,6 @@ import javax.inject.Inject
 class UpdatesViewModel @Inject constructor(
 	private val repository: TrackingRepository,
 	private val settings: AppSettings,
-	private val historyRepository: HistoryRepository,
 	private val extraProvider: ListExtraProvider,
 	downloadScheduler: DownloadWorker.Scheduler,
 ) : MangaListViewModel(settings, downloadScheduler) {
@@ -56,6 +54,12 @@ class UpdatesViewModel @Inject constructor(
 		emit(listOf(it.toErrorState(canRetry = false)))
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
+	init {
+		launchJob(Dispatchers.Default) {
+			repository.gc()
+		}
+	}
+
 	override fun onRefresh() = Unit
 
 	override fun onRetry() = Unit
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
index 2880969dc..50c6cf8be 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
@@ -1,15 +1,16 @@
 package org.koitharu.kotatsu.tracker.work
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.os.Build
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.VISIBILITY_PUBLIC
 import androidx.core.app.NotificationCompat.VISIBILITY_SECRET
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
+import androidx.core.content.edit
 import androidx.hilt.work.HiltWorker
 import androidx.lifecycle.asFlow
 import androidx.work.BackoffPolicy
@@ -29,31 +30,40 @@ import androidx.work.WorkerParameters
 import androidx.work.await
 import coil.ImageLoader
 import coil.request.ImageRequest
+import dagger.Reusable
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.logs.FileLogger
 import org.koitharu.kotatsu.core.logs.TrackerLogger
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.WorkManagerHelper
+import org.koitharu.kotatsu.core.util.ext.awaitUniqueWorkInfoByName
+import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
 import org.koitharu.kotatsu.core.util.ext.trySetForeground
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.settings.work.PeriodicWorkScheduler
 import org.koitharu.kotatsu.tracker.domain.Tracker
 import org.koitharu.kotatsu.tracker.domain.model.MangaUpdates
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 
 @HiltWorker
 class TrackWorker @AssistedInject constructor(
@@ -65,18 +75,16 @@ class TrackWorker @AssistedInject constructor(
 	@TrackerLogger private val logger: FileLogger,
 ) : CoroutineWorker(context, workerParams) {
 
-	private val notificationManager by lazy {
-		applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-	}
+	private val notificationManager by lazy { NotificationManagerCompat.from(applicationContext) }
 
 	override suspend fun doWork(): Result {
 		trySetForeground()
-		logger.log("doWork()")
-		try {
-			return doWorkImpl()
+		logger.log("doWork(): attempt $runAttemptCount")
+		return try {
+			doWorkImpl()
 		} catch (e: Throwable) {
 			logger.log("fatal", e)
-			throw e
+			Result.failure()
 		} finally {
 			withContext(NonCancellable) {
 				logger.flush()
@@ -89,7 +97,12 @@ class TrackWorker @AssistedInject constructor(
 		if (!settings.isTrackerEnabled) {
 			return Result.success(workDataOf(0, 0))
 		}
-		val tracks = tracker.getAllTracks()
+		val retryIds = getRetryIds()
+		val tracks = if (retryIds.isNotEmpty()) {
+			tracker.getTracks(retryIds)
+		} else {
+			tracker.getAllTracks()
+		}
 		logger.log("Total ${tracks.size} tracks")
 		if (tracks.isEmpty()) {
 			return Result.success(workDataOf(0, 0))
@@ -100,47 +113,68 @@ class TrackWorker @AssistedInject constructor(
 
 		var success = 0
 		var failed = 0
+		val retry = HashSet<Long>()
 		results.forEach { x ->
-			if (x == null) {
-				failed++
-			} else {
-				success++
+			when (x) {
+				is MangaUpdates.Success -> success++
+				is MangaUpdates.Failure -> {
+					failed++
+					if (x.shouldRetry()) {
+						retry += x.manga.id
+					}
+				}
 			}
 		}
-		logger.log("Result: success: $success, failed: $failed")
+		if (runAttemptCount > MAX_ATTEMPTS) {
+			retry.clear()
+		}
+		setRetryIds(retry)
+		logger.log("Result: success: $success, failed: $failed, retry: ${retry.size}")
 		val resultData = workDataOf(success, failed)
-		return if (success == 0 && failed != 0) {
-			Result.failure(resultData)
-		} else {
-			Result.success(resultData)
+		return when {
+			retry.isNotEmpty() -> Result.retry()
+			success == 0 && failed != 0 -> Result.failure(resultData)
+			else -> Result.success(resultData)
 		}
 	}
 
-	private suspend fun checkUpdatesAsync(tracks: List<TrackingItem>): List<MangaUpdates?> {
-		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
-		return supervisorScope {
-			tracks.map { (track, channelId) ->
-				async(dispatcher) {
-					runCatchingCancellable {
-						tracker.fetchUpdates(track, commit = true)
-					}.onFailure {
-						logger.log("checkUpdatesAsync", it)
-					}.onSuccess { updates ->
-						if (updates.isValid && updates.isNotEmpty()) {
-							showNotification(
-								manga = updates.manga,
-								channelId = channelId,
-								newChapters = updates.newChapters,
-							)
-						}
-					}.getOrNull()
+	private suspend fun checkUpdatesAsync(tracks: List<TrackingItem>): List<MangaUpdates> {
+		val semaphore = Semaphore(MAX_PARALLELISM)
+		return channelFlow {
+			for ((track, channelId) in tracks) {
+				launch {
+					semaphore.withPermit {
+						send(
+							runCatchingCancellable {
+								tracker.fetchUpdates(track, commit = true)
+							}.onFailure { e ->
+								if (e is CloudFlareProtectedException) {
+									CaptchaNotifier(applicationContext).notify(e)
+								}
+								logger.log("checkUpdatesAsync", e)
+							}.onSuccess { updates ->
+								if (updates.isValid && updates.isNotEmpty()) {
+									showNotification(
+										manga = updates.manga,
+										channelId = channelId,
+										newChapters = updates.newChapters,
+									)
+								}
+							}.getOrElse { error ->
+								MangaUpdates.Failure(
+									manga = track.manga,
+									error = error,
+								)
+							},
+						)
+					}
 				}
-			}.awaitAll()
-		}
+			}
+		}.toList(ArrayList(tracks.size))
 	}
 
 	private suspend fun showNotification(manga: Manga, channelId: String?, newChapters: List<MangaChapter>) {
-		if (newChapters.isEmpty() || channelId == null) {
+		if (newChapters.isEmpty() || channelId == null || !applicationContext.checkNotificationPermission()) {
 			return
 		}
 		val id = manga.url.hashCode()
@@ -204,18 +238,15 @@ class TrackWorker @AssistedInject constructor(
 
 	override suspend fun getForegroundInfo(): ForegroundInfo {
 		val title = applicationContext.getString(R.string.check_for_new_chapters)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			val channel = NotificationChannel(
-				WORKER_CHANNEL_ID,
-				title,
-				NotificationManager.IMPORTANCE_LOW,
-			)
-			channel.setShowBadge(false)
-			channel.enableVibration(false)
-			channel.setSound(null, null)
-			channel.enableLights(false)
-			notificationManager.createNotificationChannel(channel)
-		}
+		val channel = NotificationChannelCompat.Builder(WORKER_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+			.setName(title)
+			.setShowBadge(false)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		notificationManager.createNotificationChannel(channel)
+
 		val notification = NotificationCompat.Builder(applicationContext, WORKER_CHANNEL_ID)
 			.setContentTitle(title)
 			.setPriority(NotificationCompat.PRIORITY_MIN)
@@ -230,6 +261,22 @@ class TrackWorker @AssistedInject constructor(
 		return ForegroundInfo(WORKER_NOTIFICATION_ID, notification)
 	}
 
+	private suspend fun setRetryIds(ids: Set<Long>) = runInterruptible(Dispatchers.IO) {
+		val prefs = applicationContext.getSharedPreferences(TAG, Context.MODE_PRIVATE)
+		prefs.edit(commit = true) {
+			if (ids.isEmpty()) {
+				remove(KEY_RETRY_IDS)
+			} else {
+				putStringSet(KEY_RETRY_IDS, ids.mapToSet { it.toString() })
+			}
+		}
+	}
+
+	private fun getRetryIds(): Set<Long> {
+		val prefs = applicationContext.getSharedPreferences(TAG, Context.MODE_PRIVATE)
+		return prefs.getStringSet(KEY_RETRY_IDS, null)?.mapToSet { it.toLong() }.orEmpty()
+	}
+
 	private fun workDataOf(success: Int, failed: Int): Data {
 		return Data.Builder()
 			.putInt(DATA_KEY_SUCCESS, success)
@@ -237,57 +284,70 @@ class TrackWorker @AssistedInject constructor(
 			.build()
 	}
 
-	companion object : PeriodicWorkScheduler {
-
-		private const val WORKER_CHANNEL_ID = "track_worker"
-		private const val WORKER_NOTIFICATION_ID = 35
-		private const val TAG = "tracking"
-		private const val TAG_ONESHOT = "tracking_oneshot"
-		private const val MAX_PARALLELISM = 4
-		private const val DATA_KEY_SUCCESS = "success"
-		private const val DATA_KEY_FAILED = "failed"
+	@Reusable
+	class Scheduler @Inject constructor(
+		private val workManager: WorkManager,
+		private val settings: AppSettings,
+	) : PeriodicWorkScheduler {
 
-		override suspend fun schedule(context: Context) {
-			val constraints = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
+		override suspend fun schedule() {
+			val constraints = createConstraints()
 			val request = PeriodicWorkRequestBuilder<TrackWorker>(4, TimeUnit.HOURS)
 				.setConstraints(constraints)
 				.addTag(TAG)
-				.setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
+				.setBackoffCriteria(BackoffPolicy.LINEAR, 5, TimeUnit.MINUTES)
 				.build()
-			WorkManager.getInstance(context)
-				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.KEEP, request)
+			workManager
+				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.UPDATE, request)
 				.await()
 		}
 
-		override suspend fun unschedule(context: Context) {
-			WorkManager.getInstance(context)
+		override suspend fun unschedule() {
+			workManager
 				.cancelUniqueWork(TAG)
 				.await()
 		}
 
-		override suspend fun isScheduled(context: Context): Boolean {
-			return WorkManagerHelper(WorkManager.getInstance(context))
-				.getUniqueWorkInfoByName(TAG)
+		override suspend fun isScheduled(): Boolean {
+			return workManager
+				.awaitUniqueWorkInfoByName(TAG)
 				.any { !it.state.isFinished }
 		}
 
-		fun startNow(context: Context) {
+		fun startNow() {
 			val constraints = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
 			val request = OneTimeWorkRequestBuilder<TrackWorker>()
 				.setConstraints(constraints)
 				.addTag(TAG_ONESHOT)
 				.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
 				.build()
-			WorkManager.getInstance(context).enqueue(request)
+			workManager.enqueue(request)
 		}
 
-		fun observeIsRunning(context: Context): Flow<Boolean> {
+		fun observeIsRunning(): Flow<Boolean> {
 			val query = WorkQuery.Builder.fromTags(listOf(TAG, TAG_ONESHOT)).build()
-			return WorkManager.getInstance(context).getWorkInfosLiveData(query)
+			return workManager.getWorkInfosLiveData(query)
 				.asFlow()
 				.map { works ->
 					works.any { x -> x.state == WorkInfo.State.RUNNING }
 				}
 		}
+
+		private fun createConstraints() = Constraints.Builder()
+			.setRequiredNetworkType(if (settings.isTrackerWifiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED)
+			.build()
+	}
+
+	private companion object {
+
+		const val WORKER_CHANNEL_ID = "track_worker"
+		const val WORKER_NOTIFICATION_ID = 35
+		const val TAG = "tracking"
+		const val TAG_ONESHOT = "tracking_oneshot"
+		const val MAX_PARALLELISM = 3
+		const val MAX_ATTEMPTS = 4
+		const val DATA_KEY_SUCCESS = "success"
+		const val DATA_KEY_FAILED = "failed"
+		const val KEY_RETRY_IDS = "retry"
 	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt
index 3c100b6a0..4525aa9b3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt
@@ -1,11 +1,10 @@
 package org.koitharu.kotatsu.tracker.work
 
-import android.app.NotificationChannel
-import android.app.NotificationChannelGroup
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
-import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationChannelGroupCompat
 import androidx.core.app.NotificationManagerCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
@@ -24,9 +23,6 @@ class TrackerNotificationChannels @Inject constructor(
 		get() = !manager.areNotificationsEnabled()
 
 	fun updateChannels(categories: Collection<FavouriteCategory>) {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-			return
-		}
 		manager.deleteNotificationChannel(OLD_CHANNEL_ID)
 		val group = createGroup()
 		val existingChannels = group.channels.associateByTo(HashMap()) { it.id }
@@ -35,8 +31,10 @@ class TrackerNotificationChannels @Inject constructor(
 			if (existingChannels.remove(id)?.name == category.title) {
 				continue
 			}
-			val channel = NotificationChannel(id, category.title, NotificationManager.IMPORTANCE_DEFAULT)
-			channel.group = GROUP_ID
+			val channel = NotificationChannelCompat.Builder(id, NotificationManagerCompat.IMPORTANCE_DEFAULT)
+				.setName(category.title)
+				.setGroup(GROUP_ID)
+				.build()
 			manager.createNotificationChannel(channel)
 		}
 		existingChannels.remove(CHANNEL_ID_HISTORY)
@@ -47,23 +45,15 @@ class TrackerNotificationChannels @Inject constructor(
 	}
 
 	fun createChannel(category: FavouriteCategory) {
-		renameChannel(category.id, category.title)
-	}
-
-	fun renameChannel(categoryId: Long, name: String) {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-			return
-		}
-		val id = getFavouritesChannelId(categoryId)
-		val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT)
-		channel.group = createGroup().id
+		val id = getFavouritesChannelId(category.id)
+		val channel = NotificationChannelCompat.Builder(id, NotificationManagerCompat.IMPORTANCE_DEFAULT)
+			.setName(category.title)
+			.setGroup(createGroup().id)
+			.build()
 		manager.createNotificationChannel(channel)
 	}
 
 	fun deleteChannel(categoryId: Long) {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-			return
-		}
 		manager.deleteNotificationChannel(getFavouritesChannelId(categoryId))
 	}
 
@@ -97,11 +87,8 @@ class TrackerNotificationChannels @Inject constructor(
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
 			return settings.isTrackerNotificationsEnabled
 		}
-		val group = manager.getNotificationChannelGroup(GROUP_ID) ?: return true
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && group.isBlocked) {
-			return false
-		}
-		return group.channels.any { it.importance != NotificationManagerCompat.IMPORTANCE_NONE }
+		val group = manager.getNotificationChannelGroupCompat(GROUP_ID) ?: return true
+		return !group.isBlocked && group.channels.any { it.importance != NotificationManagerCompat.IMPORTANCE_NONE }
 	}
 
 	fun getFavouritesChannelId(categoryId: Long): String {
@@ -112,26 +99,21 @@ class TrackerNotificationChannels @Inject constructor(
 		return CHANNEL_ID_HISTORY
 	}
 
-	@RequiresApi(Build.VERSION_CODES.O)
-	private fun createGroup(): NotificationChannelGroup {
-		manager.getNotificationChannelGroup(GROUP_ID)?.let {
-			return it
+	private fun createGroup(): NotificationChannelGroupCompat {
+		return manager.getNotificationChannelGroupCompat(GROUP_ID) ?: run {
+			val group = NotificationChannelGroupCompat.Builder(GROUP_ID)
+				.setName(context.getString(R.string.new_chapters))
+				.build()
+			manager.createNotificationChannelGroup(group)
+			group
 		}
-		val group = NotificationChannelGroup(GROUP_ID, context.getString(R.string.new_chapters))
-		manager.createNotificationChannelGroup(group)
-		return group
 	}
 
 	private fun createHistoryChannel() {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-			return
-		}
-		val channel = NotificationChannel(
-			CHANNEL_ID_HISTORY,
-			context.getString(R.string.history),
-			NotificationManager.IMPORTANCE_DEFAULT,
-		)
-		channel.group = GROUP_ID
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID_HISTORY, NotificationManagerCompat.IMPORTANCE_DEFAULT)
+			.setName(context.getString(R.string.history))
+			.setGroup(GROUP_ID)
+			.build()
 		manager.createNotificationChannel(channel)
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackingItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackingItem.kt
index 1b945618a..837835583 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackingItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackingItem.kt
@@ -18,9 +18,7 @@ class TrackingItem(
 		other as TrackingItem
 
 		if (tracking != other.tracking) return false
-		if (channelId != other.channelId) return false
-
-		return true
+		return channelId == other.channelId
 	}
 
 	override fun hashCode(): Int {
@@ -28,4 +26,4 @@ class TrackingItem(
 		result = 31 * result + channelId.hashCode()
 		return result
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/adapter/CategorySelectAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/adapter/CategorySelectAdapter.kt
index 10fac5806..0bd0a6789 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/adapter/CategorySelectAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/adapter/CategorySelectAdapter.kt
@@ -1,33 +1,14 @@
 package org.koitharu.kotatsu.widget.shelf.adapter
 
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.widget.shelf.model.CategoryItem
 
 class CategorySelectAdapter(
 	clickListener: OnListItemClickListener<CategoryItem>
-) : AsyncListDifferDelegationAdapter<CategoryItem>(DiffCallback()) {
+) : BaseListAdapter<CategoryItem>() {
 
 	init {
 		delegatesManager.addDelegate(categorySelectItemAD(clickListener))
 	}
-
-	private class DiffCallback : DiffUtil.ItemCallback<CategoryItem>() {
-
-		override fun areItemsTheSame(oldItem: CategoryItem, newItem: CategoryItem): Boolean {
-			return oldItem.id == newItem.id
-		}
-
-		override fun areContentsTheSame(oldItem: CategoryItem, newItem: CategoryItem): Boolean {
-			return oldItem == newItem
-		}
-
-		override fun getChangePayload(oldItem: CategoryItem, newItem: CategoryItem): Any? {
-			if (oldItem.isSelected != newItem.isSelected) {
-				return newItem.isSelected
-			}
-			return super.getChangePayload(oldItem, newItem)
-		}
-	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/model/CategoryItem.kt b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/model/CategoryItem.kt
index 0407dd18a..82e5082a0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/model/CategoryItem.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/model/CategoryItem.kt
@@ -1,7 +1,23 @@
 package org.koitharu.kotatsu.widget.shelf.model
 
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
 data class CategoryItem(
 	val id: Long,
 	val name: String?,
 	val isSelected: Boolean
-)
\ No newline at end of file
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is CategoryItem && other.id == id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		return if (previousState is CategoryItem && previousState.isSelected != isSelected) {
+			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
+		} else {
+			null
+		}
+	}
+}
diff --git a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
index 6bb0c8f83..bbd22d907 100644
--- a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
+++ b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.4" android:color="?attr/colorPrimaryInverse" />
+	<item android:alpha="0.2" android:color="?attr/colorPrimary" />
 </selector>
diff --git a/app/src/main/res/color-v23/bottom_menu_active_item.xml b/app/src/main/res/color-v23/bottom_menu_active_item.xml
index c2c510e6d..6b6938f5e 100644
--- a/app/src/main/res/color-v23/bottom_menu_active_item.xml
+++ b/app/src/main/res/color-v23/bottom_menu_active_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?attr/colorOnPrimaryContainer" android:state_checked="true" />
-	<item android:color="?attr/colorControlNormal" android:state_checked="false" />
+	<item android:color="?attr/colorOnSecondaryContainer" android:state_checked="true" />
+	<item android:color="?attr/colorOnSurfaceVariant" android:state_checked="false" />
 </selector>
diff --git a/app/src/main/res/color-v23/colored_button.xml b/app/src/main/res/color-v23/colored_button.xml
index fce774b1a..ad0dd1b69 100644
--- a/app/src/main/res/color-v23/colored_button.xml
+++ b/app/src/main/res/color-v23/colored_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.08" android:color="?attr/elevationOverlayColor" />
+	<item android:color="?attr/colorSurfaceContainerLow" />
 </selector>
diff --git a/app/src/main/res/color/bottom_menu_active_indicator.xml b/app/src/main/res/color/bottom_menu_active_indicator.xml
index cd82add77..3dd89e625 100644
--- a/app/src/main/res/color/bottom_menu_active_indicator.xml
+++ b/app/src/main/res/color/bottom_menu_active_indicator.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.4" android:color="@color/kotatsu_inversePrimary" />
+	<item android:alpha="0.2" android:color="@color/kotatsu_primary" />
 </selector>
diff --git a/app/src/main/res/color/bottom_menu_active_item.xml b/app/src/main/res/color/bottom_menu_active_item.xml
index 2c439130a..715da6df6 100644
--- a/app/src/main/res/color/bottom_menu_active_item.xml
+++ b/app/src/main/res/color/bottom_menu_active_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/kotatsu_onPrimaryContainer" android:state_checked="true" />
-	<item android:color="?attr/colorControlNormal" android:state_checked="false" />
+	<item android:color="@color/kotatsu_onSecondaryContainer" android:state_checked="true" />
+	<item android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" />
 </selector>
diff --git a/app/src/main/res/color/colored_button.xml b/app/src/main/res/color/colored_button.xml
index a585251c3..15a69be0a 100644
--- a/app/src/main/res/color/colored_button.xml
+++ b/app/src/main/res/color/colored_button.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.08" android:color="@color/kotatsu_onSurface" />
+	<item android:color="@color/kotatsu_surfaceContainerLow" />
 </selector>
diff --git a/app/src/main/res/color/navigation_bar_scrim.xml b/app/src/main/res/color/navigation_bar_scrim.xml
index 6d9fe48af..379700c44 100644
--- a/app/src/main/res/color/navigation_bar_scrim.xml
+++ b/app/src/main/res/color/navigation_bar_scrim.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.7" android:color="?attr/colorSurface" />
+	<item android:alpha="0.7" android:color="?attr/colorSurfaceContainerHigh" />
 </selector>
diff --git a/app/src/main/res/color/ripple_toolbar.xml b/app/src/main/res/color/ripple_toolbar.xml
index 7ef8081de..979d0f94a 100644
--- a/app/src/main/res/color/ripple_toolbar.xml
+++ b/app/src/main/res/color/ripple_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<!-- 34% of 12% = ~4% -->
-	<item android:alpha="0.34" android:color="?attr/colorControlHighlight" />
-</selector>
\ No newline at end of file
+	<item android:alpha="0.34" android:color="?attr/colorPrimary" />
+</selector>
diff --git a/app/src/main/res/drawable-v23/tabs_background.xml b/app/src/main/res/drawable-v23/tabs_background.xml
new file mode 100644
index 000000000..7679bfbcf
--- /dev/null
+++ b/app/src/main/res/drawable-v23/tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorOutline"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorSurfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable-v23/toolbar_background.xml b/app/src/main/res/drawable-v23/toolbar_background.xml
new file mode 100644
index 000000000..7679bfbcf
--- /dev/null
+++ b/app/src/main/res/drawable-v23/toolbar_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorOutline"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="?attr/colorSurfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable/avd_bookshelf_enter.xml b/app/src/main/res/drawable/avd_bookshelf_enter.xml
deleted file mode 100644
index e229eba7a..000000000
--- a/app/src/main/res/drawable/avd_bookshelf_enter.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<animated-vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:aapt="http://schemas.android.com/aapt">
-	<aapt:attr name="android:drawable">
-		<vector
-			android:name="vector"
-			android:width="24dp"
-			android:height="24dp"
-			android:viewportWidth="24"
-			android:viewportHeight="24">
-			<path
-				android:name="path"
-				android:fillColor="#000"
-				android:pathData="M 5 5 L 8 5 L 8 18 L 5 18 Z M 9 3 L 12 3 L 12 18 L 9 18 Z M 3 19 L 21 19 L 21 21 L 3 21 Z"
-				android:strokeWidth="1" />
-			<path
-				android:name="path_1"
-				android:fillColor="#000"
-				android:pathData="M 11.967 4.974 L 15.025 4.031 L 19.034 17.027 L 15.976 17.971 Z"
-				android:strokeWidth="1" />
-		</vector>
-	</aapt:attr>
-	<target android:name="path_1">
-		<aapt:attr name="android:animation">
-			<objectAnimator
-				android:duration="@integer/config_defaultAnimTime"
-				android:interpolator="@android:interpolator/fast_out_slow_in"
-				android:propertyName="pathData"
-				android:valueFrom="M 15.025 4.031 L 11.967 4.974 L 15.976 17.971 L 19.034 17.027 L 15.025 4.031 M 6.5 11.5 L 6.5 11.5 L 6.5 11.5 L 6.5 11.5 L 6.5 11.5 M 10.5 10.5 L 10.5 10.5 L 10.5 10.5 L 10.5 10.5 L 10.5 10.5 M 12 20 L 12 20 L 12 20 L 12 20 L 12 20"
-				android:valueTo="M 19.2 4.4 L 16 4.4 L 16 18 L 19.2 18 L 19.2 4.4 M 5 5 L 8 5 L 8 18 L 5 18 L 5 5 M 9 3 L 12 3 L 12 18 L 9 18 L 9 3 M 3 19 L 21 19 L 21 21 L 3 21 L 3 19"
-				android:valueType="pathType" />
-		</aapt:attr>
-	</target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_bookshelf_leave.xml b/app/src/main/res/drawable/avd_bookshelf_leave.xml
deleted file mode 100644
index 7b06237b6..000000000
--- a/app/src/main/res/drawable/avd_bookshelf_leave.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 5 5 L 8 5 L 8 18 L 5 18 Z M 9 3 L 12 3 L 12 18 L 9 18 Z M 3 19 L 21 19 L 21 21 L 3 21 Z M 16 4.4 L 19.2 4.4 L 19.2 18 L 16 18 Z"
-                android:fillColor="#000"
-                android:strokeWidth="1"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="pathData"
-                android:duration="@integer/config_defaultAnimTime"
-                android:valueFrom="M 16 4.4 L 19.2 4.4 L 19.2 18 L 16 18 L 16 4.4 M 9 3 L 9 18 L 12 18 L 12 3 L 9 3 M 5 5 L 5 18 L 8 18 L 8 5 L 5 5 M 3 19 L 21 19 L 21 21 L 3 21 L 3 20 L 3 19"
-                android:valueTo="M 12 5 L 15 4 L 19 17 L 16 18 L 12 5 M 9 3 L 9 18 L 12 18 L 12 3 L 9 3 M 5 5 L 5 18 L 8 18 L 8 5 L 5 5 M 3 19 L 21 19 L 21 21 L 3 21 L 3 19 L 3 19"
-                android:valueType="pathType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_favourites_enter.xml b/app/src/main/res/drawable/avd_favourites_enter.xml
new file mode 100644
index 000000000..89deddcb6
--- /dev/null
+++ b/app/src/main/res/drawable/avd_favourites_enter.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:aapt="http://schemas.android.com/aapt">
+	<aapt:attr name="android:drawable">
+		<vector
+			android:name="vector"
+			android:width="24dp"
+			android:height="24dp"
+			android:viewportWidth="24"
+			android:viewportHeight="24">
+			<path
+				android:name="path"
+				android:pathData="M 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.04 L 12 21.35 L 13.45 20.03 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 Z M 12.1 18.55 L 12 18.65 L 11.9 18.55 C 7.14 14.24 4 11.39 4 8.5 C 4 6.5 5.5 5 7.5 5 C 9.04 5 10.54 5.99 11.07 7.36 L 12.94 7.36 C 13.46 5.99 14.96 5 16.5 5 C 18.5 5 20 6.5 20 8.5 C 20 11.39 16.86 14.24 12.1 18.55 Z"
+				android:fillColor="#000000"/>
+		</vector>
+	</aapt:attr>
+	<target android:name="path">
+		<aapt:attr name="android:animation">
+			<objectAnimator
+				android:propertyName="pathData"
+				android:duration="300"
+				android:valueFrom="M 12 21.35 L 10.55 20.04 C 5.4 15.36 2 12.28 2 8.5 C 2 5.42 4.42 3 7.5 3 C 9.24 3 10.91 3.81 12 5.09 C 13.09 3.81 14.76 3 16.5 3 L 16.5 3 C 19.58 3 22 5.42 22 8.5 C 22 12.28 18.6 15.36 13.45 20.03 L 12.725 20.69 L 12 21.35 M 11.07 7.36 C 10.54 5.99 9.04 5 7.5 5 C 5.5 5 4 6.5 4 8.5 C 4 11.39 7.14 14.24 11.9 18.55 L 12 18.65 L 12.1 18.55 L 12.1 18.55 C 16.86 14.24 20 11.39 20 8.5 C 20 6.5 18.5 5 16.5 5 C 14.96 5 13.46 5.99 12.94 7.36 L 11.07 7.36"
+				android:valueTo="M 12 21.35 L 10.55 20.03 C 5.4 15.36 2 12.28 2 8.5 C 2 5.42 4.42 3 7.5 3 C 9.24 3 10.91 3.81 12 5.09 C 13.09 3.81 14.76 3 16.5 3 L 16.5 3 C 19.58 3 22 5.42 22 8.5 C 22 12.28 18.6 15.36 13.45 20.04 L 12 21.35 L 12 21.35 M 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825 L 12 11.825 L 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825"
+				android:valueType="pathType"
+				android:interpolator="@android:interpolator/fast_out_slow_in"/>
+		</aapt:attr>
+	</target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/avd_favourites_leave.xml b/app/src/main/res/drawable/avd_favourites_leave.xml
new file mode 100644
index 000000000..d15328702
--- /dev/null
+++ b/app/src/main/res/drawable/avd_favourites_leave.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:aapt="http://schemas.android.com/aapt">
+	<aapt:attr name="android:drawable">
+		<vector
+			android:name="vector"
+			android:width="24dp"
+			android:height="24dp"
+			android:viewportWidth="24"
+			android:viewportHeight="24">
+			<path
+				android:name="path"
+				android:pathData="M 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.04 L 12 21.35 L 13.45 20.03 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 Z M 12.1 18.55 L 12 18.65 L 11.9 18.55 C 7.14 14.24 4 11.39 4 8.5 C 4 6.5 5.5 5 7.5 5 C 9.04 5 10.54 5.99 11.07 7.36 L 12.94 7.36 C 13.46 5.99 14.96 5 16.5 5 C 18.5 5 20 6.5 20 8.5 C 20 11.39 16.86 14.24 12.1 18.55 Z"
+				android:fillColor="#000000"/>
+		</vector>
+	</aapt:attr>
+	<target android:name="path">
+		<aapt:attr name="android:animation">
+			<objectAnimator
+				android:propertyName="pathData"
+				android:duration="300"
+				android:valueFrom="M 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.03 L 12 21.35 L 12 21.35 L 13.45 20.04 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 L 16.5 3 M 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825"
+				android:valueTo="M 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.04 L 11.275 20.695 L 12 21.35 L 13.45 20.03 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 L 16.5 3 M 12.1 18.55 C 12.067 18.583 12.033 18.617 12 18.65 C 11.967 18.617 11.933 18.583 11.9 18.55 C 7.14 14.24 4 11.39 4 8.5 C 4 6.5 5.5 5 7.5 5 C 9.04 5 10.54 5.99 11.07 7.36 L 12.94 7.36 C 13.46 5.99 14.96 5 16.5 5 C 18.5 5 20 6.5 20 8.5 C 20 11.39 16.86 14.24 12.1 18.55 L 12.1 18.55"
+				android:valueType="pathType"
+				android:interpolator="@android:interpolator/fast_out_slow_in"/>
+		</aapt:attr>
+	</target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/avd_history_enter.xml b/app/src/main/res/drawable/avd_history_enter.xml
new file mode 100644
index 000000000..fcca925e3
--- /dev/null
+++ b/app/src/main/res/drawable/avd_history_enter.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:aapt="http://schemas.android.com/aapt">
+	<aapt:attr name="android:drawable">
+		<vector
+			android:name="history_enter"
+			android:width="24dp"
+			android:height="24dp"
+			android:viewportWidth="24"
+			android:viewportHeight="24">
+			<path
+				android:name="clock"
+				android:fillColor="#000000"
+				android:pathData="M 12 8 L 12 13 L 16.28 15.54 L 17 14.33 L 13.5 12.25 L 13.5 8 L 12 8 Z" />
+			<group
+				android:name="arrow_head"
+				android:pivotX="13"
+				android:pivotY="12">
+				<path
+					android:name="arrow"
+					android:fillColor="#000000"
+					android:pathData="M 13 3 C 8.03 3 4 7.03 4 12 L 1 12 L 4.89 15.89 L 4.96 16.03 L 9 12 L 6 12 C 6 8.13 9.13 5 13 5 C 16.87 5 20 8.13 20 12 C 20 15.87 16.87 19 13 19 C 11.07 19 9.32 18.21 8.06 16.94 L 6.64 18.36 C 8.27 19.99 10.51 21 13 21 C 17.97 21 22 16.97 22 12 C 22 7.03 17.97 3 13 3 Z M 13 3 Z" />
+			</group>
+		</vector>
+	</aapt:attr>
+	<target android:name="arrow_head">
+		<aapt:attr name="android:animation">
+			<objectAnimator
+				android:duration="500"
+				android:interpolator="@android:interpolator/fast_out_slow_in"
+				android:propertyName="rotation"
+				android:valueFrom="360"
+				android:valueTo="0"
+				android:valueType="floatType" />
+		</aapt:attr>
+	</target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/avd_tools_enter.xml b/app/src/main/res/drawable/avd_tools_enter.xml
deleted file mode 100644
index 5d17a7cbd..000000000
--- a/app/src/main/res/drawable/avd_tools_enter.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 L 21.9 16.3 C 22 16.3 22 16.1 22 16 L 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.3 14.7 19 14.6 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.8 14.6 15.6 14.8 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.6 20.4 15.9 20.5 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 19.1 20.6 19.3 20.4 19.6 20.2 L 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 L 22 19 C 22.1 18.9 22 18.8 21.9 18.7 L 20.9 17.9 Z M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
-                android:fillColor="#FF000000"/>
-            <path
-                android:name="path_1"
-                android:pathData="M 9 1.1 L 9 6 L 7 6 L 7 1.1 C 4.2 1.6 2 4 2 7 C 2 9.2 3.2 11.1 5 12.2 L 5 21 C 5 21.5 5.4 22 6 22 L 10 22 C 10.6 22 11 21.5 11 21 L 11 12.2 C 12.8 11.2 14 9.2 14 7 C 14 4 11.8 1.6 9 1.1 M 10 10.5 L 9 11 L 9 20 L 7 20 L 7 11 L 6 10.4 C 4.8 9.7 4 8.4 4 7 C 4 6 4.4 5.1 5 4.3 L 5 8 L 11 8 L 11 4.3 C 11.6 5.1 12 6 12 7 C 12 8.4 11.2 9.7 10 10.5"
-                android:fillColor="#FF000000"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:duration="150"
-                    android:valueFrom="M 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 C 21.233 16.767 21.567 16.533 21.9 16.3 C 22 16.3 22 16.1 22 16 C 21.667 15.5 21.333 15 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.397 14.797 19.267 14.72 19.125 14.657 C 18.991 14.597 18.845 14.548 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.963 14.546 15.847 14.612 15.733 14.68 C 15.597 14.761 15.463 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.505 20.305 15.637 20.382 15.783 20.461 C 15.915 20.532 16.057 20.605 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.96 20.647 19.091 20.565 19.224 20.47 C 19.341 20.387 19.46 20.294 19.6 20.2 L 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 L 22 19 C 22.1 18.9 22 18.8 21.9 18.7 L 20.9 17.9 C 20.9 17.9 20.9 17.9 20.9 17.9 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
-                    android:valueTo="M 19.24 20.459 C 19.352 20.379 19.466 20.289 19.6 20.2 C 20 20.367 20.4 20.533 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 C 21.4 20.067 21.7 19.533 22 19 C 22.1 18.9 22 18.8 21.9 18.7 C 21.567 18.433 21.233 18.167 20.9 17.9 L 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 L 21.9 16.3 C 22 16.3 22 16.1 22 16 L 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.403 14.803 19.282 14.729 19.148 14.667 C 19.008 14.603 18.854 14.551 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.961 14.546 15.843 14.614 15.727 14.684 C 15.593 14.764 15.461 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.51 20.31 15.649 20.389 15.803 20.472 C 15.929 20.54 16.065 20.61 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.966 20.645 19.101 20.559 19.24 20.459 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="150"
-                    android:duration="150"
-                    android:valueFrom="M 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 C 21.233 16.767 21.567 16.533 21.9 16.3 C 22 16.3 22 16.1 22 16 C 21.667 15.5 21.333 15 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.397 14.797 19.267 14.72 19.125 14.657 C 18.991 14.597 18.845 14.548 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.963 14.546 15.847 14.612 15.733 14.68 C 15.597 14.761 15.463 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.505 20.305 15.637 20.382 15.783 20.461 C 15.915 20.532 16.057 20.605 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.96 20.647 19.091 20.565 19.224 20.47 C 19.341 20.387 19.46 20.294 19.6 20.2 L 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 L 22 19 C 22.1 18.9 22 18.8 21.9 18.7 L 20.9 17.9 C 20.9 17.9 20.9 17.9 20.9 17.9 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
-                    android:valueTo="M 19.24 20.459 C 19.352 20.379 19.466 20.289 19.6 20.2 C 20 20.367 20.4 20.533 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 C 21.4 20.067 21.7 19.533 22 19 C 22.1 18.9 22 18.8 21.9 18.7 C 21.567 18.433 21.233 18.167 20.9 17.9 L 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 L 21.9 16.3 C 22 16.3 22 16.1 22 16 L 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.403 14.803 19.282 14.729 19.148 14.667 C 19.008 14.603 18.854 14.551 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.961 14.546 15.843 14.614 15.727 14.684 C 15.593 14.764 15.461 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.51 20.31 15.649 20.389 15.803 20.472 C 15.929 20.54 16.065 20.61 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.966 20.645 19.101 20.559 19.24 20.459 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="path_1">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:duration="200"
-                    android:valueFrom="M 9 1.1 L 9 6 L 7 6 L 7 1.1 C 4.2 1.6 2 4 2 7 C 2 9.2 3.2 11.1 5 12.2 L 5 21 C 5 21.5 5.4 22 6 22 L 10 22 C 10.6 22 11 21.5 11 21 L 11 12.2 C 12.8 11.2 14 9.2 14 7 C 14 4 11.8 1.6 9 1.1 M 10 10.5 L 9 11 L 9 20 L 7 20 L 7 11 L 6 10.4 C 4.8 9.7 4 8.4 4 7 C 4 6 4.4 5.1 5 4.3 L 5 8 L 11 8 L 11 4.3 C 11.6 5.1 12 6 12 7 C 12 8.4 11.2 9.7 10 10.5"
-                    android:valueTo="M 9 0 L 9 4.9 L 7 4.9 L 7 0 C 4.2 0.5 2 2.9 2 5.9 C 2 8.1 3.2 10 5 11.1 L 5 19.9 C 5 20.4 5.4 20.9 6 20.9 L 10 20.9 C 10.6 20.9 11 20.4 11 19.9 L 11 11.1 C 12.8 10.1 14 8.1 14 5.9 C 14 2.9 11.8 0.5 9 0 M 10 9.4 L 9 9.9 L 9 18.9 L 7 18.9 L 7 9.9 L 6 9.4 C 4.8 8.7 4 7.4 4 5.9 C 4 4.9 4.4 4 5 3.2 L 5 6.9 L 11 6.9 L 11 3.3 C 11.6 4 12 5 12 6 C 12 7.3 11.2 8.6 10 9.4"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="200"
-                    android:duration="100"
-                    android:valueFrom="M 9 0 L 9 4.9 L 7 4.9 L 7 0 C 4.2 0.5 2 2.9 2 5.9 C 2 8.1 3.2 10 5 11.1 L 5 19.9 C 5 20.4 5.4 20.9 6 20.9 L 10 20.9 C 10.6 20.9 11 20.4 11 19.9 L 11 11.1 C 12.8 10.1 14 8.1 14 5.9 C 14 2.9 11.8 0.5 9 0 M 10 9.4 L 9 9.9 L 9 18.9 L 7 18.9 L 7 9.9 L 6 9.4 C 4.8 8.7 4 7.4 4 5.9 C 4 4.9 4.4 4 5 3.2 L 5 6.9 L 11 6.9 L 11 3.3 C 11.6 4 12 5 12 6 C 12 7.3 11.2 8.6 10 9.4"
-                    android:valueTo="M 9 1.1 L 9 6 L 7 6 L 7 1.1 C 4.2 1.6 2 4 2 7 C 2 9.2 3.2 11.1 5 12.2 L 5 21 C 5 21.5 5.4 22 6 22 L 10 22 C 10.6 22 11 21.5 11 21 L 11 12.2 C 12.8 11.2 14 9.2 14 7 C 14 4 11.8 1.6 9 1.1 M 10 10.5 L 9 11 L 9 20 L 7 20 L 7 11 L 6 10.4 C 4.8 9.7 4 8.4 4 7 C 4 6 4.4 5.1 5 4.3 L 5 8 L 11 8 L 11 4.3 C 11.6 5.1 12 6 12 7 C 12 8.4 11.2 9.7 10 10.5"
-                    android:valueType="pathType"
-                    android:interpolator="@android:anim/anticipate_overshoot_interpolator"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/bg_rounded_square.xml b/app/src/main/res/drawable/bg_rounded_square.xml
new file mode 100644
index 000000000..48edee83b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_rounded_square.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<corners
+		android:radius="4dp" />
+
+	<solid android:color="?colorSurface" />
+
+	<size
+		android:width="12dp"
+		android:height="12dp" />
+
+</shape>
diff --git a/app/src/main/res/drawable/divider_transparent.xml b/app/src/main/res/drawable/divider_transparent.xml
new file mode 100644
index 000000000..64725fa5b
--- /dev/null
+++ b/app/src/main/res/drawable/divider_transparent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<size
+		android:width="8dp"
+		android:height="8dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_bookshelf_checked.xml b/app/src/main/res/drawable/ic_bookshelf_checked.xml
deleted file mode 100644
index 5f881c4fc..000000000
--- a/app/src/main/res/drawable/ic_bookshelf_checked.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M5,5h3v13h-3z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M9,3h3v15h-3z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M3,19h18v2h-18z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16,4.4h3.2v13.6h-3.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bookshelf_normal.xml b/app/src/main/res/drawable/ic_bookshelf_normal.xml
deleted file mode 100644
index c344ae0bd..000000000
--- a/app/src/main/res/drawable/ic_bookshelf_normal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:autoMirrored="true"
-	android:tint="#000000"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M9 3V18H12V3H9M12 5L16 18L19 17L15 4L12 5M5 5V18H8V5H5M3 19V21H21V19H3Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_expand.xml b/app/src/main/res/drawable/ic_expand.xml
new file mode 100644
index 000000000..e529f2e16
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000000"
+		android:pathData="M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml
new file mode 100644
index 000000000..17453a301
--- /dev/null
+++ b/app/src/main/res/drawable/ic_eye.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?><!-- drawable/eye_outline.xml -->
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000000"
+		android:pathData="M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9M12,4.5C17,4.5 21.27,7.61 23,12C21.27,16.39 17,19.5 12,19.5C7,19.5 2.73,16.39 1,12C2.73,7.61 7,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C15.76,17.5 19.17,15.36 20.82,12C19.17,8.64 15.76,6.5 12,6.5C8.24,6.5 4.83,8.64 3.18,12Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
new file mode 100644
index 000000000..8a53bd92c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_eye_off.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000000"
+		android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L15.65,18.92C14.5,19.3 13.28,19.5 12,19.5C7,19.5 2.73,16.39 1,12C1.69,10.24 2.79,8.69 4.19,7.46L2,5.27M12,9A3,3 0 0,1 15,12C15,12.35 14.94,12.69 14.83,13L11,9.17C11.31,9.06 11.65,9 12,9M12,4.5C17,4.5 21.27,7.61 23,12C22.18,14.08 20.79,15.88 19,17.19L17.58,15.76C18.94,14.82 20.06,13.54 20.82,12C19.17,8.64 15.76,6.5 12,6.5C10.91,6.5 9.84,6.68 8.84,7L7.3,5.47C8.74,4.85 10.33,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C12.69,17.5 13.37,17.43 14,17.29L11.72,15C10.29,14.85 9.15,13.71 9,12.28L5.6,8.87C4.61,9.72 3.78,10.78 3.18,12Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bookshelf_selector.xml b/app/src/main/res/drawable/ic_favourites_selector.xml
similarity index 64%
rename from app/src/main/res/drawable/ic_bookshelf_selector.xml
rename to app/src/main/res/drawable/ic_favourites_selector.xml
index 07464b289..d2e01350b 100644
--- a/app/src/main/res/drawable/ic_bookshelf_selector.xml
+++ b/app/src/main/res/drawable/ic_favourites_selector.xml
@@ -3,22 +3,22 @@
 
 	<item
 		android:id="@+id/normal"
-		android:drawable="@drawable/ic_bookshelf_normal"
+		android:drawable="@drawable/ic_heart_outline"
 		android:state_checked="false" />
 
 	<item
 		android:id="@+id/checked"
-		android:drawable="@drawable/ic_bookshelf_checked"
+		android:drawable="@drawable/ic_heart_outline"
 		android:state_checked="true" />
 
 	<transition
-		android:drawable="@drawable/avd_bookshelf_enter"
+		android:drawable="@drawable/avd_favourites_enter"
 		android:fromId="@id/normal"
 		android:toId="@id/checked" />
 
 	<transition
-		android:drawable="@drawable/avd_bookshelf_leave"
+		android:drawable="@drawable/avd_favourites_leave"
 		android:fromId="@id/checked"
 		android:toId="@id/normal" />
 
-</animated-selector>
\ No newline at end of file
+</animated-selector>
diff --git a/app/src/main/res/drawable/ic_tools_selector.xml b/app/src/main/res/drawable/ic_history_selector.xml
similarity index 56%
rename from app/src/main/res/drawable/ic_tools_selector.xml
rename to app/src/main/res/drawable/ic_history_selector.xml
index d4f3dd57a..9b91bb31c 100644
--- a/app/src/main/res/drawable/ic_tools_selector.xml
+++ b/app/src/main/res/drawable/ic_history_selector.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+<animated-selector
+	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<item
 		android:id="@+id/normal"
-		android:drawable="@drawable/ic_tools"
+		android:drawable="@drawable/ic_history"
 		android:state_checked="false" />
 
 	<item
 		android:id="@+id/checked"
-		android:drawable="@drawable/ic_tools"
+		android:drawable="@drawable/ic_history"
 		android:state_checked="true" />
 
 	<transition
-		android:drawable="@drawable/avd_tools_enter"
+		android:drawable="@drawable/avd_history_enter"
 		android:fromId="@id/normal"
 		android:toId="@id/checked" />
 
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index 1bbf44939..d0a13e6d2 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -2,7 +2,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:width="24dp"
 	android:height="24dp"
-	android:tint="#000000"
+	android:tint="?colorControlNormal"
 	android:viewportWidth="24"
 	android:viewportHeight="24">
 	<path
diff --git a/app/src/main/res/drawable/ic_tools.xml b/app/src/main/res/drawable/ic_tools.xml
deleted file mode 100644
index 884f4943e..000000000
--- a/app/src/main/res/drawable/ic_tools.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M20.9,17.9c0,-0.2 0,-0.3 0,-0.4s0,-0.3 0,-0.5l1,-0.7C22,16.3 22,16.1 22,16L21,14.5c0,-0.1 -0.2,-0.1 -0.3,-0.1l-1.2,0.5c-0.2,-0.2 -0.5,-0.3 -0.8,-0.4l-0.2,-1.2c0,-0.1 -0.1,-0.2 -0.2,-0.2h-1.8c-0.1,0 -0.2,0.1 -0.2,0.2l-0.2,1.2c-0.3,0.1 -0.5,0.3 -0.8,0.4l-1.2,-0.5c-0.1,0 -0.2,0 -0.3,0.1L13,16c-0.1,0.1 0,0.2 0.1,0.3l1,0.7c0,0.2 0,0.3 0,0.5s0,0.3 0,0.4l-1,0.7C13,18.8 13,18.9 13,19l0.9,1.6c0,0.1 0.2,0.1 0.3,0.1l1.2,-0.5c0.2,0.2 0.5,0.3 0.8,0.5l0.2,1.2c0,0.1 0.1,0.2 0.2,0.2h1.8c0.1,0 0.2,-0.1 0.2,-0.2l0.2,-1.2c0.3,-0.1 0.5,-0.3 0.8,-0.5l1.2,0.5c0.1,0 0.2,0 0.3,-0.1L22,19c0.1,-0.1 0,-0.2 -0.1,-0.3L20.9,17.9zM17.5,19c-0.8,0 -1.5,-0.7 -1.5,-1.5s0.7,-1.5 1.5,-1.5s1.5,0.7 1.5,1.5S18.3,19 17.5,19z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M9,1.1V6H7V1.1C4.2,1.6 2,4 2,7c0,2.2 1.2,4.1 3,5.2V21c0,0.5 0.4,1 1,1h4c0.6,0 1,-0.5 1,-1v-8.8c1.8,-1 3,-3 3,-5.2C14,4 11.8,1.6 9,1.1M10,10.5L9,11v9H7v-9l-1,-0.6C4.8,9.7 4,8.4 4,7c0,-1 0.4,-1.9 1,-2.7V8h6V4.3C11.6,5.1 12,6 12,7C12,8.4 11.2,9.7 10,10.5"/>
-</vector>
diff --git a/app/src/main/res/drawable/search_bar_background.xml b/app/src/main/res/drawable/search_bar_background.xml
new file mode 100644
index 000000000..32b28bd70
--- /dev/null
+++ b/app/src/main/res/drawable/search_bar_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<solid android:color="@color/colored_button" />
+	<corners android:radius="100dp" />
+</shape>
diff --git a/app/src/main/res/drawable/tabs_background.xml b/app/src/main/res/drawable/tabs_background.xml
new file mode 100644
index 000000000..79f3ec5f3
--- /dev/null
+++ b/app/src/main/res/drawable/tabs_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_outline"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_surfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/app/src/main/res/drawable/toolbar_background.xml
index 32b28bd70..2a07082ae 100644
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ b/app/src/main/res/drawable/toolbar_background.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<solid android:color="@color/colored_button" />
-	<corners android:radius="100dp" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<!-- Fills the entire area with the divider's color first... -->
+	<item>
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_primaryContainer"/>
+		</shape>
+	</item>
+	<!-- ..., then draws a rectangle with the container color to cover the area not for the divider. -->
+	<item
+		android:bottom="1dp">
+		<shape
+			android:shape="rectangle">
+			<solid android:color="@color/kotatsu_surfaceContainerHigh"/>
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/layout-w600dp-land/activity_categories.xml b/app/src/main/res/layout-w600dp-land/activity_categories.xml
deleted file mode 100644
index a7c07c39e..000000000
--- a/app/src/main/res/layout-w600dp-land/activity_categories.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:fitsSystemWindows="true">
-
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:id="@+id/collapsingToolbarLayout"
-			style="?attr/collapsingToolbarLayoutLargeStyle"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
-			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-			app:toolbarId="@id/toolbar">
-
-			<com.google.android.material.appbar.MaterialToolbar
-				android:id="@id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="?attr/actionBarSize"
-				app:layout_collapseMode="pin">
-
-				<Button
-					android:id="@+id/button_done"
-					style="@style/Widget.Material3.Button.UnelevatedButton"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="end"
-					android:layout_marginHorizontal="@dimen/toolbar_button_margin"
-					android:text="@string/done"
-					android:visibility="gone" />
-
-			</com.google.android.material.appbar.MaterialToolbar>
-
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/recyclerView"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:clipToPadding="false"
-		android:orientation="vertical"
-		android:paddingVertical="@dimen/list_spacing"
-		android:scrollbars="vertical"
-		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-		android:id="@+id/fab_add"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:contentDescription="@string/add_new_category"
-		android:src="@drawable/ic_add"
-		android:text="@string/create_category"
-		app:fabSize="normal"
-		app:icon="@drawable/ic_add"
-		app:layout_anchor="@id/recyclerView"
-		app:layout_anchorGravity="bottom|end"
-		app:layout_behavior="org.koitharu.kotatsu.core.ui.util.ShrinkOnScrollBehavior"
-		app:layout_dodgeInsetEdges="bottom" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-w600dp-land/activity_details.xml b/app/src/main/res/layout-w600dp-land/activity_details.xml
index 03faa2f1f..6dd525f7b 100644
--- a/app/src/main/res/layout-w600dp-land/activity_details.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_details.xml
@@ -102,6 +102,7 @@
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_chapters"
+		style="@style/Widget.Kotatsu.CardView.Light"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/side_card_offset"
diff --git a/app/src/main/res/layout-w600dp-land/activity_main.xml b/app/src/main/res/layout-w600dp-land/activity_main.xml
index 320e64005..e566cad6f 100644
--- a/app/src/main/res/layout-w600dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_main.xml
@@ -52,7 +52,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="56dp"
 				android:layout_marginVertical="8dp"
-				android:background="@drawable/toolbar_background"
+				android:background="@drawable/search_bar_background"
 				android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
 				app:layout_scrollFlags="scroll|enterAlways|snap">
 
diff --git a/app/src/main/res/layout-w600dp-land/activity_manga_list.xml b/app/src/main/res/layout-w600dp-land/activity_manga_list.xml
index 6d5eae09b..ba9e74670 100644
--- a/app/src/main/res/layout-w600dp-land/activity_manga_list.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_manga_list.xml
@@ -11,7 +11,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:fitsSystemWindows="true"
-		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintEnd_toEndOf="@id/container"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
 
@@ -28,13 +28,14 @@
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@id/card_filter"
+		app:layout_constraintEnd_toStartOf="@id/card_side"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/appbar"
 		tools:layout="@layout/fragment_list" />
 
 	<com.google.android.material.card.MaterialCardView
-		android:id="@+id/card_filter"
+		android:id="@+id/card_side"
+		style="@style/Widget.Kotatsu.CardView.Light"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/side_card_offset"
@@ -44,13 +45,13 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/container"
-		app:layout_constraintTop_toBottomOf="@id/appbar"
-		app:layout_constraintWidth_max="400dp"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintWidth_max="600dp"
 		app:layout_constraintWidth_min="320dp"
-		app:layout_constraintWidth_percent="0.35">
+		app:layout_constraintWidth_percent="0.4">
 
 		<androidx.fragment.app.FragmentContainerView
-			android:id="@+id/container_filter"
+			android:id="@+id/container_side"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			tools:layout="@layout/sheet_filter" />
diff --git a/app/src/main/res/layout-w600dp-land/activity_settings.xml b/app/src/main/res/layout-w600dp-land/activity_settings.xml
index bbbd8dadf..b4e60d72e 100644
--- a/app/src/main/res/layout-w600dp-land/activity_settings.xml
+++ b/app/src/main/res/layout-w600dp-land/activity_settings.xml
@@ -39,13 +39,13 @@
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card_details"
+		style="@style/Widget.Kotatsu.CardView.Light"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		android:layout_marginStart="@dimen/side_card_offset"
 		android:layout_marginTop="2dp"
 		android:layout_marginEnd="@dimen/side_card_offset"
 		android:layout_marginBottom="@dimen/side_card_offset"
-		app:cardBackgroundColor="?colorBackgroundFloating"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/container_master"
@@ -71,7 +71,8 @@
 			<androidx.fragment.app.FragmentContainerView
 				android:id="@+id/container"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent" />
+				android:layout_height="match_parent"
+				android:theme="@style/ThemeOverlay.Kotatsu.CardContainer" />
 
 		</LinearLayout>
 
diff --git a/app/src/main/res/layout-w600dp-land/fragment_details.xml b/app/src/main/res/layout-w600dp-land/fragment_details.xml
deleted file mode 100644
index 19d7974ea..000000000
--- a/app/src/main/res/layout-w600dp-land/fragment_details.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/scrollView"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:clipToPadding="false"
-	android:scrollbars="vertical"
-	app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent">
-
-		<com.google.android.material.imageview.ShapeableImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:background="?colorSecondaryContainer"
-			android:foreground="?selectableItemBackground"
-			android:scaleType="centerCrop"
-			app:layout_constraintDimensionRatio="H,13:18"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintWidth_percent="0.3"
-			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
-			tools:background="@tools:sample/backgrounds/scenic"
-			tools:ignore="ContentDescription,UnusedAttribute" />
-
-		<org.koitharu.kotatsu.history.ui.util.ReadingProgressView
-			android:id="@+id/progressView"
-			android:layout_width="@dimen/card_indicator_size"
-			android:layout_height="@dimen/card_indicator_size"
-			android:layout_margin="@dimen/card_indicator_offset"
-			app:layout_constraintBottom_toBottomOf="@id/imageView_cover"
-			app:layout_constraintEnd_toEndOf="@id/imageView_cover" />
-
-		<LinearLayout
-			android:id="@+id/layout_titles"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:paddingHorizontal="16dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toTopOf="@+id/imageView_cover">
-
-			<TextView
-				android:id="@+id/textView_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="4"
-				android:padding="4dp"
-				android:textAppearance="?attr/textAppearanceHeadlineSmall"
-				tools:text="@tools:sample/lorem[15]" />
-
-			<TextView
-				android:id="@+id/textView_subtitle"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="3"
-				android:padding="4dp"
-				android:textAppearance="?attr/textAppearanceBodyMedium"
-				tools:text="@tools:sample/lorem[12]" />
-
-			<TextView
-				android:id="@+id/textView_author"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:background="@drawable/list_selector"
-				android:padding="4dp"
-				android:singleLine="true"
-				android:textColor="?attr/colorTertiary"
-				android:textStyle="bold"
-				tools:text="@tools:sample/full_names" />
-
-			<RatingBar
-				android:id="@+id/rating_bar"
-				style="?ratingBarStyleSmall"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:isIndicator="true"
-				android:max="1"
-				android:numStars="5"
-				android:padding="4dp"
-				android:stepSize="0.5"
-				tools:rating="4" />
-
-		</LinearLayout>
-
-		<androidx.constraintlayout.widget.Barrier
-			android:id="@+id/barrier_header"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			app:barrierDirection="bottom"
-			app:barrierMargin="8dp"
-			app:constraint_referenced_ids="layout_titles,imageView_cover" />
-
-		<include
-			android:id="@+id/info_layout"
-			layout="@layout/layout_details_info"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/barrier_header" />
-
-		<org.koitharu.kotatsu.core.ui.widgets.ChipsView
-			android:id="@+id/chips_tags"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			app:chipSpacingHorizontal="6dp"
-			app:chipSpacingVertical="6dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/info_layout" />
-
-		<TextView
-			android:id="@+id/textView_bookmarks"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:gravity="center_vertical|start"
-			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			android:singleLine="true"
-			android:text="@string/bookmarks"
-			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/chips_tags" />
-
-		<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/recyclerView_bookmarks"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="4dp"
-			android:layout_marginBottom="6dp"
-			android:clipToPadding="false"
-			android:nestedScrollingEnabled="false"
-			android:orientation="horizontal"
-			android:paddingStart="12dp"
-			android:paddingEnd="12dp"
-			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/textView_bookmarks"
-			tools:listitem="@layout/item_bookmark" />
-
-		<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/recyclerView_scrobbling"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="12dp"
-			android:nestedScrollingEnabled="false"
-			android:orientation="vertical"
-			android:overScrollMode="never"
-			android:scrollbars="none"
-			android:visibility="gone"
-			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/recyclerView_bookmarks"
-			tools:itemCount="2"
-			tools:listitem="@layout/item_scrobbling_info"
-			tools:visibility="visible" />
-
-		<org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
-			android:id="@+id/textView_description"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="@dimen/margin_normal"
-			android:layout_marginTop="@dimen/margin_small"
-			android:layout_marginEnd="@dimen/margin_normal"
-			android:lineSpacingMultiplier="1.2"
-			android:paddingBottom="@dimen/margin_normal"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			android:textIsSelectable="true"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/recyclerView_scrobbling"
-			tools:ignore="UnusedAttribute"
-			tools:text="@tools:sample/lorem/random[250]" />
-
-		<com.google.android.material.progressindicator.LinearProgressIndicator
-			android:id="@+id/progressBar"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:indeterminate="true"
-			android:visibility="gone"
-			app:hideAnimationBehavior="outward"
-			app:layout_constraintBottom_toTopOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:showAnimationBehavior="inward"
-			app:trackCornerRadius="0dp"
-			tools:visibility="visible" />
-
-		<androidx.constraintlayout.widget.Group
-			android:id="@+id/group_bookmarks"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			app:constraint_referenced_ids="recyclerView_bookmarks,textView_bookmarks"
-			tools:visibility="visible" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml b/app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml
new file mode 100644
index 000000000..1697cf808
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-land/fragment_settings_sources.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/recyclerView"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?android:colorBackground"
+	android:clipToPadding="false"
+	android:orientation="vertical"
+	android:scrollbars="vertical"
+	android:theme="@style/ThemeOverlay.Kotatsu.CardContainer"
+	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+	tools:listitem="@layout/item_source_config" />
diff --git a/app/src/main/res/layout-w600dp-land/fragment_tools.xml b/app/src/main/res/layout-w600dp-land/fragment_tools.xml
deleted file mode 100644
index ba158413a..000000000
--- a/app/src/main/res/layout-w600dp-land/fragment_tools.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<androidx.constraintlayout.widget.Guideline
-			android:id="@+id/guideline"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			app:layout_constraintGuide_percent="0.5" />
-
-		<include
-			android:id="@+id/card_update"
-			layout="@layout/layout_app_update"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_normal"
-			android:visibility="gone"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/guideline"
-			app:layout_constraintTop_toTopOf="parent"
-			tools:visibility="visible" />
-
-		<org.koitharu.kotatsu.settings.tools.views.MemoryUsageView
-			android:id="@+id/memory_usage_view"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			app:layout_constraintEnd_toStartOf="@id/guideline"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
-
-		<com.google.android.material.materialswitch.MaterialSwitch
-			android:id="@+id/switch_incognito"
-			style="?listItemTextViewStyle"
-			android:layout_width="0dp"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:layout_marginTop="2dp"
-			android:drawableStart="@drawable/ic_incognito"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/incognito_mode"
-			android:textAppearance="?attr/textAppearanceButton"
-			android:textColor="?attr/colorControlNormal"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/guideline"
-			app:layout_constraintTop_toBottomOf="@id/card_update"
-			app:layout_goneMarginTop="8dp" />
-
-		<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
-			android:id="@+id/button_downloads"
-			android:layout_width="0dp"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_download"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/downloads"
-			android:textAppearance="?attr/textAppearanceButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/guideline"
-			app:layout_constraintTop_toBottomOf="@id/switch_incognito" />
-
-		<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
-			android:id="@+id/button_settings"
-			android:layout_width="0dp"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_settings"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/settings"
-			android:textAppearance="?attr/textAppearanceButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/guideline"
-			app:layout_constraintTop_toBottomOf="@id/button_downloads" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout-w600dp-land/item_recommendation.xml b/app/src/main/res/layout-w600dp-land/item_recommendation.xml
new file mode 100644
index 000000000..62f495c04
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-land/item_recommendation.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@drawable/list_selector"
+	android:clipChildren="false">
+
+	<com.google.android.material.imageview.ShapeableImageView
+		android:id="@+id/imageView_cover"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:scaleType="centerCrop"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		tools:src="@tools:sample/backgrounds/scenic" />
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyLarge"
+		app:layout_constraintBottom_toTopOf="@+id/textView_subtitle"
+		app:layout_constraintEnd_toStartOf="@id/button_more"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
+		tools:text="@tools:sample/lorem" />
+
+	<TextView
+		android:id="@+id/textView_subtitle"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
+		app:layout_constraintEnd_toStartOf="@id/button_more"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toBottomOf="@+id/textView_title"
+		tools:text="@tools:sample/lorem/random" />
+
+	<Button
+		android:id="@+id/button_more"
+		style="@style/Widget.Kotatsu.ExploreButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="8dp"
+		android:gravity="center"
+		android:minWidth="120dp"
+		android:text="@string/more"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml
index 97799592d..a16d2432d 100644
--- a/app/src/main/res/layout/activity_categories.xml
+++ b/app/src/main/res/layout/activity_categories.xml
@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -50,7 +51,8 @@
 		android:paddingVertical="@dimen/list_spacing"
 		android:scrollbars="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+		tools:listitem="@layout/item_category" />
 
 	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 		android:id="@+id/fab_add"
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index 579adf35d..f401b2a27 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -21,7 +21,7 @@
 			android:id="@id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
-			android:background="@drawable/m3_tabs_background"
+			android:background="@drawable/toolbar_background"
 			android:theme="?attr/actionBarTheme"
 			app:layout_scrollFlags="noScroll"
 			tools:ignore="PrivateResource" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d3d46a580..a19fc1163 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -36,7 +36,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
 			android:layout_marginVertical="8dp"
-			android:background="@drawable/toolbar_background"
+			android:background="@drawable/search_bar_background"
 			android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
 			app:layout_scrollFlags="scroll|enterAlways|snap">
 
diff --git a/app/src/main/res/layout/activity_manga_list.xml b/app/src/main/res/layout/activity_manga_list.xml
index d2fe1e037..b4e9fe861 100644
--- a/app/src/main/res/layout/activity_manga_list.xml
+++ b/app/src/main/res/layout/activity_manga_list.xml
@@ -29,18 +29,14 @@
 				app:layout_collapseMode="parallax"
 				tools:ignore="RtlSymmetry">
 
-				<com.google.android.material.chip.Chip
-					android:id="@+id/chip_sort"
-					style="@style/Widget.Material3.Chip.Assist.Elevated"
+				<com.google.android.material.button.MaterialButton
+					android:id="@+id/button_order"
+					style="@style/Widget.Kotatsu.Button.More"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:visibility="gone"
-					app:chipIcon="@drawable/ic_sort"
-					app:chipIconEnabled="true"
-					app:closeIcon="@drawable/ic_expand_more"
-					app:closeIconEnabled="true"
-					app:layout_collapseMode="pin"
-					tools:text="@string/popular"
+					android:visibility="invisible"
+					app:icon="@drawable/ic_reorder"
+					tools:text="@string/manage"
 					tools:visibility="visible" />
 
 			</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_import.xml b/app/src/main/res/layout/dialog_import.xml
index 5f1fb3b45..5adac836f 100644
--- a/app/src/main/res/layout/dialog_import.xml
+++ b/app/src/main/res/layout/dialog_import.xml
@@ -32,21 +32,4 @@
 		app:subtitle="@string/folder_with_images_import_description"
 		app:title="@string/folder_with_images" />
 
-	<com.google.android.material.divider.MaterialDivider
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginVertical="4dp" />
-
-	<org.koitharu.kotatsu.core.ui.widgets.TwoLinesItemView
-		android:id="@+id/button_backup"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:drawablePadding="?android:listPreferredItemPaddingStart"
-		android:minHeight="?android:listPreferredItemHeightSmall"
-		android:paddingStart="?android:listPreferredItemPaddingStart"
-		android:paddingEnd="?android:listPreferredItemPaddingEnd"
-		app:icon="@drawable/ic_backup_restore"
-		app:subtitle="@string/restore_backup_description"
-		app:title="@string/restore_backup" />
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index 4f32dbd71..17edfc03e 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -139,25 +139,80 @@
 			app:layout_constraintTop_toBottomOf="@+id/info_layout" />
 
 		<TextView
-			android:id="@+id/textView_bookmarks"
+			android:id="@+id/textView_description_title"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
+			android:layout_marginStart="@dimen/margin_small"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_weight="1"
 			android:gravity="center_vertical|start"
-			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
+			android:padding="@dimen/grid_spacing"
 			android:singleLine="true"
-			android:text="@string/bookmarks"
+			android:text="@string/description"
 			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
-			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintEnd_toStartOf="@id/button_description_more"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/chips_tags" />
 
+		<Button
+			android:id="@+id/button_description_more"
+			style="@style/Widget.Kotatsu.Button.More"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:text="@string/more"
+			app:layout_constraintBaseline_toBaselineOf="@id/textView_description_title"
+			app:layout_constraintEnd_toEndOf="parent" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
+			android:id="@+id/textView_description"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/margin_normal"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_marginEnd="@dimen/margin_normal"
+			android:ellipsize="end"
+			android:lineSpacingMultiplier="1.2"
+			android:maxLines="@integer/details_description_lines"
+			android:paddingBottom="@dimen/margin_normal"
+			android:textAppearance="?attr/textAppearanceBodyMedium"
+			android:textIsSelectable="true"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/textView_description_title"
+			tools:ignore="UnusedAttribute"
+			tools:text="@tools:sample/lorem/random" />
+
+		<TextView
+			android:id="@+id/textView_bookmarks_title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/margin_small"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_weight="1"
+			android:gravity="center_vertical|start"
+			android:padding="@dimen/grid_spacing"
+			android:singleLine="true"
+			android:text="@string/bookmarks"
+			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
+			app:layout_constraintEnd_toStartOf="@id/button_bookmarks_more"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/textView_description" />
+
+		<Button
+			android:id="@+id/button_bookmarks_more"
+			style="@style/Widget.Kotatsu.Button.More"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:text="@string/show_all"
+			app:layout_constraintBaseline_toBaselineOf="@id/textView_bookmarks_title"
+			app:layout_constraintEnd_toEndOf="parent" />
+
 		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/recyclerView_bookmarks"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="4dp"
 			android:layout_marginBottom="6dp"
 			android:clipToPadding="false"
 			android:nestedScrollingEnabled="false"
@@ -167,9 +222,35 @@
 			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/textView_bookmarks"
+			app:layout_constraintTop_toBottomOf="@id/textView_bookmarks_title"
 			tools:listitem="@layout/item_bookmark" />
 
+		<TextView
+			android:id="@+id/textView_scrobbling_title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/margin_small"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_weight="1"
+			android:gravity="center_vertical|start"
+			android:padding="@dimen/grid_spacing"
+			android:singleLine="true"
+			android:text="@string/tracking"
+			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
+			app:layout_constraintEnd_toStartOf="@id/button_scrobbling_more"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/recyclerView_bookmarks" />
+
+		<Button
+			android:id="@+id/button_scrobbling_more"
+			style="@style/Widget.Kotatsu.Button.More"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:text="@string/manage"
+			app:layout_constraintBaseline_toBaselineOf="@id/textView_scrobbling_title"
+			app:layout_constraintEnd_toEndOf="parent" />
+
 		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/recyclerView_scrobbling"
 			android:layout_width="0dp"
@@ -185,28 +266,11 @@
 			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/recyclerView_bookmarks"
+			app:layout_constraintTop_toBottomOf="@id/textView_scrobbling_title"
 			tools:itemCount="2"
 			tools:listitem="@layout/item_scrobbling_info"
 			tools:visibility="visible" />
 
-		<org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
-			android:id="@+id/textView_description"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="@dimen/margin_normal"
-			android:layout_marginTop="@dimen/margin_small"
-			android:layout_marginEnd="@dimen/margin_normal"
-			android:lineSpacingMultiplier="1.2"
-			android:paddingBottom="@dimen/margin_normal"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			android:textIsSelectable="true"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/recyclerView_scrobbling"
-			tools:ignore="UnusedAttribute"
-			tools:text="@tools:sample/lorem/random[250]" />
-
 		<com.google.android.material.progressindicator.LinearProgressIndicator
 			android:id="@+id/progressBar"
 			android:layout_width="0dp"
@@ -227,7 +291,66 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="gone"
-			app:constraint_referenced_ids="recyclerView_bookmarks,textView_bookmarks"
+			app:constraint_referenced_ids="recyclerView_bookmarks,textView_bookmarks_title,button_bookmarks_more"
+			tools:visibility="visible" />
+
+		<androidx.constraintlayout.widget.Group
+			android:id="@+id/group_scrobbling"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			app:constraint_referenced_ids="recyclerView_scrobbling,textView_scrobbling_title,button_scrobbling_more"
+			tools:visibility="visible" />
+
+		<TextView
+			android:id="@+id/textView_related_title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/margin_small"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_weight="1"
+			android:gravity="center_vertical|start"
+			android:padding="@dimen/grid_spacing"
+			android:singleLine="true"
+			android:text="@string/related_manga"
+			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
+			app:layout_constraintEnd_toStartOf="@id/button_related_more"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/recyclerView_scrobbling" />
+
+		<Button
+			android:id="@+id/button_related_more"
+			style="@style/Widget.Kotatsu.Button.More"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:text="@string/show_all"
+			android:visibility="gone"
+			app:layout_constraintBaseline_toBaselineOf="@id/textView_related_title"
+			app:layout_constraintEnd_toEndOf="parent" />
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/recyclerView_related"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="6dp"
+			android:clipToPadding="false"
+			android:nestedScrollingEnabled="false"
+			android:orientation="horizontal"
+			android:paddingStart="12dp"
+			android:paddingEnd="12dp"
+			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/textView_related_title"
+			tools:listitem="@layout/item_manga_grid" />
+
+		<androidx.constraintlayout.widget.Group
+			android:id="@+id/group_related"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			app:constraint_referenced_ids="recyclerView_related,textView_related_title,button_related_more"
 			tools:visibility="visible" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_favourites_container.xml b/app/src/main/res/layout/fragment_favourites_container.xml
new file mode 100644
index 000000000..53d453eb4
--- /dev/null
+++ b/app/src/main/res/layout/fragment_favourites_container.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<com.google.android.material.tabs.TabLayout
+		android:id="@+id/tabs"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:tabGravity="start"
+		app:tabMode="scrollable" />
+
+	<org.koitharu.kotatsu.core.ui.widgets.EnhancedViewPager
+		android:id="@+id/pager"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		tools:visibility="gone" />
+
+	<ViewStub
+		android:id="@+id/stub_empty"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout="@layout/item_empty_state"
+		tools:visibility="visible" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index dba209dca..0eb8c87b9 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -17,10 +17,7 @@
 			android:layout_height="match_parent"
 			android:clipToPadding="false"
 			android:orientation="vertical"
-			android:paddingLeft="@dimen/list_spacing"
-			android:paddingTop="@dimen/grid_spacing_outer"
-			android:paddingRight="@dimen/list_spacing"
-			android:paddingBottom="@dimen/grid_spacing_outer"
+			app:bubbleSize="small"
 			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 			tools:listitem="@layout/item_feed" />
 
diff --git a/app/src/main/res/layout/fragment_preview.xml b/app/src/main/res/layout/fragment_preview.xml
new file mode 100644
index 000000000..127ef5308
--- /dev/null
+++ b/app/src/main/res/layout/fragment_preview.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/imageView_cover"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:background="?colorSecondaryContainer"
+			android:foreground="?selectableItemBackground"
+			android:scaleType="centerCrop"
+			app:layout_constraintDimensionRatio="H,13:18"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintWidth_percent="0.3"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
+			tools:background="@tools:sample/backgrounds/scenic[5]"
+			tools:ignore="ContentDescription,UnusedAttribute" />
+
+		<TextView
+			android:id="@+id/textView_title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:ellipsize="end"
+			android:maxLines="5"
+			android:textAppearance="?attr/textAppearanceHeadlineSmall"
+			app:layout_constraintEnd_toStartOf="@id/button_open"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_goneMarginEnd="16dp"
+			tools:text="@tools:sample/lorem" />
+
+		<ImageButton
+			android:id="@+id/button_open"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dp"
+			android:background="?selectableItemBackgroundBorderless"
+			android:contentDescription="@string/details"
+			android:padding="12dp"
+			app:layout_constraintEnd_toStartOf="@id/button_close"
+			app:layout_constraintTop_toTopOf="parent"
+			app:srcCompat="@drawable/ic_expand" />
+
+		<ImageButton
+			android:id="@+id/button_close"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="4dp"
+			android:background="?selectableItemBackgroundBorderless"
+			android:contentDescription="@string/close"
+			android:padding="12dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:srcCompat="?actionModeCloseDrawable"
+			app:tint="?colorControlNormal" />
+
+		<TextView
+			android:id="@+id/textView_subtitle"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="16dp"
+			android:ellipsize="end"
+			android:maxLines="3"
+			android:textAppearance="?attr/textAppearanceBodyMedium"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_title"
+			tools:text="@tools:sample/lorem[12]" />
+
+		<TextView
+			android:id="@+id/textView_author"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="16dp"
+			android:background="@drawable/list_selector"
+			android:padding="2dp"
+			android:singleLine="true"
+			android:textColor="?attr/colorTertiary"
+			android:textStyle="bold"
+			app:layout_constrainedWidth="true"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+			tools:text="@tools:sample/full_names" />
+
+		<RatingBar
+			android:id="@+id/rating_bar"
+			style="?ratingBarStyleSmall"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="16dp"
+			android:isIndicator="true"
+			android:max="1"
+			android:numStars="5"
+			android:stepSize="0.5"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0.0"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_author"
+			tools:rating="4" />
+
+		<androidx.constraintlayout.widget.Barrier
+			android:id="@+id/barrier_header"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			app:barrierDirection="bottom"
+			app:barrierMargin="8dp"
+			app:constraint_referenced_ids="imageView_cover,rating_bar" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.ChipsView
+			android:id="@+id/chips_tags"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			app:chipSpacingHorizontal="6dp"
+			app:chipSpacingVertical="6dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/barrier_header" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
+			android:id="@+id/textView_description"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/margin_normal"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_marginEnd="@dimen/margin_normal"
+			android:lineSpacingMultiplier="1.2"
+			android:paddingBottom="@dimen/margin_normal"
+			android:textAppearance="?attr/textAppearanceBodyMedium"
+			android:textIsSelectable="true"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/chips_tags"
+			tools:ignore="UnusedAttribute"
+			tools:text="@tools:sample/lorem/random" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_settings_sources.xml b/app/src/main/res/layout/fragment_settings_sources.xml
index 4a59b7c92..93255b2d2 100644
--- a/app/src/main/res/layout/fragment_settings_sources.xml
+++ b/app/src/main/res/layout/fragment_settings_sources.xml
@@ -11,4 +11,4 @@
 	android:orientation="vertical"
 	android:scrollbars="vertical"
 	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-	tools:listitem="@layout/item_source_config_checkable" />
+	tools:listitem="@layout/item_source_config" />
diff --git a/app/src/main/res/layout/fragment_tools.xml b/app/src/main/res/layout/fragment_tools.xml
deleted file mode 100644
index af1af8fc9..000000000
--- a/app/src/main/res/layout/fragment_tools.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
-
-		<include
-			android:id="@+id/card_update"
-			layout="@layout/layout_app_update"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_normal"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-		<com.google.android.material.divider.MaterialDivider
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginVertical="@dimen/margin_small"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-		<org.koitharu.kotatsu.settings.tools.views.MemoryUsageView
-			android:id="@+id/memory_usage_view"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-
-		<com.google.android.material.divider.MaterialDivider
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginVertical="@dimen/margin_small" />
-
-		<com.google.android.material.materialswitch.MaterialSwitch
-			android:id="@+id/switch_incognito"
-			style="?listItemTextViewStyle"
-			android:layout_width="match_parent"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_incognito"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/incognito_mode"
-			android:textAppearance="?attr/textAppearanceButton"
-			android:textColor="?attr/colorControlNormal" />
-
-		<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
-			android:id="@+id/button_downloads"
-			android:layout_width="match_parent"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_download"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/downloads"
-			android:textAppearance="?attr/textAppearanceButton" />
-
-		<org.koitharu.kotatsu.core.ui.widgets.ListItemTextView
-			android:id="@+id/button_settings"
-			android:layout_width="match_parent"
-			android:layout_height="?android:listPreferredItemHeightSmall"
-			android:drawableStart="@drawable/ic_settings"
-			android:drawablePadding="?android:listPreferredItemPaddingStart"
-			android:paddingStart="?android:listPreferredItemPaddingStart"
-			android:paddingEnd="?android:listPreferredItemPaddingEnd"
-			android:text="@string/settings"
-			android:textAppearance="?attr/textAppearanceButton" />
-
-	</LinearLayout>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/item_bookmark_large.xml b/app/src/main/res/layout/item_bookmark_large.xml
new file mode 100644
index 000000000..370762f4a
--- /dev/null
+++ b/app/src/main/res/layout/item_bookmark_large.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/Widget.Kotatsu.CardView.Outlined"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
+	tools:layout_width="140dp">
+
+	<org.koitharu.kotatsu.core.ui.widgets.CoverImageView
+		android:id="@+id/imageView_thumb"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:scaleType="centerCrop"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
+		tools:ignore="ContentDescription"
+		tools:src="@tools:sample/backgrounds/scenic[5]" />
+
+	<org.koitharu.kotatsu.history.ui.util.ReadingProgressView
+		android:id="@+id/progressView"
+		android:layout_width="@dimen/card_indicator_size"
+		android:layout_height="@dimen/card_indicator_size"
+		android:layout_gravity="bottom|end"
+		android:layout_margin="@dimen/card_indicator_offset" />
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml
index 3f1e61d54..99e0fa846 100644
--- a/app/src/main/res/layout/item_category.xml
+++ b/app/src/main/res/layout/item_category.xml
@@ -72,7 +72,7 @@
 		android:singleLine="true"
 		android:textAppearance="?attr/textAppearanceBodyLarge"
 		app:layout_constraintBottom_toTopOf="@id/textView_subtitle"
-		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintEnd_toStartOf="@id/imageView_handle"
 		app:layout_constraintStart_toEndOf="@id/imageView_cover3"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
@@ -84,27 +84,51 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="@dimen/margin_normal"
 		android:layout_marginTop="4dp"
-		android:layout_marginEnd="?listPreferredItemPaddingEnd"
+		android:layout_marginEnd="8dp"
 		android:singleLine="true"
 		android:textAppearance="?attr/textAppearanceBodySmall"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintEnd_toStartOf="@id/imageView_tracker"
+		app:layout_constraintHorizontal_bias="0"
+		app:layout_constraintHorizontal_chainStyle="packed"
 		app:layout_constraintStart_toEndOf="@id/imageView_cover3"
 		app:layout_constraintTop_toBottomOf="@id/textView_title"
 		app:layout_constraintVertical_chainStyle="packed"
+		app:layout_constraintWidth_default="wrap"
 		tools:text="@tools:sample/lorem[1]" />
 
+	<ImageView
+		android:id="@+id/imageView_tracker"
+		android:layout_width="16dp"
+		android:layout_height="16dp"
+		android:layout_marginEnd="4dp"
+		android:contentDescription="@string/check_for_new_chapters"
+		app:layout_constraintBottom_toBottomOf="@id/textView_subtitle"
+		app:layout_constraintEnd_toStartOf="@id/imageView_visible"
+		app:layout_constraintStart_toEndOf="@id/textView_subtitle"
+		app:layout_constraintTop_toTopOf="@id/textView_subtitle"
+		app:srcCompat="@drawable/ic_notification" />
+
+	<ImageView
+		android:id="@+id/imageView_visible"
+		android:layout_width="16dp"
+		android:layout_height="16dp"
+		android:contentDescription="@string/show_on_shelf"
+		app:layout_constraintBottom_toBottomOf="@id/textView_subtitle"
+		app:layout_constraintEnd_toEndOf="@id/textView_title"
+		app:layout_constraintStart_toEndOf="@id/imageView_tracker"
+		app:layout_constraintTop_toTopOf="@id/textView_subtitle"
+		app:srcCompat="@drawable/ic_eye" />
+
 	<ImageView
 		android:id="@+id/imageView_handle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:background="?selectableItemBackgroundBorderless"
 		android:contentDescription="@string/reorder"
 		android:padding="@dimen/margin_normal"
 		android:src="@drawable/ic_reorder_handle"
-		android:visibility="gone"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		tools:visibility="visible" />
+		app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_category_checkable.xml b/app/src/main/res/layout/item_category_checkable.xml
new file mode 100644
index 000000000..f6c20c387
--- /dev/null
+++ b/app/src/main/res/layout/item_category_checkable.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/linearLayout"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="?listPreferredItemHeightSmall"
+	android:paddingStart="?android:listPreferredItemPaddingStart"
+	android:paddingEnd="?android:listPreferredItemPaddingEnd"
+	tools:ignore="RtlSymmetry">
+
+	<org.koitharu.kotatsu.core.ui.widgets.CheckableImageView
+		android:id="@+id/checkableImageView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="?android:listChoiceIndicatorMultiple" />
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="?listPreferredItemPaddingStart"
+		android:ellipsize="end"
+		android:singleLine="true"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		app:layout_constrainedWidth="true"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@id/imageView_tracker"
+		app:layout_constraintHorizontal_bias="0"
+		app:layout_constraintHorizontal_chainStyle="packed"
+		app:layout_constraintStart_toEndOf="@id/checkableImageView"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="@tools:sample/lorem[1]" />
+
+	<ImageView
+		android:id="@+id/imageView_tracker"
+		android:layout_width="14dp"
+		android:layout_height="14dp"
+		android:layout_marginStart="4dp"
+		android:contentDescription="@string/check_for_new_chapters"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@id/imageView_visible"
+		app:layout_constraintStart_toEndOf="@id/textView_title"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/ic_notification" />
+
+	<ImageView
+		android:id="@+id/imageView_visible"
+		android:layout_width="14dp"
+		android:layout_height="14dp"
+		android:layout_marginStart="4dp"
+		android:contentDescription="@string/show_on_shelf"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/imageView_tracker"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/ic_eye" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_download_option.xml b/app/src/main/res/layout/item_download_option.xml
index 195b02ace..b40694d2b 100644
--- a/app/src/main/res/layout/item_download_option.xml
+++ b/app/src/main/res/layout/item_download_option.xml
@@ -2,7 +2,6 @@
 
 <org.koitharu.kotatsu.core.ui.widgets.TwoLinesItemView
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/button_file"
 	android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_empty_state.xml b/app/src/main/res/layout/item_empty_state.xml
index ff9a86494..94198432e 100644
--- a/app/src/main/res/layout/item_empty_state.xml
+++ b/app/src/main/res/layout/item_empty_state.xml
@@ -37,7 +37,6 @@
 
 	<Button
 		android:id="@+id/button_retry"
-		style="@style/Widget.Material3.Button.TonalButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/margin_normal"
diff --git a/app/src/main/res/layout/item_explore_buttons.xml b/app/src/main/res/layout/item_explore_buttons.xml
index 1864b1cd4..e55b90d35 100644
--- a/app/src/main/res/layout/item_explore_buttons.xml
+++ b/app/src/main/res/layout/item_explore_buttons.xml
@@ -7,30 +7,6 @@
 	android:paddingHorizontal="8dp"
 	android:paddingVertical="4dp">
 
-	<com.google.android.material.button.MaterialButton
-		android:id="@+id/button_history"
-		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/history"
-		app:icon="@drawable/ic_history" />
-
-	<com.google.android.material.button.MaterialButton
-		android:id="@+id/button_favourites"
-		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/favourites"
-		app:icon="@drawable/ic_heart_outline" />
-
-	<com.google.android.material.button.MaterialButton
-		android:id="@+id/button_suggestions"
-		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/suggestions"
-		app:icon="@drawable/ic_suggestion" />
-
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_local"
 		style="@style/Widget.Kotatsu.ExploreButton"
@@ -55,11 +31,19 @@
 		android:text="@string/random"
 		app:icon="@drawable/ic_dice" />
 
+	<com.google.android.material.button.MaterialButton
+		android:id="@+id/button_downloads"
+		style="@style/Widget.Kotatsu.ExploreButton"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:text="@string/downloads"
+		app:icon="@drawable/ic_download" />
+
 	<androidx.constraintlayout.helper.widget.Flow
 		android:id="@+id/flow"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		app:constraint_referenced_ids="button_history,button_favourites,button_local,button_bookmarks,button_suggestions,button_random"
+		app:constraint_referenced_ids="button_local,button_bookmarks,button_random,button_downloads"
 		app:flow_horizontalGap="12dp"
 		app:flow_maxElementsWrap="@integer/explore_buttons_columns"
 		app:flow_verticalGap="8dp"
@@ -68,4 +52,4 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_explore_source_grid.xml b/app/src/main/res/layout/item_explore_source_grid.xml
index 2f952ffee..e1cef0936 100644
--- a/app/src/main/res/layout/item_explore_source_grid.xml
+++ b/app/src/main/res/layout/item_explore_source_grid.xml
@@ -18,8 +18,11 @@
 		android:layout_height="72dp"
 		android:background="?colorControlHighlight"
 		android:labelFor="@id/textView_title"
+		android:padding="1dp"
 		android:scaleType="fitCenter"
 		app:shapeAppearance="?shapeAppearanceCornerMedium"
+		app:strokeColor="?colorOutline"
+		app:strokeWidth="1dp"
 		tools:src="@tools:sample/avatars" />
 
 	<TextView
diff --git a/app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/item_feed.xml
index 14c3be57d..dabc72ae8 100644
--- a/app/src/main/res/layout/item_feed.xml
+++ b/app/src/main/res/layout/item_feed.xml
@@ -4,15 +4,17 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="72dp"
 	android:background="@drawable/list_selector"
-	android:clipChildren="false"
-	android:padding="@dimen/list_spacing">
+	android:clipChildren="false">
 
 	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_cover"
-		android:layout_width="42dp"
-		android:layout_height="42dp"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -25,9 +27,10 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textAppearance="?attr/textAppearanceBodyMedium"
+		android:textAppearance="?attr/textAppearanceBodyLarge"
 		app:layout_constraintBottom_toTopOf="@+id/textView_summary"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
@@ -39,13 +42,14 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textAppearance="?attr/textAppearanceBodySmall"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
 		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
 		app:layout_constraintTop_toBottomOf="@+id/textView_title"
-		tools:text="@string/new_chapters" />
+		tools:text="@tools:sample/lorem/random" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_header_button.xml b/app/src/main/res/layout/item_header_button.xml
index 5b478fef9..cddfe3ac7 100644
--- a/app/src/main/res/layout/item_header_button.xml
+++ b/app/src/main/res/layout/item_header_button.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:baselineAligned="true"
 	android:orientation="horizontal">
 
 	<TextView
@@ -17,11 +18,13 @@
 		android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
 		tools:text="@tools:sample/lorem[2]" />
 
-	<Button
+	<com.google.android.material.button.MaterialButton
 		android:id="@+id/button_more"
-		style="@style/Widget.Material3.Button.TextButton"
+		style="@style/Widget.Kotatsu.Button.More.Small"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="@string/manage" />
+		android:visibility="invisible"
+		tools:text="@string/manage"
+		tools:visibility="visible" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_list_group.xml b/app/src/main/res/layout/item_list_group.xml
index 3a8becad9..cb34ff150 100644
--- a/app/src/main/res/layout/item_list_group.xml
+++ b/app/src/main/res/layout/item_list_group.xml
@@ -27,7 +27,7 @@
 
 	<Button
 		android:id="@+id/button_more"
-		style="@style/Widget.Material3.Button.TextButton"
+		style="@style/Widget.Kotatsu.Button.More"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignBaseline="@id/textView_title"
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index d4699ec71..18330e25b 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -3,11 +3,12 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	style="@style/Widget.Material3.CardView.Filled"
+	style="@style/Widget.Kotatsu.CardView.Outlined"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:clipChildren="false"
-	app:cardCornerRadius="16dp"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerHighest"
+	app:cardCornerRadius="12dp"
 	tools:layout_width="140dp">
 
 	<LinearLayout
@@ -23,6 +24,7 @@
 				android:id="@+id/imageView_cover"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+				android:background="?colorSurfaceContainer"
 				android:orientation="horizontal"
 				android:scaleType="centerCrop"
 				app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index 14309a582..e28499024 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -4,15 +4,18 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="72dp"
 	android:background="@drawable/list_selector"
-	android:clipChildren="false"
-	android:padding="@dimen/list_spacing">
+	android:clipChildren="false">
 
 	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_cover"
-		android:layout_width="42dp"
-		android:layout_height="42dp"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
+		android:background="?colorSurfaceContainer"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -25,9 +28,10 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textAppearance="?attr/textAppearanceBodyMedium"
+		android:textAppearance="?attr/textAppearanceBodyLarge"
 		app:layout_constraintBottom_toTopOf="@+id/textView_subtitle"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
@@ -39,9 +43,10 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textAppearance="?attr/textAppearanceBodySmall"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
 		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml
index b61d5497c..68f851c3e 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -15,6 +15,7 @@
 			android:id="@+id/imageView_cover"
 			android:layout_width="98dp"
 			android:layout_height="0dp"
+			android:background="?colorSurfaceContainer"
 			android:scaleType="centerCrop"
 			app:layout_constraintDimensionRatio="13:18"
 			app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_page.xml b/app/src/main/res/layout/item_page.xml
index 3634cf169..6100fb225 100644
--- a/app/src/main/res/layout/item_page.xml
+++ b/app/src/main/res/layout/item_page.xml
@@ -4,8 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="?android:windowBackground">
+	android:layout_height="match_parent">
 
 	<com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 		android:id="@+id/ssiv"
diff --git a/app/src/main/res/layout/item_recommendation.xml b/app/src/main/res/layout/item_recommendation.xml
new file mode 100644
index 000000000..08777e553
--- /dev/null
+++ b/app/src/main/res/layout/item_recommendation.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@drawable/list_selector"
+	android:clipChildren="false">
+
+	<com.google.android.material.imageview.ShapeableImageView
+		android:id="@+id/imageView_cover"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:scaleType="centerCrop"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		tools:src="@tools:sample/backgrounds/scenic" />
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyLarge"
+		app:layout_constraintBottom_toTopOf="@+id/textView_subtitle"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
+		tools:text="@tools:sample/lorem" />
+
+	<TextView
+		android:id="@+id/textView_subtitle"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toBottomOf="@+id/textView_title"
+		tools:text="@tools:sample/lorem/random" />
+
+	<Button
+		android:id="@+id/button_more"
+		style="@style/Widget.Kotatsu.ExploreButton"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:gravity="center"
+		android:text="@string/more"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/textView_subtitle" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layout/item_scrobbling_info.xml b/app/src/main/res/layout/item_scrobbling_info.xml
index 65a7148ff..2f6699c9f 100644
--- a/app/src/main/res/layout/item_scrobbling_info.xml
+++ b/app/src/main/res/layout/item_scrobbling_info.xml
@@ -3,65 +3,80 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	style="@style/Widget.Material3.CardView.Filled"
+	style="@style/Widget.Material3.CardView.Outlined"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	app:contentPadding="8dp">
+	android:layout_height="wrap_content">
 
-	<RelativeLayout
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingBottom="2dp">
+		android:layout_height="wrap_content">
 
 		<com.google.android.material.imageview.ShapeableImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="46dp"
-			android:layout_height="46dp"
-			android:layout_alignParentStart="true"
-			android:layout_alignParentTop="true"
-			android:contentDescription="@null"
-			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
-			tools:src="@tools:sample/backgrounds/scenic[7]" />
+			android:id="@+id/imageView_icon"
+			android:layout_width="40dp"
+			android:layout_height="40dp"
+			android:layout_marginVertical="20dp"
+			android:layout_marginStart="16dp"
+			android:background="?colorPrimary"
+			android:scaleType="center"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Circle"
+			app:tint="?colorOnPrimary"
+			tools:src="@drawable/ic_shikimori" />
 
 		<TextView
 			android:id="@+id/textView_title"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_alignParentTop="true"
-			android:layout_alignParentEnd="true"
-			android:layout_marginStart="8dp"
+			android:layout_marginHorizontal="16dp"
 			android:layout_toEndOf="@id/imageView_cover"
-			android:drawablePadding="8dp"
-			android:gravity="center_vertical"
+			android:singleLine="true"
 			android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-			app:drawableTint="?colorControlNormal"
-			tools:drawableEndCompat="@drawable/ic_shikimori"
-			tools:text="@tools:sample/lorem" />
+			app:layout_constraintBottom_toTopOf="@id/textView_status"
+			app:layout_constraintEnd_toStartOf="@id/imageView_cover"
+			app:layout_constraintStart_toEndOf="@id/imageView_icon"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed"
+			tools:text="@string/shikimori" />
 
 		<RatingBar
 			android:id="@+id/ratingBar"
 			style="?ratingBarStyleSmall"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/textView_title"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="4dp"
-			android:layout_toEndOf="@id/imageView_cover"
 			android:isIndicator="true"
 			android:max="1"
-			android:numStars="5" />
+			android:layout_marginStart="6dp"
+			android:numStars="5"
+			app:layout_constraintBottom_toBottomOf="@id/textView_status"
+			app:layout_constraintStart_toEndOf="@id/textView_status"
+			app:layout_constraintTop_toTopOf="@id/textView_status" />
 
 		<TextView
 			android:id="@+id/textView_status"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignBottom="@id/ratingBar"
-			android:layout_marginStart="4dp"
-			android:layout_marginBottom="-2dp"
-			android:layout_toEndOf="@id/ratingBar"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
 			android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintStart_toEndOf="@id/imageView_icon"
+			app:layout_constraintTop_toBottomOf="@id/textView_title"
 			tools:text="Reading" />
 
-	</RelativeLayout>
+		<ImageView
+			android:id="@+id/imageView_cover"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:scaleType="centerCrop"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintDimensionRatio="1:1"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:src="@tools:sample/backgrounds/scenic[7]" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_tip2.xml b/app/src/main/res/layout/item_tip2.xml
new file mode 100644
index 000000000..fa3512b5e
--- /dev/null
+++ b/app/src/main/res/layout/item_tip2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.koitharu.kotatsu.core.ui.widgets.TipView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginVertical="8dp"
+	android:layout_marginHorizontal="8dp"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
+	app:shapeAppearance="?shapeAppearanceCornerExtraLarge"
+	tools:icon="@drawable/ic_notification"
+	tools:primaryButtonText="@string/settings"
+	tools:secondaryButtonText="@string/close"
+	tools:text="Включите их, чтобы ничего не пропускать. Откройте настройки системы и разрешите их отправку."
+	tools:title="Уведомления отключены" />
diff --git a/app/src/main/res/layout/layout_app_update.xml b/app/src/main/res/layout/layout_app_update.xml
index 02701ea39..d9b7525e7 100644
--- a/app/src/main/res/layout/layout_app_update.xml
+++ b/app/src/main/res/layout/layout_app_update.xml
@@ -3,7 +3,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/card_update"
-	style="@style/Widget.Material3.CardView.Filled"
+	app:cardCornerRadius="21dp"
+	app:cardBackgroundColor="?attr/colorSurfaceContainerLow"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	app:contentPadding="@dimen/margin_normal">
diff --git a/app/src/main/res/layout/layout_details_info.xml b/app/src/main/res/layout/layout_details_info.xml
index 8551c127b..228a38b40 100644
--- a/app/src/main/res/layout/layout_details_info.xml
+++ b/app/src/main/res/layout/layout_details_info.xml
@@ -7,7 +7,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:baselineAligned="false"
-	android:divider="?attr/colorOutline"
+	android:divider="?attr/colorSecondary"
 	android:dividerPadding="8dp"
 	android:gravity="center_vertical"
 	android:orientation="horizontal"
diff --git a/app/src/main/res/layout/layout_memory_usage.xml b/app/src/main/res/layout/preference_memory_usage.xml
similarity index 68%
rename from app/src/main/res/layout/layout_memory_usage.xml
rename to app/src/main/res/layout/preference_memory_usage.xml
index 6d6212caa..e6d920fde 100644
--- a/app/src/main/res/layout/layout_memory_usage.xml
+++ b/app/src/main/res/layout/preference_memory_usage.xml
@@ -1,42 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	tools:ignore="RtlSymmetry"
-	tools:orientation="vertical"
-	tools:parentTag="android.widget.LinearLayout">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/screen_padding"
-		android:layout_marginTop="@dimen/margin_small">
-
-		<TextView
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/storage_usage"
-			android:textAppearance="?textAppearanceTitleMedium" />
-
-		<Button
-			android:id="@+id/button_manage"
-			style="@style/Widget.Material3.Button.TextButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="8dp"
-			android:text="@string/manage" />
-
-	</LinearLayout>
+	android:orientation="vertical"
+	android:paddingBottom="4dp"
+	tools:ignore="RtlSymmetry">
 
 	<org.koitharu.kotatsu.core.ui.widgets.SegmentedBarView
 		android:id="@+id/bar"
 		android:layout_width="match_parent"
-		android:layout_height="16dp"
+		android:layout_height="18dp"
 		android:layout_marginStart="@dimen/screen_padding"
+		android:layout_marginTop="@dimen/screen_padding"
 		android:layout_marginEnd="@dimen/screen_padding"
 		android:background="?colorSecondaryContainer" />
 
@@ -49,7 +27,7 @@
 		android:layout_marginTop="@dimen/margin_normal"
 		android:layout_marginEnd="@dimen/screen_padding"
 		android:text="@string/saved_manga"
-		app:drawableStartCompat="@drawable/bg_circle"
+		app:drawableStartCompat="@drawable/bg_rounded_square"
 		tools:drawableTint="?colorPrimary" />
 
 	<TextView
@@ -61,7 +39,7 @@
 		android:layout_marginTop="@dimen/margin_small"
 		android:layout_marginEnd="@dimen/screen_padding"
 		android:text="@string/pages_cache"
-		app:drawableStartCompat="@drawable/bg_circle"
+		app:drawableStartCompat="@drawable/bg_rounded_square"
 		tools:drawableTint="?colorSecondary" />
 
 	<TextView
@@ -73,7 +51,7 @@
 		android:layout_marginTop="@dimen/margin_small"
 		android:layout_marginEnd="@dimen/screen_padding"
 		android:text="@string/other_cache"
-		app:drawableStartCompat="@drawable/bg_circle"
+		app:drawableStartCompat="@drawable/bg_rounded_square"
 		tools:drawableTint="?colorTertiary" />
 
 	<TextView
@@ -86,7 +64,7 @@
 		android:layout_marginEnd="@dimen/screen_padding"
 		android:layout_marginBottom="@dimen/screen_padding"
 		android:text="@string/computing_"
-		app:drawableStartCompat="@drawable/bg_circle"
+		app:drawableStartCompat="@drawable/bg_rounded_square"
 		app:drawableTint="?colorSecondaryContainer" />
 
-</merge>
+</LinearLayout>
diff --git a/app/src/main/res/layout/view_tip.xml b/app/src/main/res/layout/view_tip.xml
new file mode 100644
index 000000000..011b635bf
--- /dev/null
+++ b/app/src/main/res/layout/view_tip.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:padding="@dimen/margin_normal"
+	tools:background="@drawable/bg_appwidget_card"
+	tools:backgroundTint="?colorBackgroundFloating"
+	tools:layout_height="wrap_content"
+	tools:layout_margin="16dp"
+	tools:layout_width="match_parent"
+	tools:orientation="vertical"
+	tools:parentTag="android.widget.LinearLayout">
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:drawablePadding="10dp"
+		android:gravity="center_vertical"
+		android:textAppearance="?textAppearanceTitleMedium"
+		tools:drawableStartCompat="@drawable/ic_app_update"
+		tools:text="Уведомления отключены" />
+
+	<TextView
+		android:id="@+id/textView_body"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:textAppearance="?textAppearanceBodyMedium"
+		tools:text="Включите их, чтобы ничего не пропускать. Откройте настройки системы и разрешите их отправку." />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:layout_weight="2"
+		android:divider="@drawable/divider_transparent"
+		android:orientation="horizontal"
+		android:showDividers="middle">
+
+		<com.google.android.material.button.MaterialButton
+			android:id="@+id/button_primary"
+			style="@style/Widget.Material3.Button.UnelevatedButton"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:paddingHorizontal="8dp"
+			android:singleLine="true"
+			tools:text="Открыть настройки" />
+
+		<Button
+			android:id="@+id/button_secondary"
+			style="@style/Widget.Material3.Button.TonalButton"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:paddingHorizontal="8dp"
+			android:singleLine="true"
+			tools:text="Отмена" />
+
+	</LinearLayout>
+
+</merge>
diff --git a/app/src/main/res/menu/mode_category.xml b/app/src/main/res/menu/mode_category.xml
index 2877cfd75..b84f0c554 100644
--- a/app/src/main/res/menu/mode_category.xml
+++ b/app/src/main/res/menu/mode_category.xml
@@ -4,9 +4,15 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-		android:id="@+id/action_edit"
-		android:icon="@drawable/ic_edit"
-		android:title="@string/edit"
+		android:id="@+id/action_show"
+		android:icon="@drawable/ic_eye"
+		android:title="@string/show"
+		app:showAsAction="ifRoom" />
+
+	<item
+		android:id="@+id/action_hide"
+		android:icon="@drawable/ic_eye_off"
+		android:title="@string/hide"
 		app:showAsAction="ifRoom" />
 
 	<item
@@ -15,4 +21,4 @@
 		android:title="@string/remove"
 		app:showAsAction="ifRoom" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/nav_bottom.xml b/app/src/main/res/menu/nav_bottom.xml
index bf1aed02b..a7a2e95dd 100644
--- a/app/src/main/res/menu/nav_bottom.xml
+++ b/app/src/main/res/menu/nav_bottom.xml
@@ -3,9 +3,14 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<item
-		android:id="@+id/nav_shelf"
-		android:icon="@drawable/ic_bookshelf_selector"
-		android:title="@string/manga_shelf" />
+		android:id="@+id/nav_history"
+		android:icon="@drawable/ic_history_selector"
+		android:title="@string/history" />
+
+	<item
+		android:id="@+id/nav_favourites"
+		android:icon="@drawable/ic_favourites_selector"
+		android:title="@string/favourites" />
 
 	<item
 		android:id="@+id/nav_explore"
@@ -17,9 +22,4 @@
 		android:icon="@drawable/ic_feed_selector"
 		android:title="@string/feed" />
 
-	<item
-		android:id="@+id/nav_tools"
-		android:icon="@drawable/ic_tools_selector"
-		android:title="@string/options" />
-
 </menu>
diff --git a/app/src/main/res/menu/opt_categories.xml b/app/src/main/res/menu/opt_categories.xml
deleted file mode 100644
index 9facdc165..000000000
--- a/app/src/main/res/menu/opt_categories.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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">
-
-	<item
-		android:id="@+id/action_reorder"
-		android:icon="@drawable/ic_reorder"
-		android:title="@string/reorder"
-		app:showAsAction="ifRoom" />
-
-</menu>
diff --git a/app/src/main/res/menu/opt_favourites_container.xml b/app/src/main/res/menu/opt_favourites_container.xml
new file mode 100644
index 000000000..5a15dd9c2
--- /dev/null
+++ b/app/src/main/res/menu/opt_favourites_container.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/action_manage"
+		android:orderInCategory="48"
+		android:title="@string/manage_categories"
+		android:titleCondensed="@string/manage" />
+
+</menu>
diff --git a/app/src/main/res/menu/opt_feed.xml b/app/src/main/res/menu/opt_feed.xml
index 44c985e74..aff41be01 100644
--- a/app/src/main/res/menu/opt_feed.xml
+++ b/app/src/main/res/menu/opt_feed.xml
@@ -4,21 +4,21 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-		android:id="@+id/action_update"
+		android:id="@+id/action_updated"
 		android:orderInCategory="50"
-		android:title="@string/update"
+		android:title="@string/updated"
 		app:showAsAction="never" />
 
 	<item
-		android:id="@+id/action_clear_feed"
+		android:id="@+id/action_update"
 		android:orderInCategory="50"
-		android:title="@string/clear_feed"
+		android:title="@string/update"
 		app:showAsAction="never" />
 
 	<item
-		android:id="@+id/action_settings"
+		android:id="@+id/action_clear_feed"
 		android:orderInCategory="50"
-		android:title="@string/settings"
+		android:title="@string/clear_feed"
 		app:showAsAction="never" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/opt_history.xml b/app/src/main/res/menu/opt_history.xml
index 13dead55b..3f3a973af 100644
--- a/app/src/main/res/menu/opt_history.xml
+++ b/app/src/main/res/menu/opt_history.xml
@@ -3,18 +3,31 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
+	<item
+		android:id="@+id/action_order"
+		android:orderInCategory="25"
+		android:title="@string/sort_order">
+
+		<menu>
+
+			<group android:id="@+id/group_order" />
+
+		</menu>
+
+	</item>
+
 	<item
 		android:id="@+id/action_history_grouping"
 		android:checkable="true"
 		android:checked="true"
-		android:orderInCategory="15"
+		android:orderInCategory="25"
 		android:title="@string/group"
 		app:showAsAction="never" />
 
 	<item
 		android:id="@+id/action_clear_history"
-		android:orderInCategory="50"
+		android:orderInCategory="10"
 		android:title="@string/clear_history"
 		app:showAsAction="never" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/opt_list.xml b/app/src/main/res/menu/opt_list.xml
index 421f8a2c5..1ea6a47ff 100644
--- a/app/src/main/res/menu/opt_list.xml
+++ b/app/src/main/res/menu/opt_list.xml
@@ -9,4 +9,4 @@
 		android:title="@string/list_mode"
 		app:showAsAction="never" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/opt_list_remote.xml b/app/src/main/res/menu/opt_list_remote.xml
index 82554a1e2..5dff03a7c 100644
--- a/app/src/main/res/menu/opt_list_remote.xml
+++ b/app/src/main/res/menu/opt_list_remote.xml
@@ -10,6 +10,12 @@
 		app:actionViewClass="androidx.appcompat.widget.SearchView"
 		app:showAsAction="ifRoom|collapseActionView" />
 
+	<item
+		android:id="@+id/action_random"
+		android:icon="@drawable/ic_dice"
+		android:title="@string/random"
+		app:showAsAction="ifRoom" />
+
 	<item
 		android:id="@+id/action_filter"
 		android:orderInCategory="30"
@@ -21,4 +27,4 @@
 		android:orderInCategory="50"
 		android:title="@string/settings"
 		app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/opt_main.xml b/app/src/main/res/menu/opt_main.xml
new file mode 100644
index 000000000..ef76a5e4d
--- /dev/null
+++ b/app/src/main/res/menu/opt_main.xml
@@ -0,0 +1,27 @@
+<?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">
+
+	<item
+		android:id="@+id/action_app_update"
+		android:icon="@drawable/ic_app_update"
+		android:orderInCategory="1"
+		android:title="@string/update"
+		android:visible="false"
+		app:showAsAction="ifRoom" />
+
+	<item
+		android:id="@+id/action_incognito"
+		android:checkable="true"
+		android:orderInCategory="90"
+		android:title="@string/incognito_mode"
+		app:showAsAction="never" />
+
+	<item
+		android:id="@+id/action_settings"
+		android:orderInCategory="90"
+		android:title="@string/settings"
+		app:showAsAction="never" />
+
+</menu>
diff --git a/app/src/main/res/menu/opt_search_suggestion.xml b/app/src/main/res/menu/opt_search_suggestion.xml
index 9570cd8a3..710342964 100644
--- a/app/src/main/res/menu/opt_search_suggestion.xml
+++ b/app/src/main/res/menu/opt_search_suggestion.xml
@@ -3,9 +3,16 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
+	<item
+		android:id="@+id/action_voice_search"
+		android:icon="@drawable/ic_voice_input"
+		android:orderInCategory="0"
+		android:title="@string/voice_search"
+		app:showAsAction="ifRoom" />
+
 	<item
 		android:id="@+id/action_clear"
 		android:title="@string/clear_search_history"
 		app:showAsAction="never" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/opt_sources.xml b/app/src/main/res/menu/opt_sources.xml
index 9ec1bc4f0..1a550d464 100644
--- a/app/src/main/res/menu/opt_sources.xml
+++ b/app/src/main/res/menu/opt_sources.xml
@@ -10,9 +10,20 @@
 		app:actionViewClass="androidx.appcompat.widget.SearchView"
 		app:showAsAction="ifRoom|collapseActionView" />
 
+	<item
+		android:id="@+id/action_no_nsfw"
+		android:checkable="true"
+		android:title="@string/disable_nsfw"
+		app:showAsAction="never" />
+
+	<item
+		android:id="@+id/action_locales"
+		android:title="@string/languages"
+		app:showAsAction="never" />
+
 	<item
 		android:id="@+id/action_disable_all"
 		android:title="@string/disable_all"
 		app:showAsAction="never" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
new file mode 100644
index 000000000..467b3efec
--- /dev/null
+++ b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 19ebd551f..b32c5d440 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -74,4 +74,5 @@
     <string name="_continue">يكمل</string>
     <string name="error">خطاء</string>
     <string name="clear_search_history">مسح تاريخ البحث</string>
+    <string name="disable_nsfw">تعطيل NSFW</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/plurals.xml b/app/src/main/res/values-be/plurals.xml
index e27eb524b..e0e95afdf 100644
--- a/app/src/main/res/values-be/plurals.xml
+++ b/app/src/main/res/values-be/plurals.xml
@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="items">
-		<item quantity="one">%1$d элемент</item>
-		<item quantity="few">%1$d элементы</item>
-		<item quantity="many">%1$d элементаў</item>
-		<item quantity="other">%1$d элементаў</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d новая частка</item>
-		<item quantity="few">%1$d новыя часткi</item>
-		<item quantity="many">%1$d новых частак</item>
-		<item quantity="other">%1$d новых частак</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d частка</item>
-		<item quantity="few">%1$d часткi</item>
-		<item quantity="many">%1$d частак</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">%1$d хвіліну таму</item>
-		<item quantity="few">%1$d хвіліны таму</item>
-		<item quantity="many">%1$d хвілін таму</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">%1$d гадзіну таму</item>
-		<item quantity="few">%1$d гадзіны таму</item>
-		<item quantity="many">%1$d гадзін таму</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">%1$d дзень таму</item>
-		<item quantity="few">%1$d дні таму</item>
-		<item quantity="many">%1$d дзён таму</item>
-	</plurals>
-</resources>
+    <plurals name="items">
+        <item quantity="one">%1$d элемент</item>
+        <item quantity="few">%1$d элементы</item>
+        <item quantity="many">%1$d элементаў</item>
+        <item quantity="other">%1$d элементаў</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d новая частка</item>
+        <item quantity="few">%1$d новыя часткi</item>
+        <item quantity="many">%1$d новых частак</item>
+        <item quantity="other">%1$d новых частак</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d частка</item>
+        <item quantity="few">%1$d часткi</item>
+        <item quantity="many">%1$d частак</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d хвіліну таму</item>
+        <item quantity="few">%1$d хвіліны таму</item>
+        <item quantity="many">%1$d хвілін таму</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d гадзіну таму</item>
+        <item quantity="few">%1$d гадзіны таму</item>
+        <item quantity="many">%1$d гадзін таму</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d дзень таму</item>
+        <item quantity="few">%1$d дні таму</item>
+        <item quantity="many">%1$d дзён таму</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">%1$d месяц таму</item>
+        <item quantity="few">%1$d месяцы таму</item>
+        <item quantity="many">%1$d месяцаў таму</item>
+        <item quantity="other">%1$d месяцаў таму</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 18467fc6b..facf79ff1 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -176,7 +176,7 @@
     <string name="welcome">Вітаю</string>
     <string name="text_local_holder_secondary">Вы можаце захаваць мангу з анлайн-крыніц або імпартаваць з файла.</string>
     <string name="text_local_holder_primary">У вас яшчэ няма ніводнай захаванай мангі</string>
-    <string name="text_history_holder_secondary">Вы можаце знайсці, што пачытаць, у бакавым меню.</string>
+    <string name="text_history_holder_secondary">Знайдзіце, што пачытаць, у раздзеле «Агляд»</string>
     <string name="text_history_holder_primary">Тут будзе паказана манга, якую вы чытаеце</string>
     <string name="text_search_holder_secondary">Паспрабуйце перафармуляваць запыт.</string>
     <string name="text_empty_holder_primary">Неяк тут пуста…</string>
@@ -443,4 +443,27 @@
     <string name="download_option_next_unread_n_chapters">Наступная непрачытаная %s</string>
     <string name="custom_directory">Карыстацкі каталог</string>
     <string name="no_access_to_file">У вас няма доступу да гэтага файла або каталога</string>
+    <string name="description">Апісанне</string>
+    <string name="this_month">Гэты месяц</string>
+    <string name="voice_search">Галасавы пошук</string>
+    <string name="related_manga">Падобная манга</string>
+    <string name="color_light">Светлы</string>
+    <string name="color_dark">Цёмны</string>
+    <string name="color_white">Белы</string>
+    <string name="data_not_restored">Дадзеныя не былі адноўлены</string>
+    <string name="suggestions_wifi_only_summary">Не абнаўляць рэкамендацыі пры выкарыстанні лімітнага інтэрнэт-злучэння</string>
+    <string name="tracker_wifi_only_summary">Не правяраць наяўнасць новых раздзелаў пры выкарыстанні лімітнага інтэрнэт-злучэння</string>
+    <string name="color_black">Чорны</string>
+    <string name="background">Фон</string>
+    <string name="data_not_restored_text">Пераканайцеся, што вы выбралі правільны файл рэзервовай копіі</string>
+    <string name="search_hint">Увядзіце назву мангі, жанр або назву крыніцы</string>
+    <string name="progress">Прагрэс</string>
+    <string name="manage_categories">Упраўленне катэгорыямі</string>
+    <string name="order_added">Дададзена</string>
+    <string name="view_list">Прагляд спісу</string>
+    <string name="show">Паказаць</string>
+    <string name="captcha_required_summary">Для правільнай працы %s патрабуецца праверка captcha</string>
+    <string name="languages">Мовы</string>
+    <string name="unknown">Невядомы</string>
+    <string name="in_progress">У працэсе</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/plurals.xml b/app/src/main/res/values-bn/plurals.xml
index a90d74e48..b02c1c03a 100644
--- a/app/src/main/res/values-bn/plurals.xml
+++ b/app/src/main/res/values-bn/plurals.xml
@@ -1,11 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="items">
-		<item quantity="one">%1$dটি আইটেম</item>
-		<item quantity="other">%1$dটি আইটেম</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$dটি নতুন চ্যাপ্টার</item>
-		<item quantity="other">%1$dটি নতুন চ্যাপ্টার</item>
-	</plurals>
-</resources>
+    <plurals name="items">
+        <item quantity="one">%1$d টি আইটেম</item>
+        <item quantity="other">%1$d টি আইটেম</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d টি নতুন পর্ব</item>
+        <item quantity="other">%1$d টি নতুন পর্ব</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">মাত্র %1$d আগে</item>
+        <item quantity="other">মাত্র %1$d দিন আগে</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">প্রায় %1$d মাস আগে</item>
+        <item quantity="other">%1$d মাস আগে</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d পর্ব</item>
+        <item quantity="other">%1$d টি পর্ব</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d মাত্র ঘন্টা আগে</item>
+        <item quantity="other">%1$d ঘন্টা আগে</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">মাত্র %1$d মিনিট আগে</item>
+        <item quantity="other">%1$d মিনিটস আগে</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 514b823f6..1fe6648d6 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,6 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="favourites">প্রিয়গুলি</string>
-	<string name="history">ইতিহাস</string>
-	<string name="local_storage">লোকাল স্টোরেজ</string>
-</resources>
+    <string name="favourites">পছন্দের গুলো</string>
+    <string name="history">ইতিহাস</string>
+    <string name="local_storage">লোকাল স্টোরেজ</string>
+    <string name="_continue">চালিয়ে যান</string>
+    <string name="clear_thumbs_cache">থাম্বনেইল ক্যাচ সাফ করুন</string>
+    <string name="clear_search_history">সার্চ ইতিহাস সাফ করুন</string>
+    <string name="gestures_only">শুধুমাত্র Gestures</string>
+    <string name="internal_storage">ইন্টার্নাল স্টোরেজ</string>
+    <string name="external_storage">এক্সটার্নাল স্টোরেজ</string>
+    <string name="domain">ডোমেইন</string>
+    <string name="app_update_available">অ্যাপের নতুন ভার্সন পাওয়া গেছে</string>
+    <string name="open_in_browser">ব্রাউজারে খুলুন</string>
+    <string name="error_occurred">কিছু একটা গন্ডগোল হয়েছে</string>
+    <string name="details">খুঁটিনাটি</string>
+    <string name="chapters">পর্ব সমূহ</string>
+    <string name="list">তালিকা</string>
+    <string name="detailed_list">পুঙ্খানুপুঙ্খ তালিকা</string>
+    <string name="grid">গ্রিড</string>
+    <string name="settings">সেটিং সমূহ</string>
+    <string name="loading_">লোড হচ্ছে…</string>
+    <string name="close">বন্ধ</string>
+    <string name="try_again">আবারো চেষ্টা করুন</string>
+    <string name="clear_history">ইতিহাস মুছুন</string>
+    <string name="computing_">প্রস্তুত হচ্ছে…</string>
+    <string name="chapter_d_of_d">%2$d টির মধ্যে %1$d তম পর্ব</string>
+    <string name="nothing_found">কিছু পাওয়া যায়নি</string>
+    <string name="history_is_empty">কোনো ইতিহাস লেখা হয়নি</string>
+    <string name="read">পড়ুন</string>
+    <string name="add_to_favourites">পছন্দ করুন</string>
+    <string name="text_file_not_supported">একটি ZIP অথবা CBZ ফাইল নিন</string>
+    <string name="no_description">কোনো বর্ণনা নেই</string>
+    <string name="clear_pages_cache">পেজের ক্যাচ পরিষ্কার করুন</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="share_image">ছবি শেয়ার করুন</string>
+    <string name="_import">আমদানি</string>
+    <string name="delete">মুছে ফেলুন</string>
+    <string name="operation_not_supported">এই কাজটি করা সম্ভব নয়</string>
+    <string name="switch_pages">পেজ পাল্টান</string>
+    <string name="taps_on_edges">কোনার ট্যাপ</string>
+    <string name="search_history_cleared">সাফ করা হয়েছে</string>
+    <string name="network_error">নেটওয়ার্কে সমস্যা</string>
+    <string name="remote_sources">মানগা সোর্স সমূহ</string>
+    <string name="you_have_not_favourites_yet">এখনো কিছু পছন্দ হয়নি</string>
+    <string name="add_new_category">নতুন বিভাগ</string>
+    <string name="by_rating">রেটিং</string>
+    <string name="add">যোগ করুন</string>
+    <string name="save">সেভ করুন</string>
+    <string name="sort_order">বাছাইয়ের ধারা</string>
+    <string name="share">শেয়ার করুন</string>
+    <string name="create_shortcut">শর্টকাট তৈরি করুন…</string>
+    <string name="share_s">%s শেয়ার করুন</string>
+    <string name="search">খুঁজুন</string>
+    <string name="search_manga">মানগা খুঁজুন</string>
+    <string name="manga_downloading_">ডাউনলোড হচ্ছে…</string>
+    <string name="processing_">প্রস্তুত হচ্ছে…</string>
+    <string name="downloads">ডাউনলোড হ‌ওয়া গুলো</string>
+    <string name="by_name">নাম</string>
+    <string name="popular">জনপ্রিয়</string>
+    <string name="updated">আপডেট হয়েছে</string>
+    <string name="newest">সবচেয়ে নতুন</string>
+    <string name="filter">বাছাই</string>
+    <string name="theme">থিম</string>
+    <string name="light">আলো</string>
+    <string name="dark">আঁধার</string>
+    <string name="automatic">সিস্টেম অনুযায়ী</string>
+    <string name="pages">পৃষ্ঠাগুলি</string>
+    <string name="webtoon">ওয়েবটুন</string>
+    <string name="read_mode">পড়ার মোড</string>
+    <string name="grid_size">গ্রিডের আকার</string>
+    <string name="clear">পরিষ্কার</string>
+    <string name="text_clear_history_prompt">সকল পড়ার ইতিহাস সাফ করবেন\?</string>
+    <string name="remove">সরিয়ে ফেলুন</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" লোকাল স্টোরেজ থেকে সরানো হয়েছে</string>
+    <string name="save_page">পেজ সেভ করুন</string>
+    <string name="page_saved">সেভ হয়েছে</string>
+    <string name="standard">স্ট্যান্ডার্ড</string>
+    <string name="search_on_s">%s এ খুঁজুন</string>
+    <string name="delete_manga">মানগা ডিলিট করুন</string>
+    <string name="text_delete_local_manga">\"%s\" পারমানেন্ট ভাবে ডিভাইস থেকে ডিলিট করতে চান\?</string>
+    <string name="reader_settings">রিডারের সেটিংস</string>
+    <string name="volume_buttons">ভলিউম বাটন</string>
+    <string name="error">সমস্যা</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/plurals.xml b/app/src/main/res/values-de/plurals.xml
index 57ba4ecdf..a8d757a8f 100644
--- a/app/src/main/res/values-de/plurals.xml
+++ b/app/src/main/res/values-de/plurals.xml
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="items">
-		<item quantity="one">%1$d Element</item>
-		<item quantity="other">%1$d Elemente</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d neues Kapitel</item>
-		<item quantity="other">%1$d neue Kapitel</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d Kapitel</item>
-		<item quantity="other">%1$d Kapitel</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">Vor %1$d Minute</item>
-		<item quantity="other">Vor %1$d Minuten</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">Vor %1$d Stunde</item>
-		<item quantity="other">Vor %1$d Stunden</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">Vor %1$d Tag</item>
-		<item quantity="other">Vor %1$d Tagen</item>
-	</plurals>
-</resources>
+    <plurals name="items">
+        <item quantity="one">%1$d Element</item>
+        <item quantity="other">%1$d Elemente</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d neues Kapitel</item>
+        <item quantity="other">%1$d neue Kapitel</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d Kapitel</item>
+        <item quantity="other">%1$d Kapitel</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">Vor %1$d Minute</item>
+        <item quantity="other">Vor %1$d Minuten</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">Vor %1$d Stunde</item>
+        <item quantity="other">Vor %1$d Stunden</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">Vor %1$d Tag</item>
+        <item quantity="other">Vor %1$d Tagen</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">Vor %1$d Monat</item>
+        <item quantity="other">Vor %1$d Monaten</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e7cb5fb89..1608cdb1a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,411 +1,468 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-	<string name="remove">Entfernen</string>
-	<string name="text_clear_history_prompt">Gesamten Leseverlauf unwiderruflich löschen\?</string>
-	<string name="theme">Design</string>
-	<string name="pages">Seiten</string>
-	<string name="automatic">Wie System</string>
-	<string name="dark">Dunkel</string>
-	<string name="light">Hell</string>
-	<string name="filter">Filter</string>
-	<string name="sort_order">Sortierreihenfolge</string>
-	<string name="by_rating">Bewertung</string>
-	<string name="newest">Neuestes</string>
-	<string name="popular">Beliebt</string>
-	<string name="by_name">Name</string>
-	<string name="downloads">Downloads</string>
-	<string name="download_complete">Heruntergeladen</string>
-	<string name="search_manga">Manga suchen</string>
-	<string name="search">Suchen</string>
-	<string name="share_s">Teilen %s</string>
-	<string name="share">Teilen</string>
-	<string name="save">Speichern</string>
-	<string name="add">Hinzufügen</string>
-	<string name="add_new_category">Neue Kategorie</string>
-	<string name="add_to_favourites">Zu Favoriten hinzufügen</string>
-	<string name="you_have_not_favourites_yet">Noch keine Favoriten</string>
-	<string name="read">Lesen</string>
-	<string name="history_is_empty">Noch kein Verlauf</string>
-	<string name="nothing_found">Nichts gefunden</string>
-	<string name="clear_history">Verlauf löschen</string>
-	<string name="try_again">Erneut versuchen</string>
-	<string name="close">Schließen</string>
-	<string name="chapter_d_of_d">Kapitel %1$d von %2$d</string>
-	<string name="remote_sources">Manga Quellen</string>
-	<string name="settings">Einstellungen</string>
-	<string name="list_mode">Listenmodus</string>
-	<string name="grid">Raster</string>
-	<string name="text_clear_updates_feed_prompt">Den gesamte Aktualisierungsverlauf unwiderruflich löschen\?</string>
-	<string name="no_update_available">Keine Aktualisierungen verfügbar</string>
-	<string name="check_for_updates">Nach Aktualisierungen suchen</string>
-	<string name="track_sources">Suche nach Aktualisierungen</string>
-	<string name="feed_will_update_soon">Die Feed-Aktualisierung beginnt gleich</string>
-	<string name="update">Aktualisieren</string>
-	<string name="updates_feed_cleared">Gelöscht</string>
-	<string name="clear_updates_feed">Aktualisierungsfeed löschen</string>
-	<string name="updates">Aktualisierungen</string>
-	<string name="app_update_available">Eine neue Version der App ist verfügbar</string>
-	<string name="updated">Aktualisiert</string>
-	<string name="preparing_">Vorbereitung…</string>
-	<string name="text_empty_holder_primary">Hier ist es etwas leer…</string>
-	<string name="processing_">Verarbeiten…</string>
-	<string name="manga_downloading_">Herunterladen…</string>
-	<string name="create_shortcut">Verknüpfung erstellen…</string>
-	<string name="loading_">Laden…</string>
-	<string name="text_delete_local_manga">„%s“ unwiderruflich vom Gerät löschen\?</string>
-	<string name="_s_deleted_from_local_storage">„%s“ aus lokalem Speicher gelöscht</string>
-	<string name="detailed_list">Detaillierte Liste</string>
-	<string name="list">Liste</string>
-	<string name="chapters">Kapitel</string>
-	<string name="details">Details</string>
-	<string name="network_error">Netzwerkfehler</string>
-	<string name="error_occurred">Ein Fehler ist aufgetreten</string>
-	<string name="history">Verlauf</string>
-	<string name="favourites">Favoriten</string>
-	<string name="local_storage">Lokaler Speicher</string>
-	<string name="manga_save_location">Ordner für Downloads</string>
-	<string name="text_history_holder_primary">Die Manga, die du gerade liest, werden hier angezeigt</string>
-	<string name="zoom_mode_keep_start">Am Anfang ausrichten</string>
-	<string name="zoom_mode_fit_width">An Breite anpassen</string>
-	<string name="zoom_mode_fit_height">An Höhe anpassen</string>
-	<string name="black_dark_theme_summary">Spart Energie auf AMOLED-Bildschirmen</string>
-	<string name="black_dark_theme">Reines Schwarz</string>
-	<string name="right_to_left">Von rechts nach links</string>
-	<string name="create_category">Neue Kategorie</string>
-	<string name="backup_restore">Backup und Wiederherstellung</string>
-	<string name="data_restored">Daten wiederhergestellt</string>
-	<string name="restore_backup">Backup wiederherstellen</string>
-	<string name="create_backup">Backup erstellen</string>
-	<string name="file_not_found">Datei nicht gefunden</string>
-	<string name="just_now">Gerade jetzt</string>
-	<string name="group">Gruppe</string>
-	<string name="cookies_cleared">Alle Cookies wurden entfernt</string>
-	<string name="clear_cookies">Cookies löschen</string>
-	<string name="default_s">Standard: %s</string>
-	<string name="auth_required">Melde dich an, um diesen Inhalt anzusehen</string>
-	<string name="reverse">Umkehren</string>
-	<string name="check_for_new_chapters">Nach neuen Kapiteln suchen</string>
-	<string name="clear_feed">Feed löschen</string>
-	<string name="sign_in">Anmelden</string>
-	<string name="password_length_hint">Das Passwort muss mindestens 4 Zeichen lang sein</string>
-	<string name="confirm">Bestätigen</string>
-	<string name="protect_application_subtitle">Gib ein Passwort ein, mit dem die App gestartet werden soll</string>
-	<string name="next">Weiter</string>
-	<string name="text_clear_search_history_prompt">Möchtest du alle letzten Suchanfragen unwiderruflich entfernen\?</string>
-	<string name="read_more">Mehr erfahren</string>
-	<string name="tracker_warning">Einige Geräte haben ein anderes Systemverhalten, welches womöglich Hintergrundprozesse unterbricht.</string>
-	<string name="backup_saved">Backup gespeichert</string>
-	<string name="welcome">Willkommen</string>
-	<string name="remove_category">Entfernen</string>
-	<string name="rotate_screen">Bildschirm drehen</string>
-	<string name="size_s">Größe: %s</string>
-	<string name="new_version_s">Neue Version: %s</string>
-	<string name="search_results">Suchergebnisse</string>
-	<string name="text_feed_holder">Hier siehst du neue Kapitel der Mangas, die du liest</string>
-	<string name="read_later">Später lesen</string>
-	<string name="favourites_category_empty">Diese Kategorie ist leer</string>
-	<string name="all_favourites">Alle Favoriten</string>
-	<string name="done">Fertig</string>
-	<string name="other_storage">Sonstiger Speicherort</string>
-	<string name="cannot_find_available_storage">Kein verfügbarer Speicher gefunden</string>
-	<string name="not_available">Nicht verfügbar</string>
-	<string name="pages_animation">Seitenanimation</string>
-	<string name="recent_manga">Neueste Manga</string>
-	<string name="manga_shelf">Regal</string>
-	<string name="text_local_holder_secondary">Speicher Manga aus Online-Quellen oder importiere Dateien.</string>
-	<string name="text_local_holder_primary">Speichere erst etwas</string>
-	<string name="text_history_holder_secondary">Was du lesen kannst, findest du im Seitenmenü.</string>
-	<string name="text_search_holder_secondary">Versuche, die Anfrage umzuformulieren.</string>
-	<string name="favourites_categories">Favoriten-Kategorien</string>
-	<string name="vibration">Vibration</string>
-	<string name="light_indicator">LED-Anzeige</string>
-	<string name="notification_sound">Benachrichtigungston</string>
-	<string name="notifications_settings">Benachrichtigungseinstellungen</string>
-	<string name="download">Herunterladen</string>
-	<string name="new_chapters">Neue Kapitel</string>
-	<string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d von %2$d aktiviert</string>
-	<string name="notifications">Benachrichtigungen</string>
-	<string name="save_manga">Manga speichern</string>
-	<string name="large_manga_save_confirm">Dieser Manga hat %s. Alles davon speichern\?</string>
-	<string name="open_in_browser">Im Browser öffnen</string>
-	<string name="external_storage">Externer Speicher</string>
-	<string name="internal_storage">Interner Speicher</string>
-	<string name="search_history_cleared">Gelöscht</string>
-	<string name="clear_search_history">Suchverlauf löschen</string>
-	<string name="clear_thumbs_cache">Miniaturansichten Cache löschen</string>
-	<string name="error">Fehler</string>
-	<string name="_continue">Weiter</string>
-	<string name="volume_buttons">Lautstärketasten</string>
-	<string name="switch_pages">Seiten wechseln</string>
-	<string name="reader_settings">Leseeinstellungen</string>
-	<string name="delete_manga">Manga löschen</string>
-	<string name="search_on_s">Suche auf %s</string>
-	<string name="grid_size">Rastergröße</string>
-	<string name="read_mode">Lesemodus</string>
-	<string name="webtoon">Webtoon</string>
-	<string name="standard">Standard</string>
-	<string name="text_file_sizes">B|kB|MB|GB|TB</string>
-	<string name="clear_pages_cache">Seitencache löschen</string>
-	<string name="no_description">Keine Beschreibung</string>
-	<string name="text_file_not_supported">Wähle entweder eine ZIP- oder CBZ-Datei.</string>
-	<string name="operation_not_supported">Dieser Vorgang wird nicht unterstützt</string>
-	<string name="delete">Löschen</string>
-	<string name="_import">Importieren</string>
-	<string name="share_image">Bild teilen</string>
-	<string name="page_saved">Gespeichert</string>
-	<string name="save_page">Seite speichern</string>
-	<string name="clear">Löschen</string>
-	<string name="taps_on_edges">Rand antippen</string>
-	<string name="captcha_solve">Lösen</string>
-	<string name="captcha_required">CAPTCHA erforderlich</string>
-	<string name="silent">Stumm</string>
-	<string name="reader_mode_hint">Die gewählte Konfiguration wird für diesen Manga gespeichert</string>
-	<string name="tap_to_try_again">Tippe, um es erneut zu versuchen</string>
-	<string name="today">Heute</string>
-	<string name="long_ago">Vor langer Zeit</string>
-	<string name="yesterday">Gestern</string>
-	<string name="backup_information">Du kannst ein Backup deines Verlaufs und deiner Favoriten erstellen und wiederherstellen</string>
-	<string name="data_restored_with_errors">Die Daten wurden wiederhergestellt, aber es gibt Fehler</string>
-	<string name="data_restored_success">Alle Daten wiederhergestellt</string>
-	<string name="zoom_mode_fit_center">An Zentrum anpassen</string>
-	<string name="scale_mode">Skalierungsmodus</string>
-	<string name="app_version">Version %s</string>
-	<string name="about">Über</string>
-	<string name="passwords_mismatch">Passwörter stimmen nicht überein</string>
-	<string name="repeat_password">Wiederhole das Passwort</string>
-	<string name="protect_application_summary">Beim Start von Kotatsu nach Passwort fragen</string>
-	<string name="protect_application">App schützen</string>
-	<string name="wrong_password">Falsches Passwort</string>
-	<string name="enter_password">Passwort eingeben</string>
-	<string name="dont_check">Nicht prüfen</string>
-	<string name="domain">Domäne</string>
-	<string name="gestures_only">Nur Gesten</string>
-	<string name="chapter_is_missing">Das Kapitel fehlt</string>
-	<string name="queued">In Warteschlange</string>
-	<string name="about_app_translation">Übersetzung</string>
-	<string name="about_app_translation_summary">Übersetze die App</string>
-	<string name="text_clear_cookies_prompt">Du wirst von allen Quellen abgemeldet</string>
-	<string name="genres">Genres</string>
-	<string name="auth_not_supported_by">Anmeldung bei %s wird nicht unterstützt</string>
-	<string name="auth_complete">Autorisierung abgeschlossen</string>
-	<string name="state_finished">Beendet</string>
-	<string name="state_ongoing">Fortlaufend</string>
-	<string name="system_default">Standard</string>
-	<string name="exclude_nsfw_from_history">NSFW-Manga vom Verlauf ausschließen</string>
-	<string name="show_pages_numbers">Nummerierte Seiten</string>
-	<string name="enabled_sources">Verwendete Quellen</string>
-	<string name="available_sources">Verfügbare Quellen</string>
-	<string name="computing_">Berechnen…</string>
-	<string name="screenshots_allow">Erlauben</string>
-	<string name="screenshots_policy">Bildschirmfoto-Verhalten</string>
-	<string name="screenshots_block_nsfw">Für NSFW blockieren</string>
-	<string name="screenshots_block_all">Immer blockieren</string>
-	<string name="suggestions">Vorschläge</string>
-	<string name="suggestions_enable">Vorschläge einschalten</string>
-	<string name="suggestions_summary">Schlage Manga basierend auf deinen Vorlieben vor</string>
-	<string name="suggestions_info">Alle Daten werden ausschließlich lokal auf diesem Gerät ausgewertet und nie weiter versendet.</string>
-	<string name="exclude_nsfw_from_suggestions">Keine NSFW-Manga vorschlagen</string>
-	<string name="enabled">Aktiviert</string>
-	<string name="text_suggestion_holder">Beginne Manga zu lesen und du erhältst personalisierte Vorschläge</string>
-	<string name="disabled">Deaktiviert</string>
-	<string name="filter_load_error">Liste der Genres kann nicht geladen werden</string>
-	<string name="never">Nie</string>
-	<string name="always">Immer</string>
-	<string name="preload_pages">Seiten vorladen</string>
-	<string name="reset_filter">Filter zurücksetzen</string>
-	<string name="only_using_wifi">Nur über WLAN</string>
-	<string name="onboard_text">Wähle die Sprachen aus, in denen du Mangas lesen möchten. Du kannst das später in den Einstellungen anpassen.</string>
-	<string name="logged_in_as">Angemeldet als %s</string>
-	<string name="nsfw">18+</string>
-	<string name="various_languages">Verschiedene Sprachen</string>
-	<string name="search_chapters">Kapitel suchen</string>
-	<string name="chapters_empty">Keine Kapitel in diesem Manga</string>
-	<string name="percent_string_pattern">%1$s%%</string>
-	<string name="appearance">Aussehen</string>
-	<string name="suggestions_updating">Vorschläge werden aktualisiert</string>
-	<string name="suggestions_excluded_genres">Genres ausschließen</string>
-	<string name="suggestions_excluded_genres_summary">Gebe Genres an, die du nicht in den Vorschlägen sehen möchtest</string>
-	<string name="text_delete_local_manga_batch">Ausgewählte Elemente unwiderruflich vom Gerät löschen\?</string>
-	<string name="removal_completed">Entfernung abgeschlossen</string>
-	<string name="download_slowdown">Download-Verzögerung</string>
-	<string name="local_manga_processing">Manga-Verarbeitung gespeichert</string>
-	<string name="download_slowdown_summary">Hilft, das Blockieren deiner IP-Adresse zu vermeiden</string>
-	<string name="chapters_will_removed_background">Kapitel werden im Hintergrund entfernt</string>
-	<string name="hide">Ausblenden</string>
-	<string name="new_sources_text">Neue Manga-Quellen sind verfügbar</string>
-	<string name="check_new_chapters_title">Nach neuen Kapiteln suchen und benachrichtigt werden</string>
-	<string name="show_notification_new_chapters_on">Erhalte Benachrichtigungen bei Aktualisierungen der Manga, die du liest</string>
-	<string name="notifications_enable">Benachrichtigungen einschalten</string>
-	<string name="empty_favourite_categories">Keine bevorzugten Kategorien</string>
-	<string name="name">Name</string>
-	<string name="edit">Bearbeiten</string>
-	<string name="show_notification_new_chapters_off">Du wirst keine Benachrichtigungen erhalten, aber neue Kapitel werden in den Listen hervorgehoben</string>
-	<string name="edit_category">Kategorie bearbeiten</string>
-	<string name="bookmark_add">Lesezeichen hinzufügen</string>
-	<string name="bookmarks">Lesezeichen</string>
-	<string name="bookmark_removed">Lesezeichen entfernt</string>
-	<string name="removed_from_history">Aus dem Verlauf entfernt</string>
-	<string name="bookmark_remove">Lesezeichen entfernen</string>
-	<string name="bookmark_added">Lesezeichen hinzugefügt</string>
-	<string name="undo">Rückgängig</string>
-	<string name="dns_over_https">DNS über HTTPS</string>
-	<string name="default_mode">Standard-Modus</string>
-	<string name="detect_reader_mode">Automatische Erkennung des Modus</string>
-	<string name="detect_reader_mode_summary">Automatisch erkennen, ob ein Manga ein Webtoon ist</string>
-	<string name="disable_battery_optimization">Akkuoptimierung deaktivieren</string>
-	<string name="disable_battery_optimization_summary">Hilft bei der Hintergrundaktualisierung</string>
-	<string name="send">Senden</string>
-	<string name="crash_text">Etwas ist schief gelaufen. Bitte sende einen Fehlerbericht an die Entwickler, um uns bei der Behebung zu helfen.</string>
-	<string name="disable_all">Alle deaktivieren</string>
-	<string name="use_fingerprint">Fingerabdruck verwenden, falls verfügbar</string>
-	<string name="appwidget_shelf_description">Manga aus deinen Favoriten</string>
-	<string name="appwidget_recent_description">Deine kürzlich gelesenen Manga</string>
-	<string name="report">Melden</string>
-	<string name="tracking">Nachverfolgung</string>
-	<string name="logout">Abmelden</string>
-	<string name="status_planned">Geplant</string>
-	<string name="status_on_hold">In der Warteschleife</string>
-	<string name="show_reading_indicators">Indikatoren für den Lesefortschritt anzeigen</string>
-	<string name="show_all">Alle anzeigen</string>
-	<string name="show_reading_indicators_summary">Zeige gelesenen Prozentsatz in Verlauf und Favoriten</string>
-	<string name="clear_cookies_summary">Kann bei einigen Probleme helfen. Alle Anmeldungen werden ungültig</string>
-	<string name="status_completed">Abgeschlossen</string>
-	<string name="exclude_nsfw_from_history_summary">Als NSFW markierte Manga werden nicht dem Verlauf beigefügt und dein Lesefortschritt wird nicht gespeichert</string>
-	<string name="data_deletion">Datenlöschung</string>
-	<string name="invalid_domain_message">Ungültige Domain</string>
-	<string name="status_reading">Lese</string>
-	<string name="select_range">Bereich auswählen</string>
-	<string name="not_found_404">Inhalt nicht gefunden oder entfernt</string>
-	<string name="manga_error_description_pattern">Fehlerdetails:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Versuche, &lt;a href=%2$s&gt;den Manga in einem Webbrowser zu öffnen&lt;/a&gt;, um sicherzustellen, dass er bei seiner Quelle verfügbar ist&lt;br&gt;2. Stelle sicher, dass du die &lt;a href=kotatsu://about&gt;neueste Kotatsu-Version&lt;/a&gt;&lt;br&gt;3 benutzt. Wenn er verfügbar ist, sende einen Fehlerbericht an die Entwickler.</string>
-	<string name="no_bookmarks_yet">Noch keine Lesezeichen</string>
-	<string name="no_manga_sources">Keine Manga-Quellen</string>
-	<string name="no_manga_sources_text">Manga-Quellen aktivieren, um Manga online zu lesen</string>
-	<string name="exit_confirmation">Beenden bestätigen</string>
-	<string name="saved_manga">Gespeicherte Manga</string>
-	<string name="pages_cache">Seiten-Cache</string>
-	<string name="other_cache">Anderer Cache</string>
-	<string name="storage_usage">Speichernutzung</string>
-	<string name="available">Verfügbar</string>
-	<string name="memory_usage_pattern">%s - %s</string>
-	<string name="removed_from_favourites">Aus den Favoriten entfernt</string>
-	<string name="options">Optionen</string>
-	<string name="automatic_scroll">Automatisches Blättern</string>
-	<string name="comics_archive">Comics-Archiv</string>
-	<string name="reader_info_pattern">Kap. %1$d/%2$d S. %3$d/%4$d</string>
-	<string name="text_shelf_holder_primary">Deine Manga werden hier angezeigt</string>
-	<string name="text_shelf_holder_secondary">Finde etwas zu lesen in der Rubrik „Erkunden“</string>
-	<string name="canceled">Abgebrochen</string>
-	<string name="account_already_exists">Konto existiert bereits</string>
-	<string name="back">Zurück</string>
-	<string name="sync">Synchronisierung</string>
-	<string name="sync_title">Synchronisiere deine Daten</string>
-	<string name="email_enter_hint">Gib deine E-Mail-Adresse ein, um fortzufahren</string>
-	<string name="clear_all_history">Gesamten Verlauf löschen</string>
-	<string name="last_2_hours">Letzte 2 Stunden</string>
-	<string name="history_cleared">Verlauf gelöscht</string>
-	<string name="manage">Verwalten</string>
-	<string name="no_bookmarks_summary">Du kannst beim Lesen von Mangas Lesezeichen erstellen</string>
-	<string name="bookmarks_removed">Lesezeichen entfernt</string>
-	<string name="random">Zufällig</string>
-	<string name="categories_delete_confirm">Bist du sicher, dass du die ausgewählten Lieblingskategorien löschen möchtest\?
+    <string name="remove">Entfernen</string>
+    <string name="text_clear_history_prompt">Gesamten Leseverlauf unwiderruflich löschen\?</string>
+    <string name="theme">Design</string>
+    <string name="pages">Seiten</string>
+    <string name="automatic">Wie System</string>
+    <string name="dark">Dunkel</string>
+    <string name="light">Hell</string>
+    <string name="filter">Filter</string>
+    <string name="sort_order">Sortierreihenfolge</string>
+    <string name="by_rating">Bewertung</string>
+    <string name="newest">Neuestes</string>
+    <string name="popular">Beliebt</string>
+    <string name="by_name">Name</string>
+    <string name="downloads">Downloads</string>
+    <string name="download_complete">Heruntergeladen</string>
+    <string name="search_manga">Manga suchen</string>
+    <string name="search">Suchen</string>
+    <string name="share_s">Teilen %s</string>
+    <string name="share">Teilen</string>
+    <string name="save">Speichern</string>
+    <string name="add">Hinzufügen</string>
+    <string name="add_new_category">Neue Kategorie</string>
+    <string name="add_to_favourites">Zu Favoriten hinzufügen</string>
+    <string name="you_have_not_favourites_yet">Noch keine Favoriten</string>
+    <string name="read">Lesen</string>
+    <string name="history_is_empty">Noch kein Verlauf</string>
+    <string name="nothing_found">Nichts gefunden</string>
+    <string name="clear_history">Verlauf löschen</string>
+    <string name="try_again">Erneut versuchen</string>
+    <string name="close">Schließen</string>
+    <string name="chapter_d_of_d">Kapitel %1$d von %2$d</string>
+    <string name="remote_sources">Manga Quellen</string>
+    <string name="settings">Einstellungen</string>
+    <string name="list_mode">Listenmodus</string>
+    <string name="grid">Raster</string>
+    <string name="text_clear_updates_feed_prompt">Den gesamte Aktualisierungsverlauf unwiderruflich löschen\?</string>
+    <string name="no_update_available">Keine Aktualisierungen verfügbar</string>
+    <string name="check_for_updates">Nach Aktualisierungen suchen</string>
+    <string name="track_sources">Suche nach Aktualisierungen</string>
+    <string name="feed_will_update_soon">Die Feed-Aktualisierung beginnt gleich</string>
+    <string name="update">Aktualisieren</string>
+    <string name="updates_feed_cleared">Gelöscht</string>
+    <string name="clear_updates_feed">Aktualisierungsfeed löschen</string>
+    <string name="updates">Aktualisierungen</string>
+    <string name="app_update_available">Eine neue Version der App ist verfügbar</string>
+    <string name="updated">Aktualisiert</string>
+    <string name="preparing_">Vorbereitung…</string>
+    <string name="text_empty_holder_primary">Hier ist es etwas leer…</string>
+    <string name="processing_">Verarbeiten…</string>
+    <string name="manga_downloading_">Herunterladen…</string>
+    <string name="create_shortcut">Verknüpfung erstellen…</string>
+    <string name="loading_">Laden…</string>
+    <string name="text_delete_local_manga">„%s“ unwiderruflich vom Gerät löschen\?</string>
+    <string name="_s_deleted_from_local_storage">„%s“ aus lokalem Speicher gelöscht</string>
+    <string name="detailed_list">Detaillierte Liste</string>
+    <string name="list">Liste</string>
+    <string name="chapters">Kapitel</string>
+    <string name="details">Details</string>
+    <string name="network_error">Netzwerkfehler</string>
+    <string name="error_occurred">Ein Fehler ist aufgetreten</string>
+    <string name="history">Verlauf</string>
+    <string name="favourites">Favoriten</string>
+    <string name="local_storage">Lokaler Speicher</string>
+    <string name="manga_save_location">Ordner für Downloads</string>
+    <string name="text_history_holder_primary">Die Manga, die du gerade liest, werden hier angezeigt</string>
+    <string name="zoom_mode_keep_start">Am Anfang ausrichten</string>
+    <string name="zoom_mode_fit_width">An Breite anpassen</string>
+    <string name="zoom_mode_fit_height">An Höhe anpassen</string>
+    <string name="black_dark_theme_summary">Spart Energie auf AMOLED-Bildschirmen</string>
+    <string name="black_dark_theme">Reines Schwarz</string>
+    <string name="right_to_left">Von rechts nach links</string>
+    <string name="create_category">Neue Kategorie</string>
+    <string name="backup_restore">Backup und Wiederherstellung</string>
+    <string name="data_restored">Daten wiederhergestellt</string>
+    <string name="restore_backup">Backup wiederherstellen</string>
+    <string name="create_backup">Backup erstellen</string>
+    <string name="file_not_found">Datei nicht gefunden</string>
+    <string name="just_now">Gerade jetzt</string>
+    <string name="group">Gruppe</string>
+    <string name="cookies_cleared">Alle Cookies wurden entfernt</string>
+    <string name="clear_cookies">Cookies löschen</string>
+    <string name="default_s">Standard: %s</string>
+    <string name="auth_required">Melde dich an, um diesen Inhalt anzusehen</string>
+    <string name="reverse">Umkehren</string>
+    <string name="check_for_new_chapters">Nach neuen Kapiteln suchen</string>
+    <string name="clear_feed">Feed löschen</string>
+    <string name="sign_in">Anmelden</string>
+    <string name="password_length_hint">Das Passwort muss mindestens 4 Zeichen lang sein</string>
+    <string name="confirm">Bestätigen</string>
+    <string name="protect_application_subtitle">Gib ein Passwort ein, mit dem die App gestartet werden soll</string>
+    <string name="next">Weiter</string>
+    <string name="text_clear_search_history_prompt">Möchtest du alle letzten Suchanfragen unwiderruflich entfernen\?</string>
+    <string name="read_more">Mehr erfahren</string>
+    <string name="tracker_warning">Einige Geräte haben ein anderes Systemverhalten, welches womöglich Hintergrundprozesse unterbricht.</string>
+    <string name="backup_saved">Backup gespeichert</string>
+    <string name="welcome">Willkommen</string>
+    <string name="remove_category">Entfernen</string>
+    <string name="rotate_screen">Bildschirm drehen</string>
+    <string name="size_s">Größe: %s</string>
+    <string name="new_version_s">Neue Version: %s</string>
+    <string name="search_results">Suchergebnisse</string>
+    <string name="text_feed_holder">Hier siehst du neue Kapitel der Mangas, die du liest</string>
+    <string name="read_later">Später lesen</string>
+    <string name="favourites_category_empty">Diese Kategorie ist leer</string>
+    <string name="all_favourites">Alle Favoriten</string>
+    <string name="done">Fertig</string>
+    <string name="other_storage">Sonstiger Speicherort</string>
+    <string name="cannot_find_available_storage">Kein verfügbarer Speicher gefunden</string>
+    <string name="not_available">Nicht verfügbar</string>
+    <string name="pages_animation">Seitenanimation</string>
+    <string name="recent_manga">Neueste Manga</string>
+    <string name="manga_shelf">Regal</string>
+    <string name="text_local_holder_secondary">Speicher Manga aus Online-Quellen oder importiere Dateien.</string>
+    <string name="text_local_holder_primary">Speichere erst etwas</string>
+    <string name="text_history_holder_secondary">Finde etwas zu lesen in der Rubrik „Erkunden“</string>
+    <string name="text_search_holder_secondary">Versuche, die Anfrage umzuformulieren.</string>
+    <string name="favourites_categories">Favoriten-Kategorien</string>
+    <string name="vibration">Vibration</string>
+    <string name="light_indicator">LED-Anzeige</string>
+    <string name="notification_sound">Benachrichtigungston</string>
+    <string name="notifications_settings">Benachrichtigungseinstellungen</string>
+    <string name="download">Herunterladen</string>
+    <string name="new_chapters">Neue Kapitel</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d von %2$d aktiviert</string>
+    <string name="notifications">Benachrichtigungen</string>
+    <string name="save_manga">Manga speichern</string>
+    <string name="large_manga_save_confirm">Dieser Manga hat %s. Alles davon speichern\?</string>
+    <string name="open_in_browser">Im Browser öffnen</string>
+    <string name="external_storage">Externer Speicher</string>
+    <string name="internal_storage">Interner Speicher</string>
+    <string name="search_history_cleared">Gelöscht</string>
+    <string name="clear_search_history">Suchverlauf löschen</string>
+    <string name="clear_thumbs_cache">Miniaturansichten Cache löschen</string>
+    <string name="error">Fehler</string>
+    <string name="_continue">Weiter</string>
+    <string name="volume_buttons">Lautstärketasten</string>
+    <string name="switch_pages">Seiten wechseln</string>
+    <string name="reader_settings">Leseeinstellungen</string>
+    <string name="delete_manga">Manga löschen</string>
+    <string name="search_on_s">Suche auf %s</string>
+    <string name="grid_size">Rastergröße</string>
+    <string name="read_mode">Lesemodus</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="standard">Standard</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="clear_pages_cache">Seitencache löschen</string>
+    <string name="no_description">Keine Beschreibung</string>
+    <string name="text_file_not_supported">Wähle entweder eine ZIP- oder CBZ-Datei.</string>
+    <string name="operation_not_supported">Dieser Vorgang wird nicht unterstützt</string>
+    <string name="delete">Löschen</string>
+    <string name="_import">Importieren</string>
+    <string name="share_image">Bild teilen</string>
+    <string name="page_saved">Gespeichert</string>
+    <string name="save_page">Seite speichern</string>
+    <string name="clear">Löschen</string>
+    <string name="taps_on_edges">Rand antippen</string>
+    <string name="captcha_solve">Lösen</string>
+    <string name="captcha_required">CAPTCHA erforderlich</string>
+    <string name="silent">Stumm</string>
+    <string name="reader_mode_hint">Die gewählte Konfiguration wird für diesen Manga gespeichert</string>
+    <string name="tap_to_try_again">Tippe, um es erneut zu versuchen</string>
+    <string name="today">Heute</string>
+    <string name="long_ago">Vor langer Zeit</string>
+    <string name="yesterday">Gestern</string>
+    <string name="backup_information">Du kannst ein Backup deines Verlaufs und deiner Favoriten erstellen und wiederherstellen</string>
+    <string name="data_restored_with_errors">Die Daten wurden wiederhergestellt, aber es gibt Fehler</string>
+    <string name="data_restored_success">Alle Daten wiederhergestellt</string>
+    <string name="zoom_mode_fit_center">An Zentrum anpassen</string>
+    <string name="scale_mode">Skalierungsmodus</string>
+    <string name="app_version">Version %s</string>
+    <string name="about">Über</string>
+    <string name="passwords_mismatch">Passwörter stimmen nicht überein</string>
+    <string name="repeat_password">Wiederhole das Passwort</string>
+    <string name="protect_application_summary">Beim Start von Kotatsu nach Passwort fragen</string>
+    <string name="protect_application">App schützen</string>
+    <string name="wrong_password">Falsches Passwort</string>
+    <string name="enter_password">Passwort eingeben</string>
+    <string name="dont_check">Nicht prüfen</string>
+    <string name="domain">Domäne</string>
+    <string name="gestures_only">Nur Gesten</string>
+    <string name="chapter_is_missing">Das Kapitel fehlt</string>
+    <string name="queued">In Warteschlange</string>
+    <string name="about_app_translation">Übersetzung</string>
+    <string name="about_app_translation_summary">Übersetze die App</string>
+    <string name="text_clear_cookies_prompt">Du wirst von allen Quellen abgemeldet</string>
+    <string name="genres">Genres</string>
+    <string name="auth_not_supported_by">Anmeldung bei %s wird nicht unterstützt</string>
+    <string name="auth_complete">Autorisierung abgeschlossen</string>
+    <string name="state_finished">Beendet</string>
+    <string name="state_ongoing">Fortlaufend</string>
+    <string name="system_default">Standard</string>
+    <string name="exclude_nsfw_from_history">NSFW-Manga vom Verlauf ausschließen</string>
+    <string name="show_pages_numbers">Nummerierte Seiten</string>
+    <string name="enabled_sources">Verwendete Quellen</string>
+    <string name="available_sources">Verfügbare Quellen</string>
+    <string name="computing_">Berechnen…</string>
+    <string name="screenshots_allow">Erlauben</string>
+    <string name="screenshots_policy">Bildschirmfoto-Verhalten</string>
+    <string name="screenshots_block_nsfw">Für NSFW blockieren</string>
+    <string name="screenshots_block_all">Immer blockieren</string>
+    <string name="suggestions">Vorschläge</string>
+    <string name="suggestions_enable">Vorschläge einschalten</string>
+    <string name="suggestions_summary">Schlage Manga basierend auf deinen Vorlieben vor</string>
+    <string name="suggestions_info">Alle Daten werden ausschließlich lokal auf diesem Gerät ausgewertet und nie weiter versendet.</string>
+    <string name="exclude_nsfw_from_suggestions">Keine NSFW-Manga vorschlagen</string>
+    <string name="enabled">Aktiviert</string>
+    <string name="text_suggestion_holder">Beginne Manga zu lesen und du erhältst personalisierte Vorschläge</string>
+    <string name="disabled">Deaktiviert</string>
+    <string name="filter_load_error">Liste der Genres kann nicht geladen werden</string>
+    <string name="never">Nie</string>
+    <string name="always">Immer</string>
+    <string name="preload_pages">Seiten vorladen</string>
+    <string name="reset_filter">Filter zurücksetzen</string>
+    <string name="only_using_wifi">Nur über WLAN</string>
+    <string name="onboard_text">Wähle die Sprachen aus, in denen du Mangas lesen möchten. Du kannst das später in den Einstellungen anpassen.</string>
+    <string name="logged_in_as">Angemeldet als %s</string>
+    <string name="nsfw">18+</string>
+    <string name="various_languages">Verschiedene Sprachen</string>
+    <string name="search_chapters">Kapitel suchen</string>
+    <string name="chapters_empty">Keine Kapitel in diesem Manga</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aussehen</string>
+    <string name="suggestions_updating">Vorschläge werden aktualisiert</string>
+    <string name="suggestions_excluded_genres">Genres ausschließen</string>
+    <string name="suggestions_excluded_genres_summary">Gebe Genres an, die du nicht in den Vorschlägen sehen möchtest</string>
+    <string name="text_delete_local_manga_batch">Ausgewählte Elemente unwiderruflich vom Gerät löschen\?</string>
+    <string name="removal_completed">Entfernung abgeschlossen</string>
+    <string name="download_slowdown">Download-Verzögerung</string>
+    <string name="local_manga_processing">Manga-Verarbeitung gespeichert</string>
+    <string name="download_slowdown_summary">Hilft, das Blockieren deiner IP-Adresse zu vermeiden</string>
+    <string name="chapters_will_removed_background">Kapitel werden im Hintergrund entfernt</string>
+    <string name="hide">Ausblenden</string>
+    <string name="new_sources_text">Neue Manga-Quellen sind verfügbar</string>
+    <string name="check_new_chapters_title">Nach neuen Kapiteln suchen und benachrichtigt werden</string>
+    <string name="show_notification_new_chapters_on">Erhalte Benachrichtigungen bei Aktualisierungen der Manga, die du liest</string>
+    <string name="notifications_enable">Benachrichtigungen einschalten</string>
+    <string name="empty_favourite_categories">Keine bevorzugten Kategorien</string>
+    <string name="name">Name</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="show_notification_new_chapters_off">Du wirst keine Benachrichtigungen erhalten, aber neue Kapitel werden in den Listen hervorgehoben</string>
+    <string name="edit_category">Kategorie bearbeiten</string>
+    <string name="bookmark_add">Lesezeichen hinzufügen</string>
+    <string name="bookmarks">Lesezeichen</string>
+    <string name="bookmark_removed">Lesezeichen entfernt</string>
+    <string name="removed_from_history">Aus dem Verlauf entfernt</string>
+    <string name="bookmark_remove">Lesezeichen entfernen</string>
+    <string name="bookmark_added">Lesezeichen hinzugefügt</string>
+    <string name="undo">Rückgängig</string>
+    <string name="dns_over_https">DNS über HTTPS</string>
+    <string name="default_mode">Standard-Modus</string>
+    <string name="detect_reader_mode">Automatische Erkennung des Modus</string>
+    <string name="detect_reader_mode_summary">Automatisch erkennen, ob ein Manga ein Webtoon ist</string>
+    <string name="disable_battery_optimization">Akkuoptimierung deaktivieren</string>
+    <string name="disable_battery_optimization_summary">Hilft bei der Hintergrundaktualisierung</string>
+    <string name="send">Senden</string>
+    <string name="crash_text">Etwas ist schief gelaufen. Bitte sende einen Fehlerbericht an die Entwickler, um uns bei der Behebung zu helfen.</string>
+    <string name="disable_all">Alle deaktivieren</string>
+    <string name="use_fingerprint">Fingerabdruck verwenden, falls verfügbar</string>
+    <string name="appwidget_shelf_description">Manga aus deinen Favoriten</string>
+    <string name="appwidget_recent_description">Deine kürzlich gelesenen Manga</string>
+    <string name="report">Melden</string>
+    <string name="tracking">Nachverfolgung</string>
+    <string name="logout">Abmelden</string>
+    <string name="status_planned">Geplant</string>
+    <string name="status_on_hold">In der Warteschleife</string>
+    <string name="show_reading_indicators">Indikatoren für den Lesefortschritt anzeigen</string>
+    <string name="show_all">Alle anzeigen</string>
+    <string name="show_reading_indicators_summary">Zeige gelesenen Prozentsatz in Verlauf und Favoriten</string>
+    <string name="clear_cookies_summary">Kann bei einigen Probleme helfen. Alle Anmeldungen werden ungültig</string>
+    <string name="status_completed">Abgeschlossen</string>
+    <string name="exclude_nsfw_from_history_summary">Als NSFW markierte Manga werden nicht dem Verlauf beigefügt und dein Lesefortschritt wird nicht gespeichert</string>
+    <string name="data_deletion">Datenlöschung</string>
+    <string name="invalid_domain_message">Ungültige Domain</string>
+    <string name="status_reading">Lese</string>
+    <string name="select_range">Bereich auswählen</string>
+    <string name="not_found_404">Inhalt nicht gefunden oder entfernt</string>
+    <string name="manga_error_description_pattern">Fehlerdetails:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Versuche, &lt;a href=%2$s&gt;den Manga in einem Webbrowser zu öffnen&lt;/a&gt;, um sicherzustellen, dass er bei seiner Quelle verfügbar ist&lt;br&gt;2. Stelle sicher, dass du die &lt;a href=kotatsu://about&gt;neueste Kotatsu-Version&lt;/a&gt;&lt;br&gt;3 benutzt. Wenn er verfügbar ist, sende einen Fehlerbericht an die Entwickler.</string>
+    <string name="no_bookmarks_yet">Noch keine Lesezeichen</string>
+    <string name="no_manga_sources">Keine Manga-Quellen</string>
+    <string name="no_manga_sources_text">Manga-Quellen aktivieren, um Manga online zu lesen</string>
+    <string name="exit_confirmation">Beenden bestätigen</string>
+    <string name="saved_manga">Gespeicherte Manga</string>
+    <string name="pages_cache">Seiten-Cache</string>
+    <string name="other_cache">Anderer Cache</string>
+    <string name="storage_usage">Speichernutzung</string>
+    <string name="available">Verfügbar</string>
+    <string name="memory_usage_pattern">%s - %s</string>
+    <string name="removed_from_favourites">Aus den Favoriten entfernt</string>
+    <string name="options">Optionen</string>
+    <string name="automatic_scroll">Automatisches Blättern</string>
+    <string name="comics_archive">Comics-Archiv</string>
+    <string name="reader_info_pattern">Kap. %1$d/%2$d S. %3$d/%4$d</string>
+    <string name="text_shelf_holder_primary">Deine Manga werden hier angezeigt</string>
+    <string name="text_shelf_holder_secondary">Finde etwas zu lesen in der Rubrik „Erkunden“</string>
+    <string name="canceled">Abgebrochen</string>
+    <string name="account_already_exists">Konto existiert bereits</string>
+    <string name="back">Zurück</string>
+    <string name="sync">Synchronisierung</string>
+    <string name="sync_title">Synchronisiere deine Daten</string>
+    <string name="email_enter_hint">Gib deine E-Mail-Adresse ein, um fortzufahren</string>
+    <string name="clear_all_history">Gesamten Verlauf löschen</string>
+    <string name="last_2_hours">Letzte 2 Stunden</string>
+    <string name="history_cleared">Verlauf gelöscht</string>
+    <string name="manage">Verwalten</string>
+    <string name="no_bookmarks_summary">Du kannst beim Lesen von Mangas Lesezeichen erstellen</string>
+    <string name="bookmarks_removed">Lesezeichen entfernt</string>
+    <string name="random">Zufällig</string>
+    <string name="categories_delete_confirm">Bist du sicher, dass du die ausgewählten Lieblingskategorien löschen möchtest\?
 \nAlle darin enthaltenen Manga gehen verloren und das kann nicht rückgängig gemacht werden.</string>
-	<string name="reorder">Neu anordnen</string>
-	<string name="empty">Leer</string>
-	<string name="explore">Erkunden</string>
-	<string name="confirm_exit">Drücke zum Beenden erneut Zurück</string>
-	<string name="exit_confirmation_summary">Drücke zweimal Zurück, um die App zu beenden</string>
-	<string name="feed">Feed</string>
-	<string name="incognito_mode">Inkognito-Modus</string>
-	<string name="no_chapters">Keine Kapitel</string>
-	<string name="reader_info_bar">Zeige Informationsleiste beim Lesen</string>
-	<string name="folder_with_images">Ordner mit Bildern</string>
-	<string name="importing_manga">Importiere Manga</string>
-	<string name="import_completed">Import abgeschlossen</string>
-	<string name="import_completed_hint">Du kannst die Originaldatei aus dem Speicher löschen, um Platz zu sparen</string>
-	<string name="import_will_start_soon">Import wird bald beginnen</string>
-	<string name="server_error">Serverseitiger Fehler (%1$d). Bitte versuche es später erneut</string>
-	<string name="compact">Kompakt</string>
-	<string name="contrast">Kontrast</string>
-	<string name="network_unavailable_hint">Schalte WLAN oder mobile Daten ein, um Manga online zu lesen</string>
-	<string name="clear_new_chapters_counters">Auch Informationen über neue Kapitel löschen</string>
-	<string name="text_unsaved_changes_prompt">Ungespeicherte Änderungen speichern oder verwerfen\?</string>
-	<string name="discard">Verwerfen</string>
-	<string name="reset">Zurücksetzen</string>
-	<string name="brightness">Helligkeit</string>
-	<string name="color_correction_hint">Die gewählten Farbeinstellungen werden für diesen Manga beibehalten</string>
-	<string name="color_correction">Farbkorrektur</string>
-	<string name="error_no_space_left">Kein Platz übrig auf dem Gerät</string>
-	<string name="different_languages">Verschiedene Sprachen</string>
-	<string name="network_unavailable">Netzwerk ist nicht verfügbar</string>
-	<string name="reader_control_ltr">Ergonomische Lesekontrolle</string>
-	<string name="reader_control_ltr_summary">Tippe auf den rechten Rand oder drücke die rechte Taste, um immer zur nächsten Seite zu wechseln</string>
-	<string name="reader_slider">Zeige Seitenwechsel-Schieber</string>
-	<string name="source_disabled">Quelle deaktiviert</string>
-	<string name="prefetch_content">Inhalte vorladen</string>
-	<string name="mark_as_current">Als aktuell markieren</string>
-	<string name="webtoon_zoom">Webtoon-Zoom</string>
-	<string name="share_logs">Protokolle teilen</string>
-	<string name="enable_logging">Protokollierung aktivieren</string>
-	<string name="language">Sprache</string>
-	<string name="enable_logging_summary">Einige Aktionen zu Debug-Zwecken aufzeichnen</string>
-	<string name="history_shortcuts">Zeige Verknüpfungen zu aktuellen Manga</string>
-	<string name="history_shortcuts_summary">Neueste Manga durch langes Drücken auf das Anwendungssymbol verfügbar machen</string>
-	<string name="show_suspicious_content">Verdächtige Inhalte anzeigen</string>
-	<string name="status_dropped">Abgebrochen</string>
-	<string name="color_theme">Farbschema</string>
-	<string name="theme_name_dynamic">Dynamisch</string>
-	<string name="theme_name_mamimi">Mamimi</string>
-	<string name="nothing_here">Hier ist nichts</string>
-	<string name="services">Dienste</string>
-	<string name="theme_name_kanade">Kanade</string>
-	<string name="scrobbling_empty_hint">Um deinen Lesefortschritt nachzuverfolgen, wähle Menu → Track auf dem Manga Details Bildschirm.</string>
-	<string name="find_similar">Ähnliche finden</string>
-	<string name="theme_name_sakura">Sakura</string>
-	<string name="allow_unstable_updates_summary">Schlage Updates zu Beta-Versionen der App vor</string>
-	<string name="allow_unstable_updates">Erlaube instabile Updates</string>
-	<string name="got_it">Alles klar</string>
-	<string name="sources_reorder_tip">Drücke und halte eine Quelle, um diese umzusortieren</string>
-	<string name="settings_apply_restart_required">Bitte starte die App neu, um die Änderungen anzuwenden</string>
-	<string name="comics_archive_import_description">Du kannst eine oder mehrere .cbz oder .zip Dateien auswählen, jede Datei wird als einzelner Manga erkannt.</string>
-	<string name="folder_with_images_import_description">Du kannst einen Ordner mit Archiven oder Bildern auswählen. Jedes Archiv (oder Unterverzeichnis) wird als ein Kapitel erkannt.</string>
-	<string name="speed">Geschwindigkeit</string>
-	<string name="restore_backup_description">Importiere ein zuvor erstelltes Nutzerdaten-Backup</string>
-	<string name="show_on_shelf">Im Regal anzeigen</string>
-	<string name="theme_name_miku">Miku</string>
-	<string name="theme_name_asuka">Asuka</string>
-	<string name="theme_name_mion">Mion</string>
-	<string name="theme_name_rikka">Rikka</string>
-	<string name="show_in_grid_view">In Raster-Ansicht anzeigen</string>
-	<string name="server_address">Serveradresse</string>
-	<string name="mirror_switching">Wähle Mirror automatisch</string>
-	<string name="download_started">Download gestartet</string>
-	<string name="sync_settings">Synchronisationseinstellungen</string>
-	<string name="sync_host_description">Du kannst einen Standard- oder einen selbst gehosteten Synchronisations-Server verwenden. Ändere diese Einstellungen nicht, wenn du dich nicht auskennst.</string>
-	<string name="ignore_ssl_errors">Ignoriere SSL Errors</string>
-	<string name="mirror_switching_summary">Wechsel bei Fehlern automatisch die Domains für Manga-Quellen, falls Mirrors verfügbar sind</string>
-	<string name="status_re_reading">Lese erneut</string>
-	<string name="sync_auth_hint">Du kannst dich mit einem bestehenden Account anmelden oder einen neuen erstellen</string>
-	<string name="user_agent">UserAgent-Kopfzeile</string>
-	<string name="enable">Aktivieren</string>
-	<string name="no_thanks">Nein danke</string>
-	<string name="pause">Pausieren</string>
-	<string name="resume">Fortsetzen</string>
-	<string name="paused">Pausiert</string>
-	<string name="remove_completed">Entfernung abgeschlossen</string>
-	<string name="cancel_all">Alle abbrechen</string>
-	<string name="downloads_wifi_only">Nur über Wi-Fi herunterladen</string>
-	<string name="downloads_wifi_only_summary">Beende das Herunterladen beim Wechsel zu einem Mobilfunknetz</string>
-	<string name="suggestions_notifications_summary">Zeige ab und zu Benachrichtigungen mit Manga-Vorschlägen</string>
-	<string name="downloads_removed">Downloads wurden entfernt</string>
-	<string name="suggestion_manga">Vorschlag: %s</string>
-	<string name="more">Mehr</string>
-	<string name="cancel_all_downloads_confirm">Alle Downloads werden abgebrochen, teilweise heruntergeladene Dateien gehen verloren</string>
-	<string name="remove_completed_downloads_confirm">Dein Downloads-Verlauf wird unwiderruflich gelöscht</string>
-	<string name="text_downloads_list_holder">Du hast keine Downloads</string>
-	<string name="downloads_resumed">Downloads wurden fortgesetzt</string>
-	<string name="downloads_paused">Downloads wurden pausiert</string>
-	<string name="downloads_cancelled">Downloads wurden abgebrochen</string>
-	<string name="suggestions_enable_prompt">Willst du personalisierte Manga-Vorschläge erhalten\?</string>
-	<string name="translations">Übersetzungen</string>
-	<string name="web_view_unavailable">WebView nicht verfügbar: überprüfe, ob WebView installiert ist</string>
-</resources>
+    <string name="reorder">Neu anordnen</string>
+    <string name="empty">Leer</string>
+    <string name="explore">Erkunden</string>
+    <string name="confirm_exit">Drücke zum Beenden erneut Zurück</string>
+    <string name="exit_confirmation_summary">Drücke zweimal Zurück, um die App zu beenden</string>
+    <string name="feed">Feed</string>
+    <string name="incognito_mode">Inkognito-Modus</string>
+    <string name="no_chapters">Keine Kapitel</string>
+    <string name="reader_info_bar">Zeige Informationsleiste beim Lesen</string>
+    <string name="folder_with_images">Ordner mit Bildern</string>
+    <string name="importing_manga">Importiere Manga</string>
+    <string name="import_completed">Import abgeschlossen</string>
+    <string name="import_completed_hint">Du kannst die Originaldatei aus dem Speicher löschen, um Platz zu sparen</string>
+    <string name="import_will_start_soon">Import wird bald beginnen</string>
+    <string name="server_error">Serverseitiger Fehler (%1$d). Bitte versuche es später erneut</string>
+    <string name="compact">Kompakt</string>
+    <string name="contrast">Kontrast</string>
+    <string name="network_unavailable_hint">Schalte WLAN oder mobile Daten ein, um Manga online zu lesen</string>
+    <string name="clear_new_chapters_counters">Auch Informationen über neue Kapitel löschen</string>
+    <string name="text_unsaved_changes_prompt">Ungespeicherte Änderungen speichern oder verwerfen\?</string>
+    <string name="discard">Verwerfen</string>
+    <string name="reset">Zurücksetzen</string>
+    <string name="brightness">Helligkeit</string>
+    <string name="color_correction_hint">Die gewählten Farbeinstellungen werden für diesen Manga beibehalten</string>
+    <string name="color_correction">Farbkorrektur</string>
+    <string name="error_no_space_left">Kein Platz übrig auf dem Gerät</string>
+    <string name="different_languages">Verschiedene Sprachen</string>
+    <string name="network_unavailable">Netzwerk ist nicht verfügbar</string>
+    <string name="reader_control_ltr">Ergonomische Lesekontrolle</string>
+    <string name="reader_control_ltr_summary">Tippe auf den rechten Rand oder drücke die rechte Taste, um immer zur nächsten Seite zu wechseln</string>
+    <string name="reader_slider">Zeige Seitenwechsel-Schieber</string>
+    <string name="source_disabled">Quelle deaktiviert</string>
+    <string name="prefetch_content">Inhalte vorladen</string>
+    <string name="mark_as_current">Als aktuell markieren</string>
+    <string name="webtoon_zoom">Webtoon-Zoom</string>
+    <string name="share_logs">Protokolle teilen</string>
+    <string name="enable_logging">Protokollierung aktivieren</string>
+    <string name="language">Sprache</string>
+    <string name="enable_logging_summary">Einige Aktionen zu Debug-Zwecken aufzeichnen</string>
+    <string name="history_shortcuts">Zeige Verknüpfungen zu aktuellen Manga</string>
+    <string name="history_shortcuts_summary">Neueste Manga durch langes Drücken auf das Anwendungssymbol verfügbar machen</string>
+    <string name="show_suspicious_content">Verdächtige Inhalte anzeigen</string>
+    <string name="status_dropped">Abgebrochen</string>
+    <string name="color_theme">Farbschema</string>
+    <string name="theme_name_dynamic">Dynamisch</string>
+    <string name="theme_name_mamimi">Mamimi</string>
+    <string name="nothing_here">Hier ist nichts</string>
+    <string name="services">Dienste</string>
+    <string name="theme_name_kanade">Kanade</string>
+    <string name="scrobbling_empty_hint">Um deinen Lesefortschritt nachzuverfolgen, wähle Menu → Track auf dem Manga Details Bildschirm.</string>
+    <string name="find_similar">Ähnliche finden</string>
+    <string name="theme_name_sakura">Sakura</string>
+    <string name="allow_unstable_updates_summary">Schlage Updates zu Beta-Versionen der App vor</string>
+    <string name="allow_unstable_updates">Erlaube instabile Updates</string>
+    <string name="got_it">Alles klar</string>
+    <string name="sources_reorder_tip">Drücke und halte eine Quelle, um diese umzusortieren</string>
+    <string name="settings_apply_restart_required">Bitte starte die App neu, um die Änderungen anzuwenden</string>
+    <string name="comics_archive_import_description">Du kannst eine oder mehrere .cbz oder .zip Dateien auswählen, jede Datei wird als einzelner Manga erkannt.</string>
+    <string name="folder_with_images_import_description">Du kannst einen Ordner mit Archiven oder Bildern auswählen. Jedes Archiv (oder Unterverzeichnis) wird als ein Kapitel erkannt.</string>
+    <string name="speed">Geschwindigkeit</string>
+    <string name="restore_backup_description">Importiere ein zuvor erstelltes Nutzerdaten-Backup</string>
+    <string name="show_on_shelf">Im Regal anzeigen</string>
+    <string name="theme_name_miku">Miku</string>
+    <string name="theme_name_asuka">Asuka</string>
+    <string name="theme_name_mion">Mion</string>
+    <string name="theme_name_rikka">Rikka</string>
+    <string name="show_in_grid_view">In Raster-Ansicht anzeigen</string>
+    <string name="server_address">Serveradresse</string>
+    <string name="mirror_switching">Wähle Mirror automatisch</string>
+    <string name="download_started">Download gestartet</string>
+    <string name="sync_settings">Synchronisationseinstellungen</string>
+    <string name="sync_host_description">Du kannst einen Standard- oder einen selbst gehosteten Synchronisations-Server verwenden. Ändere diese Einstellungen nicht, wenn du dich nicht auskennst.</string>
+    <string name="ignore_ssl_errors">Ignoriere SSL Errors</string>
+    <string name="mirror_switching_summary">Wechsel bei Fehlern automatisch die Domains für Manga-Quellen, falls Mirrors verfügbar sind</string>
+    <string name="status_re_reading">Lese erneut</string>
+    <string name="sync_auth_hint">Du kannst dich mit einem bestehenden Account anmelden oder einen neuen erstellen</string>
+    <string name="user_agent">UserAgent-Kopfzeile</string>
+    <string name="enable">Aktivieren</string>
+    <string name="no_thanks">Nein danke</string>
+    <string name="pause">Pausieren</string>
+    <string name="resume">Fortsetzen</string>
+    <string name="paused">Pausiert</string>
+    <string name="remove_completed">Entfernung abgeschlossen</string>
+    <string name="cancel_all">Alle abbrechen</string>
+    <string name="downloads_wifi_only">Nur über Wi-Fi herunterladen</string>
+    <string name="downloads_wifi_only_summary">Beende das Herunterladen beim Wechsel zu einem Mobilfunknetz</string>
+    <string name="suggestions_notifications_summary">Zeige ab und zu Benachrichtigungen mit Manga-Vorschlägen</string>
+    <string name="downloads_removed">Downloads wurden entfernt</string>
+    <string name="suggestion_manga">Vorschlag: %s</string>
+    <string name="more">Mehr</string>
+    <string name="cancel_all_downloads_confirm">Alle Downloads werden abgebrochen, teilweise heruntergeladene Dateien gehen verloren</string>
+    <string name="remove_completed_downloads_confirm">Dein Downloads-Verlauf wird unwiderruflich gelöscht</string>
+    <string name="text_downloads_list_holder">Du hast keine Downloads</string>
+    <string name="downloads_resumed">Downloads wurden fortgesetzt</string>
+    <string name="downloads_paused">Downloads wurden pausiert</string>
+    <string name="downloads_cancelled">Downloads wurden abgebrochen</string>
+    <string name="suggestions_enable_prompt">Willst du personalisierte Manga-Vorschläge erhalten\?</string>
+    <string name="translations">Übersetzungen</string>
+    <string name="web_view_unavailable">WebView nicht verfügbar: Bitte prüfen, ob WebView installiert ist</string>
+    <string name="address">Adresse</string>
+    <string name="port">Port</string>
+    <string name="proxy">Proxy</string>
+    <string name="invalid_value_message">Ungültiger Wert</string>
+    <string name="type">Typ</string>
+    <string name="manga_branch_title_template">%1$s (%2$s)</string>
+    <string name="downloaded">Heruntergeladen</string>
+    <string name="images_proxy_title">Bildoptimierungsproxy</string>
+    <string name="username">Benutzername</string>
+    <string name="password">Passwort</string>
+    <string name="authorization_optional">Berechtigung (optional)</string>
+    <string name="invalid_port_number">Ungültige Portnummer</string>
+    <string name="network">Netzwerk</string>
+    <string name="data_and_privacy">Daten und Datenschutz</string>
+    <string name="restore_summary">Zuvor erstellte Sicherung wiederherstellen</string>
+    <string name="reader_info_bar_summary">Die aktuelle Uhrzeit und den Lesefortschritt oben auf dem Bildschirm anzeigen</string>
+    <string name="show_pages_numbers_summary">Seitenzahlen in der unteren Ecke anzeigen</string>
+    <string name="pages_animation_summary">Seitenwechsel animieren</string>
+    <string name="download_option_whole_manga">Das ganze Manga</string>
+    <string name="download_option_first_n_chapters">Erste %s</string>
+    <string name="download_option_next_unread_n_chapters">Nächste ungelesene %s</string>
+    <string name="download_option_all_unread">Alle ungelesenen Kapitel</string>
+    <string name="download_option_all_unread_b">Alle ungelesenen Kapitel (%s)</string>
+    <string name="download_option_manual_selection">Kapitel manuell auswählen</string>
+    <string name="description">Beschreibung</string>
+    <string name="this_month">Dieser Monat</string>
+    <string name="voice_search">Sprachsuche</string>
+    <string name="invert_colors">Farben umkehren</string>
+    <string name="pick_custom_directory">Eigenes Verzeichnis wählen</string>
+    <string name="custom_directory">Eigenes Verzeichnis</string>
+    <string name="no_access_to_file">Auf diese Datei oder dieses Verzeichnis kann nicht zugegriffen werden</string>
+    <string name="local_manga_directories">Lokale Manga-Verzeichnisse</string>
+    <string name="download_option_all_chapters">Alle Kapitel mit Übersetzung %s</string>
+    <string name="details_button_tip">Um weitere Optionen anzuzeigen, die Lesen-Taste drücken und gedrückt halten</string>
+    <string name="color_light">Hell</string>
+    <string name="color_dark">Dunkel</string>
+    <string name="color_white">Weiß</string>
+    <string name="color_black">Schwarz</string>
+    <string name="background">Hintergrund</string>
+    <string name="data_not_restored">Daten wurden nicht wiederhergestellt</string>
+    <string name="data_not_restored_text">Bitte sicherstellen, dass die richtige Sicherungsdatei ausgewählt wurde</string>
+    <string name="search_hint">Mangatitel, Genre oder Quellname eingeben</string>
+    <string name="progress">Fortschritt</string>
+    <string name="order_added">Hinzugefügt</string>
+    <string name="suggestions_wifi_only_summary">Keine Vorschläge über getaktete Netzverbindungen aktualisieren</string>
+    <string name="tracker_wifi_only_summary">Nicht über getaktete Netzverbindungen auf neue Kapitel prüfen</string>
+    <string name="manage_categories">Kategorien verwalten</string>
+    <string name="view_list">Liste ansehen</string>
+    <string name="show">Anzeigen</string>
+    <string name="images_procy_description">Wenn möglich bitte den Dienst wsrv.nl nutzen, um den Datenverkehr zu reduzieren und das Laden von Bildern zu beschleunigen</string>
+    <string name="clear_network_cache">Netzwerkcache löschen</string>
+    <string name="captcha_required_summary">%s erfordert ein Captcha, das gelöst werden muss, um richtig zu funktionieren</string>
+    <string name="languages">Sprachen</string>
+    <string name="unknown">Unbekannt</string>
+    <string name="in_progress">In Arbeit</string>
+    <string name="related_manga">Verwandte Manga</string>
+    <string name="clear_source_cookies_summary">Cookies nur für bestimmte Domain löschen. In den meisten Fällen wird die Genehmigung ungültig</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/plurals.xml b/app/src/main/res/values-es/plurals.xml
index 10d2afcd6..587b6c85a 100644
--- a/app/src/main/res/values-es/plurals.xml
+++ b/app/src/main/res/values-es/plurals.xml
@@ -1,33 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="items">
-		<item quantity="one">%1$d elemento</item>
-		<item quantity="many">%1$d elementos</item>
-		<item quantity="other">%1$d elementos</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d nuevo capítulo</item>
-		<item quantity="many">%1$d nuevos capítulos</item>
-		<item quantity="other">%1$d nuevos capítulos</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d capítulo</item>
-		<item quantity="many">%1$d capítulos</item>
-		<item quantity="other">%1$d capítulos</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">hace %1$d minuto</item>
-		<item quantity="many">hace %1$d minutos</item>
-		<item quantity="other">hace %1$d minutos</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">hace %1$d hora</item>
-		<item quantity="many">hace %1$d horas</item>
-		<item quantity="other">hace %1$d horas</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">hace %1$d día</item>
-		<item quantity="many">hace %1$d días</item>
-		<item quantity="other">hace %1$d días</item>
-	</plurals>
-</resources>
+    <plurals name="items">
+        <item quantity="one">%1$d elemento</item>
+        <item quantity="many">%1$d elementos</item>
+        <item quantity="other">%1$d elementos</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nuevo capítulo</item>
+        <item quantity="many">%1$d nuevos capítulos</item>
+        <item quantity="other">%1$d nuevos capítulos</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capítulo</item>
+        <item quantity="many">%1$d capítulos</item>
+        <item quantity="other">%1$d capítulos</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">hace %1$d minuto</item>
+        <item quantity="many">hace %1$d minutos</item>
+        <item quantity="other">hace %1$d minutos</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">hace %1$d hora</item>
+        <item quantity="many">hace %1$d horas</item>
+        <item quantity="other">hace %1$d horas</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">hace %1$d día</item>
+        <item quantity="many">hace %1$d días</item>
+        <item quantity="other">hace %1$d días</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">Hace %1$d mes</item>
+        <item quantity="many">Hace %1$d meses</item>
+        <item quantity="other">Hace %1$d meses</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 023e847bb..55ffa9130 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -171,7 +171,7 @@
     <string name="password_length_hint">La contraseña debe tener al menos 4 caracteres</string>
     <string name="text_local_holder_secondary">Puedes guardarlo desde fuentes in línea o importarlo desde un archivo.</string>
     <string name="text_local_holder_primary">Todavía no tienes ningún manga guardado</string>
-    <string name="text_history_holder_secondary">Encuentra qué leer en el menú lateral.</string>
+    <string name="text_history_holder_secondary">Encuentra qué leer en la sección «Explorar»</string>
     <string name="text_history_holder_primary">Lo que leas se mostrará aquí</string>
     <string name="text_empty_holder_primary">Está un poco vacío aquí…</string>
     <string name="chapter_is_missing">Falta un capítulo</string>
@@ -384,7 +384,7 @@
     <string name="server_address">Dirección del servidor</string>
     <string name="ignore_ssl_errors">Ignorar los errores SSL</string>
     <string name="mirror_switching">Elige un espejo automáticamente</string>
-    <string name="mirror_switching_summary">Cambio automático de dominios para las fuentes remotas en caso de error si hay réplicas disponibles</string>
+    <string name="mirror_switching_summary">Cambio automático de los dominios para las fuentes del manga en caso de error si hay réplicas disponibles</string>
     <string name="pause">Pausar</string>
     <string name="resume">Reanudar</string>
     <string name="remove_completed">Eliminación completa</string>
@@ -443,4 +443,28 @@
     <string name="no_access_to_file">No tienes acceso a este archivo o directorio</string>
     <string name="custom_directory">Directorio personalizado</string>
     <string name="local_manga_directories">Directorios locales del manga</string>
+    <string name="description">Descripción</string>
+    <string name="this_month">Este mes</string>
+    <string name="voice_search">Buscar por voz</string>
+    <string name="related_manga">Manga relacionado</string>
+    <string name="color_light">Claro</string>
+    <string name="color_dark">Oscuro</string>
+    <string name="color_white">Blanco</string>
+    <string name="color_black">Negro</string>
+    <string name="data_not_restored">Los datos no se han restaurado</string>
+    <string name="data_not_restored_text">Asegúrate de haber seleccionado el archivo de la copia de seguridad correcto</string>
+    <string name="background">Fondo</string>
+    <string name="tracker_wifi_only_summary">No compruebe si hay nuevos capítulos utilizando conexiones de red medidas</string>
+    <string name="search_hint">Introduce el título del manga, el género o el nombre de la fuente</string>
+    <string name="progress">Progresos</string>
+    <string name="order_added">Añadido</string>
+    <string name="manage_categories">Gestionar las categorías</string>
+    <string name="view_list">Ver la lista</string>
+    <string name="show">Mostrar</string>
+    <string name="captcha_required_summary">%s requiere un captcha para funcionar correctamente</string>
+    <string name="languages">Idiomas</string>
+    <string name="suggestions_wifi_only_summary">No actualices las sugerencias utilizando conexiones de red medidas</string>
+    <string name="unknown">Desconocido</string>
+    <string name="in_progress">En proceso</string>
+    <string name="disable_nsfw">Desactivar NSFW</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index f74a58aa6..91f70b36f 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -120,7 +120,7 @@
     <string name="nothing_found">Walang nahanap</string>
     <string name="remove">Tanggalin</string>
     <string name="add_new_category">Bagong Kategorya</string>
-    <string name="read">Nabasa</string>
+    <string name="read">Magbasa</string>
     <string name="you_have_not_favourites_yet">Wala pang paborito</string>
     <string name="add_to_favourites">I-paborito ito</string>
     <string name="add">Idagdag</string>
@@ -442,4 +442,28 @@
     <string name="no_access_to_file">Wala kang access sa file o direktoryo na ito</string>
     <string name="local_manga_directories">Mga lokal na direktoryo ng manga</string>
     <string name="password">Password</string>
+    <string name="details_button_tip">Pindutin nang matagal ang Magbasa na button upang makita ang iba pang opsyon</string>
+    <string name="description">Paglalarawan</string>
+    <string name="this_month">Sa buwang ito</string>
+    <string name="color_light">Maliwanag</string>
+    <string name="color_dark">Madilim</string>
+    <string name="color_white">Puti</string>
+    <string name="color_black">Itim</string>
+    <string name="background">Background</string>
+    <string name="data_not_restored">Hindi na-restore ang data</string>
+    <string name="data_not_restored_text">Tiyaking napili mo ang tamang backup file</string>
+    <string name="tracker_wifi_only_summary">Huwag suriin ang mga bagong kabanata gamit ang mga naka-metrong network na koneksyon</string>
+    <string name="search_hint">Ilagay ang pamagat ng manga, genre o pangalan ng source</string>
+    <string name="progress">Pag-unlad</string>
+    <string name="order_added">Idinagdag na</string>
+    <string name="view_list">Tingnan ang listahan</string>
+    <string name="languages">Mga wika</string>
+    <string name="voice_search">Paghahanap gamit ang boses</string>
+    <string name="related_manga">Kaugnay na manga</string>
+    <string name="captcha_required_summary">Ang %s ay nangangailangan ng isang captcha upang malutas upang gumana nang maayos</string>
+    <string name="manage_categories">Ayusin ang mga kategorya</string>
+    <string name="suggestions_wifi_only_summary">Huwag i-update ang mga mungkahi gamit ang mga naka-metrong network na koneksyon</string>
+    <string name="show">Ipakita</string>
+    <string name="unknown">Di-alam</string>
+    <string name="in_progress">Isinasagawa</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4f78ff826..2657b9593 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -81,7 +81,7 @@
     <string name="manga_shelf">Étagère</string>
     <string name="text_local_holder_secondary">Enregistrez-le à partir de sources en ligne ou importez des fichiers.</string>
     <string name="text_local_holder_primary">Sauvegardez d\'abord quelque chose</string>
-    <string name="text_history_holder_secondary">Trouvez ce que vous voulez lire dans le menu latéral.</string>
+    <string name="text_history_holder_secondary">Trouver quoi lire dans la section « Explorer »</string>
     <string name="text_history_holder_primary">Ce que vous lisez sera affiché ici</string>
     <string name="text_search_holder_secondary">Essayez de reformuler la requête.</string>
     <string name="text_empty_holder_primary">C\'est un peu vide ici…</string>
@@ -443,4 +443,27 @@
     <string name="no_access_to_file">Vous n\'avez pas accès à ce fichier ou répertoire</string>
     <string name="pick_custom_directory">Choisir un répertoire personnalisé</string>
     <string name="local_manga_directories">Annuaires locaux de mangas</string>
+    <string name="progress">Progression</string>
+    <string name="order_added">Ajouté</string>
+    <string name="tracker_wifi_only_summary">Ne pas vérifier les nouveaux chapitres en utilisant des connexions réseau tarifées</string>
+    <string name="search_hint">Entrez le titre du manga, le genre ou le nom de la source</string>
+    <string name="description">Description</string>
+    <string name="this_month">Ce mois-ci</string>
+    <string name="voice_search">Recherche vocale</string>
+    <string name="related_manga">Mangas connexes</string>
+    <string name="color_light">Clair</string>
+    <string name="color_dark">Sombre</string>
+    <string name="color_white">Blanc</string>
+    <string name="color_black">Noir</string>
+    <string name="background">Arrière-plan</string>
+    <string name="data_not_restored">Les données n\'ont pas été restaurées</string>
+    <string name="data_not_restored_text">Assurez-vous que vous avez sélectionné le bon fichier de sauvegarde</string>
+    <string name="suggestions_wifi_only_summary">Ne pas mettre à jour les suggestions en utilisant des connexions réseau</string>
+    <string name="manage_categories">Gérer les catégories</string>
+    <string name="view_list">Voir la liste</string>
+    <string name="show">Afficher</string>
+    <string name="captcha_required_summary">%s exige qu\'un Captcha soit résolu pour fonctionner correctement</string>
+    <string name="languages">Langues</string>
+    <string name="unknown">Inconnu</string>
+    <string name="in_progress">En cours</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/plurals.xml b/app/src/main/res/values-hu/plurals.xml
new file mode 100644
index 000000000..877b159ab
--- /dev/null
+++ b/app/src/main/res/values-hu/plurals.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d új fejezet</item>
+        <item quantity="other">%1$d új fejezetek</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d fejezet</item>
+        <item quantity="other">%1$d fejezetek</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 02e4c7137..6f052a367 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -119,7 +119,7 @@
     <string name="manga_shelf">Scaffale da manga</string>
     <string name="text_local_holder_secondary">Puoi salvarlo da fonti in linea o importarlo da un file.</string>
     <string name="text_local_holder_primary">Non hai ancora salvato nessun manga</string>
-    <string name="text_history_holder_secondary">Puoi trovare cosa leggere nel menù laterale.</string>
+    <string name="text_history_holder_secondary">Trova cosa leggere nella sezione «Esplora»</string>
     <string name="text_history_holder_primary">I manga che stai leggendo saranno visualizzati qui</string>
     <string name="text_search_holder_secondary">Prova a riformulare la domanda.</string>
     <string name="text_empty_holder_primary">È un po\' vuoto qui…</string>
diff --git a/app/src/main/res/values-iw/plurals.xml b/app/src/main/res/values-iw/plurals.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-iw/plurals.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/plurals.xml b/app/src/main/res/values-ja/plurals.xml
index cf5756968..c199ce92d 100644
--- a/app/src/main/res/values-ja/plurals.xml
+++ b/app/src/main/res/values-ja/plurals.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="minutes_ago">
-		<item quantity="other">%1$d 1分前</item>
-	</plurals>
-	<plurals name="items">
-		<item quantity="other">%1$d 項目</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="other">%1$d 1時間前</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="other">%1$d 1日前</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="other">%1$dチャプター</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="other">%1$d新しい章</item>
-	</plurals>
-</resources>
+    <plurals name="minutes_ago">
+        <item quantity="other">%1$d 1分前</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="other">%1$d 項目</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="other">%1$d 1時間前</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="other">%1$d 1日前</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="other">%1$dチャプター</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="other">%1$d新しい章</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="other">%1$d ヶ月前</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3595971f3..1d075ed61 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -94,7 +94,7 @@
     <string name="remove_category">削除</string>
     <string name="text_search_holder_secondary">クエリを再定式化してみてください。</string>
     <string name="text_history_holder_primary">読んだ内容がここに表示されます</string>
-    <string name="text_history_holder_secondary">サイドメニューで何を読むかを見つけてください。</string>
+    <string name="text_history_holder_secondary">«探検» セクションで読みたいものを見つけてください</string>
     <string name="text_local_holder_primary">最初に何かを保存する</string>
     <string name="manga_shelf">本棚</string>
     <string name="recent_manga">最近</string>
@@ -290,7 +290,7 @@
     <string name="automatic_scroll">自動スクロール</string>
     <string name="importing_manga">マンガのインポート</string>
     <string name="email_enter_hint">続行するにはメールアドレスを入力してください</string>
-    <string name="text_shelf_holder_secondary">«探索»セクションで読むべきものを見つける</string>
+    <string name="text_shelf_holder_secondary">«探検»セクションで読むべきものを見つける</string>
     <string name="import_completed">インポートが完了しました</string>
     <string name="text_shelf_holder_primary">あなたのマンガはここに表示されます</string>
     <string name="canceled">キャンセル</string>
@@ -443,4 +443,27 @@
     <string name="no_access_to_file">このファイルまたはディレクトリにアクセスできません</string>
     <string name="pick_custom_directory">カスタムディレクトリを選択</string>
     <string name="local_manga_directories">ローカルマンガディレクトリ</string>
+    <string name="this_month">今月</string>
+    <string name="description">説明</string>
+    <string name="voice_search">音声検索</string>
+    <string name="background">バックグラウンド</string>
+    <string name="data_not_restored_text">正しいバックアップファイルを選択しているか確認してください</string>
+    <string name="data_not_restored">データを復元することが出来ませんでした</string>
+    <string name="suggestions_wifi_only_summary">従量制課金ネットワーク接続を使用して提案を更新しないでください</string>
+    <string name="search_hint">漫画のタイトル、ジャンル、またはソース名を入力してください</string>
+    <string name="progress">進捗状況</string>
+    <string name="order_added">追加</string>
+    <string name="view_list">一覧を表示</string>
+    <string name="show">見せる</string>
+    <string name="related_manga">関連漫画</string>
+    <string name="color_light">ライト</string>
+    <string name="color_dark">ダーク</string>
+    <string name="color_white">ホワイト</string>
+    <string name="color_black">ブラック</string>
+    <string name="tracker_wifi_only_summary">従量制ネットワーク接続を使用して新しいチャプターをチェックしないでください</string>
+    <string name="manage_categories">カテゴリーの管理</string>
+    <string name="captcha_required_summary">%sを正しく動作させるには、キャプチャを解決する必要があります</string>
+    <string name="languages">言語</string>
+    <string name="unknown">不明</string>
+    <string name="in_progress">進行状況</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 013919301..27c49dc27 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -19,7 +19,7 @@
     <string name="vibration">진동</string>
     <string name="remove_category">지우기</string>
     <string name="text_search_holder_secondary">쿼리를 재구성하십시오.</string>
-    <string name="text_history_holder_secondary">사이드 메뉴에서 만화를 탐색해보세요.</string>
+    <string name="text_history_holder_secondary">«탐색» 섹션에서 읽을 내용 찾기</string>
     <string name="text_shelf_holder_primary">만화가 여기에 표시됩니다</string>
     <string name="text_shelf_holder_secondary">«탐색» 섹션에서 만화를 탐색해보세요</string>
     <string name="pages_animation">페이지 전환 효과</string>
diff --git a/app/src/main/res/values-night-v23/color_themes.xml b/app/src/main/res/values-night-v23/color_themes.xml
index 0085829bc..a4a77b973 100644
--- a/app/src/main/res/values-night-v23/color_themes.xml
+++ b/app/src/main/res/values-night-v23/color_themes.xml
@@ -2,205 +2,261 @@
 <resources>
 	<!-- Colored themes -->
 	<style name="Theme.Kotatsu.Miku">
-		<item name="colorPrimary">#4CDBCE</item>
-		<item name="colorOnPrimary">#003733</item>
+		<item name="colorPrimary">#50DBCF</item>
 		<item name="colorPrimaryContainer">#00504A</item>
-		<item name="colorOnPrimaryContainer">#6EF8EA</item>
+		<item name="colorOnPrimary">#003733</item>
+		<item name="colorOnPrimaryContainer">#72F7EB</item>
+		<item name="colorPrimaryInverse">#006A63</item>
 		<item name="colorSecondary">#B1CCC8</item>
-		<item name="colorOnSecondary">#1C3532</item>
 		<item name="colorSecondaryContainer">#324B48</item>
+		<item name="colorOnSecondary">#1C3532</item>
 		<item name="colorOnSecondaryContainer">#CCE8E4</item>
-		<item name="colorTertiary">#AFC9E7</item>
-		<item name="colorOnTertiary">#17324A</item>
-		<item name="colorTertiaryContainer">#2F4961</item>
+		<item name="colorTertiary">#96CCFF</item>
+		<item name="colorTertiaryContainer">#004A75</item>
+		<item name="colorOnTertiary">#003353</item>
 		<item name="colorOnTertiaryContainer">#CEE5FF</item>
+		<item name="colorSurface">#101413</item>
+		<item name="colorSurfaceDim">#101413</item>
+		<item name="colorSurfaceBright">#363A39</item>
+		<item name="colorSurfaceContainerLowest">#0B0F0E</item>
+		<item name="colorSurfaceContainerLow">#191C1C</item>
+		<item name="colorSurfaceContainer">#1D2020</item>
+		<item name="colorSurfaceContainerHigh">#272B2A</item>
+		<item name="colorSurfaceContainerHighest">#323535</item>
+		<item name="colorSurfaceVariant">#3F4947</item>
+		<item name="colorOnSurface">#C4C7C6</item>
+		<item name="colorOnSurfaceVariant">#BEC9C6</item>
+		<item name="colorSurfaceInverse">#E0E3E1</item>
+		<item name="colorOnSurfaceInverse">#191C1C</item>
+		<item name="android:colorBackground">#272B2A</item>
+		<item name="colorOnBackground">#E0E3E1</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_miku</item>
-		<item name="colorOnBackground">#E0E3E1</item>
-		<item name="colorSurface">@color/background_miku</item>
-		<item name="colorOnSurface">#E0E3E1</item>
-		<item name="colorSurfaceVariant">#3F4947</item>
-		<item name="colorOnSurfaceVariant">#BEC9C6</item>
 		<item name="colorOutline">#899391</item>
-		<item name="colorOnSurfaceInverse">#191C1C</item>
-		<item name="colorSurfaceInverse">#E0E3E1</item>
-		<item name="colorPrimaryInverse">#006A63</item>
+		<item name="colorOutlineVariant">#3F4947</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Asuka">
 		<item name="colorPrimary">#FFB3AF</item>
-		<item name="colorOnPrimary">#68000E</item>
 		<item name="colorPrimaryContainer">#930018</item>
+		<item name="colorOnPrimary">#68000E</item>
 		<item name="colorOnPrimaryContainer">#FFDAD7</item>
+		<item name="colorPrimaryInverse">#BA1928</item>
 		<item name="colorSecondary">#FFB783</item>
+		<item name="colorSecondaryContainer">#703700</item>
 		<item name="colorOnSecondary">#4F2500</item>
-		<item name="colorSecondaryContainer">#713700</item>
 		<item name="colorOnSecondaryContainer">#FFDCC5</item>
-		<item name="colorTertiary">#E2C28C</item>
-		<item name="colorOnTertiary">#412D05</item>
-		<item name="colorTertiaryContainer">#594319</item>
-		<item name="colorOnTertiaryContainer">#FFDEA9</item>
+		<item name="colorTertiary">#F7BD48</item>
+		<item name="colorTertiaryContainer">#5E4200</item>
+		<item name="colorOnTertiary">#412D00</item>
+		<item name="colorOnTertiaryContainer">#FFDEA7</item>
+		<item name="colorSurface">#181212</item>
+		<item name="colorSurfaceDim">#181212</item>
+		<item name="colorSurfaceBright">#3F3737</item>
+		<item name="colorSurfaceContainerLowest">#120D0C</item>
+		<item name="colorSurfaceContainerLow">#201A1A</item>
+		<item name="colorSurfaceContainer">#251E1E</item>
+		<item name="colorSurfaceContainerHigh">#2F2828</item>
+		<item name="colorSurfaceContainerHighest">#3A3332</item>
+		<item name="colorSurfaceVariant">#534342</item>
+		<item name="colorOnSurface">#D0C4C3</item>
+		<item name="colorOnSurfaceVariant">#D8C1C0</item>
+		<item name="colorSurfaceInverse">#EDE0DE</item>
+		<item name="colorOnSurfaceInverse">#201A1A</item>
+		<item name="android:colorBackground">#2F2828</item>
+		<item name="colorOnBackground">#EDE0DE</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_asuka</item>
-		<item name="colorOnBackground">#EDE0DE</item>
-		<item name="colorSurface">@color/background_asuka</item>
-		<item name="colorOnSurface">#EDE0DE</item>
-		<item name="colorSurfaceVariant">#534342</item>
-		<item name="colorOnSurfaceVariant">#D8C1C0</item>
 		<item name="colorOutline">#A08C8B</item>
-		<item name="colorOnSurfaceInverse">#201A1A</item>
-		<item name="colorSurfaceInverse">#EDE0DE</item>
-		<item name="colorPrimaryInverse">#BA1928</item>
+		<item name="colorOutlineVariant">#534342</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
-		<item name="colorPrimary">#7FDA8E</item>
-		<item name="colorOnPrimary">#003915</item>
-		<item name="colorPrimaryContainer">#005321</item>
-		<item name="colorOnPrimaryContainer">#9AF7A8</item>
-		<item name="colorSecondary">#EAC32E</item>
-		<item name="colorOnSecondary">#3C2F00</item>
+		<item name="colorPrimary">#70DBA8</item>
+		<item name="colorPrimaryContainer">#005236</item>
+		<item name="colorOnPrimary">#003824</item>
+		<item name="colorOnPrimaryContainer">#8CF7C2</item>
+		<item name="colorPrimaryInverse">#006C48</item>
+		<item name="colorSecondary">#E7C349</item>
 		<item name="colorSecondaryContainer">#564500</item>
+		<item name="colorOnSecondary">#3C2F00</item>
 		<item name="colorOnSecondaryContainer">#FFE080</item>
-		<item name="colorTertiary">#5AD5F9</item>
-		<item name="colorOnTertiary">#003542</item>
-		<item name="colorTertiaryContainer">#004E5F</item>
-		<item name="colorOnTertiaryContainer">#B4EBFF</item>
+		<item name="colorTertiary">#FFB2BA</item>
+		<item name="colorTertiaryContainer">#7D2938</item>
+		<item name="colorOnTertiary">#5F1223</item>
+		<item name="colorOnTertiaryContainer">#FFD9DC</item>
+		<item name="colorSurface">#111412</item>
+		<item name="colorSurfaceDim">#111412</item>
+		<item name="colorSurfaceBright">#373A37</item>
+		<item name="colorSurfaceContainerLowest">#0C0F0D</item>
+		<item name="colorSurfaceContainerLow">#191C1A</item>
+		<item name="colorSurfaceContainer">#1D201E</item>
+		<item name="colorSurfaceContainerHigh">#272B28</item>
+		<item name="colorSurfaceContainerHighest">#323633</item>
+		<item name="colorSurfaceVariant">#404943</item>
+		<item name="colorOnSurface">#C5C7C3</item>
+		<item name="colorOnSurfaceVariant">#C0C9C1</item>
+		<item name="colorSurfaceInverse">#E1E3DF</item>
+		<item name="colorOnSurfaceInverse">#191C1A</item>
+		<item name="android:colorBackground">#272B28</item>
+		<item name="colorOnBackground">#E1E3DF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_mion</item>
-		<item name="colorOnBackground">#E2E3DD</item>
-		<item name="colorSurface">@color/background_mion</item>
-		<item name="colorOnSurface">#E2E3DD</item>
-		<item name="colorSurfaceVariant">#414941</item>
-		<item name="colorOnSurfaceVariant">#C1C9BE</item>
-		<item name="colorOutline">#8B9389</item>
-		<item name="colorOnSurfaceInverse">#1A1C19</item>
-		<item name="colorSurfaceInverse">#E2E3DD</item>
-		<item name="colorPrimaryInverse">#006E2F</item>
+		<item name="colorOutline">#8A938C</item>
+		<item name="colorOutlineVariant">#404943</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
-		<item name="colorPrimary">#FFC2C4</item>
-		<item name="colorOnPrimary">#C44B50</item>
-		<item name="colorPrimaryContainer">#91363A</item>
-		<item name="colorOnPrimaryContainer">#FFDADB</item>
-		<item name="colorSecondary">#9886A3</item>
-		<item name="colorOnSecondary">#544B59</item>
-		<item name="colorSecondaryContainer">#3E3543</item>
-		<item name="colorOnSecondaryContainer">#F0D5FF</item>
-		<item name="colorTertiary">#E9B9D2</item>
-		<item name="colorOnTertiary">#47263A</item>
-		<item name="colorTertiaryContainer">#5F3C51</item>
+		<item name="colorPrimary">#FFB3B6</item>
+		<item name="colorPrimaryContainer">#7D2933</item>
+		<item name="colorOnPrimary">#5F121E</item>
+		<item name="colorOnPrimaryContainer">#FFDADA</item>
+		<item name="colorPrimaryInverse">#9C4049</item>
+		<item name="colorSecondary">#E0B6FF</item>
+		<item name="colorSecondaryContainer">#5E3281</item>
+		<item name="colorOnSecondary">#461969</item>
+		<item name="colorOnSecondaryContainer">#F2DAFF</item>
+		<item name="colorTertiary">#FFAEDC</item>
+		<item name="colorTertiaryContainer">#762A5C</item>
+		<item name="colorOnTertiary">#5A1145</item>
 		<item name="colorOnTertiaryContainer">#FFD8EB</item>
+		<item name="colorSurface">#181212</item>
+		<item name="colorSurfaceDim">#181212</item>
+		<item name="colorSurfaceBright">#3F3737</item>
+		<item name="colorSurfaceContainerLowest">#120D0D</item>
+		<item name="colorSurfaceContainerLow">#201A1A</item>
+		<item name="colorSurfaceContainer">#241E1E</item>
+		<item name="colorSurfaceContainerHigh">#2F2828</item>
+		<item name="colorSurfaceContainerHighest">#3A3333</item>
+		<item name="colorSurfaceVariant">#524343</item>
+		<item name="colorOnSurface">#D0C4C3</item>
+		<item name="colorOnSurfaceVariant">#D7C1C1</item>
+		<item name="colorSurfaceInverse">#ECE0DF</item>
+		<item name="colorOnSurfaceInverse">#201A1A</item>
+		<item name="android:colorBackground">#2F2828</item>
+		<item name="colorOnBackground">#ECE0DF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_rikka</item>
-		<item name="colorOnBackground">#E5E1E6</item>
-		<item name="colorSurface">@color/background_rikka</item>
-		<item name="colorOnSurface">#E5E1E6</item>
-		<item name="colorSurfaceVariant">#332837</item>
-		<item name="colorOnSurfaceVariant">#C8C5D0</item>
-		<item name="colorOutline">#918F9A</item>
-		<item name="colorOnSurfaceInverse">#28202B</item>
-		<item name="colorSurfaceInverse">#E5E1E6</item>
-		<item name="colorPrimaryInverse">#8A3B49</item>
+		<item name="colorOutline">#9F8C8C</item>
+		<item name="colorOutlineVariant">#524343</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
-		<item name="colorPrimary">#6993A1</item>
-		<item name="colorOnPrimary">#39545d</item>
-		<item name="colorPrimaryContainer">#263C43</item>
-		<item name="colorOnPrimaryContainer">#CCF2FF</item>
-		<item name="colorSecondary">#FFA8AC</item>
-		<item name="colorOnSecondary">#C54F54</item>
-		<item name="colorSecondaryContainer">#393233</item>
-		<item name="colorOnSecondaryContainer">#FFC8CA</item>
-		<item name="colorTertiary">#97DDF4</item>
-		<item name="colorOnTertiary">#072A37</item>
-		<item name="colorTertiaryContainer">#293F47</item>
-		<item name="colorOnTertiaryContainer">#BFEFFF</item>
+		<item name="colorPrimary">#B2EBFF</item>
+		<item name="colorPrimaryContainer">#004E5E</item>
+		<item name="colorOnPrimary">#001F27</item>
+		<item name="colorOnPrimaryContainer">#B2EBFF</item>
+		<item name="colorPrimaryInverse">#00677D</item>
+		<item name="colorSecondary">#FFDADA</item>
+		<item name="colorSecondaryContainer">#7D2933</item>
+		<item name="colorOnSecondary">#40000C</item>
+		<item name="colorOnSecondaryContainer">#FFDADA</item>
+		<item name="colorTertiary">#59D5F8</item>
+		<item name="colorTertiaryContainer">#004E5E</item>
+		<item name="colorOnTertiary">#003642</item>
+		<item name="colorOnTertiaryContainer">#B2EBFF</item>
+		<item name="colorSurface">#111415</item>
+		<item name="colorSurfaceDim">#111415</item>
+		<item name="colorSurfaceBright">#373A3B</item>
+		<item name="colorSurfaceContainerLowest">#0B0F10</item>
+		<item name="colorSurfaceContainerLow">#191C1D</item>
+		<item name="colorSurfaceContainer">#1D2021</item>
+		<item name="colorSurfaceContainerHigh">#272A2C</item>
+		<item name="colorSurfaceContainerHighest">#323536</item>
+		<item name="colorSurfaceVariant">#40484B</item>
+		<item name="colorOnSurface">#C5C7C8</item>
+		<item name="colorOnSurfaceVariant">#BFC8CC</item>
+		<item name="colorSurfaceInverse">#E1E3E4</item>
+		<item name="colorOnSurfaceInverse">#191C1D</item>
+		<item name="android:colorBackground">#272A2C</item>
+		<item name="colorOnBackground">#E1E3E4</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_sakura</item>
-		<item name="colorOnBackground">#EBE0E1</item>
-		<item name="colorSurface">@color/background_sakura</item>
-		<item name="colorOnSurface">#EBE0E1</item>
-		<item name="colorSurfaceVariant">#393233</item>
-		<item name="colorOnSurfaceVariant">#D5C2C6</item>
-		<item name="colorOutline">#9E8C90</item>
-		<item name="colorOnSurfaceInverse">#201C1D</item>
-		<item name="colorSurfaceInverse">#EBE0E1</item>
-		<item name="colorPrimaryInverse">#423B3D</item>
+		<item name="colorOutline">#899296</item>
+		<item name="colorOutlineVariant">#40484B</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mamimi">
-		<item name="colorPrimary">#EAB1B2</item>
-		<item name="colorOnPrimary">#9C4346</item>
-		<item name="colorPrimaryContainer">#5C3436</item>
-		<item name="colorOnPrimaryContainer">#FFC8CA</item>
-		<item name="colorSecondary">#72A3CD</item>
-		<item name="colorOnSecondary">#294055</item>
-		<item name="colorSecondaryContainer">#2F4559</item>
-		<item name="colorOnSecondaryContainer">#C7E5FF</item>
-		<item name="colorTertiary">#9A9486</item>
-		<item name="colorOnTertiary">#5C574A</item>
-		<item name="colorTertiaryContainer">#43403A</item>
-		<item name="colorOnTertiaryContainer">#FFF1CF</item>
+		<item name="colorPrimary">#FFB2B7</item>
+		<item name="colorPrimaryContainer">#7D2935</item>
+		<item name="colorOnPrimary">#5F1220</item>
+		<item name="colorOnPrimaryContainer">#FFDADB</item>
+		<item name="colorPrimaryInverse">#9C404B</item>
+		<item name="colorSecondary">#98CBFF</item>
+		<item name="colorSecondaryContainer">#004A77</item>
+		<item name="colorOnSecondary">#003354</item>
+		<item name="colorOnSecondaryContainer">#CFE5FF</item>
+		<item name="colorTertiary">#FFB784</item>
+		<item name="colorTertiaryContainer">#713700</item>
+		<item name="colorOnTertiary">#502500</item>
+		<item name="colorOnTertiaryContainer">#FFDCC6</item>
+		<item name="colorSurface">#181212</item>
+		<item name="colorSurfaceDim">#181212</item>
+		<item name="colorSurfaceBright">#3F3738</item>
+		<item name="colorSurfaceContainerLowest">#120D0D</item>
+		<item name="colorSurfaceContainerLow">#201A1A</item>
+		<item name="colorSurfaceContainer">#241E1E</item>
+		<item name="colorSurfaceContainerHigh">#2F2828</item>
+		<item name="colorSurfaceContainerHighest">#3A3333</item>
+		<item name="colorSurfaceVariant">#524344</item>
+		<item name="colorOnSurface">#D0C4C4</item>
+		<item name="colorOnSurfaceVariant">#D7C1C2</item>
+		<item name="colorSurfaceInverse">#ECE0DF</item>
+		<item name="colorOnSurfaceInverse">#201A1A</item>
+		<item name="android:colorBackground">#2F2828</item>
+		<item name="colorOnBackground">#ECE0DF</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_mamimi</item>
-		<item name="colorOnBackground">#EBE0E1</item>
-		<item name="colorSurface">@color/background_mamimi</item>
-		<item name="colorOnSurface">#EBE0E1</item>
-		<item name="colorSurfaceVariant">#294055</item>
-		<item name="colorOnSurfaceVariant">#D5C2C6</item>
-		<item name="colorOutline">#9E8C90</item>
-		<item name="colorOnSurfaceInverse">#232B33</item>
-		<item name="colorSurfaceInverse">#EBE0E1</item>
-		<item name="colorPrimaryInverse">#525a6d</item>
+		<item name="colorOutline">#9F8C8D</item>
+		<item name="colorOutlineVariant">#524344</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Kanade">
-		<item name="colorPrimary">#AEAEAE</item>
-		<item name="colorOnPrimary">#555555</item>
-		<item name="colorPrimaryContainer">#4A4A4A</item>
-		<item name="colorOnPrimaryContainer">#CCCCCC</item>
-		<item name="colorSecondary">#B1B1B1</item>
-		<item name="colorOnSecondary">#464646</item>
-		<item name="colorSecondaryContainer">#4E4E4E</item>
-		<item name="colorOnSecondaryContainer">#B3B3B3</item>
-		<item name="colorTertiary">#959595</item>
-		<item name="colorOnTertiary">#676767</item>
-		<item name="colorTertiaryContainer">#494949</item>
-		<item name="colorOnTertiaryContainer">#BABABA</item>
+		<item name="colorPrimary">#D8D8D8</item>
+		<item name="colorPrimaryContainer">#494949</item>
+		<item name="colorOnPrimary">#2C2C2C</item>
+		<item name="colorOnPrimaryContainer">#DADADA</item>
+		<item name="colorPrimaryInverse">#656565</item>
+		<item name="colorSecondary">#CDCDCD</item>
+		<item name="colorSecondaryContainer">#474747</item>
+		<item name="colorOnSecondary">#323232</item>
+		<item name="colorOnSecondaryContainer">#E1E1E1</item>
+		<item name="colorTertiary">#BABABA</item>
+		<item name="colorTertiaryContainer">#7A7A7A</item>
+		<item name="colorOnTertiary">#4E4E4E</item>
+		<item name="colorOnTertiaryContainer">#CFCFCF</item>
+		<item name="colorSurface">#151515</item>
+		<item name="colorSurfaceDim">#151515</item>
+		<item name="colorSurfaceBright">#393939</item>
+		<item name="colorSurfaceContainerLowest">#101010</item>
+		<item name="colorSurfaceContainerLow">#1E1E1E</item>
+		<item name="colorSurfaceContainer">#232323</item>
+		<item name="colorSurfaceContainerHigh">#2B2B2B</item>
+		<item name="colorSurfaceContainerHighest">#353535</item>
+		<item name="colorSurfaceVariant">#4E4E4E</item>
+		<item name="colorOnSurface">#C8C8C8</item>
+		<item name="colorOnSurfaceVariant">#C8C8C8</item>
+		<item name="colorSurfaceInverse">#E3E3E3</item>
+		<item name="colorOnSurfaceInverse">#1B1B1B</item>
+		<item name="android:colorBackground">#2B2B2B</item>
+		<item name="colorOnBackground">#E3E3E3</item>
 		<item name="colorError">#FFB4AB</item>
 		<item name="colorErrorContainer">#93000A</item>
 		<item name="colorOnError">#690005</item>
 		<item name="colorOnErrorContainer">#FFDAD6</item>
-		<item name="android:colorBackground">@color/background_kanade</item>
-		<item name="colorOnBackground">#D8D8D8</item>
-		<item name="colorSurface">@color/background_kanade</item>
-		<item name="colorOnSurface">#E3E3E3</item>
-		<item name="colorSurfaceVariant">#575757</item>
-		<item name="colorOnSurfaceVariant">#CCCCCC</item>
-		<item name="colorOutline">#A5A5A5</item>
-		<item name="colorOnSurfaceInverse">#353535</item>
-		<item name="colorSurfaceInverse">#272727</item>
-		<item name="colorPrimaryInverse">#686868</item>
+		<item name="colorOutline">#959595</item>
+		<item name="colorOutlineVariant">#494949</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 8c93dcd18..da4b204b0 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -5,31 +5,39 @@
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
-		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
-		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
 		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
+		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
 		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
+		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
 		<item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
-		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
 		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
+		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
 		<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
 		<item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
-		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
 		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
+		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
 		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
-		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
-		<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
 		<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
-		<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
+		<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
+		<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
+		<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_dark_surface_container_lowest</item>
+		<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
+		<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
+		<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_dark_surface_container_highest</item>
 		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
+		<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
 		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
 		<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
 		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
-		<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+		<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
 		<item name="colorError">@color/m3_sys_color_dark_error</item>
-		<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
 		<item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
+		<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
 		<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
+		<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+		<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_dark_outline_variant</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
 		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 59fe57a5c..3bd14edc9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -10,7 +10,7 @@
 	<color name="divider_default">#1FFFFFFF</color>
 	<color name="status_bar_incognito">#66311B92</color>
 	<color name="warning">#FB8C00</color>
-	<color name="launcher_background">#000000</color>
+	<color name="launcher_background">#222222</color>
 	<color name="splash_primary">#0C4091</color>
 
 	<!-- Color schemes colors -->
diff --git a/app/src/main/res/values-night/colors_kotatsu.xml b/app/src/main/res/values-night/colors_kotatsu.xml
index 12f4d3023..520e2e02d 100644
--- a/app/src/main/res/values-night/colors_kotatsu.xml
+++ b/app/src/main/res/values-night/colors_kotatsu.xml
@@ -4,29 +4,41 @@
   ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
 -->
 <resources>
-	<color name="kotatsu_primary">#A5C8FF</color>
-	<color name="kotatsu_onPrimary">#00315E</color>
-	<color name="kotatsu_inversePrimary">#005FAE</color>
-	<color name="kotatsu_primaryContainer">#004785</color>
-	<color name="kotatsu_onPrimaryContainer">#D4E3FF</color>
-	<color name="kotatsu_secondary">#BCC7DC</color>
-	<color name="kotatsu_onSecondary">#263141</color>
-	<color name="kotatsu_secondaryContainer">#3D4758</color>
-	<color name="kotatsu_onSecondaryContainer">#D8E3F8</color>
-	<color name="kotatsu_tertiary">#DABDE2</color>
-	<color name="kotatsu_onTertiary">#3D2946</color>
-	<color name="kotatsu_tertiaryContainer">#553F5E</color>
-	<color name="kotatsu_onTertiaryContainer">#F7D8FF</color>
-	<color name="kotatsu_background">#1A1C1E</color>
-	<color name="kotatsu_onBackground">#E3E2E6</color>
-	<color name="kotatsu_surface">#1A1C1E</color>
-	<color name="kotatsu_onSurface">#E3E2E6</color>
-	<color name="kotatsu_surfaceVariant">#43474E</color>
-	<color name="kotatsu_onSurfaceVariant">#C3C6CF</color>
-	<color name="kotatsu_inverseSurface">#E3E2E6</color>
-	<color name="kotatsu_inverseOnSurface">#1A1C1E</color>
-	<color name="kotatsu_outline">#8D9199</color>
+	<color name="kotatsu_primary">#D0BCFF</color>
+	<color name="kotatsu_primaryContainer">#4F378B</color>
+	<color name="kotatsu_onPrimary">#371E73</color>
+	<color name="kotatsu_onPrimaryContainer">#EADDFF</color>
+	<color name="kotatsu_inversePrimary">#6750A4</color>
+	<color name="kotatsu_secondary">#CCC2DC</color>
+	<color name="kotatsu_secondaryContainer">#4A4458</color>
+	<color name="kotatsu_onSecondary">#332D41</color>
+	<color name="kotatsu_onSecondaryContainer">#E8DEF8</color>
+	<color name="kotatsu_tertiary">#EFB8C8</color>
+	<color name="kotatsu_tertiaryContainer">#633B48</color>
+	<color name="kotatsu_onTertiary">#492532</color>
+	<color name="kotatsu_onTertiaryContainer">#FFD8E4</color>
+	<color name="kotatsu_surface">#141218</color>
+	<color name="kotatsu_surfaceDim">#141218</color>
+	<color name="kotatsu_surfaceBright">#141218</color>
+	<color name="kotatsu_surfaceContainerLowest">#0F0D13</color>
+	<color name="kotatsu_surfaceContainerLow">#1D1B20</color>
+	<color name="kotatsu_surfaceContainer">#211F26</color>
+	<color name="kotatsu_surfaceContainerHigh">#2B2930</color>
+	<color name="kotatsu_surfaceContainerHighest">#36343B</color>
+	<color name="kotatsu_surfaceVariant">#49454F</color>
+	<color name="kotatsu_onSurface">#E6E1E5</color>
+	<color name="kotatsu_onSurfaceVariant">#CAC4D0</color>
+	<color name="kotatsu_inverseSurface">#E6E1E5</color>
+	<color name="kotatsu_inverseOnSurface">#313033</color>
+	<color name="kotatsu_background">#141218</color>
+	<color name="kotatsu_onBackground">#E6E1E5</color>
+	<color name="kotatsu_error">#F2B8B5</color>
+	<color name="kotatsu_errorContainer">#8C1D18</color>
+	<color name="kotatsu_onError">#601410</color>
+	<color name="kotatsu_onErrorContainer">#F9DEDC</color>
+	<color name="kotatsu_outline">#938F99</color>
+	<color name="kotatsu_outlineVariant">#444746</color>
 	<color name="kotatsu_shadow">#000000</color>
-	<color name="kotatsu_surfaceTint">#A5C8FF</color>
-	<color name="kotatsu_surfaceTintColor">#A5C8FF</color>
+	<color name="kotatsu_surfaceTint">#D0BCFF</color>
+	<color name="kotatsu_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values-ru/plurals.xml b/app/src/main/res/values-ru/plurals.xml
index a3ef775fa..b8114fe41 100644
--- a/app/src/main/res/values-ru/plurals.xml
+++ b/app/src/main/res/values-ru/plurals.xml
@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="items">
-		<item quantity="one">%1$d элемент</item>
-		<item quantity="few">%1$d элемента</item>
-		<item quantity="many">%1$d элементов</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d новая глава</item>
-		<item quantity="few">%1$d новых главы</item>
-		<item quantity="many">%1$d новых глав</item>
-		<item quantity="other">%1$d новых глав</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d глава</item>
-		<item quantity="few">%1$d главы</item>
-		<item quantity="many">%1$d глав</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">%1$d минуту назад</item>
-		<item quantity="few">%1$d минуты назад</item>
-		<item quantity="many">%1$d минут назад</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">%1$d час назад</item>
-		<item quantity="few">%1$d часа назад</item>
-		<item quantity="many">%1$d часов назад</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">%1$d день назад</item>
-		<item quantity="few">%1$d дня назад</item>
-		<item quantity="many">%1$d дней назад</item>
-	</plurals>
-</resources>
+    <plurals name="items">
+        <item quantity="one">%1$d элемент</item>
+        <item quantity="few">%1$d элемента</item>
+        <item quantity="many">%1$d элементов</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d новая глава</item>
+        <item quantity="few">%1$d новых главы</item>
+        <item quantity="many">%1$d новых глав</item>
+        <item quantity="other">%1$d новых глав</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d глава</item>
+        <item quantity="few">%1$d главы</item>
+        <item quantity="many">%1$d глав</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d минуту назад</item>
+        <item quantity="few">%1$d минуты назад</item>
+        <item quantity="many">%1$d минут назад</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d час назад</item>
+        <item quantity="few">%1$d часа назад</item>
+        <item quantity="many">%1$d часов назад</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d день назад</item>
+        <item quantity="few">%1$d дня назад</item>
+        <item quantity="many">%1$d дней назад</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">%1$d месяц назад</item>
+        <item quantity="few">%1$d месяца назад</item>
+        <item quantity="many">%1$d месяцев назад</item>
+        <item quantity="other">%1$d месяцев назад</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c5b44d4c3..b517be00c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -98,7 +98,7 @@
     <string name="text_empty_holder_primary">Как-то здесь пусто…</string>
     <string name="text_search_holder_secondary">Попробуйте переформулировать запрос.</string>
     <string name="text_history_holder_primary">То, что вы прочитаете, будет отображено здесь</string>
-    <string name="text_history_holder_secondary">Найдите, что почитать, в боковом меню.</string>
+    <string name="text_history_holder_secondary">Найдите, что почитать в разделе «Обзор»</string>
     <string name="text_local_holder_primary">Сохраните что-нибудь</string>
     <string name="text_local_holder_secondary">Сохраните что-нибудь из онлайн-каталога или импортируйте из файла.</string>
     <string name="manga_shelf">Полка</string>
@@ -443,4 +443,27 @@
     <string name="custom_directory">Пользовательский каталог</string>
     <string name="local_manga_directories">Локальные каталоги манги</string>
     <string name="pick_custom_directory">Выбрать пользовательский каталог</string>
+    <string name="this_month">Этот месяц</string>
+    <string name="voice_search">Голосовой поиск</string>
+    <string name="related_manga">Похожая манга</string>
+    <string name="color_light">Светлый</string>
+    <string name="color_dark">Тёмный</string>
+    <string name="color_white">Белый</string>
+    <string name="color_black">Чёрный</string>
+    <string name="background">Фон</string>
+    <string name="data_not_restored">Данные не были восстановлены</string>
+    <string name="suggestions_wifi_only_summary">Не обновлять рекомендации при использовании лимитного интернет-соединения</string>
+    <string name="order_added">Добавлено</string>
+    <string name="view_list">Посмотреть список</string>
+    <string name="data_not_restored_text">Убедитесь, что вы выбрали правильный файл резервной копии</string>
+    <string name="description">Описание</string>
+    <string name="manage_categories">Управление категориями</string>
+    <string name="search_hint">Введите название манги, жанр или название источника</string>
+    <string name="show">Показать</string>
+    <string name="tracker_wifi_only_summary">Не проверять наличие новых глав при использовании лимитного интернет-соединения</string>
+    <string name="progress">Прогресс</string>
+    <string name="captcha_required_summary">Для правильной работы %s требуется проверка captcha</string>
+    <string name="languages">Языки</string>
+    <string name="unknown">Неизвестный</string>
+    <string name="in_progress">В процессе</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/plurals.xml b/app/src/main/res/values-th/plurals.xml
index a6b3daec9..88ef00b5b 100644
--- a/app/src/main/res/values-th/plurals.xml
+++ b/app/src/main/res/values-th/plurals.xml
@@ -1,2 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <plurals name="months_ago">
+        <item quantity="other">%1$d เดือนที่ผ่านมา</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="other">%1$d ตอน</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="other">%1$d ตอนใหม่</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="other">%1$d รายการ</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="other">%1$d วันที่ผ่านมา</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="other">%1$d นาทีที่แล้ว</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="other">%1$d ชั่วโมงที่แล้ว</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
new file mode 100644
index 000000000..d451c591a
--- /dev/null
+++ b/app/src/main/res/values-th/strings.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="light">สว่าง</string>
+    <string name="automatic">ตั้งค่าตามเครื่อง</string>
+    <string name="text_clear_history_prompt">จะเคลียร์ประวัติการอ่านทั้งหมดแบบถาวรใช่ไหม\?</string>
+    <string name="remove">ลบ</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" ได้ถูกลบจากที่จัดเก็บในเครื่องแล้ว</string>
+    <string name="share_image">แชร์รูปภาพ</string>
+    <string name="_import">นำเข้า</string>
+    <string name="delete">ลบ</string>
+    <string name="text_file_not_supported">เลือกไฟล์ ZIP หรือ CBZ</string>
+    <string name="clear_pages_cache">เคลียร์แคชหน้า</string>
+    <string name="standard">มาตรฐาน</string>
+    <string name="read_mode">โหมดอ่าน</string>
+    <string name="grid_size">ขนาดตาราง</string>
+    <string name="text_delete_local_manga">จะลบ \"%s\" ออกจากเครื่องแบบถาวรใช่ไหม\?</string>
+    <string name="switch_pages">สลับหน้า</string>
+    <string name="error">ข้อผิดพลาด</string>
+    <string name="app_update_available">มีเวอร์ชันใหม่ของแอปนี้ให้ใช้งานแล้ว</string>
+    <string name="save_manga">บันทึก</string>
+    <string name="notifications">การแจ้งเตือน</string>
+    <string name="notifications_settings">ตั้งค่าการแจ้งเตือน</string>
+    <string name="vibration">สั่น</string>
+    <string name="remove_category">ลบ</string>
+    <string name="favourites">รายการโปรด</string>
+    <string name="history">ประวัติ</string>
+    <string name="error_occurred">เกิดข้อผิดพลาด</string>
+    <string name="history_is_empty">ยังไม่มีประวัติ</string>
+    <string name="read">อ่าน</string>
+    <string name="you_have_not_favourites_yet">ยังไม่มีรายการโปรด</string>
+    <string name="try_again">ลองใหม่อีกครั้ง</string>
+    <string name="nothing_found">ไม่พบอะไรเลย</string>
+    <string name="settings">ตั้งค่า</string>
+    <string name="close">ปิด</string>
+    <string name="loading_">โปรดรอสักครู่…</string>
+    <string name="add">เพิ่ม</string>
+    <string name="local_storage">ที่เก็บข้อมูลในเครื่อง</string>
+    <string name="clear_history">ลบประวัติ</string>
+    <string name="save">บันทึก</string>
+    <string name="no_description">ไม่มีคำอธิบาย</string>
+    <string name="network_error">อินเตอร์เน็ตมีปัญหา</string>
+    <string name="share">แชร์</string>
+    <string name="theme">ธีม</string>
+    <string name="dark">มืด</string>
+    <string name="pages">หน้า</string>
+    <string name="clear">เคลียร์</string>
+    <string name="page_saved">บันทึกแล้ว</string>
+    <string name="save_page">บันทึกหน้า</string>
+    <string name="search_history_cleared">เคลียร์สำเร็จ</string>
+    <string name="clear_search_history">เคลียร์ประวัติการค้นหา</string>
+    <string name="download">ดาวน์โหลด</string>
+    <string name="notification_sound">เสียงการแจ้งเตือน</string>
+    <string name="text_shelf_holder_primary">มังงะของคุณจะแสดงที่นี่</string>
+    <string name="cannot_find_available_storage">ไม่มีพื้นที่ว่างในอุปกรณ์</string>
+    <string name="done">สำเร็จ</string>
+    <string name="text_feed_holder">ตอนใหม่ของเรื่องที่คุณกำลังอ่านจะแสดงอยู่ที่นี่</string>
+    <string name="passwords_mismatch">รหัสผ่านไม่ตรงกัน</string>
+    <string name="text_empty_holder_primary">ที่นี่มันว่างเปล่า…</string>
+    <string name="filter">กรอง</string>
+    <string name="search_on_s">ค้นหาบน %s</string>
+    <string name="delete_manga">ลบมังงะ</string>
+    <string name="_continue">ดำเนินการต่อ</string>
+    <string name="internal_storage">ที่เก็บข้อมูลภายใน</string>
+    <string name="external_storage">ที่จัดเก็บภายนอก</string>
+    <string name="open_in_browser">เปิดในเบราว์เซอร์</string>
+    <string name="large_manga_save_confirm">มังงะเรื่องนี้มี %s บันทึกทั้งหมดหรือไม่\?</string>
+    <string name="new_chapters">ตอนใหม่</string>
+    <string name="favourites_categories">หมวดหมู่รายการโปรด</string>
+    <string name="text_history_holder_primary">สิ่งที่คุณอ่านจะแสดงที่นี่</string>
+    <string name="text_local_holder_primary">บันทึกบางอย่างก่อน</string>
+    <string name="text_local_holder_secondary">บันทึกจากออนไลน์หรือนำเข้าไฟล์</string>
+    <string name="recent_manga">ล่าสุด</string>
+    <string name="manga_save_location">แฟ้มสำหรับดาวน์โหลด</string>
+    <string name="other_storage">พื้นที่จัดเก็บอื่น</string>
+    <string name="favourites_category_empty">หมวดหมู่ที่ว่างเปล่า</string>
+    <string name="read_later">อ่านทีหลัง</string>
+    <string name="updates">อัพเดท</string>
+    <string name="search_results">รายการค้นหา</string>
+    <string name="new_version_s">เวอร์ชั่นใหม่: %s</string>
+    <string name="size_s">ขนาด: %s</string>
+    <string name="update">อัพเดท</string>
+    <string name="track_sources">มองหาการอัพเดท</string>
+    <string name="wrong_password">รหัสผ่านผิด</string>
+    <string name="repeat_password">โปรดใส่รหัสผ่านอีกรอบ</string>
+    <string name="app_version">เวอร์ชั่น %s</string>
+    <string name="check_for_updates">ค้นหาการอัพเดท</string>
+    <string name="no_update_available">ไม่พบการอัพเดท</string>
+    <string name="details">รายละเอียด</string>
+    <string name="list">รายการ</string>
+    <string name="add_to_favourites">เพิ่มเข้ารายการโปรด</string>
+    <string name="add_new_category">หมวดหมู่ใหม่</string>
+    <string name="manga_downloading_">กำลังดาวน์โหลด…</string>
+    <string name="download_complete">ดาวน์โหลดสำเร็จ</string>
+    <string name="by_name">ชื่อ</string>
+    <string name="popular">นิยม</string>
+    <string name="by_rating">คะแนนโหวต</string>
+    <string name="share_s">แชร์ %s</string>
+    <string name="search">ค้นหา</string>
+    <string name="search_manga">ค้นหามังงะ</string>
+    <string name="updated">อัพเดทแล้ว</string>
+    <string name="remove_completed">ลบสำเร็จแล้ว</string>
+    <string name="remove_completed_downloads_confirm">ประวัติการดาวน์โหลดของคุณจะถูกลบถาวร</string>
+    <string name="text_downloads_list_holder">คุณไม่มีอะไรในดาวน์โหลดเลย</string>
+    <string name="downloads_resumed">การดาวน์โหลดของคุณได้ดำเนินการต่อแล้ว</string>
+    <string name="downloads_paused">การดาวน์โหลดของคุณได้หยุดชั่วคราว</string>
+    <string name="data_and_privacy">ข้อมูลและความเป็นส่วนตัว</string>
+    <string name="cookies_cleared">คุกกี้ทั้งหมดได้ถูกลบแล้ว</string>
+    <string name="removed_from_history">ได้ลบจากประวัติแล้ว</string>
+    <string name="removed_from_favourites">ลบออกจากรายการโปรดแล้ว</string>
+    <string name="processing_">ประมวลผล…</string>
+    <string name="downloads">ดาวน์โหลด</string>
+    <string name="newest">ใหม่ล่าสุด</string>
+    <string name="remote_sources">แหล่งมังงะ</string>
+    <string name="computing_">กำลังคำนวน…</string>
+    <string name="create_shortcut">สร้าง shortcut…</string>
+    <string name="sort_order">เรียวตามลำดับ</string>
+    <string name="enable">เปิดการใช้งาน</string>
+    <string name="downloads_removed">การดาวน์โหลดชองคุณได้ถูกลบแล้ว</string>
+    <string name="downloads_cancelled">การดาวน์โหลดของคุณได้ถูกยกเลิกแล้ว</string>
+    <string name="downloaded">ดาวน์โหลดแล้ว</string>
+    <string name="invert_colors">กลับสี</string>
+    <string name="pages_animation_summary">อนิเมชั่นการเปลี่ยนหน้า</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/plurals.xml b/app/src/main/res/values-uk/plurals.xml
index 2219d916a..a4f23fe26 100644
--- a/app/src/main/res/values-uk/plurals.xml
+++ b/app/src/main/res/values-uk/plurals.xml
@@ -1,39 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d новий розділ</item>
-		<item quantity="few">%1$d нові розділи</item>
-		<item quantity="many">%1$d нових розділів</item>
-		<item quantity="other">%1$d нових розділів</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">%1$d хвилину тому</item>
-		<item quantity="few">%1$d хвилини тому</item>
-		<item quantity="many">%1$d хвилин тому</item>
-		<item quantity="other">%1$d хвилин тому</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">%1$d годину тому</item>
-		<item quantity="few">%1$d години тому</item>
-		<item quantity="many">%1$d годин тому</item>
-		<item quantity="other">%1$d годин тому</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">%1$d день тому</item>
-		<item quantity="few">%1$d дні тому</item>
-		<item quantity="many">%1$d днів тому</item>
-		<item quantity="other">%1$d днів тому</item>
-	</plurals>
-	<plurals name="items">
-		<item quantity="one">%1$d елемент</item>
-		<item quantity="few">%1$d елементи</item>
-		<item quantity="many">%1$d елементів</item>
-		<item quantity="other">%1$d елементів</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d розділ</item>
-		<item quantity="few">%1$d розділи</item>
-		<item quantity="many">%1$d розділів</item>
-		<item quantity="other">%1$d розділів</item>
-	</plurals>
-</resources>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d новий розділ</item>
+        <item quantity="few">%1$d нові розділи</item>
+        <item quantity="many">%1$d нових розділів</item>
+        <item quantity="other">%1$d нових розділів</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d хвилину тому</item>
+        <item quantity="few">%1$d хвилини тому</item>
+        <item quantity="many">%1$d хвилин тому</item>
+        <item quantity="other">%1$d хвилин тому</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d годину тому</item>
+        <item quantity="few">%1$d години тому</item>
+        <item quantity="many">%1$d годин тому</item>
+        <item quantity="other">%1$d годин тому</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d день тому</item>
+        <item quantity="few">%1$d дні тому</item>
+        <item quantity="many">%1$d днів тому</item>
+        <item quantity="other">%1$d днів тому</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d елемент</item>
+        <item quantity="few">%1$d елементи</item>
+        <item quantity="many">%1$d елементів</item>
+        <item quantity="other">%1$d елементів</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d розділ</item>
+        <item quantity="few">%1$d розділи</item>
+        <item quantity="many">%1$d розділів</item>
+        <item quantity="other">%1$d розділів</item>
+    </plurals>
+    <plurals name="months_ago">
+        <item quantity="one">%1$d місяць тому</item>
+        <item quantity="few">%1$d місяця тому</item>
+        <item quantity="many">%1$d місяців тому</item>
+        <item quantity="other">%1$d місяців тому</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8a90c4324..e45d6b18f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -88,7 +88,7 @@
     <string name="text_empty_holder_primary">Тут якось пусто…</string>
     <string name="text_search_holder_secondary">Спробуйте переформулювати запит.</string>
     <string name="text_history_holder_primary">Те, що ви читаєте, буде показано тут</string>
-    <string name="text_history_holder_secondary">Знайдіть, що читати, у бічному меню.</string>
+    <string name="text_history_holder_secondary">Знайдіть, що почитати, у розділі «Огляд»</string>
     <string name="text_local_holder_primary">Спочатку збережіть щось</string>
     <string name="text_local_holder_secondary">Збережіть його з онлайн-джерела або імпортуйте файли.</string>
     <string name="manga_shelf">Полиця</string>
@@ -135,7 +135,7 @@
     <string name="backup_information">Ви можете створити резервну копію своєї історії та уподобань і відновити їх</string>
     <string name="just_now">Тільки що</string>
     <string name="tap_to_try_again">Торкніться, щоб спробувати ще раз</string>
-    <string name="reader_mode_hint">Обраний режим буде запам\'ятован для цієї манги</string>
+    <string name="reader_mode_hint">Обраний режим буде запам\'ятован для цієї манґи</string>
     <string name="captcha_required">Потрібна CAPTCHA</string>
     <string name="captcha_solve">Пройти</string>
     <string name="clear_cookies">Очистити кукі</string>
@@ -258,8 +258,8 @@
     <string name="send">Надіслати</string>
     <string name="disable_all">Вимкнути все</string>
     <string name="use_fingerprint">Використовувати відбиток пальця, якщо доступно</string>
-    <string name="appwidget_shelf_description">Манга з Вашого улюбленого</string>
-    <string name="appwidget_recent_description">Манга, яку Ви нещодавно читали</string>
+    <string name="appwidget_shelf_description">Манґа з Ваших обраних</string>
+    <string name="appwidget_recent_description">Манґа, яку Ви нещодавно читали</string>
     <string name="invalid_domain_message">Недійсний домен</string>
     <string name="report">Звіт</string>
     <string name="tracking">Відстеження</string>
@@ -278,7 +278,7 @@
     <string name="show_all">Показати всі</string>
     <string name="select_range">Виберіть діапазон</string>
     <string name="not_found_404">Вміст не знайдено або видалено</string>
-    <string name="text_shelf_holder_primary">Ваша манга буде відображатися тут</string>
+    <string name="text_shelf_holder_primary">Ваша манґа буде відображатися тут</string>
     <string name="text_shelf_holder_secondary">Знайдіть, що почитати у розділі «Огляд»</string>
     <string name="back">Назад</string>
     <string name="email_enter_hint">Введіть свою електронну пошту, щоб продовжити</string>
@@ -324,7 +324,7 @@
     <string name="removed_from_favourites">Видалено з уподобань</string>
     <string name="other_cache">Інший кеш</string>
     <string name="memory_usage_pattern">%s - %s</string>
-    <string name="manga_error_description_pattern">Деталі помилки:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Спробуйте &lt;a href=%2$s&gt;відкрити мангу у веб-браузері&lt;/a&gt;, щоб переконатися, що вона доступна в джерелі&lt;br&gt;2. Переконайтеся, що ви використовуєте &lt;a href=kotatsu://about&gt;останню версію Kotatsu&lt;/a&gt;&lt;br&gt;3. Якщо він доступний, надішліть звіт про помилку розробникам.</string>
+    <string name="manga_error_description_pattern">Деталі помилки:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Спробуйте &lt;a href=%2$s&gt;відкрити манґу у веб-браузері&lt;/a&gt;, щоб переконатися, що вона доступна в джерелі&lt;br&gt;2. Переконайтеся, що ви використовуєте &lt;a href=kotatsu://about&gt;останню версію Kotatsu&lt;/a&gt;&lt;br&gt;3. Якщо він доступний, надішліть звіт про помилку розробникам.</string>
     <string name="history_shortcuts">Показувати ярлики останньої прочитаної манґи</string>
     <string name="history_shortcuts_summary">Зробити нещодавно прочитану манґу доступною за довгим натисканням на іконку застосунку</string>
     <string name="reader_control_ltr_summary">Натискання на правий край або натискання правої клавіші завжди переходить на наступну сторінку</string>
@@ -352,7 +352,7 @@
     <string name="theme_name_kanade">Канаде</string>
     <string name="services">Служби</string>
     <string name="nothing_here">Тут нічого нема</string>
-    <string name="scrobbling_empty_hint">Щоб відстежувати прогрес читання, виберіть Меню → Відстежити на екрані деталей манги.</string>
+    <string name="scrobbling_empty_hint">Щоб відстежувати прогрес читання, виберіть Меню → Відстежити на екрані деталей манґи.</string>
     <string name="theme_name_miku">Міку</string>
     <string name="theme_name_asuka">Аска</string>
     <string name="theme_name_mion">Міон</string>
@@ -372,7 +372,7 @@
     <string name="user_agent">Заголовок UserAgent</string>
     <string name="settings_apply_restart_required">Перезапустіть програму, щоб застосувати зміни</string>
     <string name="got_it">Зрозумів</string>
-    <string name="comics_archive_import_description">Ви можете вибрати один або кілька файлів .cbz або .zip, кожен файл буде розпізнано як окрема манга.</string>
+    <string name="comics_archive_import_description">Ви можете вибрати один або кілька файлів .cbz або .zip, кожен файл буде розпізнано як окрема манґа.</string>
     <string name="folder_with_images_import_description">Ви можете вибрати каталог з архівами або зображеннями. Кожен архів (або підкаталог) буде розпізнано як розділ.</string>
     <string name="speed">Швидкість</string>
     <string name="restore_backup_description">Імпортуйте раніше створену резервну копію даних користувача</string>
@@ -396,7 +396,7 @@
     <string name="enable">Увімкнути</string>
     <string name="no_thanks">Ні, дякую</string>
     <string name="suggestion_manga">Пропозиція: %s</string>
-    <string name="suggestions_notifications_summary">Іноді показувати сповіщення з запропонованою мангою</string>
+    <string name="suggestions_notifications_summary">Іноді показувати сповіщення з запропонованою манґою</string>
     <string name="more">Більше</string>
     <string name="cancel_all_downloads_confirm">Усі активні завантаження буде скасовано, частково завантажені дані буде втрачено</string>
     <string name="remove_completed_downloads_confirm">Ваша історія завантажень буде остаточно видалена</string>
@@ -405,7 +405,7 @@
     <string name="downloads_paused">Завантаження призупинено</string>
     <string name="downloads_removed">Завантаження видалено</string>
     <string name="downloads_cancelled">Завантаження скасовано</string>
-    <string name="suggestions_enable_prompt">Хочете отримувати персоналізовані пропозиції щодо манги\?</string>
+    <string name="suggestions_enable_prompt">Хочете отримувати персоналізовані пропозиції щодо манґи\?</string>
     <string name="web_view_unavailable">WebView недоступний: перевірте, чи встановлено провайдер WebView</string>
     <string name="translations">Переклади</string>
     <string name="clear_network_cache">Очистити мережевий кеш</string>
@@ -436,11 +436,34 @@
     <string name="no_access_to_file">Ви не маєте доступу до цього файлу чи каталогу</string>
     <string name="download_option_all_unread">Усі непрочитані розділи</string>
     <string name="download_option_all_chapters">Усі розділи з перекладом %s</string>
-    <string name="download_option_whole_manga">Манга цілком</string>
+    <string name="download_option_whole_manga">Манґа цілком</string>
     <string name="download_option_all_unread_b">Усі непрочитані розділи (%s)</string>
     <string name="download_option_manual_selection">Виберіть розділи вручну</string>
     <string name="local_manga_directories">Локальні каталоги манґи</string>
     <string name="custom_directory">Користувальницький каталог</string>
     <string name="download_option_first_n_chapters">Перші %s</string>
     <string name="download_option_next_unread_n_chapters">Перші непрочитані %s</string>
+    <string name="description">Опис</string>
+    <string name="this_month">Цього місяця</string>
+    <string name="color_dark">Темний</string>
+    <string name="color_black">Чорний</string>
+    <string name="background">Фон</string>
+    <string name="data_not_restored">Дані не відновлено</string>
+    <string name="data_not_restored_text">Переконайтеся, що ви вибрали правильний файл резервної копії</string>
+    <string name="suggestions_wifi_only_summary">Не оновлювати пропозиції під час використання лімітного інтернет-з\'єднання</string>
+    <string name="tracker_wifi_only_summary">Не перевіряти наявність нових розділів під час використання лімітного інтернет-з\'єднання</string>
+    <string name="search_hint">Введіть назву манґи, жанр або назву джерела</string>
+    <string name="progress">Прогрес</string>
+    <string name="order_added">Додано</string>
+    <string name="view_list">Переглянути список</string>
+    <string name="show">Показати</string>
+    <string name="voice_search">Голосовий пошук</string>
+    <string name="related_manga">Схожа манґа</string>
+    <string name="color_light">Світлий</string>
+    <string name="color_white">Білий</string>
+    <string name="manage_categories">Кіровання категоріями</string>
+    <string name="captcha_required_summary">Для належної роботи %s потрібна перевірка captcha</string>
+    <string name="languages">Мови</string>
+    <string name="unknown">Невідомий</string>
+    <string name="in_progress">В процесі</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/color_themes.xml b/app/src/main/res/values-v23/color_themes.xml
index 788787398..17b1a0d67 100644
--- a/app/src/main/res/values-v23/color_themes.xml
+++ b/app/src/main/res/values-v23/color_themes.xml
@@ -3,204 +3,260 @@
 	<!-- Colored themes -->
 	<style name="Theme.Kotatsu.Miku">
 		<item name="colorPrimary">#006A63</item>
+		<item name="colorPrimaryContainer">#72F7EB</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#6EF8EA</item>
 		<item name="colorOnPrimaryContainer">#00201D</item>
+		<item name="colorPrimaryInverse">#50DBCF</item>
 		<item name="colorSecondary">#4A6360</item>
-		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorSecondaryContainer">#CCE8E4</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorOnSecondaryContainer">#051F1D</item>
-		<item name="colorTertiary">#47617A</item>
-		<item name="colorOnTertiary">#FFFFFF</item>
+		<item name="colorTertiary">#00639A</item>
 		<item name="colorTertiaryContainer">#CEE5FF</item>
-		<item name="colorOnTertiaryContainer">#001D33</item>
-		<item name="colorError">#BA1A1A</item>
+		<item name="colorOnTertiary">#FFFFFF</item>
+		<item name="colorOnTertiaryContainer">#001D32</item>
+		<item name="colorSurface">#F7FAF8</item>
+		<item name="colorSurfaceDim">#D8DBD9</item>
+		<item name="colorSurfaceBright">#F7FAF8</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#F2F4F2</item>
+		<item name="colorSurfaceContainer">#ECEEED</item>
+		<item name="colorSurfaceContainerHigh">#E6E9E7</item>
+		<item name="colorSurfaceContainerHighest">#E0E3E1</item>
+		<item name="colorSurfaceVariant">#DAE5E2</item>
+		<item name="colorOnSurface">#191C1C</item>
+		<item name="colorOnSurfaceVariant">#3F4947</item>
+		<item name="colorSurfaceInverse">#2D3130</item>
+		<item name="colorOnSurfaceInverse">#EFF1F0</item>
+		<item name="android:colorBackground">#E6E9E7</item>
+		<item name="colorOnBackground">#191C1C</item>
+		<item name="colorError">#B81F1E</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_miku</item>
-		<item name="colorOnBackground">#191C1C</item>
-		<item name="colorSurface">@color/background_miku</item>
-		<item name="colorOnSurface">#191C1C</item>
-		<item name="colorSurfaceVariant">#DAE5E2</item>
-		<item name="colorOnSurfaceVariant">#3F4947</item>
 		<item name="colorOutline">#6F7977</item>
-		<item name="colorOnSurfaceInverse">#EFF1F0</item>
-		<item name="colorSurfaceInverse">#2D3130</item>
-		<item name="colorPrimaryInverse">#4CDBCE</item>
+		<item name="colorOutlineVariant">#BEC9C6</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Asuka">
 		<item name="colorPrimary">#BA1928</item>
-		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorPrimaryContainer">#FFDAD7</item>
+		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorOnPrimaryContainer">#410005</item>
+		<item name="colorPrimaryInverse">#FFB3AF</item>
 		<item name="colorSecondary">#944B00</item>
-		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorSecondaryContainer">#FFDCC5</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorOnSecondaryContainer">#301400</item>
-		<item name="colorTertiary">#735B2E</item>
+		<item name="colorTertiary">#7C5800</item>
+		<item name="colorTertiaryContainer">#FFDEA7</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFDEA9</item>
 		<item name="colorOnTertiaryContainer">#271900</item>
+		<item name="colorSurface">#FFF8F7</item>
+		<item name="colorSurfaceDim">#E4D7D6</item>
+		<item name="colorSurfaceBright">#FFF8F7</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#FEF1EF</item>
+		<item name="colorSurfaceContainer">#F8EBEA</item>
+		<item name="colorSurfaceContainerHigh">#F2E5E4</item>
+		<item name="colorSurfaceContainerHighest">#EDE0DE</item>
+		<item name="colorSurfaceVariant">#F4DDDB</item>
+		<item name="colorOnSurface">#201A1A</item>
+		<item name="colorOnSurfaceVariant">#534342</item>
+		<item name="colorSurfaceInverse">#362F2E</item>
+		<item name="colorOnSurfaceInverse">#FBEEEC</item>
+		<item name="android:colorBackground">#F2E5E4</item>
+		<item name="colorOnBackground">#201A1A</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_asuka</item>
-		<item name="colorOnBackground">#201A1A</item>
-		<item name="colorSurface">@color/background_asuka</item>
-		<item name="colorOnSurface">#201A1A</item>
-		<item name="colorSurfaceVariant">#F4DDDB</item>
-		<item name="colorOnSurfaceVariant">#534342</item>
 		<item name="colorOutline">#857372</item>
-		<item name="colorOnSurfaceInverse">#FBEEEC</item>
-		<item name="colorSurfaceInverse">#362F2E</item>
-		<item name="colorPrimaryInverse">#FFB3AF</item>
+		<item name="colorOutlineVariant">#D8C1C0</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mion">
-		<item name="colorPrimary">#2D956A</item>
+		<item name="colorPrimary">#006C48</item>
+		<item name="colorPrimaryContainer">#8CF7C2</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#9AF7A8</item>
-		<item name="colorOnPrimaryContainer">#00301C</item>
+		<item name="colorOnPrimaryContainer">#002113</item>
+		<item name="colorPrimaryInverse">#70DBA8</item>
 		<item name="colorSecondary">#725C00</item>
+		<item name="colorSecondaryContainer">#FFE080</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#FFEFC0</item>
 		<item name="colorOnSecondaryContainer">#231B00</item>
-		<item name="colorTertiary">#f28795</item>
+		<item name="colorTertiary">#9B404F</item>
+		<item name="colorTertiaryContainer">#FFD9DC</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFB3BD</item>
-		<item name="colorOnTertiaryContainer">#2B0006</item>
+		<item name="colorOnTertiaryContainer">#400011</item>
+		<item name="colorSurface">#F8FAF6</item>
+		<item name="colorSurfaceDim">#D8DBD6</item>
+		<item name="colorSurfaceBright">#F8FAF6</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#F2F4F0</item>
+		<item name="colorSurfaceContainer">#ECEEEA</item>
+		<item name="colorSurfaceContainerHigh">#E7E9E5</item>
+		<item name="colorSurfaceContainerHighest">#E1E3DF</item>
+		<item name="colorSurfaceVariant">#DCE5DD</item>
+		<item name="colorOnSurface">#191C1A</item>
+		<item name="colorOnSurfaceVariant">#404943</item>
+		<item name="colorSurfaceInverse">#2E312F</item>
+		<item name="colorOnSurfaceInverse">#EFF1ED</item>
+		<item name="android:colorBackground">#E7E9E5</item>
+		<item name="colorOnBackground">#191C1A</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_mion</item>
-		<item name="colorOnBackground">#1A1C19</item>
-		<item name="colorSurface">@color/background_mion</item>
-		<item name="colorOnSurface">#1A1C19</item>
-		<item name="colorSurfaceVariant">#DDE5DA</item>
-		<item name="colorOnSurfaceVariant">#414941</item>
-		<item name="colorOutline">#727970</item>
-		<item name="colorOnSurfaceInverse">#F0F1EC</item>
-		<item name="colorSurfaceInverse">#2E312E</item>
-		<item name="colorPrimaryInverse">#7FDA8E</item>
+		<item name="colorOutline">#707973</item>
+		<item name="colorOutlineVariant">#C0C9C1</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Rikka">
-		<item name="colorPrimary">#4b4965</item>
+		<item name="colorPrimary">#5954A8</item>
+		<item name="colorPrimaryContainer">#E3DFFF</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#E3E1FF</item>
-		<item name="colorOnPrimaryContainer">#1E1C49</item>
-		<item name="colorSecondary">#c44b50</item>
+		<item name="colorOnPrimaryContainer">#140463</item>
+		<item name="colorPrimaryInverse">#C5C0FF</item>
+		<item name="colorSecondary">#A8363D</item>
+		<item name="colorSecondaryContainer">#FFDAD9</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#FFD3D5</item>
-		<item name="colorOnSecondaryContainer">#450003</item>
-		<item name="colorTertiary">#592A2A</item>
+		<item name="colorOnSecondaryContainer">#410008</item>
+		<item name="colorTertiary">#9C4142</item>
+		<item name="colorTertiaryContainer">#FFDAD8</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFD8D8</item>
-		<item name="colorOnTertiaryContainer">#301111</item>
+		<item name="colorOnTertiaryContainer">#410007</item>
+		<item name="colorSurface">#FCF8FD</item>
+		<item name="colorSurfaceDim">#DDD9DD</item>
+		<item name="colorSurfaceBright">#FCF8FD</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#F6F2F7</item>
+		<item name="colorSurfaceContainer">#F1ECF1</item>
+		<item name="colorSurfaceContainerHigh">#EBE7EC</item>
+		<item name="colorSurfaceContainerHighest">#E5E1E6</item>
+		<item name="colorSurfaceVariant">#E5E1EC</item>
+		<item name="colorOnSurface">#1C1B1F</item>
+		<item name="colorOnSurfaceVariant">#47464F</item>
+		<item name="colorSurfaceInverse">#313034</item>
+		<item name="colorOnSurfaceInverse">#F4EFF4</item>
+		<item name="android:colorBackground">#EBE7EC</item>
+		<item name="colorOnBackground">#1C1B1F</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_rikka</item>
-		<item name="colorOnBackground">#1C1B1F</item>
-		<item name="colorSurface">@color/background_rikka</item>
-		<item name="colorOnSurface">#1C1B1F</item>
-		<item name="colorSurfaceVariant">#E4E1EC</item>
-		<item name="colorOnSurfaceVariant">#47464F</item>
-		<item name="colorOutline">#777680</item>
-		<item name="colorOnSurfaceInverse">#F3EFF4</item>
-		<item name="colorSurfaceInverse">#313034</item>
-		<item name="colorPrimaryInverse">#C2C1FF</item>
+		<item name="colorOutline">#787680</item>
+		<item name="colorOutlineVariant">#C8C5D0</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Sakura">
 		<item name="colorPrimary">#B31A62</item>
-		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorPrimaryContainer">#FFD9E2</item>
+		<item name="colorOnPrimary">#FFFFFF</item>
 		<item name="colorOnPrimaryContainer">#3E001D</item>
+		<item name="colorPrimaryInverse">#FFB1C8</item>
 		<item name="colorSecondary">#B12E00</item>
-		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorSecondaryContainer">#FFDBD1</item>
+		<item name="colorOnSecondary">#FFFFFF</item>
 		<item name="colorOnSecondaryContainer">#3B0900</item>
-		<item name="colorTertiary">#7C5635</item>
+		<item name="colorTertiary">#8F4E00</item>
+		<item name="colorTertiaryContainer">#FFDCC2</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFDCC1</item>
 		<item name="colorOnTertiaryContainer">#2E1500</item>
+		<item name="colorSurface">#FFF8F8</item>
+		<item name="colorSurfaceDim">#E3D7D9</item>
+		<item name="colorSurfaceBright">#FFF8F8</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#FDF1F2</item>
+		<item name="colorSurfaceContainer">#F7EBEC</item>
+		<item name="colorSurfaceContainerHigh">#F1E5E7</item>
+		<item name="colorSurfaceContainerHighest">#EBE0E1</item>
+		<item name="colorSurfaceVariant">#F2DDE1</item>
+		<item name="colorOnSurface">#201A1B</item>
+		<item name="colorOnSurfaceVariant">#514347</item>
+		<item name="colorSurfaceInverse">#352F30</item>
+		<item name="colorOnSurfaceInverse">#FAEEEF</item>
+		<item name="android:colorBackground">#F1E5E7</item>
+		<item name="colorOnBackground">#201A1B</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_sakura</item>
-		<item name="colorOnBackground">#201A1B</item>
-		<item name="colorSurface">@color/background_sakura</item>
-		<item name="colorOnSurface">#201A1B</item>
-		<item name="colorSurfaceVariant">#F2DDE1</item>
-		<item name="colorOnSurfaceVariant">#514347</item>
 		<item name="colorOutline">#837377</item>
-		<item name="colorOnSurfaceInverse">#FAEEEF</item>
-		<item name="colorSurfaceInverse">#352F30</item>
-		<item name="colorPrimaryInverse">#FFB1C8</item>
+		<item name="colorOutlineVariant">#D5C2C6</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Mamimi">
-		<item name="colorPrimary">#964d54</item>
+		<item name="colorPrimary">#9C404B</item>
+		<item name="colorPrimaryContainer">#FFDADB</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#FFD6DA</item>
-		<item name="colorOnPrimaryContainer">#400006</item>
-		<item name="colorSecondary">#385068</item>
+		<item name="colorOnPrimaryContainer">#40000E</item>
+		<item name="colorPrimaryInverse">#FFB2B7</item>
+		<item name="colorSecondary">#00639D</item>
+		<item name="colorSecondaryContainer">#CFE5FF</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#CAE5FF</item>
-		<item name="colorOnSecondaryContainer">#002142</item>
-		<item name="colorTertiary">#A19086</item>
+		<item name="colorOnSecondaryContainer">#001D33</item>
+		<item name="colorTertiary">#944A01</item>
+		<item name="colorTertiaryContainer">#FFDCC6</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#FFD7BF</item>
-		<item name="colorOnTertiaryContainer">#491B00</item>
+		<item name="colorOnTertiaryContainer">#301400</item>
+		<item name="colorSurface">#FFF8F7</item>
+		<item name="colorSurfaceDim">#E4D7D7</item>
+		<item name="colorSurfaceBright">#FFF8F7</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#FEF1F0</item>
+		<item name="colorSurfaceContainer">#F8EBEB</item>
+		<item name="colorSurfaceContainerHigh">#F2E5E5</item>
+		<item name="colorSurfaceContainerHighest">#ECE0DF</item>
+		<item name="colorSurfaceVariant">#F4DDDE</item>
+		<item name="colorOnSurface">#201A1A</item>
+		<item name="colorOnSurfaceVariant">#524344</item>
+		<item name="colorSurfaceInverse">#362F2F</item>
+		<item name="colorOnSurfaceInverse">#FBEEED</item>
+		<item name="android:colorBackground">#F2E5E5</item>
+		<item name="colorOnBackground">#201A1A</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_mamimi</item>
-		<item name="colorOnBackground">#201A1B</item>
-		<item name="colorSurface">@color/background_mamimi</item>
-		<item name="colorOnSurface">#201A1B</item>
-		<item name="colorSurfaceVariant">#CAE5FF</item>
-		<item name="colorOnSurfaceVariant">#514347</item>
-		<item name="colorOutline">#837377</item>
-		<item name="colorOnSurfaceInverse">#FAEEEF</item>
-		<item name="colorSurfaceInverse">#352F30</item>
-		<item name="colorPrimaryInverse">#FFB1C8</item>
+		<item name="colorOutline">#857373</item>
+		<item name="colorOutlineVariant">#D7C1C2</item>
 	</style>
 
 	<style name="Theme.Kotatsu.Kanade">
-		<item name="colorPrimary">#5E5E5E</item>
+		<item name="colorPrimary">#A1A1A1</item>
+		<item name="colorPrimaryContainer">#D3D3D3</item>
 		<item name="colorOnPrimary">#FFFFFF</item>
-		<item name="colorPrimaryContainer">#BDBDBD</item>
-		<item name="colorOnPrimaryContainer">#494949</item>
-		<item name="colorSecondary">#757575</item>
+		<item name="colorOnPrimaryContainer">#404040</item>
+		<item name="colorPrimaryInverse">#989898</item>
+		<item name="colorSecondary">#9C9C9C</item>
+		<item name="colorSecondaryContainer">#C1C1C1</item>
 		<item name="colorOnSecondary">#FFFFFF</item>
-		<item name="colorSecondaryContainer">#CCCCCC</item>
 		<item name="colorOnSecondaryContainer">#474747</item>
-		<item name="colorTertiary">#434343</item>
+		<item name="colorTertiary">#919191</item>
+		<item name="colorTertiaryContainer">#C1C1C1</item>
 		<item name="colorOnTertiary">#FFFFFF</item>
-		<item name="colorTertiaryContainer">#919191</item>
-		<item name="colorOnTertiaryContainer">#373737</item>
+		<item name="colorOnTertiaryContainer">#252525</item>
+		<item name="colorSurface">#F3F3F3</item>
+		<item name="colorSurfaceDim">#DCDCDC</item>
+		<item name="colorSurfaceBright">#EDEDED</item>
+		<item name="colorSurfaceContainerLowest">#FFFFFF</item>
+		<item name="colorSurfaceContainerLow">#E3E3E3</item>
+		<item name="colorSurfaceContainer">#E4E4E4</item>
+		<item name="colorSurfaceContainerHigh">#E6E6E6</item>
+		<item name="colorSurfaceContainerHighest">#D8D8D8</item>
+		<item name="colorSurfaceVariant">#C6C6C6</item>
+		<item name="colorOnSurface">#202020</item>
+		<item name="colorOnSurfaceVariant">#505050</item>
+		<item name="colorSurfaceInverse">#373737</item>
+		<item name="colorOnSurfaceInverse">#F1F1F1</item>
+		<item name="android:colorBackground">#E6E6E6</item>
+		<item name="colorOnBackground">#202020</item>
 		<item name="colorError">#BA1A1A</item>
 		<item name="colorErrorContainer">#FFDAD6</item>
 		<item name="colorOnError">#FFFFFF</item>
 		<item name="colorOnErrorContainer">#410002</item>
-		<item name="android:colorBackground">@color/background_kanade</item>
-		<item name="colorOnBackground">#202020</item>
-		<item name="colorSurface">@color/background_kanade</item>
-		<item name="colorOnSurface">#272727</item>
-		<item name="colorSurfaceVariant">#CCCCCC</item>
-		<item name="colorOnSurfaceVariant">#616161</item>
-		<item name="colorOutline">#818181</item>
-		<item name="colorOnSurfaceInverse">#FAEEEF</item>
-		<item name="colorSurfaceInverse">#E4E4E4</item>
-		<item name="colorPrimaryInverse">#8F8F8F</item>
+		<item name="colorOutline">#808080</item>
+		<item name="colorOutlineVariant">#D5D5D5</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index b888a80e4..aae4b36f1 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -13,31 +13,39 @@
 		<item name="isMaterial3DynamicColorApplied">true</item>
 		<!-- Color palettes -->
 		<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
-		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
-		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
 		<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
+		<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
 		<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
+		<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
 		<item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
-		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
 		<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
+		<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
 		<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_light_on_secondary_container</item>
 		<item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
-		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
 		<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
+		<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
 		<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
-		<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
-		<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
 		<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
-		<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
+		<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
+		<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
+		<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_light_surface_container_lowest</item>
+		<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_light_surface_container_low</item>
+		<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container</item>
+		<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_light_surface_container_high</item>
+		<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_light_surface_container_highest</item>
 		<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
+		<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
 		<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
 		<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
 		<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
-		<item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+		<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
 		<item name="colorError">@color/m3_sys_color_light_error</item>
-		<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
 		<item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
+		<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
 		<item name="colorOnErrorContainer">@color/m3_sys_color_light_on_error_container</item>
+		<item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+		<item name="colorOutlineVariant">@color/m3_sys_color_dynamic_light_outline_variant</item>
+		<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_surface_container_high</item>
 		<!-- Default Framework Text Colors. -->
 		<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
 		<item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 18a373ee1..219deea06 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -9,7 +9,7 @@
     <string name="list">Danh sách</string>
     <string name="settings">Cài đặt</string>
     <string name="remote_sources">Nguồn truyện</string>
-    <string name="list_mode">Dạng danh sách</string>
+    <string name="list_mode">Chế độ hiển thị</string>
     <string name="chapter_d_of_d">Chương %1$d trên %2$d</string>
     <string name="close">Đóng</string>
     <string name="nothing_found">Không tìm thấy kết quả</string>
@@ -23,7 +23,7 @@
     <string name="manga_downloading_">Đang tải xuống…</string>
     <string name="by_name">Tên</string>
     <string name="updated">Mới cập nhật</string>
-    <string name="newest">Mới đăng</string>
+    <string name="newest">Mới nhất</string>
     <string name="by_rating">Đánh giá</string>
     <string name="filter">Bộ lọc</string>
     <string name="theme">Chủ đề</string>
@@ -71,7 +71,7 @@
     <string name="text_local_holder_primary">Lưu gì đó trước</string>
     <string name="manga_shelf">Tủ truyện</string>
     <string name="pages_animation">Hoạt ảnh chuyển trang</string>
-    <string name="manga_save_location">Thư mục lưu truyện tải xuống</string>
+    <string name="manga_save_location">Thư mục tải xuống</string>
     <string name="not_available">Không khả dụng</string>
     <string name="cannot_find_available_storage">Không có bộ nhớ khả dụng</string>
     <string name="other_storage">Bộ nhớ khác</string>
@@ -83,7 +83,7 @@
     <string name="size_s">Kích thước: %s</string>
     <string name="rotate_screen">Xoay màn hình</string>
     <string name="feed_will_update_soon">Cập nhật danh sách sẽ bắt đầu sớm</string>
-    <string name="track_sources">Tìm kiếm cập nhật mới trong</string>
+    <string name="track_sources">Tìm kiếm bản cập nhật mới</string>
     <string name="dont_check">Không kiểm tra</string>
     <string name="enter_password">Nhập mật khẩu</string>
     <string name="protect_application_summary">Hỏi mật khẩu khi khởi động Kotatsu</string>
@@ -98,7 +98,7 @@
     <string name="zoom_mode_fit_center">Vừa màn hình</string>
     <string name="zoom_mode_fit_height">Vừa chiều dọc</string>
     <string name="zoom_mode_keep_start">Giữ ở đầu</string>
-    <string name="black_dark_theme">Đen</string>
+    <string name="black_dark_theme">Nền đen</string>
     <string name="backup_restore">Sao lưu và khôi phục</string>
     <string name="preparing_">Đang chuẩn bị…</string>
     <string name="backup_information">Bạn có thể tạo bản sao lưu lịch sử, danh sách yêu thích và khôi phục nó</string>
@@ -183,7 +183,7 @@
     <string name="theme_name_dynamic">Động</string>
     <string name="error_occurred">Đã xảy ra lỗi</string>
     <string name="history">Lịch sử</string>
-    <string name="grid">Lưới</string>
+    <string name="grid">Dạng lưới</string>
     <string name="detailed_list">Danh sách chi tiết</string>
     <string name="computing_">Đang tính toán…</string>
     <string name="loading_">Đang tải…</string>
@@ -193,7 +193,7 @@
     <string name="share">Chia sẻ</string>
     <string name="download_complete">Đã tải xuống</string>
     <string name="save">Lưu</string>
-    <string name="add_new_category">Danh sách mới</string>
+    <string name="add_new_category">Danh mục mới</string>
     <string name="search">Tìm kiếm</string>
     <string name="processing_">Đang xử lý…</string>
     <string name="downloads">Danh sách tải xuống</string>
@@ -213,7 +213,7 @@
     <string name="available_sources">Nguồn khả dụng</string>
     <string name="screenshots_allow">Cho phép</string>
     <string name="suggestions_info">Tất cả dữ liệu chỉ được phân tích cục bộ trên thiết bị này và không bao giờ gửi đi nơi nào khác.</string>
-    <string name="all_favourites">Tất cả yêu thích</string>
+    <string name="all_favourites">Tất cả truyện yêu thích</string>
     <string name="new_version_s">Phiên bản mới: %s</string>
     <string name="clear_updates_feed">Xoá danh sách cập nhật</string>
     <string name="updates_feed_cleared">Đã xoá</string>
@@ -427,4 +427,5 @@
     <string name="memory_usage_pattern">%s - %s</string>
     <string name="web_view_unavailable">WebView hiện không có sẵn, vui lòng kiểm tra trình cung cấp WebView liệu có được cài đặt</string>
     <string name="manga_error_description_pattern">Chi tiết lỗi:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Hãy thử mở truyện trong trình duyệt&lt;/a&gt; để đảm bảo rằng nó có sẵn trên nguồn truyện&lt;br&gt;2. Hãy chắc chắn rằng bạn đang sử dụng &lt;a href=kotatsu://about&gt;phiên bản mới nhất của Kotatsu&lt;/a&gt;&lt;br&gt;3. Nếu có thể, hãy gửi một báo cáo lỗi cho nhà phát triển.</string>
+    <string name="text_history_holder_secondary">Tìm truyện để đọc trong phần «Khám phá»</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp-land/integers.xml b/app/src/main/res/values-w600dp-land/integers.xml
index 1736bebc3..573393f74 100644
--- a/app/src/main/res/values-w600dp-land/integers.xml
+++ b/app/src/main/res/values-w600dp-land/integers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<integer name="explore_buttons_columns">3</integer>
-</resources>
\ No newline at end of file
+	<integer name="explore_buttons_columns">4</integer>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 96957ff20..c7a97a87b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,416 +1,429 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-	<string name="settings">设置</string>
-	<string name="local_storage">本地存储</string>
-	<string name="favourites">喜欢</string>
-	<string name="history">历史</string>
-	<string name="error_occurred">发生了一个错误</string>
-	<string name="network_error">网络错误</string>
-	<string name="chapters">章节</string>
-	<string name="list">列表</string>
-	<string name="data_restored_with_errors">数据被恢复了，但有错误</string>
-	<string name="processing_">正在处理…</string>
-	<string name="newest">最新</string>
-	<string name="by_rating">评分</string>
-	<string name="cookies_cleared">已删除所有 cookie</string>
-	<string name="data_restored_success">所有数据都被恢复了</string>
-	<string name="silent">无声</string>
-	<string name="preparing_">准备…</string>
-	<string name="file_not_found">未找到文件</string>
-	<string name="yesterday">昨日</string>
-	<string name="backup_information">你可以创建你的历史和收藏的备份并恢复它</string>
-	<string name="just_now">现在</string>
-	<string name="long_ago">很久以前</string>
-	<string name="group">组</string>
-	<string name="tap_to_try_again">轻点以重试</string>
-	<string name="reader_mode_hint">所选择的配置将因这部漫画而被记住</string>
-	<string name="captcha_required">需要验证码</string>
-	<string name="captcha_solve">解决</string>
-	<string name="today">今天</string>
-	<string name="clear_cookies">清除cookies</string>
-	<string name="new_sources_text">有新的漫画源可用</string>
-	<string name="suggestions_summary">根据你的喜好推荐漫画</string>
-	<string name="suggestions_info">所有的数据都在这个设备上进行本地分析，不会发送到任何地方。</string>
-	<string name="never">从不</string>
-	<string name="show_notification_new_chapters_on">你会收到你正在阅读的漫画的更新通知</string>
-	<string name="nsfw">18+</string>
-	<string name="various_languages">各种语言</string>
-	<string name="search_chapters">查找章节</string>
-	<string name="suggestions_excluded_genres">排除流派</string>
-	<string name="suggestions_updating">建议更新</string>
-	<string name="check_new_chapters_title">检查新的章节并通知有关情况</string>
-	<string name="details">详细内容</string>
-	<string name="detailed_list">详细列表</string>
-	<string name="grid">网格</string>
-	<string name="list_mode">列表模式</string>
-	<string name="remote_sources">漫画源</string>
-	<string name="loading_">加载中…</string>
-	<string name="computing_">计算中…</string>
-	<string name="chapter_d_of_d">%1$d/%2$d章节</string>
-	<string name="close">关闭</string>
-	<string name="try_again">再试一次</string>
-	<string name="clear_history">清除历史</string>
-	<string name="nothing_found">没有发现</string>
-	<string name="history_is_empty">尚无历史</string>
-	<string name="read">阅读</string>
-	<string name="you_have_not_favourites_yet">尚无收藏夹</string>
-	<string name="add_to_favourites">收藏此漫画</string>
-	<string name="add_new_category">新分类</string>
-	<string name="add">添加</string>
-	<string name="save">保存</string>
-	<string name="share">分享</string>
-	<string name="create_shortcut">创建快捷方式…</string>
-	<string name="share_s">分享%s</string>
-	<string name="search">搜索</string>
-	<string name="search_manga">搜索漫画</string>
-	<string name="manga_downloading_">正在下载…</string>
-	<string name="download_complete">已下载</string>
-	<string name="downloads">下载</string>
-	<string name="by_name">名称</string>
-	<string name="popular">热门</string>
-	<string name="updated">更新</string>
-	<string name="sort_order">排序顺序</string>
-	<string name="filter">过滤器</string>
-	<string name="theme">主题</string>
-	<string name="dark">深色</string>
-	<string name="light">浅色</string>
-	<string name="automatic">跟随系统</string>
-	<string name="pages">页数</string>
-	<string name="clear">清除</string>
-	<string name="text_clear_history_prompt">永久清除所有阅读历史\?</string>
-	<string name="remove">删除</string>
-	<string name="_s_deleted_from_local_storage">\"%s\"从本地存储中删除</string>
-	<string name="save_page">保存页面</string>
-	<string name="page_saved">保存</string>
-	<string name="share_image">分享图片</string>
-	<string name="_import">导入</string>
-	<string name="delete">删除</string>
-	<string name="operation_not_supported">不支持此操作</string>
-	<string name="text_file_not_supported">选择 ZIP 或 CBZ 文件.</string>
-	<string name="no_description">无描述</string>
-	<string name="clear_pages_cache">清除页面缓存</string>
-	<string name="text_file_sizes">B|kB|MB|GB|TB</string>
-	<string name="standard">标准</string>
-	<string name="webtoon">条漫</string>
-	<string name="read_mode">阅读模式</string>
-	<string name="grid_size">网格大小</string>
-	<string name="search_on_s">在%s上搜索</string>
-	<string name="delete_manga">删除漫画</string>
-	<string name="text_delete_local_manga">从设备中永久删除\"%s\"\?</string>
-	<string name="reader_settings">阅读器设置</string>
-	<string name="switch_pages">切换页面</string>
-	<string name="volume_buttons">音量按钮</string>
-	<string name="_continue">继续</string>
-	<string name="taps_on_edges">边缘点击</string>
-	<string name="error">错误</string>
-	<string name="clear_thumbs_cache">清除缩略图缓存</string>
-	<string name="clear_search_history">清除搜索历史</string>
-	<string name="search_history_cleared">清除</string>
-	<string name="gestures_only">仅限手势</string>
-	<string name="internal_storage">内部存储</string>
-	<string name="external_storage">外部存储</string>
-	<string name="domain">范围</string>
-	<string name="app_update_available">新版本应用程序已经推出</string>
-	<string name="open_in_browser">在网络浏览器中打开</string>
-	<string name="large_manga_save_confirm">这部漫画有%s.全部保存\?</string>
-	<string name="save_manga">保存</string>
-	<string name="notifications">通知</string>
-	<string name="new_chapters">新章节</string>
-	<string name="download">下载</string>
-	<string name="notifications_settings">通知设置</string>
-	<string name="notification_sound">通知声音</string>
-	<string name="light_indicator">LED指示器</string>
-	<string name="vibration">振动</string>
-	<string name="favourites_categories">收藏夹分类</string>
-	<string name="remove_category">删除</string>
-	<string name="text_empty_holder_primary">这里有点空…</string>
-	<string name="text_search_holder_secondary">尝试重新表述查询。</string>
-	<string name="text_history_holder_primary">你所读的内容将在这里显示</string>
-	<string name="text_history_holder_secondary">在侧面菜单中找到要读的内容.</string>
-	<string name="text_local_holder_primary">先保存内容</string>
-	<string name="text_local_holder_secondary">从在线来源保存或导入文件.</string>
-	<string name="manga_shelf">书架</string>
-	<string name="recent_manga">最近</string>
-	<string name="pages_animation">页面动画</string>
-	<string name="manga_save_location">下载文件夹</string>
-	<string name="not_available">不详</string>
-	<string name="cannot_find_available_storage">没有可用的存储空间</string>
-	<string name="other_storage">其他存储</string>
-	<string name="done">完成</string>
-	<string name="all_favourites">所有收藏夹</string>
-	<string name="favourites_category_empty">空分类</string>
-	<string name="read_later">稍后阅读</string>
-	<string name="updates">更新</string>
-	<string name="text_feed_holder">你正在阅读的新章节显示在这里</string>
-	<string name="search_results">搜索结果</string>
-	<string name="new_version_s">新版本: %s</string>
-	<string name="clear_updates_feed">清除更新源</string>
-	<string name="updates_feed_cleared">已清除</string>
-	<string name="rotate_screen">旋转屏幕</string>
-	<string name="update">更新</string>
-	<string name="feed_will_update_soon">源更新即将开始</string>
-	<string name="track_sources">查找更新</string>
-	<string name="dont_check">不要检查</string>
-	<string name="enter_password">输入密码</string>
-	<string name="wrong_password">密码错误</string>
-	<string name="protect_application">保护应用程序</string>
-	<string name="protect_application_summary">在启动Kotatsu时要求输入密码</string>
-	<string name="repeat_password">重复密码</string>
-	<string name="passwords_mismatch">密码不匹配</string>
-	<string name="about">关于</string>
-	<string name="app_version">版本%s</string>
-	<string name="check_for_updates">检查更新</string>
-	<string name="no_update_available">没有更新</string>
-	<string name="right_to_left">从右到左</string>
-	<string name="create_category">新分类</string>
-	<string name="scale_mode">缩放模式</string>
-	<string name="zoom_mode_fit_center">适应中心</string>
-	<string name="zoom_mode_fit_height">适应高度</string>
-	<string name="zoom_mode_fit_width">适应宽度</string>
-	<string name="zoom_mode_keep_start">从头开始</string>
-	<string name="black_dark_theme">黑色</string>
-	<string name="black_dark_theme_summary">在AMOLED屏幕上使用更少电池</string>
-	<string name="backup_restore">备份和还原</string>
-	<string name="create_backup">创建数据备份</string>
-	<string name="restore_backup">从备份中恢复</string>
-	<string name="data_restored">恢复</string>
-	<string name="clear_feed">清除文件</string>
-	<string name="text_clear_updates_feed_prompt">永久地清除所有的更新历史？</string>
-	<string name="check_for_new_chapters">检查新的章节</string>
-	<string name="reverse">撤销</string>
-	<string name="sign_in">登录</string>
-	<string name="auth_required">登录后可查看此内容</string>
-	<string name="default_s">默认值: %s</string>
-	<string name="next">下一页</string>
-	<string name="protect_application_subtitle">输入密码以启动应用程序</string>
-	<string name="confirm">确认</string>
-	<string name="password_length_hint">密码必须是4个字符或以上</string>
-	<string name="text_clear_search_history_prompt">永久地删除所有最近的搜索查询？</string>
-	<string name="welcome">欢迎</string>
-	<string name="backup_saved">保存备份</string>
-	<string name="tracker_warning">一些设备有不同的系统行为, 这可能会破坏后台任务.</string>
-	<string name="read_more">阅读更多</string>
-	<string name="queued">排队</string>
-	<string name="chapter_is_missing">该章缺失</string>
-	<string name="about_app_translation_summary">翻译此应用程序</string>
-	<string name="about_app_translation">翻译</string>
-	<string name="auth_complete">授权</string>
-	<string name="auth_not_supported_by">不支持在%s上登录</string>
-	<string name="text_clear_cookies_prompt">你将退出登录所有来源</string>
-	<string name="genres">类型</string>
-	<string name="state_ongoing">连载中</string>
-	<string name="state_finished">已完结</string>
-	<string name="system_default">默认</string>
-	<string name="exclude_nsfw_from_history">将NSFW漫画排除在历史之外</string>
-	<string name="show_pages_numbers">页数</string>
-	<string name="enabled_sources">使用图源</string>
-	<string name="available_sources">现有图源</string>
-	<string name="screenshots_policy">屏幕截图</string>
-	<string name="screenshots_allow">允许</string>
-	<string name="screenshots_block_nsfw">禁止18+</string>
-	<string name="screenshots_block_all">始终阻止</string>
-	<string name="suggestions">建议</string>
-	<string name="suggestions_enable">启用建议</string>
-	<string name="text_suggestion_holder">开始阅读漫画，你会得到个性化的建议</string>
-	<string name="exclude_nsfw_from_suggestions">请勿推荐18+漫画</string>
-	<string name="enabled">启用</string>
-	<string name="disabled">禁用</string>
-	<string name="filter_load_error">无法加载流派列表</string>
-	<string name="reset_filter">重置过滤器</string>
-	<string name="onboard_text">选择你想看的漫画的语言. 你可以在以后的设置中改变它.</string>
-	<string name="only_using_wifi">只在Wi-Fi上使用</string>
-	<string name="always">总是</string>
-	<string name="preload_pages">预加载页面</string>
-	<string name="logged_in_as">以%s身份登录</string>
-	<string name="chapters_empty">这部漫画中没有章节</string>
-	<string name="appearance">外观</string>
-	<string name="suggestions_excluded_genres_summary">指定您不希望在建议中看到的类型</string>
-	<string name="text_delete_local_manga_batch">从设备中永久删除所选项目\?</string>
-	<string name="removal_completed">删除已完成</string>
-	<string name="download_slowdown">下载速度减慢</string>
-	<string name="download_slowdown_summary">有助于避免阻断你的IP地址</string>
-	<string name="local_manga_processing">保存的漫画处理</string>
-	<string name="chapters_will_removed_background">章节将在后台被删除</string>
-	<string name="hide">隐藏</string>
-	<string name="show_notification_new_chapters_off">你将不会收到通知但新的章节将在列表中突出显示</string>
-	<string name="notifications_enable">启用通知</string>
-	<string name="name">命名</string>
-	<string name="edit">编辑</string>
-	<string name="edit_category">编辑分类</string>
-	<string name="empty_favourite_categories">没有收藏夹分类</string>
-	<string name="bookmark_add">添加书签</string>
-	<string name="bookmark_remove">删除书签</string>
-	<string name="bookmarks">书签</string>
-	<string name="bookmark_removed">删除书签</string>
-	<string name="bookmark_added">添加书签</string>
-	<string name="undo">撤销</string>
-	<string name="removed_from_history">从历史中删除</string>
-	<string name="dns_over_https">DNS over HTTPS</string>
-	<string name="default_mode">默认模式</string>
-	<string name="detect_reader_mode">自动检测阅读器模式</string>
-	<string name="detect_reader_mode_summary">自动检测漫画是否为条漫</string>
-	<string name="disable_battery_optimization">禁用电池优化</string>
-	<string name="disable_battery_optimization_summary">帮助进行背景更新检查</string>
-	<string name="crash_text">出了点问题. 请向开发人员提交一份错误报告以帮助我们修复它.</string>
-	<string name="send">发送</string>
-	<string name="disable_all">全部禁用</string>
-	<string name="status_planned">计划</string>
-	<string name="status_on_hold">暂停</string>
-	<string name="report">报告</string>
-	<string name="tracking">追踪</string>
-	<string name="logout">注销</string>
-	<string name="status_reading">阅读</string>
-	<string name="status_re_reading">重读</string>
-	<string name="status_completed">完成</string>
-	<string name="use_fingerprint">使用指纹</string>
-	<string name="appwidget_shelf_description">你喜欢的漫画</string>
-	<string name="appwidget_recent_description">您最近阅读的漫画</string>
-	<string name="show_reading_indicators_summary">在历史和收藏夹中显示阅读百分比</string>
-	<string name="show_reading_indicators">显示阅读进度指标</string>
-	<string name="data_deletion">数据删除</string>
-	<string name="exclude_nsfw_from_history_summary">标记为NSFW的漫画将永远不会被添加到历史中你的进度也不会被保存</string>
-	<string name="clear_cookies_summary">可以在出现一些问题时提供帮助. 所有授权将被视为无效</string>
-	<string name="show_all">显示全部</string>
-	<string name="manga_error_description_pattern">错误详情：&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1.尝试&lt;a href=%2$s&gt;在网络浏览器中打开漫画&lt;/a&gt;以确保在其来源中可用&lt;br&gt;2. 请确保您使用的是&lt;a href=kotatsu://about&gt;最新版本的Kotatsu&lt;/a&gt;&lt;br&gt;3.如果可用，请向开发人员发送错误报告。</string>
-	<string name="invalid_domain_message">无效域名</string>
-	<string name="text_shelf_holder_primary">此处将显示你的漫画</string>
-	<string name="text_shelf_holder_secondary">在【浏览】页面搜索想要阅读的漫画</string>
-	<string name="percent_string_pattern">%1$s%%</string>
-	<string name="canceled">已取消</string>
-	<string name="account_already_exists">账号已存在</string>
-	<string name="back">返回</string>
-	<string name="sync">同步</string>
-	<string name="sync_title">同步您的数据</string>
-	<string name="email_enter_hint">输入您的邮箱以继续</string>
-	<string name="status_dropped">已放弃</string>
-	<string name="select_range">选择范围</string>
-	<string name="clear_all_history">清除所有历史</string>
-	<string name="last_2_hours">过去2小时</string>
-	<string name="bookmarks_removed">书签已移除</string>
-	<string name="history_cleared">历史已清除</string>
-	<string name="manage">管理</string>
-	<string name="no_bookmarks_yet">还没有书签</string>
-	<string name="no_bookmarks_summary">您可以在阅读漫画时创建书签</string>
-	<string name="no_manga_sources">无漫画源</string>
-	<string name="no_manga_sources_text">启用漫画源以在线阅读漫画</string>
-	<string name="random">随机</string>
-	<string name="categories_delete_confirm">您确定要删除选定的收藏夹吗？
+    <string name="settings">设置</string>
+    <string name="local_storage">本地存储</string>
+    <string name="favourites">喜欢</string>
+    <string name="history">历史</string>
+    <string name="error_occurred">发生了一个错误</string>
+    <string name="network_error">网络错误</string>
+    <string name="chapters">章节</string>
+    <string name="list">列表</string>
+    <string name="data_restored_with_errors">数据被恢复了，但有错误</string>
+    <string name="processing_">正在处理…</string>
+    <string name="newest">最新</string>
+    <string name="by_rating">评分</string>
+    <string name="cookies_cleared">已删除所有 cookie</string>
+    <string name="data_restored_success">所有数据都被恢复了</string>
+    <string name="silent">无声</string>
+    <string name="preparing_">准备…</string>
+    <string name="file_not_found">未找到文件</string>
+    <string name="yesterday">昨日</string>
+    <string name="backup_information">你可以创建你的历史和收藏的备份并恢复它</string>
+    <string name="just_now">现在</string>
+    <string name="long_ago">很久以前</string>
+    <string name="group">组</string>
+    <string name="tap_to_try_again">轻点以重试</string>
+    <string name="reader_mode_hint">所选择的配置将因这部漫画而被记住</string>
+    <string name="captcha_required">需要验证码</string>
+    <string name="captcha_solve">解决</string>
+    <string name="today">今天</string>
+    <string name="clear_cookies">清除cookies</string>
+    <string name="new_sources_text">有新的漫画源可用</string>
+    <string name="suggestions_summary">根据你的喜好推荐漫画</string>
+    <string name="suggestions_info">所有的数据都在这个设备上进行本地分析，不会发送到任何地方。</string>
+    <string name="never">从不</string>
+    <string name="show_notification_new_chapters_on">你会收到你正在阅读的漫画的更新通知</string>
+    <string name="nsfw">18+</string>
+    <string name="various_languages">各种语言</string>
+    <string name="search_chapters">查找章节</string>
+    <string name="suggestions_excluded_genres">排除流派</string>
+    <string name="suggestions_updating">建议更新</string>
+    <string name="check_new_chapters_title">检查新的章节并通知有关情况</string>
+    <string name="details">详细内容</string>
+    <string name="detailed_list">详细列表</string>
+    <string name="grid">网格</string>
+    <string name="list_mode">列表模式</string>
+    <string name="remote_sources">漫画源</string>
+    <string name="loading_">加载中…</string>
+    <string name="computing_">计算中…</string>
+    <string name="chapter_d_of_d">%1$d/%2$d章节</string>
+    <string name="close">关闭</string>
+    <string name="try_again">再试一次</string>
+    <string name="clear_history">清除历史</string>
+    <string name="nothing_found">没有发现</string>
+    <string name="history_is_empty">尚无历史</string>
+    <string name="read">阅读</string>
+    <string name="you_have_not_favourites_yet">尚无收藏夹</string>
+    <string name="add_to_favourites">收藏此漫画</string>
+    <string name="add_new_category">新分类</string>
+    <string name="add">添加</string>
+    <string name="save">保存</string>
+    <string name="share">分享</string>
+    <string name="create_shortcut">创建快捷方式…</string>
+    <string name="share_s">分享%s</string>
+    <string name="search">搜索</string>
+    <string name="search_manga">搜索漫画</string>
+    <string name="manga_downloading_">正在下载…</string>
+    <string name="download_complete">已下载</string>
+    <string name="downloads">下载</string>
+    <string name="by_name">名称</string>
+    <string name="popular">热门</string>
+    <string name="updated">更新</string>
+    <string name="sort_order">排序顺序</string>
+    <string name="filter">过滤器</string>
+    <string name="theme">主题</string>
+    <string name="dark">深色</string>
+    <string name="light">浅色</string>
+    <string name="automatic">跟随系统</string>
+    <string name="pages">页数</string>
+    <string name="clear">清除</string>
+    <string name="text_clear_history_prompt">永久清除所有阅读历史\?</string>
+    <string name="remove">删除</string>
+    <string name="_s_deleted_from_local_storage">\"%s\"从本地存储中删除</string>
+    <string name="save_page">保存页面</string>
+    <string name="page_saved">保存</string>
+    <string name="share_image">分享图片</string>
+    <string name="_import">导入</string>
+    <string name="delete">删除</string>
+    <string name="operation_not_supported">不支持此操作</string>
+    <string name="text_file_not_supported">选择 ZIP 或 CBZ 文件.</string>
+    <string name="no_description">无描述</string>
+    <string name="clear_pages_cache">清除页面缓存</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="standard">标准</string>
+    <string name="webtoon">条漫</string>
+    <string name="read_mode">阅读模式</string>
+    <string name="grid_size">网格大小</string>
+    <string name="search_on_s">在%s上搜索</string>
+    <string name="delete_manga">删除漫画</string>
+    <string name="text_delete_local_manga">从设备中永久删除\"%s\"\?</string>
+    <string name="reader_settings">阅读器设置</string>
+    <string name="switch_pages">切换页面</string>
+    <string name="volume_buttons">音量按钮</string>
+    <string name="_continue">继续</string>
+    <string name="taps_on_edges">边缘点击</string>
+    <string name="error">错误</string>
+    <string name="clear_thumbs_cache">清除缩略图缓存</string>
+    <string name="clear_search_history">清除搜索历史</string>
+    <string name="search_history_cleared">清除</string>
+    <string name="gestures_only">仅限手势</string>
+    <string name="internal_storage">内部存储</string>
+    <string name="external_storage">外部存储</string>
+    <string name="domain">范围</string>
+    <string name="app_update_available">新版本应用程序已经推出</string>
+    <string name="open_in_browser">在网络浏览器中打开</string>
+    <string name="large_manga_save_confirm">这部漫画有%s.全部保存\?</string>
+    <string name="save_manga">保存</string>
+    <string name="notifications">通知</string>
+    <string name="new_chapters">新章节</string>
+    <string name="download">下载</string>
+    <string name="notifications_settings">通知设置</string>
+    <string name="notification_sound">通知声音</string>
+    <string name="light_indicator">LED指示器</string>
+    <string name="vibration">振动</string>
+    <string name="favourites_categories">收藏夹分类</string>
+    <string name="remove_category">删除</string>
+    <string name="text_empty_holder_primary">这里有点空…</string>
+    <string name="text_search_holder_secondary">尝试重新表述查询。</string>
+    <string name="text_history_holder_primary">你所读的内容将在这里显示</string>
+    <string name="text_history_holder_secondary">在 «探索»部分找到要读的内容</string>
+    <string name="text_local_holder_primary">先保存内容</string>
+    <string name="text_local_holder_secondary">从在线来源保存或导入文件.</string>
+    <string name="manga_shelf">书架</string>
+    <string name="recent_manga">最近</string>
+    <string name="pages_animation">页面动画</string>
+    <string name="manga_save_location">下载文件夹</string>
+    <string name="not_available">不详</string>
+    <string name="cannot_find_available_storage">没有可用的存储空间</string>
+    <string name="other_storage">其他存储</string>
+    <string name="done">完成</string>
+    <string name="all_favourites">所有收藏夹</string>
+    <string name="favourites_category_empty">空分类</string>
+    <string name="read_later">稍后阅读</string>
+    <string name="updates">更新</string>
+    <string name="text_feed_holder">你正在阅读的新章节显示在这里</string>
+    <string name="search_results">搜索结果</string>
+    <string name="new_version_s">新版本: %s</string>
+    <string name="clear_updates_feed">清除更新源</string>
+    <string name="updates_feed_cleared">已清除</string>
+    <string name="rotate_screen">旋转屏幕</string>
+    <string name="update">更新</string>
+    <string name="feed_will_update_soon">源更新即将开始</string>
+    <string name="track_sources">查找更新</string>
+    <string name="dont_check">不要检查</string>
+    <string name="enter_password">输入密码</string>
+    <string name="wrong_password">密码错误</string>
+    <string name="protect_application">保护应用程序</string>
+    <string name="protect_application_summary">在启动Kotatsu时要求输入密码</string>
+    <string name="repeat_password">重复密码</string>
+    <string name="passwords_mismatch">密码不匹配</string>
+    <string name="about">关于</string>
+    <string name="app_version">版本%s</string>
+    <string name="check_for_updates">检查更新</string>
+    <string name="no_update_available">没有更新</string>
+    <string name="right_to_left">从右到左</string>
+    <string name="create_category">新分类</string>
+    <string name="scale_mode">缩放模式</string>
+    <string name="zoom_mode_fit_center">适应中心</string>
+    <string name="zoom_mode_fit_height">适应高度</string>
+    <string name="zoom_mode_fit_width">适应宽度</string>
+    <string name="zoom_mode_keep_start">从头开始</string>
+    <string name="black_dark_theme">黑色</string>
+    <string name="black_dark_theme_summary">在AMOLED屏幕上使用更少电池</string>
+    <string name="backup_restore">备份和还原</string>
+    <string name="create_backup">创建数据备份</string>
+    <string name="restore_backup">从备份中恢复</string>
+    <string name="data_restored">恢复</string>
+    <string name="clear_feed">清除文件</string>
+    <string name="text_clear_updates_feed_prompt">永久地清除所有的更新历史？</string>
+    <string name="check_for_new_chapters">检查新的章节</string>
+    <string name="reverse">倒序</string>
+    <string name="sign_in">登录</string>
+    <string name="auth_required">登录后可查看此内容</string>
+    <string name="default_s">默认值: %s</string>
+    <string name="next">下一页</string>
+    <string name="protect_application_subtitle">输入密码以启动应用程序</string>
+    <string name="confirm">确认</string>
+    <string name="password_length_hint">密码必须是4个字符或以上</string>
+    <string name="text_clear_search_history_prompt">永久地删除所有最近的搜索查询？</string>
+    <string name="welcome">欢迎</string>
+    <string name="backup_saved">保存备份</string>
+    <string name="tracker_warning">一些设备有不同的系统行为, 这可能会破坏后台任务.</string>
+    <string name="read_more">阅读更多</string>
+    <string name="queued">排队</string>
+    <string name="chapter_is_missing">该章缺失</string>
+    <string name="about_app_translation_summary">翻译此应用程序</string>
+    <string name="about_app_translation">翻译</string>
+    <string name="auth_complete">授权</string>
+    <string name="auth_not_supported_by">不支持在%s上登录</string>
+    <string name="text_clear_cookies_prompt">你将退出登录所有来源</string>
+    <string name="genres">类型</string>
+    <string name="state_ongoing">连载中</string>
+    <string name="state_finished">已完结</string>
+    <string name="system_default">默认</string>
+    <string name="exclude_nsfw_from_history">将NSFW漫画排除在历史之外</string>
+    <string name="show_pages_numbers">页数</string>
+    <string name="enabled_sources">使用图源</string>
+    <string name="available_sources">现有图源</string>
+    <string name="screenshots_policy">屏幕截图</string>
+    <string name="screenshots_allow">允许</string>
+    <string name="screenshots_block_nsfw">禁止18+</string>
+    <string name="screenshots_block_all">始终阻止</string>
+    <string name="suggestions">建议</string>
+    <string name="suggestions_enable">启用建议</string>
+    <string name="text_suggestion_holder">开始阅读漫画，你会得到个性化的建议</string>
+    <string name="exclude_nsfw_from_suggestions">请勿推荐18+漫画</string>
+    <string name="enabled">启用</string>
+    <string name="disabled">禁用</string>
+    <string name="filter_load_error">无法加载流派列表</string>
+    <string name="reset_filter">重置过滤器</string>
+    <string name="onboard_text">选择你想看的漫画的语言. 你可以在以后的设置中改变它.</string>
+    <string name="only_using_wifi">只在Wi-Fi上使用</string>
+    <string name="always">总是</string>
+    <string name="preload_pages">预加载页面</string>
+    <string name="logged_in_as">以%s身份登录</string>
+    <string name="chapters_empty">这部漫画中没有章节</string>
+    <string name="appearance">外观</string>
+    <string name="suggestions_excluded_genres_summary">指定您不希望在建议中看到的类型</string>
+    <string name="text_delete_local_manga_batch">从设备中永久删除所选项目\?</string>
+    <string name="removal_completed">删除已完成</string>
+    <string name="download_slowdown">下载速度减慢</string>
+    <string name="download_slowdown_summary">有助于避免阻断你的IP地址</string>
+    <string name="local_manga_processing">保存的漫画处理</string>
+    <string name="chapters_will_removed_background">章节将在后台被删除</string>
+    <string name="hide">隐藏</string>
+    <string name="show_notification_new_chapters_off">你将不会收到通知但新的章节将在列表中突出显示</string>
+    <string name="notifications_enable">启用通知</string>
+    <string name="name">命名</string>
+    <string name="edit">编辑</string>
+    <string name="edit_category">编辑分类</string>
+    <string name="empty_favourite_categories">没有收藏夹分类</string>
+    <string name="bookmark_add">添加书签</string>
+    <string name="bookmark_remove">删除书签</string>
+    <string name="bookmarks">书签</string>
+    <string name="bookmark_removed">删除书签</string>
+    <string name="bookmark_added">添加书签</string>
+    <string name="undo">撤销</string>
+    <string name="removed_from_history">从历史中删除</string>
+    <string name="dns_over_https">DNS over HTTPS</string>
+    <string name="default_mode">默认模式</string>
+    <string name="detect_reader_mode">自动检测阅读器模式</string>
+    <string name="detect_reader_mode_summary">自动检测漫画是否为条漫</string>
+    <string name="disable_battery_optimization">禁用电池优化</string>
+    <string name="disable_battery_optimization_summary">帮助进行背景更新检查</string>
+    <string name="crash_text">出了点问题. 请向开发人员提交一份错误报告以帮助我们修复它.</string>
+    <string name="send">发送</string>
+    <string name="disable_all">全部禁用</string>
+    <string name="status_planned">计划</string>
+    <string name="status_on_hold">暂停</string>
+    <string name="report">报告</string>
+    <string name="tracking">追踪</string>
+    <string name="logout">注销</string>
+    <string name="status_reading">阅读</string>
+    <string name="status_re_reading">重读</string>
+    <string name="status_completed">完成</string>
+    <string name="use_fingerprint">使用指纹</string>
+    <string name="appwidget_shelf_description">你喜欢的漫画</string>
+    <string name="appwidget_recent_description">您最近阅读的漫画</string>
+    <string name="show_reading_indicators_summary">在历史和收藏夹中显示阅读百分比</string>
+    <string name="show_reading_indicators">显示阅读进度指标</string>
+    <string name="data_deletion">数据删除</string>
+    <string name="exclude_nsfw_from_history_summary">标记为NSFW的漫画将永远不会被添加到历史中你的进度也不会被保存</string>
+    <string name="clear_cookies_summary">可以在出现一些问题时提供帮助. 所有授权将被视为无效</string>
+    <string name="show_all">显示全部</string>
+    <string name="manga_error_description_pattern">错误详情：&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1.尝试&lt;a href=%2$s&gt;在网络浏览器中打开漫画&lt;/a&gt;以确保在其来源中可用&lt;br&gt;2. 请确保您使用的是&lt;a href=kotatsu://about&gt;最新版本的Kotatsu&lt;/a&gt;&lt;br&gt;3.如果可用，请向开发人员发送错误报告。</string>
+    <string name="invalid_domain_message">无效域名</string>
+    <string name="text_shelf_holder_primary">此处将显示你的漫画</string>
+    <string name="text_shelf_holder_secondary">在【浏览】页面搜索想要阅读的漫画</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="canceled">已取消</string>
+    <string name="account_already_exists">账号已存在</string>
+    <string name="back">返回</string>
+    <string name="sync">同步</string>
+    <string name="sync_title">同步您的数据</string>
+    <string name="email_enter_hint">输入您的邮箱以继续</string>
+    <string name="status_dropped">已放弃</string>
+    <string name="select_range">选择范围</string>
+    <string name="clear_all_history">清除所有历史</string>
+    <string name="last_2_hours">过去2小时</string>
+    <string name="bookmarks_removed">书签已移除</string>
+    <string name="history_cleared">历史已清除</string>
+    <string name="manage">管理</string>
+    <string name="no_bookmarks_yet">还没有书签</string>
+    <string name="no_bookmarks_summary">您可以在阅读漫画时创建书签</string>
+    <string name="no_manga_sources">无漫画源</string>
+    <string name="no_manga_sources_text">启用漫画源以在线阅读漫画</string>
+    <string name="random">随机</string>
+    <string name="categories_delete_confirm">您确定要删除选定的收藏夹吗？
 \n所有收藏夹中的漫画将丢失且无法恢复。</string>
-	<string name="reorder">重新排序</string>
-	<string name="empty">留空</string>
-	<string name="explore">浏览</string>
-	<string name="automatic_scroll">自动滚动</string>
-	<string name="reader_info_bar">在阅读器中显示信息栏</string>
-	<string name="comics_archive">漫画压缩包</string>
-	<string name="folder_with_images">图片文件夹</string>
-	<string name="importing_manga">漫画导入中</string>
-	<string name="reader_info_pattern">Ch. %1$d/%2$d Pg. %3$d/%4$d</string>
-	<string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d 的 %2$d 启用</string>
-	<string name="size_s">大小：%s</string>
-	<string name="confirm_exit">再按一次返回键退出</string>
-	<string name="exit_confirmation_summary">按两次返回键退出应用</string>
-	<string name="exit_confirmation">退出确认</string>
-	<string name="saved_manga">已保存漫画</string>
-	<string name="pages_cache">页面缓存</string>
-	<string name="other_cache">其他缓存</string>
-	<string name="storage_usage">存储占用</string>
-	<string name="available">可用</string>
-	<string name="removed_from_favourites">从收藏中移除</string>
-	<string name="options">选项</string>
-	<string name="incognito_mode">隐身模式</string>
-	<string name="no_chapters">无章节</string>
-	<string name="import_completed">导入完毕</string>
-	<string name="import_completed_hint">您可以从存储中删除原文件以节省空间</string>
-	<string name="import_will_start_soon">即将开始导入</string>
-	<string name="feed">订阅源</string>
-	<string name="memory_usage_pattern">%s - %s</string>
-	<string name="not_found_404">内容未找到或已移除</string>
-	<string name="reader_control_ltr_summary">点击屏幕右侧或按下右键翻到下一页</string>
-	<string name="reader_control_ltr">高效阅读器控制</string>
-	<string name="history_shortcuts_summary">长按应用图标显示最近阅读的漫画</string>
-	<string name="history_shortcuts">显示最近阅读漫画的快捷方式</string>
-	<string name="reset">重置</string>
-	<string name="color_correction">颜色校正</string>
-	<string name="brightness">亮度</string>
-	<string name="contrast">对比度</string>
-	<string name="color_correction_hint">所选颜色设置将会应用于此漫画</string>
-	<string name="text_unsaved_changes_prompt">保存还是放弃未保存的更改？</string>
-	<string name="discard">放弃</string>
-	<string name="error_no_space_left">设备上没有剩余空间</string>
-	<string name="reader_slider">显示换页滑块</string>
-	<string name="webtoon_zoom">Webtoon 缩放</string>
-	<string name="different_languages">不同语言</string>
-	<string name="network_unavailable">网络不可用</string>
-	<string name="network_unavailable_hint">打开 Wi-Fi 或移动网络在线阅读漫画</string>
-	<string name="clear_new_chapters_counters">同样清除新章节信息</string>
-	<string name="server_error">服务器端错误 (%1$d)。请稍后再试</string>
-	<string name="compact">紧凑</string>
-	<string name="source_disabled">已禁用图源</string>
-	<string name="prefetch_content">内容预加载</string>
-	<string name="mark_as_current">标为当前</string>
-	<string name="language">语言</string>
-	<string name="enable_logging">启用日志记录</string>
-	<string name="share_logs">分享日志</string>
-	<string name="enable_logging_summary">出于调试目的记录某些操作</string>
-	<string name="show_suspicious_content">显示可疑内容</string>
-	<string name="theme_name_dynamic">动态</string>
-	<string name="color_theme">颜色方案</string>
-	<string name="show_in_grid_view">用网格视图显示</string>
-	<string name="theme_name_miku">Miku</string>
-	<string name="theme_name_asuka">Asuka</string>
-	<string name="theme_name_mion">Mion</string>
-	<string name="theme_name_rikka">Rikka</string>
-	<string name="theme_name_sakura">Sakura</string>
-	<string name="services">服务</string>
-	<string name="theme_name_mamimi">Mamimi</string>
-	<string name="theme_name_kanade">Kanade</string>
-	<string name="nothing_here">这里什么也没有</string>
-	<string name="scrobbling_empty_hint">要跟踪阅读进度，在漫画详情屏幕上选中“菜单→ 跟踪。</string>
-	<string name="allow_unstable_updates">允许不稳定更新</string>
-	<string name="allow_unstable_updates_summary">提示更新到测试版</string>
-	<string name="download_started">已开始下载</string>
-	<string name="user_agent">UserAgent 标头</string>
-	<string name="settings_apply_restart_required">要应用这些更改请重启程序</string>
-	<string name="sources_reorder_tip">点击并长按项目排序</string>
-	<string name="got_it">知道了</string>
-	<string name="speed">速度</string>
-	<string name="restore_backup_description">导入先前创建的用户数据备份</string>
-	<string name="show_on_shelf">在书架上显示</string>
-	<string name="comics_archive_import_description">您可以选择一个或多个cbz或zip文件，每个文件都将识别为一个单独的漫画。</string>
-	<string name="folder_with_images_import_description">您可以选择一个包含压缩包或图片的文件夹。每个压缩包（或子文件夹）都会被识别为一个章节。</string>
-	<string name="find_similar">寻找相似</string>
-	<string name="translations">翻译</string>
-	<string name="web_view_unavailable">WebView不可用：检查是否已安装WebView</string>
-	<string name="sync_host_description">你可以使用自建同步服务器或默认服务器。如果你不知道自己在干什么请不要修改此处。</string>
-	<string name="mirror_switching">自动选择镜像</string>
-	<string name="mirror_switching_summary">如果存在可用镜像，在出错时自动切换域名</string>
-	<string name="paused">已暂停</string>
-	<string name="downloads_wifi_only_summary">切换到移动网络时停止下载</string>
-	<string name="remove_completed">移除已完成</string>
-	<string name="cancel_all">取消所有</string>
-	<string name="downloads_wifi_only">仅通过Wi-Fi下载</string>
-	<string name="enable">启用</string>
-	<string name="no_thanks">不，谢谢</string>
-	<string name="sync_settings">同步设定</string>
-	<string name="server_address">服务器地址</string>
-	<string name="pause">暂停</string>
-	<string name="resume">恢复</string>
-	<string name="ignore_ssl_errors">忽略SSL错误</string>
-	<string name="text_downloads_list_holder">没有下载项</string>
-	<string name="downloads_resumed">下载已经恢复</string>
-	<string name="downloads_paused">暂停下载</string>
-	<string name="downloads_removed">下载已被移除</string>
-	<string name="downloads_cancelled">下载被取消</string>
-	<string name="suggestions_enable_prompt">你想要接收个人漫画推荐吗？</string>
-	<string name="suggestion_manga">推荐：%s</string>
-	<string name="suggestions_notifications_summary">偶尔显示建议漫画通知</string>
-	<string name="more">更多</string>
-	<string name="cancel_all_downloads_confirm">所有进行中的下载都将被取消，未下载完成的数据将丢失</string>
-	<string name="remove_completed_downloads_confirm">你的下载历史将会永久删除</string>
-	<string name="sync_auth_hint">你可以登陆一个已有账号或创建新账号</string>
-	<string name="address">地址</string>
-	<string name="clear_network_cache">清除网络缓存</string>
-	<string name="proxy">代理</string>
-	<string name="type">类型</string>
-	<string name="invalid_value_message">无效值</string>
-</resources>
+    <string name="reorder">重新排序</string>
+    <string name="empty">留空</string>
+    <string name="explore">浏览</string>
+    <string name="automatic_scroll">自动滚动</string>
+    <string name="reader_info_bar">在阅读器中显示信息栏</string>
+    <string name="comics_archive">漫画压缩包</string>
+    <string name="folder_with_images">图片文件夹</string>
+    <string name="importing_manga">漫画导入中</string>
+    <string name="reader_info_pattern">Ch. %1$d/%2$d Pg. %3$d/%4$d</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d 的 %2$d 启用</string>
+    <string name="size_s">大小：%s</string>
+    <string name="confirm_exit">再按一次返回键退出</string>
+    <string name="exit_confirmation_summary">按两次返回键退出应用</string>
+    <string name="exit_confirmation">退出确认</string>
+    <string name="saved_manga">已保存漫画</string>
+    <string name="pages_cache">页面缓存</string>
+    <string name="other_cache">其他缓存</string>
+    <string name="storage_usage">存储占用</string>
+    <string name="available">可用</string>
+    <string name="removed_from_favourites">从收藏中移除</string>
+    <string name="options">选项</string>
+    <string name="incognito_mode">隐身模式</string>
+    <string name="no_chapters">无章节</string>
+    <string name="import_completed">导入完毕</string>
+    <string name="import_completed_hint">您可以从存储中删除原文件以节省空间</string>
+    <string name="import_will_start_soon">即将开始导入</string>
+    <string name="feed">订阅源</string>
+    <string name="memory_usage_pattern">%s - %s</string>
+    <string name="not_found_404">内容未找到或已移除</string>
+    <string name="reader_control_ltr_summary">点击屏幕右侧或按下右键翻到下一页</string>
+    <string name="reader_control_ltr">高效阅读器控制</string>
+    <string name="history_shortcuts_summary">长按应用图标显示最近阅读的漫画</string>
+    <string name="history_shortcuts">显示最近阅读漫画的快捷方式</string>
+    <string name="reset">重置</string>
+    <string name="color_correction">颜色校正</string>
+    <string name="brightness">亮度</string>
+    <string name="contrast">对比度</string>
+    <string name="color_correction_hint">所选颜色设置将会应用于此漫画</string>
+    <string name="text_unsaved_changes_prompt">保存还是放弃未保存的更改？</string>
+    <string name="discard">放弃</string>
+    <string name="error_no_space_left">设备上没有剩余空间</string>
+    <string name="reader_slider">显示换页滑块</string>
+    <string name="webtoon_zoom">Webtoon 缩放</string>
+    <string name="different_languages">不同语言</string>
+    <string name="network_unavailable">网络不可用</string>
+    <string name="network_unavailable_hint">打开 Wi-Fi 或移动网络在线阅读漫画</string>
+    <string name="clear_new_chapters_counters">同样清除新章节信息</string>
+    <string name="server_error">服务器端错误 (%1$d)。请稍后再试</string>
+    <string name="compact">紧凑</string>
+    <string name="source_disabled">已禁用图源</string>
+    <string name="prefetch_content">内容预加载</string>
+    <string name="mark_as_current">标为当前</string>
+    <string name="language">语言</string>
+    <string name="enable_logging">启用日志记录</string>
+    <string name="share_logs">分享日志</string>
+    <string name="enable_logging_summary">出于调试目的记录某些操作</string>
+    <string name="show_suspicious_content">显示可疑内容</string>
+    <string name="theme_name_dynamic">动态</string>
+    <string name="color_theme">颜色方案</string>
+    <string name="show_in_grid_view">用网格视图显示</string>
+    <string name="theme_name_miku">Miku</string>
+    <string name="theme_name_asuka">Asuka</string>
+    <string name="theme_name_mion">Mion</string>
+    <string name="theme_name_rikka">Rikka</string>
+    <string name="theme_name_sakura">Sakura</string>
+    <string name="services">服务</string>
+    <string name="theme_name_mamimi">Mamimi</string>
+    <string name="theme_name_kanade">Kanade</string>
+    <string name="nothing_here">这里什么也没有</string>
+    <string name="scrobbling_empty_hint">要跟踪阅读进度，在漫画详情屏幕上选中“菜单→ 跟踪。</string>
+    <string name="allow_unstable_updates">允许不稳定更新</string>
+    <string name="allow_unstable_updates_summary">提示更新到测试版</string>
+    <string name="download_started">已开始下载</string>
+    <string name="user_agent">UserAgent 标头</string>
+    <string name="settings_apply_restart_required">要应用这些更改请重启程序</string>
+    <string name="sources_reorder_tip">点击并长按项目排序</string>
+    <string name="got_it">知道了</string>
+    <string name="speed">速度</string>
+    <string name="restore_backup_description">导入先前创建的用户数据备份</string>
+    <string name="show_on_shelf">在书架上显示</string>
+    <string name="comics_archive_import_description">您可以选择一个或多个cbz或zip文件，每个文件都将识别为一个单独的漫画。</string>
+    <string name="folder_with_images_import_description">您可以选择一个包含压缩包或图片的文件夹。每个压缩包（或子文件夹）都会被识别为一个章节。</string>
+    <string name="find_similar">寻找相似</string>
+    <string name="translations">翻译</string>
+    <string name="web_view_unavailable">WebView不可用：检查是否已安装WebView</string>
+    <string name="sync_host_description">你可以使用自建同步服务器或默认服务器。如果你不知道自己在干什么请不要修改此处。</string>
+    <string name="mirror_switching">自动选择镜像</string>
+    <string name="mirror_switching_summary">如果存在可用镜像，在出错时自动切换域名</string>
+    <string name="paused">已暂停</string>
+    <string name="downloads_wifi_only_summary">切换到移动网络时停止下载</string>
+    <string name="remove_completed">移除已完成</string>
+    <string name="cancel_all">取消所有</string>
+    <string name="downloads_wifi_only">仅通过Wi-Fi下载</string>
+    <string name="enable">启用</string>
+    <string name="no_thanks">不，谢谢</string>
+    <string name="sync_settings">同步设定</string>
+    <string name="server_address">服务器地址</string>
+    <string name="pause">暂停</string>
+    <string name="resume">恢复</string>
+    <string name="ignore_ssl_errors">忽略SSL错误</string>
+    <string name="text_downloads_list_holder">没有下载项</string>
+    <string name="downloads_resumed">下载已经恢复</string>
+    <string name="downloads_paused">暂停下载</string>
+    <string name="downloads_removed">下载已被移除</string>
+    <string name="downloads_cancelled">下载被取消</string>
+    <string name="suggestions_enable_prompt">你想要接收个性化的漫画推荐吗？</string>
+    <string name="suggestion_manga">推荐：%s</string>
+    <string name="suggestions_notifications_summary">偶尔显示建议漫画通知</string>
+    <string name="more">更多</string>
+    <string name="cancel_all_downloads_confirm">所有进行中的下载都将被取消，未下载完成的数据将丢失</string>
+    <string name="remove_completed_downloads_confirm">你的下载历史将会永久删除</string>
+    <string name="sync_auth_hint">你可以登陆一个已有账号或创建新账号</string>
+    <string name="address">地址</string>
+    <string name="clear_network_cache">清除网络缓存</string>
+    <string name="proxy">代理</string>
+    <string name="type">类型</string>
+    <string name="invalid_value_message">无效值</string>
+    <string name="network">网络</string>
+    <string name="restore_summary">从以前创建的备份恢复</string>
+    <string name="show_pages_numbers_summary">在底部一角显示页数</string>
+    <string name="details_button_tip">按住阅读按钮显示更多选项</string>
+    <string name="clear_source_cookies_summary">仅清除特定域名的 cookies。大多数情况下会使网站授权失效</string>
+    <string name="data_and_privacy">数据与隐私</string>
+    <string name="reader_info_bar_summary">在屏幕顶部显示当前时间和阅读进度</string>
+    <string name="webtoon_zoom_summary">条漫模式下允许以手势缩放</string>
+    <string name="invalid_port_number">无效端口</string>
+    <string name="no_access_to_file">您无法访问该文件或目录</string>
+    <string name="local_manga_directories">本地漫画目录</string>
+    <string name="port">端口</string>
+    <string name="manga_branch_title_template">%1$s (%2$s)</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4b0ad8866..9969d64b1 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -58,4 +58,17 @@
 		<item>HTTP</item>
 		<item>SOCKS (v4/v5)</item>
 	</string-array>
+	<string-array name="reader_backgrounds">
+		<item>@string/system_default</item>
+		<item>@string/color_light</item>
+		<item>@string/color_dark</item>
+		<item>@string/color_white</item>
+		<item>@string/color_black</item>
+	</string-array>
+	<string-array name="reader_animation">
+		<item>@string/disabled</item>
+		<item>@string/system_default</item>
+		<item>@string/advanced</item>
+	</string-array>
+	<string name="advanced">Advanced</string>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ded307bcd..2a97982c8 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,12 +7,7 @@
 	<attr name="themeChooserPreferenceStyle" />
 	<attr name="listItemTextViewStyle" />
 	<attr name="fastScrollerStyle" />
-
-	<declare-styleable name="Theme">
-		<attr name="navigationBarDividerColor" format="color" />
-		<attr name="colorControlLight" format="color" />
-		<attr name="colorSurfaceSecondary" format="color" />
-	</declare-styleable>
+	<attr name="tipViewStyle" />
 
 	<!--CoverImageView attrs-->
 	<declare-styleable name="CoverImageView">
@@ -112,4 +107,50 @@
 		<attr name="android:entries" />
 	</declare-styleable>
 
+	<declare-styleable name="TipView">
+		<attr name="icon" />
+		<attr name="title" />
+		<attr name="android:text" />
+		<attr name="primaryButtonText" format="string" />
+		<attr name="secondaryButtonText" format="string" />
+		<attr name="shapeAppearance" />
+		<attr name="shapeAppearanceOverlay" />
+		<attr name="cardBackgroundColor" />
+		<attr name="strokeWidth" />
+		<attr name="strokeColor" />
+		<attr name="elevation" />
+	</declare-styleable>
+
+	<declare-styleable name="FaviconFallbackDrawable">
+		<attr name="backgroundColor" />
+		<attr name="strokeColor" />
+		<attr name="strokeWidth" />
+		<attr name="cornerSize" />
+	</declare-styleable>
+
+	<declare-styleable name="PieChart">
+		<attr name="pieChartColors" format="reference"/>
+
+		<attr name="pieChartMarginTextFirst" format="dimension"/>
+		<attr name="pieChartMarginTextSecond" format="dimension"/>
+		<attr name="pieChartMarginTextThird" format="dimension"/>
+		<attr name="pieChartMarginSmallCircle" format="dimension"/>
+
+		<attr name="pieChartCircleStrokeWidth" format="dimension"/>
+		<attr name="pieChartCirclePadding" format="dimension"/>
+		<attr name="pieChartCirclePaintRoundSize" format="boolean"/>
+		<attr name="pieChartCircleSectionSpace" format="float"/>
+
+		<attr name="pieChartTextCircleRadius" format="dimension"/>
+		<attr name="pieChartTextAmountSize" format="dimension"/>
+		<attr name="pieChartTextNumberSize" format="dimension"/>
+		<attr name="pieChartTextDescriptionSize" format="dimension"/>
+
+		<attr name="pieChartTextAmountColor" format="color"/>
+		<attr name="pieChartTextNumberColor" format="color"/>
+		<attr name="pieChartTextDescriptionColor" format="color"/>
+
+		<attr name="pieChartTextAmount" format="string"/>
+	</declare-styleable>
+
 </resources>
diff --git a/app/src/main/res/values/colors_kotatsu.xml b/app/src/main/res/values/colors_kotatsu.xml
index 012c2e6ac..dc3b9d664 100644
--- a/app/src/main/res/values/colors_kotatsu.xml
+++ b/app/src/main/res/values/colors_kotatsu.xml
@@ -4,29 +4,41 @@
   ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
 -->
 <resources>
-	<color name="kotatsu_primary">#005FAE</color>
+	<color name="kotatsu_primary">#6750A4</color>
+	<color name="kotatsu_primaryContainer">#EADDFF</color>
 	<color name="kotatsu_onPrimary">#FFFFFF</color>
-	<color name="kotatsu_inversePrimary">#A5C8FF</color>
-	<color name="kotatsu_primaryContainer">#D4E3FF</color>
-	<color name="kotatsu_onPrimaryContainer">#001C3A</color>
-	<color name="kotatsu_secondary">#545F71</color>
+	<color name="kotatsu_onPrimaryContainer">#21005E</color>
+	<color name="kotatsu_inversePrimary">#D0BCFF</color>
+	<color name="kotatsu_secondary">#625B71</color>
+	<color name="kotatsu_secondaryContainer">#E8DEF8</color>
 	<color name="kotatsu_onSecondary">#FFFFFF</color>
-	<color name="kotatsu_secondaryContainer">#D8E3F8</color>
-	<color name="kotatsu_onSecondaryContainer">#111C2B</color>
-	<color name="kotatsu_tertiary">#6D5676</color>
+	<color name="kotatsu_onSecondaryContainer">#1E192B</color>
+	<color name="kotatsu_tertiary">#7D5260</color>
+	<color name="kotatsu_tertiaryContainer">#FFD8E4</color>
 	<color name="kotatsu_onTertiary">#FFFFFF</color>
-	<color name="kotatsu_tertiaryContainer">#F7D8FF</color>
-	<color name="kotatsu_onTertiaryContainer">#271430</color>
-	<color name="kotatsu_background">#F0F0F3</color>
-	<color name="kotatsu_onBackground">#1A1C1E</color>
-	<color name="kotatsu_surface">#F0F0F3</color>
-	<color name="kotatsu_onSurface">#1A1C1E</color>
-	<color name="kotatsu_surfaceVariant">#E0E2EC</color>
-	<color name="kotatsu_onSurfaceVariant">#43474E</color>
-	<color name="kotatsu_inverseSurface">#2F3033</color>
-	<color name="kotatsu_inverseOnSurface">#F1F0F4</color>
+	<color name="kotatsu_onTertiaryContainer">#370B1E</color>
+	<color name="kotatsu_surface">#FEF7FF</color>
+	<color name="kotatsu_surfaceDim">#DED8E1</color>
+	<color name="kotatsu_surfaceBright">#FEF7FF</color>
+	<color name="kotatsu_surfaceContainerLowest">#FFFFFF</color>
+	<color name="kotatsu_surfaceContainerLow">#F7F2FA</color>
+	<color name="kotatsu_surfaceContainer">#F3EDF7</color>
+	<color name="kotatsu_surfaceContainerHigh">#ECE6F0</color>
+	<color name="kotatsu_surfaceContainerHighest">#E6E0E9</color>
+	<color name="kotatsu_surfaceVariant">#E7E0EC</color>
+	<color name="kotatsu_onSurface">#1C1B1F</color>
+	<color name="kotatsu_onSurfaceVariant">#49454E</color>
+	<color name="kotatsu_inverseSurface">#313033</color>
+	<color name="kotatsu_inverseOnSurface">#F4EFF4</color>
+	<color name="kotatsu_background">#FEF7FF</color>
+	<color name="kotatsu_onBackground">#1C1B1F</color>
+	<color name="kotatsu_error">#B3261E</color>
+	<color name="kotatsu_errorContainer">#F9DEDC</color>
+	<color name="kotatsu_onError">#FFFFFF</color>
+	<color name="kotatsu_onErrorContainer">#410E0B</color>
 	<color name="kotatsu_outline">#74777F</color>
+	<color name="kotatsu_outlineVariant">#C4C7C5</color>
 	<color name="kotatsu_shadow">#000000</color>
-	<color name="kotatsu_surfaceTint">#005FAE</color>
-	<color name="kotatsu_surfaceTintColor">#005FAE</color>
+	<color name="kotatsu_surfaceTint">#6750A4</color>
+	<color name="kotatsu_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index 536b16a5e..c62bb5477 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -55,4 +55,9 @@
 		<item>HTTP</item>
 		<item>SOCKS</item>
 	</string-array>
+	<string-array name="chart_colors" translatable="false">
+		<item>#6750A4</item>
+		<item>#21005E</item>
+		<item>#7D5260</item>
+	</string-array>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4925f903f..b83f459f8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,6 +19,7 @@
 	<dimen name="chapter_list_item_height">48dp</dimen>
 	<dimen name="preferred_grid_width">120dp</dimen>
 	<dimen name="small_grid_width">92dp</dimen>
+	<dimen name="smaller_grid_width">102dp</dimen>
 	<dimen name="header_height">48dp</dimen>
 	<dimen name="list_footer_height_inner">36dp</dimen>
 	<dimen name="list_footer_height_outer">48dp</dimen>
@@ -45,6 +46,7 @@
 	<dimen name="dialog_radius">8dp</dimen>
 
 	<dimen name="card_indicator_size">32dp</dimen>
+	<dimen name="card_indicator_size_small">24dp</dimen>
 	<dimen name="card_indicator_offset">8dp</dimen>
 
 	<dimen name="appwidget_corner_radius_inner">8dp</dimen>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 7cbbd343a..a52bd1d69 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -6,4 +6,5 @@
 
 	<integer name="manga_badge_max_character_count">3</integer>
 	<integer name="explore_buttons_columns">2</integer>
+	<integer name="details_description_lines">5</integer>
 </resources>
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
index 5c87de9f0..794970f7e 100644
--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@@ -24,4 +24,8 @@
 		<item quantity="one">%1$d day ago</item>
 		<item quantity="other">%1$d days ago</item>
 	</plurals>
+	<plurals name="months_ago">
+		<item quantity="one">%1$d month ago</item>
+		<item quantity="other">%1$d months ago</item>
+	</plurals>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 90f39ddb6..3793a2119 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,7 +101,7 @@
 	<string name="text_empty_holder_primary">It\'s kind of empty here…</string>
 	<string name="text_search_holder_secondary">Try to reformulate the query.</string>
 	<string name="text_history_holder_primary">What you read will be displayed here</string>
-	<string name="text_history_holder_secondary">Find what to read in side menu.</string>
+	<string name="text_history_holder_secondary">Find what to read in the «Explore» section</string>
 	<string name="text_shelf_holder_primary">Your manga will be displayed here</string>
 	<string name="text_shelf_holder_secondary">Find what to read in the «Explore» section</string>
 	<string name="text_local_holder_primary">Save something first</string>
@@ -284,7 +284,7 @@
 	<string name="show_reading_indicators">Show reading progress indicators</string>
 	<string name="data_deletion">Data deletion</string>
 	<string name="show_reading_indicators_summary">Show percentage read in history and favourites</string>
-	<string name="exclude_nsfw_from_history_summary">Manga marked as NSFW will never added to the history and your progress will not be saved</string>
+	<string name="exclude_nsfw_from_history_summary">Manga marked as NSFW will never be added to the history and your progress will not be saved</string>
 	<string name="clear_cookies_summary">Can help in case of some issues. All authorizations will be invalidated</string>
 	<string name="show_all">Show all</string>
 	<string name="invalid_domain_message">Invalid domain</string>
@@ -390,7 +390,7 @@
 	<string name="sync_host_description">You can use a self-hosted synchronization server or a default one. Don\'t change this if you\'re not sure what you\'re doing.</string>
 	<string name="ignore_ssl_errors">Ignore SSL errors</string>
 	<string name="mirror_switching">Choose mirror automatically</string>
-	<string name="mirror_switching_summary">Automatically switch domains for remote sources on errors if mirrors are available</string>
+	<string name="mirror_switching_summary">Automatically switch domains for manga sources on errors if mirrors are available</string>
 	<string name="pause">Pause</string>
 	<string name="resume">Resume</string>
 	<string name="paused">Paused</string>
@@ -449,4 +449,29 @@
 	<string name="pick_custom_directory">Pick custom directory</string>
 	<string name="no_access_to_file">You have no access to this file or directory</string>
 	<string name="local_manga_directories">Local manga directories</string>
+	<string name="description">Description</string>
+	<string name="this_month">This month</string>
+	<string name="voice_search">Voice search</string>
+	<string name="related_manga">Related manga</string>
+	<string name="color_light">Light</string>
+	<string name="color_dark">Dark</string>
+	<string name="color_white">White</string>
+	<string name="color_black">Black</string>
+	<string name="background">Background</string>
+	<string name="data_not_restored">Data was not restored</string>
+	<string name="data_not_restored_text">Make sure you have selected the correct backup file</string>
+	<string name="manage_categories">Manage categories</string>
+	<string name="suggestions_wifi_only_summary">Do not update suggestions using metered network connections</string>
+	<string name="tracker_wifi_only_summary">Do not check for new chapters using metered network connections</string>
+	<string name="search_hint">Enter manga title, genre or source name</string>
+	<string name="progress">Progress</string>
+	<string name="order_added">Added</string>
+	<string name="view_list">View list</string>
+	<string name="show">Show</string>
+	<string name="captcha_required_summary">%s requires a captcha to be resolved to work properly</string>
+	<string name="languages">Languages</string>
+	<string name="unknown">Unknown</string>
+	<string name="in_progress">In progress</string>
+	<string name="disable_nsfw">Disable NSFW</string>
+	<string name="too_many_requests_message">Too many requests. Try again later</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fce1c7d72..73fdec650 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,10 +2,17 @@
 
 	<!--Toolbars-->
 
+	<style name="Widget.Kotatsu.AppBarLayout" parent="@style/Widget.Material3.AppBarLayout">
+		<item name="android:background">?attr/colorSurfaceContainerHigh</item>
+	</style>
+
 	<!--Navigation Views-->
 
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
 		<item name="labelVisibilityMode">labeled</item>
+		<item name="android:background">?attr/colorSurfaceContainerHighest</item>
+		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
+		<item name="itemIconTint">@color/bottom_menu_active_item</item>
 	</style>
 
 	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
@@ -61,19 +68,28 @@
 
 	<!-- Widget styles -->
 
+	<style name="Widget.Kotatsu.CardView.Outlined" parent="@style/Widget.Material3.CardView.Outlined">
+		<item name="strokeColor">?attr/colorSecondary</item>
+		<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
+	</style>
+
+	<style name="Widget.Kotatsu.CardView.Light" parent="Widget.Material3.CardView.Filled">
+		<item name="cardBackgroundColor">?colorBackgroundFloating</item>
+	</style>
+
 	<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.Material3.TabLayout">
+		<item name="android:background">@drawable/tabs_background</item>
 		<item name="tabGravity">center</item>
 		<item name="tabInlineLabel">true</item>
 		<item name="tabMinWidth">75dp</item>
 		<item name="tabMode">scrollable</item>
-		<item name="tabRippleColor">@color/ripple_toolbar</item>
 	</style>
 
 	<style name="Widget.Kotatsu.SearchView" parent="@style/Widget.AppCompat.SearchView">
 		<item name="iconifiedByDefault">false</item>
 		<item name="searchIcon">@null</item>
 		<item name="queryBackground">@null</item>
-		<item name="android:textColorHint">?attr/colorControlNormal</item>
+		<item name="android:textAppearance">@style/TextAppearance.Kotatsu.SearchView</item>
 		<item name="android:textSize">18sp</item>
 	</style>
 
@@ -86,7 +102,7 @@
 	</style>
 
 	<style name="Widget.Kotatsu.Chip" parent="Widget.Material3.Chip.Suggestion">
-		<item name="chipSurfaceColor">?attr/colorSurface</item>
+		<item name="chipBackgroundColor">?attr/colorSurfaceContainerHigh</item>
 		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
 		<item name="chipStrokeColor">?attr/colorOutline</item>
 		<item name="chipIconTint">?attr/colorControlNormal</item>
@@ -103,6 +119,16 @@
 		<item name="chipMinTouchTargetSize">28dp</item>
 	</style>
 
+	<style name="Widget.Kotatsu.Button.More" parent="Widget.Material3.Button.TextButton">
+		<item name="android:minWidth">48dp</item>
+	</style>
+
+	<style name="Widget.Kotatsu.Button.More.Small">
+		<item name="android:insetTop">0dp</item>
+		<item name="android:insetBottom">0dp</item>
+		<item name="android:minHeight">42dp</item>
+	</style>
+
 	<style name="Widget.Kotatsu.ToggleButton" parent="Widget.Material3.Button.OutlinedButton">
 		<item name="android:checkable">true</item>
 		<item name="android:textAlignment">textStart</item>
@@ -163,19 +189,21 @@
 	</style>
 
 	<style name="Widget.Kotatsu.ExploreButton" parent="Widget.Material3.Button.TonalButton.Icon">
-		<item name="android:minHeight">58dp</item>
-		<item name="android:textColor">?attr/colorOnSurface</item>
+		<item name="android:minHeight">54dp</item>
 		<item name="android:singleLine">true</item>
-		<item name="shapeAppearance">?shapeAppearanceCornerLarge</item>
+		<item name="shapeAppearance">?shapeAppearanceCornerExtraLarge</item>
+		<item name="android:ellipsize">marquee</item>
+		<item name="android:marqueeRepeatLimit">marquee_forever</item>
 		<item name="iconSize">22dp</item>
 		<item name="iconPadding">16dp</item>
 		<item name="iconGravity">start</item>
+		<item name="iconTint">?attr/colorPrimary</item>
+		<item name="android:textColor">?attr/colorPrimary</item>
 		<item name="android:insetTop">2dp</item>
 		<item name="android:insetBottom">2dp</item>
-		<item name="iconTint">?attr/colorPrimaryDark</item>
 		<item name="android:gravity">start|center_vertical</item>
 		<item name="android:textAppearance">?textAppearanceButton</item>
-		<item name="backgroundTint">@color/colored_button</item>
+		<item name="backgroundTint">?attr/colorSurfaceContainerLow</item>
 	</style>
 
 	<style name="Widget.Kotatsu.TextView.Indicator" parent="Widget.MaterialComponents.TextView">
@@ -188,6 +216,10 @@
 		<item name="colorControlHighlight">@color/selector_overlay</item>
 	</style>
 
+	<style name="ThemeOverlay.Kotatsu.CardContainer" parent="">
+		<item name="android:colorBackground">?colorBackgroundFloating</item>
+	</style>
+
 	<style name="ThemeOverlay.Kotatsu.ActionMode" parent="">
 		<item name="colorOnSurface">?colorPrimary</item>
 		<item name="colorControlNormal">?colorPrimary</item>
@@ -195,6 +227,10 @@
 
 	<!-- TextAppearance -->
 
+	<style name="TextAppearance.Kotatsu.SearchView" parent="TextAppearance.Material3.SearchBar">
+		<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
+	</style>
+
 	<style name="TextAppearance.Widget.Menu" parent="TextAppearance.AppCompat.Menu">
 		<item name="android:textColor">?attr/colorOnBackground</item>
 	</style>
@@ -234,7 +270,7 @@
 	</style>
 
 	<style name="ShapeAppearanceOverlay.Kotatsu.Cover.Small" parent="">
-		<item name="cornerSize">6dp</item>
+		<item name="cornerSize">8dp</item>
 	</style>
 
 	<style name="ShapeAppearanceOverlay.Kotatsu.Circle" parent="">
@@ -270,7 +306,7 @@
 		<item name="android:selectable">false</item>
 	</style>
 
-	<!-- Progress drawable -->
+	<!-- Drawable -->
 
 	<style name="ProgressDrawable">
 		<item name="android:fillAlpha">1</item>
@@ -282,4 +318,19 @@
 		<item name="autoFitTextSize">true</item>
 	</style>
 
+	<style name="FaviconDrawable">
+		<item name="backgroundColor">?colorBackgroundFloating</item>
+		<item name="strokeColor">?colorOutline</item>
+	</style>
+
+	<style name="FaviconDrawable.Small">
+		<item name="strokeWidth">1dp</item>
+		<item name="cornerSize">8dp</item>
+	</style>
+
+	<style name="FaviconDrawable.Large">
+		<item name="strokeWidth">1dp</item>
+		<item name="cornerSize">12dp</item>
+	</style>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b696d34d5..adcfbb78c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,34 +9,41 @@
 
 		<!-- Theme Colors -->
 		<item name="colorPrimary">@color/kotatsu_primary</item>
-		<item name="colorOnPrimary">@color/kotatsu_onPrimary</item>
 		<item name="colorPrimaryContainer">@color/kotatsu_primaryContainer</item>
+		<item name="colorOnPrimary">@color/kotatsu_onPrimary</item>
 		<item name="colorOnPrimaryContainer">@color/kotatsu_onPrimaryContainer</item>
+		<item name="colorPrimaryInverse">@color/kotatsu_inversePrimary</item>
 		<item name="colorSecondary">@color/kotatsu_secondary</item>
-		<item name="colorOnSecondary">@color/kotatsu_onSecondary</item>
 		<item name="colorSecondaryContainer">@color/kotatsu_secondaryContainer</item>
+		<item name="colorOnSecondary">@color/kotatsu_onSecondary</item>
 		<item name="colorOnSecondaryContainer">@color/kotatsu_onSecondaryContainer</item>
 		<item name="colorTertiary">@color/kotatsu_tertiary</item>
-		<item name="colorOnTertiary">@color/kotatsu_onTertiary</item>
 		<item name="colorTertiaryContainer">@color/kotatsu_tertiaryContainer</item>
+		<item name="colorOnTertiary">@color/kotatsu_onTertiary</item>
 		<item name="colorOnTertiaryContainer">@color/kotatsu_onTertiaryContainer</item>
-		<item name="android:colorBackground">@color/kotatsu_background</item>
-		<item name="colorOnBackground">@color/kotatsu_onBackground</item>
 		<item name="colorSurface">@color/kotatsu_surface</item>
-		<item name="colorOnSurface">@color/kotatsu_onSurface</item>
+		<item name="colorSurfaceDim">@color/kotatsu_surfaceDim</item>
+		<item name="colorSurfaceBright">@color/kotatsu_surfaceBright</item>
+		<item name="colorSurfaceContainerLowest">@color/kotatsu_surfaceContainerLowest</item>
+		<item name="colorSurfaceContainerLow">@color/kotatsu_surfaceContainerLow</item>
+		<item name="colorSurfaceContainer">@color/kotatsu_surfaceContainer</item>
+		<item name="colorSurfaceContainerHigh">@color/kotatsu_surfaceContainerHigh</item>
+		<item name="colorSurfaceContainerHighest">@color/kotatsu_surfaceContainerHighest</item>
 		<item name="colorSurfaceVariant">@color/kotatsu_surfaceVariant</item>
+		<item name="colorOnSurface">@color/kotatsu_onSurface</item>
 		<item name="colorOnSurfaceVariant">@color/kotatsu_onSurfaceVariant</item>
-		<item name="colorOutline">@color/kotatsu_outline</item>
-		<item name="colorOnSurfaceInverse">@color/kotatsu_inverseOnSurface</item>
 		<item name="colorSurfaceInverse">@color/kotatsu_inverseSurface</item>
-		<item name="colorPrimaryInverse">@color/kotatsu_inversePrimary</item>
+		<item name="colorOnSurfaceInverse">@color/kotatsu_inverseOnSurface</item>
+		<item name="android:colorBackground">@color/kotatsu_surfaceContainerHigh</item>
+		<item name="colorOnBackground">@color/kotatsu_onSurface</item>
 		<item name="colorError">@color/error</item>
-		<item name="colorOnError">@color/onError</item>
 		<item name="colorErrorContainer">@color/errorContainer</item>
-		<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
+		<item name="colorOnError">@color/onError</item>
 		<item name="colorOnErrorContainer">@color/onErrorContainer</item>
+		<item name="colorOutline">@color/kotatsu_outline</item>
+		<item name="colorOutlineVariant">@color/kotatsu_outline</item>
 
-		<item name="android:divider">@color/divider_default</item>
+		<item name="android:divider">@color/kotatsu_outline</item>
 
 		<!-- Handles RTL text -->
 		<item name="android:textAlignment">gravity</item>
@@ -64,7 +71,7 @@
 		<item name="chipStyle">@style/Widget.Kotatsu.Chip</item>
 		<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
 		<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
-		<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
+		<item name="appBarLayoutStyle">@style/Widget.Kotatsu.AppBarLayout</item>
 		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Filled</item>
diff --git a/app/src/main/res/xml/locales.xml b/app/src/main/res/xml/locales.xml
deleted file mode 100644
index 8d4010179..000000000
--- a/app/src/main/res/xml/locales.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config
-	xmlns:android="http://schemas.android.com/apk/res/android">
-	<locale android:name="en" />
-	<locale android:name="ar" />
-	<locale android:name="be" />
-	<locale android:name="bn" />
-	<locale android:name="de" />
-	<locale android:name="el" />
-	<locale android:name="es" />
-	<locale android:name="fa" />
-	<locale android:name="fi" />
-	<locale android:name="fr" />
-	<locale android:name="in" />
-	<locale android:name="it" />
-	<locale android:name="ja" />
-	<locale android:name="nb-NO" />
-	<locale android:name="pl" />
-	<locale android:name="pt" />
-	<locale android:name="pt-BR" />
-	<locale android:name="ru" />
-	<locale android:name="si" />
-	<locale android:name="sr" />
-	<locale android:name="sv" />
-	<locale android:name="tr" />
-	<locale android:name="uk" />
-	<locale android:name="zh-CN" />
-	<locale android:name="zh-TW" />
-	<locale android:name="fil" />
-	<locale android:name="hi" />
-	<locale android:name="kk" />
-	<locale android:name="ko" />
-	<locale android:name="ne" />
-	<locale android:name="nn" />
-	<locale android:name="vi" />
-</locale-config>
diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml
index a078e2928..e8cddffa9 100644
--- a/app/src/main/res/xml/pref_reader.xml
+++ b/app/src/main/res/xml/pref_reader.xml
@@ -42,6 +42,12 @@
 		android:summary="@string/reader_control_ltr_summary"
 		android:title="@string/reader_control_ltr" />
 
+	<ListPreference
+		android:entries="@array/reader_animation"
+		android:key="reader_animation2"
+		android:title="@string/pages_animation"
+		app:useSimpleSummaryProvider="true" />
+
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="reader_animation"
@@ -60,6 +66,12 @@
 		android:key="reader_slider"
 		android:title="@string/reader_slider" />
 
+	<ListPreference
+		android:entries="@array/reader_backgrounds"
+		android:key="reader_background"
+		android:title="@string/background"
+		app:useSimpleSummaryProvider="true" />
+
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="pages_numbers"
diff --git a/app/src/main/res/xml/pref_root.xml b/app/src/main/res/xml/pref_root.xml
index 4aa5ad44d..6a8c04a09 100644
--- a/app/src/main/res/xml/pref_root.xml
+++ b/app/src/main/res/xml/pref_root.xml
@@ -9,7 +9,7 @@
 		android:title="@string/appearance" />
 
 	<PreferenceScreen
-		android:fragment="org.koitharu.kotatsu.settings.sources.SourcesListFragment"
+		android:fragment="org.koitharu.kotatsu.settings.sources.SourcesManageFragment"
 		android:icon="@drawable/ic_manga_source"
 		android:key="remote_sources"
 		android:title="@string/remote_sources" />
@@ -27,7 +27,7 @@
 		android:title="@string/network" />
 
 	<PreferenceScreen
-		android:fragment="org.koitharu.kotatsu.settings.UserDataSettingsFragment"
+		android:fragment="org.koitharu.kotatsu.settings.userdata.UserDataSettingsFragment"
 		android:icon="@drawable/ic_data_privacy"
 		android:key="userdata"
 		android:title="@string/data_and_privacy" />
diff --git a/app/src/main/res/xml/pref_suggestions.xml b/app/src/main/res/xml/pref_suggestions.xml
index c754b220f..6c000cf11 100644
--- a/app/src/main/res/xml/pref_suggestions.xml
+++ b/app/src/main/res/xml/pref_suggestions.xml
@@ -10,7 +10,14 @@
 		android:title="@string/suggestions_enable" />
 
 	<SwitchPreferenceCompat
-		android:defaultValue="true"
+		android:defaultValue="false"
+		android:dependency="suggestions"
+		android:key="suggestions_wifi"
+		android:summary="@string/suggestions_wifi_only_summary"
+		android:title="@string/only_using_wifi" />
+
+	<SwitchPreferenceCompat
+		android:defaultValue="false"
 		android:dependency="suggestions"
 		android:key="suggestions_notifications"
 		android:summary="@string/suggestions_notifications_summary"
diff --git a/app/src/main/res/xml/pref_tracker.xml b/app/src/main/res/xml/pref_tracker.xml
index 10824fc59..80df9b986 100644
--- a/app/src/main/res/xml/pref_tracker.xml
+++ b/app/src/main/res/xml/pref_tracker.xml
@@ -9,6 +9,13 @@
 		android:layout="@layout/preference_toggle_header"
 		android:title="@string/check_new_chapters_title" />
 
+	<SwitchPreferenceCompat
+		android:defaultValue="false"
+		android:dependency="tracker_enabled"
+		android:key="tracker_wifi"
+		android:summary="@string/tracker_wifi_only_summary"
+		android:title="@string/only_using_wifi" />
+
 	<MultiSelectListPreference
 		android:defaultValue="@array/values_track_sources_default"
 		android:dependency="tracker_enabled"
@@ -44,4 +51,4 @@
 		android:summary="@string/tracker_warning"
 		app:allowDividerAbove="true" />
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_user_data.xml b/app/src/main/res/xml/pref_user_data.xml
index 80d0e5b7b..3146da28e 100644
--- a/app/src/main/res/xml/pref_user_data.xml
+++ b/app/src/main/res/xml/pref_user_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<SwitchPreferenceCompat
 		android:key="protect_app"
@@ -35,13 +36,16 @@
 
 	</PreferenceCategory>
 
-	<PreferenceCategory android:title="@string/data_deletion">
+	<PreferenceCategory android:title="@string/storage_usage">
+
+		<org.koitharu.kotatsu.settings.userdata.StorageUsagePreference android:key="storage_usage" />
 
 		<Preference
 			android:key="search_history_clear"
 			android:persistent="false"
 			android:summary="@string/loading_"
-			android:title="@string/clear_search_history" />
+			android:title="@string/clear_search_history"
+			app:allowDividerAbove="true" />
 
 		<Preference
 			android:key="updates_feed_clear"
diff --git a/build.gradle b/build.gradle
index 4f5a72761..9c706bc1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,10 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.0.2'
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
+		classpath 'com.android.tools.build:gradle:8.2.0-alpha15'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
 		classpath 'com.google.dagger:hilt-android-gradle-plugin:2.47'
+		classpath 'com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.0-1.0.13'
 	}
 }
 
diff --git a/gradle.properties b/gradle.properties
index 1522bd3a9..0c9e2bae4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,4 @@ android.useAndroidX=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
 android.enableR8.fullMode=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2735291ae..a9ba95a45 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Sat Feb 25 17:16:02 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists