diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 87bd3a768..bda8001d6 100755
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -23,6 +23,7 @@
       </option>
     </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="CMake">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c25c..35ffc652f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 44afccb0c..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="../../../../../../layout/custom_preview.xml" value="0.1" />
-        <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/drawable/list_divider_material.xml" value="0.28512820512820514" />
-        <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/layout/simple_dropdown_item_1line.xml" value="0.24739583333333334" />
-        <entry key="../../../../.gradle/caches/transforms-3/0998d1b3fbd6b77213a827054a7dfcfd/transformed/appcompat-1.2.0/res/layout/abc_alert_dialog_material.xml" value="0.25885416666666666" />
-        <entry key="../../../../.gradle/caches/transforms-3/0998d1b3fbd6b77213a827054a7dfcfd/transformed/appcompat-1.2.0/res/layout/abc_select_dialog_material.xml" value="0.25885416666666666" />
-        <entry key="../../../../.gradle/caches/transforms-3/688e95ad986d2d0286c79f787589b7cb/transformed/material-1.3.0/res/layout/mtrl_alert_dialog.xml" value="0.25885416666666666" />
-        <entry key="app/src/main/res/drawable/ic_storage.xml" value="0.275" />
-        <entry key="app/src/main/res/drawable/ic_suggestion.xml" value="0.275" />
-        <entry key="app/src/main/res/drawable/tab_indicator.xml" value="0.28512820512820514" />
-        <entry key="app/src/main/res/drawable/tabs_background.xml" value="0.28512820512820514" />
-        <entry key="app/src/main/res/layout-w600dp/activity_details.xml" value="0.18072916666666666" />
-        <entry key="app/src/main/res/layout-w600dp/fragment_details.xml" value="0.14583333333333334" />
-        <entry key="app/src/main/res/layout-w600dp/fragment_list.xml" value="0.14635416666666667" />
-        <entry key="app/src/main/res/layout/activity_protect.xml" value="0.26927083333333335" />
-        <entry key="app/src/main/res/layout/activity_setup_protect.xml" value="0.26927083333333335" />
-        <entry key="app/src/main/res/layout/dialog_favorite_categories.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/dialog_list_mode.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/fragment_chapters.xml" value="0.24739583333333334" />
-        <entry key="app/src/main/res/layout/fragment_details.xml" value="0.26145833333333335" />
-        <entry key="app/src/main/res/layout/fragment_favourites.xml" value="0.26296296296296295" />
-        <entry key="app/src/main/res/layout/fragment_feed.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/fragment_list.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/item_branch.xml" value="0.24739583333333334" />
-        <entry key="app/src/main/res/layout/item_branch_dropdown.xml" value="0.25743589743589745" />
-        <entry key="app/src/main/res/layout/item_category_checkable.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/item_manga_grid.xml" value="0.26042632066728455" />
-        <entry key="app/src/main/res/layout/item_manga_list_details.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/item_page_thumb.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/item_page_webtoon.xml" value="0.13095238095238096" />
-        <entry key="app/src/main/res/layout/item_recent.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/layout/item_source_config.xml" value="0.25885416666666666" />
-        <entry key="app/src/main/res/layout/sheet_pages.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/menu/nav_drawer.xml" value="0.25885416666666666" />
-        <entry key="app/src/main/res/menu/opt_protect.xml" value="0.26927083333333335" />
-        <entry key="app/src/main/res/menu/popup_category.xml" value="0.2601851851851852" />
-        <entry key="app/src/main/res/xml/pref_main.xml" value="0.26927083333333335" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index ce1897442..fddaf1d25 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669)
 
 ### Download
 
diff --git a/app/build.gradle b/app/build.gradle
index c206ffcb3..0574ceaac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,10 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 30
-		versionCode 364
-		versionName '1.0.1'
+		versionCode 369
+		versionName '2.0-b1'
+		generatedDensities = []
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 		kapt {
 			arguments {
@@ -40,6 +42,9 @@ android {
 	buildFeatures {
 		viewBinding true
 	}
+	sourceSets {
+		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+	}
 	lintOptions {
 		disable 'MissingTranslation'
 		abortOnError false
@@ -61,24 +66,24 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
-	implementation 'androidx.core:core-ktx:1.5.0-rc01'
-	implementation 'androidx.activity:activity-ktx:1.2.2'
-	implementation 'androidx.fragment:fragment-ktx:1.3.3'
+	implementation 'androidx.core:core-ktx:1.6.0'
+	implementation 'androidx.activity:activity-ktx:1.3.1'
+	implementation 'androidx.fragment:fragment-ktx:1.3.6'
 	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-service:2.3.1'
 	implementation 'androidx.lifecycle:lifecycle-process:2.3.1'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.0'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
+	implementation 'androidx.recyclerview:recyclerview:1.2.1'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.1.1'
-	implementation 'androidx.work:work-runtime-ktx:2.5.0'
-	implementation 'com.google.android.material:material:1.3.0'
+	implementation 'androidx.work:work-runtime-ktx:2.6.0'
+	implementation 'com.google.android.material:material:1.4.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.1'
 
@@ -88,20 +93,28 @@ dependencies {
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.1'
 	implementation 'com.squareup.okio:okio:2.10.0'
-	implementation 'org.jsoup:jsoup:1.13.1'
+	implementation 'org.jsoup:jsoup:1.14.2'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.0'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.0'
 
-	implementation 'io.insert-koin:koin-android:3.0.1'
-	implementation 'io.insert-koin:koin-android-ext:3.0.1'
-	implementation 'io.coil-kt:coil-base:1.1.1'
+	implementation 'io.insert-koin:koin-android:3.1.2'
+	implementation 'io.coil-kt:coil-base:1.3.2'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
-	implementation 'com.github.solkin:disk-lru-cache:1.2'
+	implementation 'com.github.solkin:disk-lru-cache:1.3'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20201115'
-	testImplementation 'io.insert-koin:koin-test-junit4:3.0.1'
+	testImplementation 'com.google.truth:truth:1.1.3'
+	testImplementation 'org.json:json:20210307'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2'
+	testImplementation 'io.insert-koin:koin-test-junit4:3.1.2'
+
+	androidTestImplementation 'androidx.test:runner:1.4.0'
+	androidTestImplementation 'androidx.test:rules:1.4.0'
+	androidTestImplementation 'androidx.test:core-ktx:1.4.0'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+	androidTestImplementation 'androidx.room:room-testing:2.3.0'
+	androidTestImplementation 'com.google.truth:truth:1.1.3'
 }
\ No newline at end of file
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
new file mode 100644
index 000000000..f0f37c2a1
--- /dev/null
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.koitharu.kotatsu.core.db.migrations.*
+import java.io.IOException
+
+@RunWith(AndroidJUnit4::class)
+class MangaDatabaseTest {
+
+	@get:Rule
+	val helper: MigrationTestHelper = MigrationTestHelper(
+		InstrumentationRegistry.getInstrumentation(),
+		MangaDatabase::class.java.canonicalName,
+		FrameworkSQLiteOpenHelperFactory()
+	)
+
+	@Test
+	@Throws(IOException::class)
+	fun migrateAll() {
+		helper.createDatabase(TEST_DB, 1).apply {
+			// TODO execSQL("")
+			close()
+		}
+		for (migration in migrations) {
+			helper.runMigrationsAndValidate(
+				TEST_DB,
+				migration.endVersion,
+				true,
+				migration
+			)
+		}
+	}
+
+
+	private companion object {
+
+		const val TEST_DB = "test-db"
+
+		val migrations = arrayOf(
+			Migration1To2(),
+			Migration2To3(),
+			Migration3To4(),
+			Migration4To5(),
+			Migration5To6(),
+			Migration6To7(),
+			Migration7To8(),
+		)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 78f461918..e18e81392 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,9 @@
 		android:theme="@style/AppTheme"
 		android:usesCleartextTraffic="true"
 		tools:ignore="UnusedAttribute">
-		<activity android:name="org.koitharu.kotatsu.main.ui.MainActivity">
+		<activity
+			android:name="org.koitharu.kotatsu.main.ui.MainActivity"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -32,12 +34,16 @@
 				android:name="android.app.default_searchable"
 				android:value=".ui.search.SearchActivity" />
 		</activity>
-		<activity android:name="org.koitharu.kotatsu.details.ui.DetailsActivity">
+		<activity
+			android:name="org.koitharu.kotatsu.details.ui.DetailsActivity"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
 		</activity>
-		<activity android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity">
+		<activity
+			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="${applicationId}.action.READ_MANGA" />
 			</intent-filter>
@@ -50,13 +56,19 @@
 			android:label="@string/settings" />
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity"
+			android:exported="true"
 			android:label="@string/settings">
 			<intent-filter>
 				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
-		<activity android:name="org.koitharu.kotatsu.browser.BrowserActivity" />
+		<activity
+			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
+			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
+			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
 			android:label="@string/error_occurred"
@@ -68,6 +80,7 @@
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
+			android:exported="true"
 			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -83,9 +96,12 @@
 		<activity
 			android:name=".settings.protect.ProtectSetupActivity"
 			android:windowSoftInputMode="adjustResize" />
+		<activity
+			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
+			android:label="@string/downloads" />
 
 		<service
-			android:name="org.koitharu.kotatsu.download.DownloadService"
+			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
 			android:foregroundServiceType="dataSync" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
index 6d9c92ed3..2c8ec865d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
@@ -9,13 +9,16 @@ import org.koitharu.kotatsu.utils.ext.await
 
 open class MangaLoaderContext(
 	private val okHttp: OkHttpClient,
-	private val cookieJar: CookieJar
+	val cookieJar: CookieJar
 ) : KoinComponent {
 
-	suspend fun httpGet(url: String): Response {
+	suspend fun httpGet(url: String, headers: Headers? = null): Response {
 		val request = Request.Builder()
 			.get()
 			.url(url)
+		if (headers != null) {
+			request.headers(headers)
+		}
 		return okHttp.newCall(request.build()).await()
 	}
 
@@ -54,16 +57,6 @@ open class MangaLoaderContext(
 
 	open fun getSettings(source: MangaSource) = SourceSettings(get(), source)
 
-	fun insertCookies(domain: String, vararg cookies: String) {
-		val url = HttpUrl.Builder()
-			.scheme(SCHEME_HTTP)
-			.host(domain)
-			.build()
-		cookieJar.saveFromResponse(url, cookies.mapNotNull {
-			Cookie.parse(url, it)
-		})
-	}
-
 	private companion object {
 
 		private const val SCHEME_HTTP = "http"
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
index b695d0bb2..5e91880a1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.base.ui
 
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
@@ -11,16 +12,16 @@ import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.ActionBarContextView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.*
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
 import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.utils.ext.getThemeColor
 
 abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindowInsetsListener {
 
@@ -35,7 +36,7 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		if (get<AppSettings>().isAmoledTheme) {
-			setTheme(R.style.AppTheme_Amoled)
+			setTheme(R.style.AppTheme_AMOLED)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -56,8 +57,19 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 	protected fun setContentView(binding: B) {
 		this.binding = binding
 		super.setContentView(binding.root)
-		(binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
+		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
+		toolbar?.let(this::setSupportActionBar)
 		ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
+
+		val toolbarParams = (binding.root.findViewById<View>(R.id.toolbar_card) ?: toolbar)
+			?.layoutParams as? AppBarLayout.LayoutParams
+		if (toolbarParams != null) {
+			if (get<AppSettings>().isToolbarHideWhenScrolling) {
+				toolbarParams.scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS or SCROLL_FLAG_SNAP
+			} else {
+				toolbarParams.scrollFlags = SCROLL_FLAG_NO_SCROLL
+			}
+		}
 	}
 
 	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
@@ -90,6 +102,12 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
 	}
 
+	protected fun isDarkAmoledTheme(): Boolean {
+		val uiMode = resources.configuration.uiMode
+		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+		return isNight && get<AppSettings>().isAmoledTheme
+	}
+
 	override fun onSupportActionModeStarted(mode: ActionMode) {
 		super.onSupportActionModeStarted(mode)
 		val insets = ViewCompat.getRootWindowInsets(binding.root)
@@ -98,12 +116,6 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(), OnApplyWindo
 		view?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			topMargin = insets.top
 		}
-		window?.statusBarColor = ContextCompat.getColor(this, R.color.grey_dark)
-	}
-
-	override fun onSupportActionModeFinished(mode: ActionMode) {
-		super.onSupportActionModeFinished(mode)
-		window?.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
 	}
 
 	override fun onBackPressed() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
index 27f923937..76f774bc8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
@@ -38,6 +38,7 @@ abstract class BaseFragment<B : ViewBinding> : Fragment(), OnApplyWindowInsetsLi
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		lastInsets = Insets.NONE
 		ViewCompat.setOnApplyWindowInsetsListener(view, this)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SectionItemDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SectionItemDecoration.kt
index b5ecb78a2..d8181e5c7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SectionItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SectionItemDecoration.kt
@@ -37,7 +37,7 @@ class SectionItemDecoration(
 
 	override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
 		super.onDrawOver(c, parent, state)
-		val textView = headerView ?: parent.inflate<TextView>(R.layout.item_header).also {
+		val textView = headerView ?: parent.inflate<TextView>(R.layout.item_filter_header).also {
 			headerView = it
 		}
 		fixLayoutSize(textView, parent)
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/AnimatedToolbar.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/AnimatedToolbar.kt
new file mode 100644
index 000000000..f17b31f84
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/AnimatedToolbar.kt
@@ -0,0 +1,41 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.isGone
+import com.google.android.material.R
+import com.google.android.material.appbar.MaterialToolbar
+import java.lang.reflect.Field
+
+class AnimatedToolbar @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = R.attr.toolbarStyle,
+) : MaterialToolbar(context, attrs, defStyleAttr) {
+
+	private var navButtonView: View? = null
+		get() {
+			if (field == null) {
+				runCatching {
+					field = navButtonViewField?.get(this) as? View
+				}
+			}
+			return field
+		}
+
+	override fun setNavigationIcon(icon: Drawable?) {
+		super.setNavigationIcon(icon)
+		navButtonView?.isGone = (icon == null)
+	}
+
+	private companion object {
+
+		val navButtonViewField: Field? = runCatching {
+			Toolbar::class.java.getDeclaredField("mNavButtonView")
+				.also { it.isAccessible = true }
+		}.getOrNull()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
index 52ca53616..eb867ec0f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
@@ -4,16 +4,17 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View.OnClickListener
 import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import androidx.core.view.children
-import com.google.android.material.R
 import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
-import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.R
 
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyleAttr: Int = R.attr.chipGroupStyle
+	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle
 ) : ChipGroup(context, attrs, defStyleAttr) {
 
 	private var isLayoutSuppressedCompat = false
@@ -21,12 +22,21 @@ class ChipsView @JvmOverloads constructor(
 	private var chipOnClickListener = OnClickListener {
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
+	private var chipOnCloseListener = OnClickListener {
+		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
+	}
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
 			val isChipClickable = value != null
 			children.forEach { it.isClickable = isChipClickable }
 		}
+	var onChipCloseClickListener: OnChipCloseClickListener? = null
+		set(value) {
+			field = value
+			val isCloseIconVisible = value != null
+			children.forEach { (it as? Chip)?.isCloseIconVisible = isCloseIconVisible }
+		}
 
 	override fun requestLayout() {
 		if (isLayoutSuppressedCompat) {
@@ -36,15 +46,15 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	fun setChips(items: List<ChipModel>) {
+	fun setChips(items: Collection<ChipModel>) {
 		suppressLayoutCompat(true)
 		try {
 			for ((i, model) in items.withIndex()) {
 				val chip = getChildAt(i) as Chip? ?: addChip()
 				bindChip(chip, model)
 			}
-			for (i in items.size until childCount) {
-				removeViewAt(i)
+			if (childCount > items.size) {
+				removeViews(items.size, childCount - items.size)
 			}
 		} finally {
 			suppressLayoutCompat(false)
@@ -59,16 +69,19 @@ class ChipsView @JvmOverloads constructor(
 			chip.isCheckedIconVisible = true
 			chip.setChipIconResource(model.icon)
 		}
+		chip.isClickable = onChipClickListener != null
 		chip.tag = model.data
 	}
 
 	private fun addChip(): Chip {
 		val chip = Chip(context)
-		chip.setTextColor(context.getThemeColor(android.R.attr.textColorPrimary))
-		chip.isCloseIconVisible = false
+		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
+		chip.setChipDrawable(drawable)
+		chip.setTextColor(ContextCompat.getColor(context, R.color.color_primary))
+		chip.isCloseIconVisible = onChipCloseClickListener != null
+		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
-		chip.isClickable = onChipClickListener != null
 		addView(chip)
 		return chip
 	}
@@ -93,4 +106,9 @@ class ChipsView @JvmOverloads constructor(
 
 		fun onChipClick(chip: Chip, data: Any?)
 	}
+
+	fun interface OnChipCloseClickListener {
+
+		fun onChipCloseClick(chip: Chip, data: Any?)
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
index 867c5e3fc..e5be6808c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -41,7 +41,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.opt_browser, menu)
 		return super.onCreateOptionsMenu(menu)
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt
index 4a666d1c7..f39da5fb5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt
@@ -1,10 +1,8 @@
 package org.koitharu.kotatsu.browser
 
 import android.graphics.Bitmap
-import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.network.WebViewClientCompat
@@ -27,19 +25,4 @@ class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat
 		super.onPageCommitVisible(view, url)
 		callback.onTitleChanged(view.title.orEmpty(), url)
 	}
-
-	override fun shouldInterceptRequestCompat(view: WebView, url: String): WebResourceResponse? {
-		return runCatching {
-			val request = Request.Builder()
-				.url(url)
-				.build()
-			val response = okHttp.newCall(request).execute()
-			val ct = response.body?.contentType()
-			WebResourceResponse(
-				"${ct?.type}/${ct?.subtype}",
-				ct?.charset()?.name() ?: "utf-8",
-				response.body?.byteStream()
-			)
-		}.getOrNull()
-	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt b/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
index ba9ab7851..fe514b6d8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
@@ -3,11 +3,11 @@ package org.koitharu.kotatsu.browser.cloudflare
 import android.graphics.Bitmap
 import android.webkit.WebView
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.core.network.CookieJar
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
 import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
 class CloudFlareClient(
-	private val cookieJar: CookieJar,
+	private val cookieJar: AndroidCookieJar,
 	private val callback: CloudFlareCallback,
 	private val targetUrl: String
 ) : WebViewClientCompat() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
index 6d934330a..eb6cb8579 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
@@ -118,6 +118,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("created_at", createdAt)
 		jo.put("sort_key", sortKey)
 		jo.put("title", title)
+		jo.put("order", order)
 		return jo
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
index 86b732b27..9626ddb13 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
@@ -5,6 +5,7 @@ import org.json.JSONObject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.history.data.HistoryEntity
@@ -101,7 +102,8 @@ class RestoreRepository(private val db: MangaDatabase) {
 		categoryId = json.getInt("category_id"),
 		createdAt = json.getLong("created_at"),
 		sortKey = json.getInt("sort_key"),
-		title = json.getString("title")
+		title = json.getString("title"),
+		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
 	)
 
 	private fun parseFavourite(json: JSONObject) = FavouriteEntity(
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
index de6aead18..dc390f0f3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
@@ -20,6 +20,7 @@ val databaseModule
 				Migration5To6(),
 				Migration6To7(),
 				Migration7To8(),
+				Migration8To9(),
 			).addCallback(
 				DatabasePrePopulateCallback(androidContext().resources)
 			).build()
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
index ce8749d9d..79d0fbd34 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
@@ -4,13 +4,14 @@ import android.content.res.Resources
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.SortOrder
 
 class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() {
 
 	override fun onCreate(db: SupportSQLiteDatabase) {
 		db.execSQL(
-			"INSERT INTO favourite_categories (created_at, sort_key, title) VALUES (?,?,?)",
-			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later))
+			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`) VALUES (?,?,?,?)",
+			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name)
 		)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
index 9c40edaae..89d90665e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -18,7 +18,7 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
-	], version = 8
+	], version = 9
 )
 abstract class MangaDatabase : RoomDatabase() {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/MangaDao.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
index 51b7571db..ee8255dfc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
@@ -13,6 +13,14 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE manga_id = :id")
 	abstract suspend fun find(id: Long): MangaWithTags?
 
+	@Transaction
+	@Query("SELECT * FROM manga WHERE title LIKE :query OR alt_title LIKE :query LIMIT :limit")
+	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>
+
+	@Transaction
+	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND source = :source 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
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
new file mode 100644
index 000000000..84eedc797
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.koitharu.kotatsu.core.model.SortOrder
+
+class Migration8To9 : Migration(8, 9) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
index 5eedf24b8..6998a1a08 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
@@ -9,5 +9,6 @@ data class FavouriteCategory(
 	val id: Long,
 	val title: String,
 	val sortKey: Int,
-	val createdAt: Date
+	val order: SortOrder,
+	val createdAt: Date,
 ) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaFilter.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaFilter.kt
index 68a3b5174..498492f24 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaFilter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaFilter.kt
@@ -5,6 +5,6 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MangaFilter(
-	val sortOrder: SortOrder,
-	val tag: MangaTag?
+	val sortOrder: SortOrder?,
+	val tags: Set<MangaTag>,
 ) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
index ac67f280d..f881a59f0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
@@ -30,7 +30,17 @@ enum class MangaSource(
 	// NUDEMOON("Nude-Moon", "ru", NudeMoonRepository::class.java),
 	MANGAREAD("MangaRead", "en", MangareadRepository::class.java),
 	REMANGA("Remanga", "ru", RemangaRepository::class.java),
-	HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java);
+	HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java),
+	ANIBEL("Anibel", "be", AnibelRepository::class.java),
+	NINEMANGA_EN("NineManga English", "en", NineMangaRepository.English::class.java),
+	NINEMANGA_ES("NineManga Español", "es", NineMangaRepository.Spanish::class.java),
+	NINEMANGA_RU("NineManga Русский", "ru", NineMangaRepository.Russian::class.java),
+	NINEMANGA_DE("NineManga Deutsch", "de", NineMangaRepository.Deutsch::class.java),
+	NINEMANGA_IT("NineManga Italiano", "it", NineMangaRepository.Italiano::class.java),
+	NINEMANGA_BR("NineManga Brasil", "pt", NineMangaRepository.Brazil::class.java),
+	NINEMANGA_FR("NineManga Français", "fr", NineMangaRepository.Francais::class.java),
+	EXHENTAI("ExHentai", null, ExHentaiRepository::class.java)
+	;
 
 	@get:Throws(NoBeanDefFoundException::class)
 	@Deprecated("")
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/CookieJar.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt
similarity index 90%
rename from app/src/main/java/org/koitharu/kotatsu/core/network/CookieJar.kt
rename to app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt
index 4740e8b13..fb806bda1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/CookieJar.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt
@@ -7,7 +7,7 @@ import okhttp3.HttpUrl
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class CookieJar : CookieJar {
+class AndroidCookieJar : CookieJar {
 
 	private val cookieManager = CookieManager.getInstance()
 
@@ -28,10 +28,6 @@ class CookieJar : CookieJar {
 		}
 	}
 
-	fun clearAsync() {
-		cookieManager.removeAllCookies(null)
-	}
-
 	suspend fun clear() = suspendCoroutine<Boolean> { continuation ->
 		cookieManager.removeAllCookies(continuation::resume)
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
new file mode 100644
index 000000000..b3fa833cd
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
@@ -0,0 +1,59 @@
+package org.koitharu.kotatsu.core.network
+
+import android.util.Log
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import okio.Buffer
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+
+class CurlLoggingInterceptor(
+	private val extraCurlOptions: String? = null,
+) : Interceptor {
+
+	@Throws(IOException::class)
+	override fun intercept(chain: Interceptor.Chain): Response {
+		val request: Request = chain.request()
+		var compressed = false
+		val curlCmd = StringBuilder("curl")
+		if (extraCurlOptions != null) {
+			curlCmd.append(" ").append(extraCurlOptions)
+		}
+		curlCmd.append(" -X ").append(request.method)
+		val headers = request.headers
+		var i = 0
+		val count = headers.size
+		while (i < count) {
+			val name = headers.name(i)
+			val value = headers.value(i)
+			if ("Accept-Encoding".equals(name, ignoreCase = true) && "gzip".equals(value,
+					ignoreCase = true)
+			) {
+				compressed = true
+			}
+			curlCmd.append(" -H " + "\"").append(name).append(": ").append(value).append("\"")
+			i++
+		}
+		val requestBody = request.body
+		if (requestBody != null) {
+			val buffer = Buffer()
+			requestBody.writeTo(buffer)
+			val contentType = requestBody.contentType()
+			val charset = contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8
+			curlCmd.append(" --data $'")
+				.append(buffer.readString(charset).replace("\n", "\\n"))
+				.append("'")
+		}
+		curlCmd.append(if (compressed) " --compressed " else " ").append(request.url)
+		Log.d(TAG, "╭--- cURL (" + request.url + ")")
+		Log.d(TAG, curlCmd.toString())
+		Log.d(TAG, "╰--- (copy and paste the above line to a terminal)")
+		return chain.proceed(request)
+	}
+
+	private companion object {
+
+		const val TAG = "CURL"
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
index 6691dd50c..4d5c26d3b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
@@ -6,12 +6,13 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.utils.CacheUtils
 import java.util.concurrent.TimeUnit
 
 val networkModule
 	get() = module {
-		single { CookieJar() } bind CookieJar::class
+		single { AndroidCookieJar() } bind CookieJar::class
 		single(named(CacheUtils.QUALIFIER_HTTP)) { CacheUtils.createHttpCache(androidContext()) }
 		single {
 			OkHttpClient.Builder().apply {
@@ -22,6 +23,9 @@ val networkModule
 				cache(get(named(CacheUtils.QUALIFIER_HTTP)))
 				addInterceptor(UserAgentInterceptor())
 				addInterceptor(CloudFlareInterceptor())
+				if (BuildConfig.DEBUG) {
+					addNetworkInterceptor(CurlLoggingInterceptor())
+				}
 			}.build()
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
index 03cfdbbe4..d8c3db0c4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
@@ -35,6 +35,7 @@ class ShortcutsRepository(
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return
 		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
+			.filter { x -> x.title.isNotEmpty() }
 			.map { buildShortcutInfo(it).build().toShortcutInfo() }
 		manager.dynamicShortcuts = shortcuts
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index cd17805d4..c8904b2a8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -1,16 +1,19 @@
 package org.koitharu.kotatsu.core.parser
 
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.qualifier.named
 import org.koitharu.kotatsu.core.model.*
 
 interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
-	suspend fun getList(
+	suspend fun getList2(
 		offset: Int,
 		query: String? = null,
+		tags: Set<MangaTag>? = null,
 		sortOrder: SortOrder? = null,
-		tag: MangaTag? = null
 	): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga
@@ -20,4 +23,11 @@ interface MangaRepository {
 	suspend fun getPageUrl(page: MangaPage): String
 
 	suspend fun getTags(): Set<MangaTag>
+
+	companion object : KoinComponent {
+
+		operator fun invoke(source: MangaSource): MangaRepository {
+			return get(named(source))
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
new file mode 100644
index 000000000..16cc5e39f
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.parser
+
+interface MangaRepositoryAuthProvider {
+
+	val authUrl: String
+
+	fun isAuthorized(): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
index b5b3f431c..361bdfa61 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
@@ -24,4 +24,13 @@ val parserModule
 		factory<MangaRepository>(named(MangaSource.MANGAREAD)) { MangareadRepository(get()) }
 		factory<MangaRepository>(named(MangaSource.REMANGA)) { RemangaRepository(get()) }
 		factory<MangaRepository>(named(MangaSource.HENTAILIB)) { HentaiLibRepository(get()) }
+		factory<MangaRepository>(named(MangaSource.ANIBEL)) { AnibelRepository(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_EN)) { NineMangaRepository.English(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_BR)) { NineMangaRepository.Brazil(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_DE)) { NineMangaRepository.Deutsch(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_ES)) { NineMangaRepository.Spanish(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_RU)) { NineMangaRepository.Russian(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_IT)) { NineMangaRepository.Italiano(get()) }
+		factory<MangaRepository>(named(MangaSource.NINEMANGA_FR)) { NineMangaRepository.Francais(get()) }
+		factory<MangaRepository>(named(MangaSource.EXHENTAI)) { ExHentaiRepository(get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
index ce91c0ddc..ef4c55817 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.exceptions.ParseException
 import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.MangaTag
@@ -19,6 +20,9 @@ abstract class RemoteMangaRepository(
 		loaderContext.getSettings(source)
 	}
 
+	val title: String
+		get() = source.title
+
 	override val sortOrders: Set<SortOrder> get() = emptySet()
 
 	override suspend fun getPageUrl(page: MangaPage): String = page.url.withDomain()
@@ -75,4 +79,8 @@ abstract class RemoteMangaRepository(
 		h = 31 * h + id
 		return h
 	}
+
+	protected fun parseFailed(message: String? = null): Nothing {
+		throw ParseException(message)
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
new file mode 100644
index 000000000..bb3622afc
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
@@ -0,0 +1,178 @@
+package org.koitharu.kotatsu.core.parser.site
+
+import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.utils.ext.*
+import java.util.*
+
+class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
+
+	override val source = MangaSource.ANIBEL
+
+	override val defaultDomain = "anibel.net"
+
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
+		SortOrder.NEWEST
+	)
+
+	override suspend fun getList2(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
+	): List<Manga> {
+		if (!query.isNullOrEmpty()) {
+			return if (offset == 0) search(query) else emptyList()
+		}
+		val page = (offset / 12f).toIntUp().inc()
+		val link = when {
+			tags.isNullOrEmpty() -> "/manga?page=$page".withDomain()
+			else -> tags.joinToString(
+				prefix = "/manga?",
+				postfix = "&page=$page",
+				separator = "&",
+			) { tag -> "genre[]=${tag.key}" }.withDomain()
+		}
+		val doc = loaderContext.httpGet(link).parseHtml()
+		val root = doc.body().select("div.manga-block") ?: parseFailed("Cannot find root")
+		val items = root.select("div.anime-card")
+		return items.mapNotNull { card ->
+			val href = card.selectFirst("a")?.attr("href") ?: return@mapNotNull null
+			val status = card.select("tr")[2].text()
+			val fullTitle = card.selectFirst("h1.anime-card-title")?.text()
+				?.substringBeforeLast('[')  ?: return@mapNotNull null
+			val titleParts = fullTitle.splitTwoParts('/')
+			Manga(
+				id = generateUid(href),
+				title = titleParts?.first?.trim() ?: fullTitle,
+				coverUrl = card.selectFirst("img")?.attr("data-src")
+					?.withDomain().orEmpty(),
+				altTitle = titleParts?.second?.trim(),
+				author = null,
+				rating = Manga.NO_RATING,
+				url = href,
+				publicUrl = href.withDomain(),
+				tags = card.select("p.tupe.tag").select("a").mapNotNullToSet tags@{ x ->
+					MangaTag(
+						title = x.text(),
+						key = x.attr("href").ifEmpty {
+							return@mapNotNull null
+						}.substringAfterLast("="),
+						source = source
+					)
+				},
+				state = when (status) {
+					"выпускаецца" -> MangaState.ONGOING
+					"завершанае" -> MangaState.FINISHED
+					else -> null
+				},
+				source = source
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val doc = loaderContext.httpGet(manga.publicUrl).parseHtml()
+		val root = doc.body().select("div.container") ?: parseFailed("Cannot find root")
+		return manga.copy(
+			description = root.select("div.manga-block.grid-12")[2].select("p").text(),
+			chapters = root.select("ul.series").flatMap { table ->
+				table.select("li")
+			}.map { it.selectFirst("a") }.mapIndexedNotNull { i, a ->
+				val href = a?.select("a")?.first()?.attr("href")
+					?.toRelativeUrl(getDomain()) ?: return@mapIndexedNotNull null
+				MangaChapter(
+					id = generateUid(href),
+					name = a.selectFirst("a")?.text().orEmpty(),
+					number = i + 1,
+					url = href,
+					source = source
+				)
+			}
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val fullUrl = chapter.url.withDomain()
+		val doc = loaderContext.httpGet(fullUrl).parseHtml()
+		val scripts = doc.select("script")
+		for (script in scripts) {
+			val data = script.html()
+			val pos = data.indexOf("dataSource")
+			if (pos == -1) {
+				continue
+			}
+			val json = data.substring(pos).substringAfter('[').substringBefore(']')
+			val domain = getDomain()
+			return json.split(",").mapNotNull {
+				it.trim()
+					.removeSurrounding('"', '\'')
+					.toRelativeUrl(domain)
+					.takeUnless(String::isBlank)
+			}.map { url ->
+				MangaPage(
+					id = generateUid(url),
+					url = url,
+					referer = fullUrl,
+					source = source
+				)
+			}
+		}
+		parseFailed("Pages list not found at ${chapter.url.withDomain()}")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = loaderContext.httpGet("https://${getDomain()}/manga").parseHtml()
+		val root = doc.body().select("div#tabs-genres").select("ul#list.ul-three-colums")
+		return root.select("p.menu-tags.tupe").mapToSet { p ->
+			val a = p.selectFirst("a") ?: parseFailed("a is null")
+			MangaTag(
+				title = a.text().toCamelCase(),
+				key = a.attr("data-name"),
+				source = source
+			)
+		}
+	}
+
+	private suspend fun search(query: String): List<Manga> {
+		val domain = getDomain()
+		val doc = loaderContext.httpGet("https://$domain/search?q=$query").parseHtml()
+		val root = doc.body().select("div.manga-block").select("article.tab-2") ?: parseFailed("Cannot find root")
+		val items = root.select("div.anime-card")
+		return items.mapNotNull { card ->
+			val href = card.select("a").attr("href")
+			val status = card.select("tr")[2].text()
+			val fullTitle = card.selectFirst("h1.anime-card-title")?.text()
+				?.substringBeforeLast('[') ?: return@mapNotNull null
+			val titleParts = fullTitle.splitTwoParts('/')
+			Manga(
+				id = generateUid(href),
+				title = titleParts?.first?.trim() ?: fullTitle,
+				coverUrl = card.selectFirst("img")?.attr("src")
+					?.withDomain().orEmpty(),
+				altTitle = titleParts?.second?.trim(),
+				author = null,
+				rating = Manga.NO_RATING,
+				url = href,
+				publicUrl = href.withDomain(),
+				tags = card.select("p.tupe.tag").select("a").mapNotNullToSet tags@{ x ->
+					MangaTag(
+						title = x.text(),
+						key = x.attr("href").ifEmpty {
+							return@mapNotNull null
+						}.substringAfterLast("="),
+						source = source
+					)
+				},
+				state = when (status) {
+					"выпускаецца" -> MangaState.ONGOING
+					"завершанае" -> MangaState.FINISHED
+					else -> null
+				},
+				source = source
+			)
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
index e5828c154..629082010 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
@@ -17,11 +17,11 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 		SortOrder.ALPHABETICAL
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val domain = getDomain()
 		val url = when {
@@ -31,11 +31,15 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 				}
 				"https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
 			}
-			tag != null -> "https://$domain/tags/${tag.key}&n=${getSortKey2(sortOrder)}?offset=$offset"
+			!tags.isNullOrEmpty() -> tags.joinToString(
+				prefix = "https://$domain/tags/",
+				postfix = "&n=${getSortKey2(sortOrder)}?offset=$offset",
+				separator = "+",
+			) { tag -> tag.key }
 			else -> "https://$domain/${getSortKey(sortOrder)}?offset=$offset"
 		}
 		val doc = loaderContext.httpGet(url).parseHtml()
-		val root = doc.body().selectFirst("div.main_fon").getElementById("content")
+		val root = doc.body().selectFirst("div.main_fon")?.getElementById("content")
 			?: throw ParseException("Cannot find root")
 		return root.select("div.content_row").mapNotNull { row ->
 			val a = row.selectFirst("div.manga_row1")?.selectFirst("h2")?.selectFirst("a")
@@ -78,7 +82,7 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 			chapters = root.select("table.table_cha").flatMap { table ->
 				table.select("div.manga2")
 			}.map { it.selectFirst("a") }.reversed().mapIndexedNotNull { i, a ->
-				val href = a.relUrl("href")
+				val href = a?.relUrl("href") ?: return@mapIndexedNotNull null
 				MangaChapter(
 					id = generateUid(href),
 					name = a.text().trim(),
@@ -123,12 +127,12 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 	override suspend fun getTags(): Set<MangaTag> {
 		val domain = getDomain()
 		val doc = loaderContext.httpGet("https://$domain/catalog").parseHtml()
-		val root = doc.body().selectFirst("div.main_fon").getElementById("side")
-			.select("ul").last()
+		val root = doc.body().selectFirst("div.main_fon")?.getElementById("side")
+			?.select("ul")?.last() ?: throw ParseException("Cannot find root")
 		return root.select("li.sidetag").mapToSet { li ->
-			val a = li.children().last()
+			val a = li.children().last() ?: throw ParseException("a is null")
 			MangaTag(
-				title = a.text().capitalize(),
+				title = a.text().toCamelCase(),
 				key = a.attr("href").substringAfterLast('/'),
 				source = source
 			)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
index c09530342..73b223b82 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
@@ -6,7 +6,6 @@ import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.utils.ext.*
 import java.util.*
-import kotlin.collections.ArrayList
 
 class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
 
@@ -21,11 +20,11 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 		SortOrder.ALPHABETICAL
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		if (query != null && offset != 0) {
 			return emptyList()
@@ -38,9 +37,9 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 			append(getSortKey(sortOrder))
 			append("&page=")
 			append((offset / 20) + 1)
-			if (tag != null) {
+			if (!tags.isNullOrEmpty()) {
 				append("&genres=")
-				append(tag.key)
+				appendAll(tags, ",") { it.key }
 			}
 			if (query != null) {
 				append("&search=")
@@ -122,12 +121,13 @@ class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepositor
 
 	override suspend fun getTags(): Set<MangaTag> {
 		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
-		val root = doc.body().getElementById("animeFilter").selectFirst(".catalog-genres")
+		val root = doc.body().getElementById("animeFilter")
+			?.selectFirst(".catalog-genres") ?: throw ParseException("Root not found")
 		return root.select("li").mapToSet {
 			MangaTag(
 				source = source,
-				key = it.selectFirst("input").attr("data-genre"),
-				title = it.selectFirst("label").text()
+				key = it.selectFirst("input")?.attr("data-genre") ?: parseFailed(),
+				title = it.selectFirst("label")?.text() ?: parseFailed()
 			)
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
new file mode 100644
index 000000000..bef2af960
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
@@ -0,0 +1,258 @@
+package org.koitharu.kotatsu.core.parser.site
+
+import org.jsoup.nodes.Element
+import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.utils.ext.*
+import kotlin.math.pow
+
+private const val DOMAIN_UNAUTHORIZED = "e-hentai.org"
+private const val DOMAIN_AUTHORIZED = "exhentai.org"
+
+class ExHentaiRepository(
+	loaderContext: MangaLoaderContext,
+) : RemoteMangaRepository(loaderContext), MangaRepositoryAuthProvider {
+
+	override val source = MangaSource.EXHENTAI
+
+	override val defaultDomain: String
+		get() = if (isAuthorized()) DOMAIN_AUTHORIZED else DOMAIN_UNAUTHORIZED
+
+	override val authUrl: String
+		get() = "https://${getDomain()}/bounce_login.php"
+
+	private val ratingPattern = Regex("-?[0-9]+px")
+	private val authCookies = arrayOf("ipb_member_id", "ipb_pass_hash")
+	private var updateDm = false
+
+	init {
+		loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "nw=1", "sl=dm_2")
+		loaderContext.cookieJar.insertCookies(DOMAIN_UNAUTHORIZED, "nw=1", "sl=dm_2")
+	}
+
+	override suspend fun getList2(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?,
+	): List<Manga> {
+		val page = (offset / 25f).toIntUp()
+		var search = query?.urlEncoded().orEmpty()
+		val url = buildString {
+			append("https://")
+			append(getDomain())
+			append("/?page=")
+			append(page)
+			if (!tags.isNullOrEmpty()) {
+				var fCats = 0
+				for (tag in tags) {
+					tag.key.toIntOrNull()?.let { fCats = fCats or it } ?: run {
+						search += tag.key + " "
+					}
+				}
+				if (fCats != 0) {
+					append("&f_cats=")
+					append(1023 - fCats)
+				}
+			}
+			if (search.isNotEmpty()) {
+				append("&f_search=")
+				append(search.trim().replace(' ', '+'))
+			}
+			// by unknown reason cookie "sl=dm_2" is ignored, so, we should request it again
+			if (updateDm) {
+				append("&inline_set=dm_e")
+			}
+		}
+		val body = loaderContext.httpGet(url).parseHtml().body()
+		val root = body.selectFirst("table.itg")
+			?.selectFirst("tbody")
+			?: if (updateDm) {
+				parseFailed("Cannot find root")
+			} else {
+				updateDm = true
+				return getList2(offset, query, tags, sortOrder)
+			}
+		updateDm = false
+		return root.children().mapNotNull { tr ->
+			if (tr.childrenSize() != 2) return@mapNotNull null
+			val (td1, td2) = tr.children()
+			val glink = td2.selectFirst("div.glink") ?: parseFailed("glink not found")
+			val a = glink.parents().select("a").first() ?: parseFailed("link not found")
+			val href = a.relUrl("href")
+			val tagsDiv = glink.nextElementSibling() ?: parseFailed("tags div not found")
+			val mainTag = td2.selectFirst("div.cn")?.let { div ->
+				MangaTag(
+					title = div.text(),
+					key = tagIdByClass(div.classNames()) ?: return@let null,
+					source = source,
+				)
+			}
+			Manga(
+				id = generateUid(href),
+				title = glink.text().cleanupTitle(),
+				altTitle = null,
+				url = href,
+				publicUrl = a.absUrl("href"),
+				rating = td2.selectFirst("div.ir")?.parseRating() ?: Manga.NO_RATING,
+				isNsfw = true,
+				coverUrl = td1.selectFirst("img")?.absUrl("src").orEmpty(),
+				tags = setOfNotNull(mainTag),
+				state = null,
+				author = tagsDiv.getElementsContainingOwnText("artist:").first()
+					?.nextElementSibling()?.text(),
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
+		val root = doc.body().selectFirst("div.gm") ?: parseFailed("Cannot find root")
+		val cover = root.getElementById("gd1")?.children()?.first()
+		val title = root.getElementById("gd2")
+		val taglist = root.getElementById("taglist")
+		val tabs = doc.body().selectFirst("table.ptt")?.selectFirst("tr")
+		return manga.copy(
+			title = title?.getElementById("gn")?.text()?.cleanupTitle() ?: manga.title,
+			altTitle = title?.getElementById("gj")?.text()?.cleanupTitle() ?: manga.altTitle,
+			publicUrl = doc.baseUri().ifEmpty { manga.publicUrl },
+			rating = root.getElementById("rating_label")?.text()
+				?.substringAfterLast(' ')
+				?.toFloatOrNull()
+				?.div(5f) ?: manga.rating,
+			largeCoverUrl = cover?.css("background")?.cssUrl(),
+			description = taglist?.select("tr")?.joinToString("<br>") { tr ->
+				val (tc, td) = tr.children()
+				val subtags = td.select("a").joinToString { it.html() }
+				"<b>${tc.html()}</b> $subtags"
+			},
+			chapters = tabs?.select("a")?.findLast { a ->
+				a.text().toIntOrNull() != null
+			}?.let { a ->
+				val count = a.text().toInt()
+				val chapters = ArrayList<MangaChapter>(count)
+				for (i in 1..count) {
+					val url = "${manga.url}?p=$i"
+					chapters += MangaChapter(
+						id = generateUid(url),
+						name = "${manga.title} #$i",
+						number = i,
+						url = url,
+						branch = null,
+						source = source,
+					)
+				}
+				chapters
+			},
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val doc = loaderContext.httpGet(chapter.url.withDomain()).parseHtml()
+		val root = doc.body().getElementById("gdt") ?: parseFailed("Root not found")
+		return root.select("a").mapNotNull { a ->
+			val url = a.relUrl("href")
+			MangaPage(
+				id = generateUid(url),
+				url = url,
+				referer = a.absUrl("href"),
+				preview = null,
+				source = source,
+			)
+		}
+	}
+
+	override suspend fun getPageUrl(page: MangaPage): String {
+		val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
+		return doc.body().getElementById("img")?.absUrl("src")
+			?: parseFailed("Image not found")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = loaderContext.httpGet("https://${getDomain()}").parseHtml()
+		val root = doc.body().getElementById("searchbox")?.selectFirst("table")
+			?: parseFailed("Root not found")
+		return root.select("div.cs").mapNotNullToSet { div ->
+			val id = div.id().substringAfterLast('_').toIntOrNull()
+				?: return@mapNotNullToSet null
+			MangaTag(
+				title = div.text(),
+				key = id.toString(),
+				source = source
+			)
+		}
+	}
+
+	override fun isAuthorized(): Boolean {
+		val authorized = isAuthorized(DOMAIN_UNAUTHORIZED)
+		if (authorized) {
+			if (!isAuthorized(DOMAIN_AUTHORIZED)) {
+				loaderContext.cookieJar.copyCookies(
+					DOMAIN_UNAUTHORIZED,
+					DOMAIN_AUTHORIZED,
+					authCookies,
+				)
+				loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "yay=louder")
+			}
+			return true
+		}
+		return false
+	}
+
+	private fun isAuthorized(domain: String): Boolean {
+		val cookies = loaderContext.cookieJar.getCookies(domain).mapToSet { x -> x.name }
+		return authCookies.all { it in cookies }
+	}
+
+	private fun Element.parseRating(): Float {
+		return runCatching {
+			val style = requireNotNull(attr("style"))
+			val (v1, v2) = ratingPattern.find(style)!!.destructured
+			var p1 = v1.dropLast(2).toInt()
+			val p2 = v2.dropLast(2).toInt()
+			if (p2 != -1) {
+				p1 += 8
+			}
+			(80 - p1) / 80f
+		}.getOrDefault(Manga.NO_RATING)
+	}
+
+	private fun String.cleanupTitle(): String {
+		val result = StringBuilder(length)
+		var skip = false
+		for (c in this) {
+			when {
+				c == '[' -> skip = true
+				c == ']' -> skip = false
+				c.isWhitespace() && result.isEmpty() -> continue
+				!skip -> result.append(c)
+			}
+		}
+		while (result.lastOrNull()?.isWhitespace() == true) {
+			result.deleteCharAt(result.lastIndex)
+		}
+		return result.toString()
+	}
+
+	private fun String.cssUrl(): String? {
+		val fromIndex = indexOf("url(")
+		if (fromIndex == -1) {
+			return null
+		}
+		val toIndex = indexOf(')', startIndex = fromIndex)
+		return if (toIndex == -1) {
+			null
+		} else {
+			substring(fromIndex + 4, toIndex).trim()
+		}
+	}
+
+	private fun tagIdByClass(classNames: Collection<String>): String? {
+		val className = classNames.find { x -> x.startsWith("ct") } ?: return null
+		val num = className.drop(2).toIntOrNull(16) ?: return null
+		return 2.0.pow(num).toInt().toString()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
index b680b5cf0..2d35111e8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.parser.site
 
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Response
 import org.koitharu.kotatsu.base.domain.MangaLoaderContext
 import org.koitharu.kotatsu.core.exceptions.ParseException
 import org.koitharu.kotatsu.core.model.*
@@ -18,11 +19,11 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 		SortOrder.RATING
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val domain = getDomain()
 		val doc = when {
@@ -33,22 +34,24 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 					"offset" to (offset upBy PAGE_SIZE_SEARCH).toString()
 				)
 			)
-			tag == null -> loaderContext.httpGet(
+			tags.isNullOrEmpty() -> loaderContext.httpGet(
 				"https://$domain/list?sortType=${
 					getSortKey(
 						sortOrder
 					)
 				}&offset=${offset upBy PAGE_SIZE}"
 			)
-			else -> loaderContext.httpGet(
-				"https://$domain/list/genre/${tag.key}?sortType=${
+			tags.size == 1 -> loaderContext.httpGet(
+				"https://$domain/list/genre/${tags.first().key}?sortType=${
 					getSortKey(
 						sortOrder
 					)
 				}&offset=${offset upBy PAGE_SIZE}"
 			)
-		}.parseHtml()
-		val root = doc.body().getElementById("mangaBox")
+			offset > 0 -> return emptyList()
+			else -> advancedSearch(domain, tags)
+		}.parseHtml().body()
+		val root = (doc.getElementById("mangaBox") ?: doc.getElementById("mangaResults"))
 			?.selectFirst("div.tiles.row") ?: throw ParseException("Cannot find root")
 		val baseHost = root.baseUri().toHttpUrl().host
 		return root.select("div.tile").mapNotNull { node ->
@@ -57,7 +60,7 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 			if (descDiv.selectFirst("i.fa-user") != null) {
 				return@mapNotNull null //skip author
 			}
-			val href = imgDiv.selectFirst("a").attr("href")?.inContextOf(node)
+			val href = imgDiv.selectFirst("a")?.attr("href")?.inContextOf(node)
 			if (href == null || href.toHttpUrl().host != baseHost) {
 				return@mapNotNull null // skip external links
 			}
@@ -161,11 +164,11 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 
 	override suspend fun getTags(): Set<MangaTag> {
 		val doc = loaderContext.httpGet("https://${getDomain()}/list/genres/sort_name").parseHtml()
-		val root = doc.body().getElementById("mangaBox").selectFirst("div.leftContent")
-			.selectFirst("table.table")
+		val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
+			?.selectFirst("table.table") ?: parseFailed("Cannot find root")
 		return root.select("a.element-link").mapToSet { a ->
 			MangaTag(
-				title = a.text().capitalize(),
+				title = a.text().toCamelCase(),
 				key = a.attr("href").substringAfterLast('/'),
 				source = source
 			)
@@ -182,6 +185,43 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 			null -> "updated"
 		}
 
+	private suspend fun advancedSearch(domain: String, tags: Set<MangaTag>): Response {
+		val url = "https://$domain/search/advanced"
+		// Step 1: map catalog genres names to advanced-search genres ids
+		val tagsIndex = loaderContext.httpGet(url).parseHtml()
+			.body().selectFirst("form.search-form")
+			?.select("div.form-group")
+			?.get(1) ?: parseFailed("Genres filter element not found")
+		val tagNames = tags.map { it.title.lowercase() }
+		val payload = HashMap<String, String>()
+		var foundGenres = 0
+		tagsIndex.select("li.property").forEach { li ->
+			val name = li.text().trim().lowercase()
+			val id = li.selectFirst("input")?.id()
+				?: parseFailed("Id for tag $name not found")
+			payload[id] = if (name in tagNames) {
+				foundGenres++
+				"in"
+			} else ""
+		}
+		if (foundGenres != tags.size) {
+			parseFailed("Some genres are not found")
+		}
+		// Step 2: advanced search
+		payload["q"] = ""
+		payload["s_high_rate"] = ""
+		payload["s_single"] = ""
+		payload["s_mature"] = ""
+		payload["s_completed"] = ""
+		payload["s_translated"] = ""
+		payload["s_many_chapters"] = ""
+		payload["s_wait_upload"] = ""
+		payload["s_sale"] = ""
+		payload["years"] = "1900,2099"
+		payload["+"] = "Искать".urlEncoded()
+		return loaderContext.httpPost(url, payload)
+	}
+
 	private companion object {
 
 		private const val PAGE_SIZE = 70
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
index e405aed9c..a358f50df 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
@@ -8,16 +8,16 @@ import org.koitharu.kotatsu.utils.ext.parseHtml
 
 class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
 
-	override val defaultDomain = "hentaichan.pro"
+	override val defaultDomain = "hentaichan.live"
 	override val source = MangaSource.HENCHAN
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
-		return super.getList(offset, query, sortOrder, tag).map {
+		return super.getList2(offset, query, tags, sortOrder).map {
 			val cover = it.coverUrl
 			if (cover.contains("_blur")) {
 				it.copy(coverUrl = cover.replace("_blur", ""))
@@ -36,7 +36,7 @@ class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(load
 			description = root.getElementById("description")?.html()?.substringBeforeLast("<div"),
 			largeCoverUrl = root.getElementById("cover")?.absUrl("src"),
 			tags = root.selectFirst("div.sidetags")?.select("li.sidetag")?.mapToSet {
-				val a = it.children().last()
+				val a = it.children().last() ?: parseFailed("Invalid tag")
 				MangaTag(
 					title = a.text(),
 					key = a.attr("href").substringAfterLast('/'),
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
index 8d2c6c87f..ba0ea771d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
@@ -10,7 +10,6 @@ import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.utils.ext.*
 import java.util.*
-import kotlin.collections.ArrayList
 
 open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 	RemoteMangaRepository(loaderContext) {
@@ -27,11 +26,11 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 		SortOrder.NEWEST
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		if (!query.isNullOrEmpty()) {
 			return if (offset == 0) search(query) else emptyList()
@@ -44,20 +43,21 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 			append(getSortKey(sortOrder))
 			append("&page=")
 			append(page)
-			if (tag != null) {
-				append("&includeGenres[]=")
+			tags?.forEach { tag ->
+				append("&genres[include][]=")
 				append(tag.key)
 			}
 		}
 		val doc = loaderContext.httpGet(url).parseHtml()
 		val root = doc.body().getElementById("manga-list") ?: throw ParseException("Root not found")
-		val items = root.selectFirst("div.media-cards-grid").select("div.media-card-wrap")
+		val items = root.selectFirst("div.media-cards-grid")?.select("div.media-card-wrap")
+			?: return emptyList()
 		return items.mapNotNull { card ->
 			val a = card.selectFirst("a.media-card") ?: return@mapNotNull null
 			val href = a.relUrl("href")
 			Manga(
 				id = generateUid(href),
-				title = card.selectFirst("h3").text(),
+				title = card.selectFirst("h3")?.text().orEmpty(),
 				coverUrl = a.absUrl("data-src"),
 				altTitle = null,
 				author = null,
@@ -98,10 +98,11 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 							append(item.getInt("chapter_volume"))
 							append("/c")
 							append(item.getString("chapter_number"))
+							@Suppress("BlockingMethodInNonBlockingContext") // lint issue
 							append('/')
 							append(item.optString("chapter_string"))
 						}
-						var name = item.getString("chapter_name")
+						var name = item.getStringOrNull("chapter_name")
 						if (name.isNullOrBlank() || name == "null") {
 							name = "Том " + item.getInt("chapter_volume") +
 									" Глава " + item.getString("chapter_number")
@@ -128,17 +129,17 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 			rating = root.selectFirst("div.media-stats-item__score")
 				?.selectFirst("span")
 				?.text()?.toFloatOrNull()?.div(5f) ?: manga.rating,
-			author = info.getElementsMatchingOwnText("Автор").firstOrNull()
+			author = info?.getElementsMatchingOwnText("Автор")?.firstOrNull()
 				?.nextElementSibling()?.text() ?: manga.author,
-			tags = info.selectFirst("div.media-tags")
+			tags = info?.selectFirst("div.media-tags")
 				?.select("a.media-tag-item")?.mapToSet { a ->
 					MangaTag(
-						title = a.text().capitalize(),
+						title = a.text().toCamelCase(),
 						key = a.attr("href").substringAfterLast('='),
 						source = source
 					)
 				} ?: manga.tags,
-			description = info.selectFirst("div.media-description__text")?.html(),
+			description = info?.selectFirst("div.media-description__text")?.html(),
 			chapters = chapters
 		)
 	}
@@ -146,11 +147,11 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		val fullUrl = chapter.url.withDomain()
 		val doc = loaderContext.httpGet(fullUrl).parseHtml()
-		if (doc.location()?.endsWith("/register") == true) {
+		if (doc.location().endsWith("/register")) {
 			throw AuthRequiredException("/login".inContextOf(doc))
 		}
 		val scripts = doc.head().select("script")
-		val pg = doc.body().getElementById("pg").html()
+		val pg = (doc.body().getElementById("pg")?.html() ?: parseFailed("Element #pg not found"))
 			.substringAfter('=')
 			.substringBeforeLast(';')
 		val pages = JSONArray(pg)
@@ -196,7 +197,7 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
 					result += MangaTag(
 						source = source,
 						key = x.getInt("id").toString(),
-						title = x.getString("name").capitalize()
+						title = x.getString("name").toCamelCase()
 					)
 				}
 				return result
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
index 4fb4085dc..bf5ce1b8f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
@@ -23,11 +23,11 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		SortOrder.UPDATED
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val sortKey = when (sortOrder) {
 			SortOrder.ALPHABETICAL -> "?name.az"
@@ -43,22 +43,28 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 				}
 				"/search?name=${query.urlEncoded()}".withDomain()
 			}
-			tag != null -> "/directory/${tag.key}/$page.htm$sortKey".withDomain()
-			else -> "/directory/$page.htm$sortKey".withDomain()
+			tags.isNullOrEmpty() -> "/directory/$page.htm$sortKey".withDomain()
+			tags.size == 1 -> "/directory/${tags.first().key}/$page.htm$sortKey".withDomain()
+			else -> tags.joinToString(
+				prefix = "/search?page=$page".withDomain()
+			) { tag ->
+				"&genres[${tag.key}]=1"
+			}
 		}
 		val doc = loaderContext.httpGet(url).parseHtml()
 		val root = doc.body().selectFirst("ul.manga_pic_list")
 			?: throw ParseException("Root not found")
 		return root.select("li").mapNotNull { li ->
 			val a = li.selectFirst("a.manga_cover")
-			val href = a.relUrl("href")
+			val href = a?.relUrl("href")
+				?: return@mapNotNull null
 			val views = li.select("p.view")
 			val status = views.findOwnText { x -> x.startsWith("Status:") }
-				?.substringAfter(':')?.trim()?.toLowerCase(Locale.ROOT)
+				?.substringAfter(':')?.trim()?.lowercase(Locale.ROOT)
 			Manga(
 				id = generateUid(href),
 				title = a.attr("title"),
-				coverUrl = a.selectFirst("img").absUrl("src"),
+				coverUrl = a.selectFirst("img")?.absUrl("src").orEmpty(),
 				source = MangaSource.MANGATOWN,
 				altTitle = null,
 				rating = li.selectFirst("p.score")?.selectFirst("b")
@@ -87,11 +93,11 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
 		val root = doc.body().selectFirst("section.main")
 			?.selectFirst("div.article_content") ?: throw ParseException("Cannot find root")
-		val info = root.selectFirst("div.detail_info").selectFirst("ul")
+		val info = root.selectFirst("div.detail_info")?.selectFirst("ul")
 		val chaptersList = root.selectFirst("div.chapter_content")
 			?.selectFirst("ul.chapter_list")?.select("li")?.asReversed()
 		return manga.copy(
-			tags = manga.tags + info.select("li").find { x ->
+			tags = manga.tags + info?.select("li")?.find { x ->
 				x.selectFirst("b")?.ownText() == "Genre(s):"
 			}?.select("a")?.mapNotNull { a ->
 				MangaTag(
@@ -100,9 +106,10 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 					source = MangaSource.MANGATOWN
 				)
 			}.orEmpty(),
-			description = info.getElementById("show")?.ownText(),
+			description = info?.getElementById("show")?.ownText(),
 			chapters = chaptersList?.mapIndexedNotNull { i, li ->
-				val href = li.selectFirst("a").relUrl("href")
+				val href = li.selectFirst("a")?.relUrl("href")
+					?: return@mapIndexedNotNull null
 				val name = li.select("span").filter { it.className().isEmpty() }
 					.joinToString(" - ") { it.text() }.trim()
 				MangaChapter(
@@ -110,7 +117,7 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 					url = href,
 					source = MangaSource.MANGATOWN,
 					number = i + 1,
-					name = if (name.isEmpty()) "${manga.title} - ${i + 1}" else name
+					name = name.ifEmpty { "${manga.title} - ${i + 1}" }
 				)
 			}
 		)
@@ -121,7 +128,7 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 		val doc = loaderContext.httpGet(fullUrl).parseHtml()
 		val root = doc.body().selectFirst("div.page_select")
 			?: throw ParseException("Cannot find root")
-		return root.selectFirst("select").select("option").mapNotNull {
+		return root.selectFirst("select")?.select("option")?.mapNotNull {
 			val href = it.relUrl("value")
 			if (href.endsWith("featured.html")) {
 				return@mapNotNull null
@@ -132,20 +139,20 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) :
 				referer = fullUrl,
 				source = MangaSource.MANGATOWN
 			)
-		}
+		} ?: parseFailed("Pages list not found")
 	}
 
 	override suspend fun getPageUrl(page: MangaPage): String {
 		val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
-		return doc.getElementById("image").absUrl("src")
+		return doc.getElementById("image")?.absUrl("src") ?: parseFailed("Image not found")
 	}
 
 	override suspend fun getTags(): Set<MangaTag> {
 		val doc = loaderContext.httpGet("/directory/".withDomain()).parseHtml()
 		val root = doc.body().selectFirst("aside.right")
-			.getElementsContainingOwnText("Genres")
-			.first()
-			.nextElementSibling()
+			?.getElementsContainingOwnText("Genres")
+			?.first()
+			?.nextElementSibling() ?: parseFailed("Root not found")
 		return root.select("li").mapNotNullToSet { li ->
 			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
 			val key = a.attr("href").parseTagKey()
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
index e4677e1be..0a94c3d04 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
@@ -20,17 +20,19 @@ class MangareadRepository(
 		SortOrder.POPULARITY
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
-		if (offset % PAGE_SIZE != 0) {
-			return emptyList()
+		val tag = when {
+			tags.isNullOrEmpty() -> null
+			tags.size == 1 -> tags.first()
+			else -> throw NotImplementedError("Multiple genres are not supported by this source")
 		}
 		val payload = createRequestTemplate()
-		payload["page"] = (offset / PAGE_SIZE).toString()
+		payload["page"] = (offset / PAGE_SIZE.toFloat()).toIntUp().toString()
 		payload["vars[meta_key]"] = when (sortOrder) {
 			SortOrder.POPULARITY -> "_wp_manga_views"
 			SortOrder.UPDATED -> "_latest_update"
@@ -43,26 +45,26 @@ class MangareadRepository(
 			payload
 		).parseHtml()
 		return doc.select("div.row.c-tabs-item__content").map { div ->
-			val href = div.selectFirst("a").relUrl("href")
+			val href = div.selectFirst("a")?.relUrl("href")
+				?: parseFailed("Link not found")
 			val summary = div.selectFirst(".tab-summary")
 			Manga(
 				id = generateUid(href),
 				url = href,
 				publicUrl = href.inContextOf(div),
-				coverUrl = div.selectFirst("img").attr("data-srcset")
-					.split(',').firstOrNull()?.substringBeforeLast(' ').orEmpty(),
-				title = summary.selectFirst("h3").text(),
+				coverUrl = div.selectFirst("img")?.absUrl("src").orEmpty(),
+				title = summary?.selectFirst("h3")?.text().orEmpty(),
 				rating = div.selectFirst("span.total_votes")?.ownText()
 					?.toFloatOrNull()?.div(5f) ?: -1f,
-				tags = summary.selectFirst(".mg_genres").select("a").mapToSet { a ->
+				tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapToSet { a ->
 					MangaTag(
 						key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
 						title = a.text(),
 						source = MangaSource.MANGAREAD
 					)
-				},
-				author = summary.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
-				state = when (summary.selectFirst(".mg_status")?.selectFirst(".summary-content")
+				}.orEmpty(),
+				author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
+				state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")
 					?.ownText()?.trim()) {
 					"OnGoing" -> MangaState.ONGOING
 					"Completed" -> MangaState.FINISHED
@@ -76,9 +78,9 @@ class MangareadRepository(
 	override suspend fun getTags(): Set<MangaTag> {
 		val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
 		val root = doc.body().selectFirst("header")
-			.selectFirst("ul.second-menu")
+			?.selectFirst("ul.second-menu") ?: parseFailed("Root not found")
 		return root.select("li").mapNotNullToSet { li ->
-			val a = li.selectFirst("a")
+			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
 			val href = a.attr("href").removeSuffix("/")
 				.substringAfterLast("genres/", "")
 			if (href.isEmpty()) {
@@ -102,8 +104,8 @@ class MangareadRepository(
 		val root2 = doc.body().selectFirst("div.content-area")
 			?.selectFirst("div.c-page")
 			?: throw ParseException("Root2 not found")
-		val mangaId = doc.getElementsByAttribute("data-postid").firstOrNull()
-			?.attr("data-postid")?.toLongOrNull()
+		val mangaId = doc.getElementsByAttribute("data-post").firstOrNull()
+			?.attr("data-post")?.toLongOrNull()
 			?: throw ParseException("Cannot obtain manga id")
 		val doc2 = loaderContext.httpPost(
 			"https://${getDomain()}/wp-admin/admin-ajax.php",
@@ -128,10 +130,12 @@ class MangareadRepository(
 				?.joinToString { it.html() },
 			chapters = doc2.select("li").asReversed().mapIndexed { i, li ->
 				val a = li.selectFirst("a")
-				val href = a.relUrl("href")
+				val href = a?.relUrl("href").orEmpty().ifEmpty {
+					parseFailed("Link is missing")
+				}
 				MangaChapter(
 					id = generateUid(href),
-					name = a.ownText(),
+					name = a!!.ownText(),
 					number = i + 1,
 					url = href,
 					source = MangaSource.MANGAREAD
@@ -148,7 +152,7 @@ class MangareadRepository(
 			?: throw ParseException("Root not found")
 		return root.select("div.page-break").map { div ->
 			val img = div.selectFirst("img")
-			val url = img.relUrl("data-src")
+			val url = img?.relUrl("src") ?: parseFailed("Page image not found")
 			MangaPage(
 				id = generateUid(url),
 				url = url,
@@ -170,4 +174,4 @@ class MangareadRepository(
 					it.substring(0, pos) to it.substring(pos + 1)
 				}.toMutableMap()
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
new file mode 100644
index 000000000..9c67b2146
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
@@ -0,0 +1,206 @@
+package org.koitharu.kotatsu.core.parser.site
+
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.exceptions.ParseException
+import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.utils.ext.*
+import java.util.*
+
+abstract class NineMangaRepository(
+	loaderContext: MangaLoaderContext,
+	override val source: MangaSource,
+	override val defaultDomain: String,
+) : RemoteMangaRepository(loaderContext) {
+
+	init {
+		loaderContext.cookieJar.insertCookies(getDomain(), "ninemanga_template_desk=yes")
+	}
+
+	override val sortOrders: Set<SortOrder> = EnumSet.of(
+		SortOrder.POPULARITY,
+	)
+
+	override suspend fun getList2(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
+	): List<Manga> {
+		val page = (offset / PAGE_SIZE.toFloat()).toIntUp() + 1
+		val url = buildString {
+			append("https://")
+			append(getDomain())
+			when {
+				!query.isNullOrEmpty() -> {
+					append("/search/?name_sel=&wd=")
+					append(query.urlEncoded())
+					append("&page=")
+				}
+				!tags.isNullOrEmpty() -> {
+					append("/search/&category_id=")
+					for (tag in tags) {
+						append(tag.key)
+						append(',')
+					}
+					append("&page=")
+				}
+				else -> {
+					append("/category/index_")
+				}
+			}
+			append(page)
+			append(".html")
+		}
+		val doc = loaderContext.httpGet(url, PREDEFINED_HEADERS).parseHtml()
+		val root = doc.body().selectFirst("ul.direlist")
+			?: throw ParseException("Cannot find root")
+		val baseHost = root.baseUri().toHttpUrl().host
+		return root.select("li").map { node ->
+			val href = node.selectFirst("a")?.absUrl("href")
+				?: parseFailed("Link not found")
+			val relUrl = href.toRelativeUrl(baseHost)
+			val dd = node.selectFirst("dd")
+			Manga(
+				id = generateUid(relUrl),
+				url = relUrl,
+				publicUrl = href,
+				title = dd?.selectFirst("a.bookname")?.text()?.toCamelCase().orEmpty(),
+				altTitle = null,
+				coverUrl = node.selectFirst("img")?.absUrl("src").orEmpty(),
+				rating = Manga.NO_RATING,
+				author = null,
+				tags = emptySet(),
+				state = null,
+				source = source,
+				description = dd?.selectFirst("p")?.html(),
+			)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val doc = loaderContext.httpGet(
+			manga.url.withDomain() + "?waring=1",
+			PREDEFINED_HEADERS
+		).parseHtml()
+		val root = doc.body().selectFirst("div.manga")
+			?: throw ParseException("Cannot find root")
+		val infoRoot = root.selectFirst("div.bookintro")
+			?: throw ParseException("Cannot find info")
+		return manga.copy(
+			tags = infoRoot.getElementsByAttributeValue("itemprop", "genre").first()
+				?.select("a")?.mapToSet { a ->
+					MangaTag(
+						title = a.text(),
+						key = a.attr("href").substringBetween("/", "."),
+						source = source,
+					)
+				}.orEmpty(),
+			author = infoRoot.getElementsByAttributeValue("itemprop", "author").first()?.text(),
+			description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()
+				?.html()?.substringAfter("</b>"),
+			chapters = root.selectFirst("div.chapterbox")?.selectFirst("ul")
+				?.select("li")?.asReversed()?.mapIndexed { i, li ->
+					val a = li.selectFirst("a")
+					val href = a?.relUrl("href") ?: parseFailed("Link not found")
+					MangaChapter(
+						id = generateUid(href),
+						name = a.text(),
+						number = i + 1,
+						url = href,
+						branch = null,
+						source = source,
+					)
+				}
+		)
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		val doc = loaderContext.httpGet(chapter.url.withDomain(), PREDEFINED_HEADERS).parseHtml()
+		return doc.body().getElementById("page")?.select("option")?.map { option ->
+			val url = option.attr("value")
+			MangaPage(
+				id = generateUid(url),
+				url = url,
+				referer = chapter.url.withDomain(),
+				preview = null,
+				source = source,
+			)
+		} ?: throw ParseException("Pages list not found at ${chapter.url}")
+	}
+
+	override suspend fun getPageUrl(page: MangaPage): String {
+		val doc = loaderContext.httpGet(page.url.withDomain(), PREDEFINED_HEADERS).parseHtml()
+		val root = doc.body()
+		return root.selectFirst("a.pic_download")?.absUrl("href")
+			?: throw ParseException("Page image not found")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		val doc = loaderContext.httpGet("https://${getDomain()}/search/?type=high", PREDEFINED_HEADERS)
+			.parseHtml()
+		val root = doc.body().getElementById("search_form")
+		return root?.select("li.cate_list")?.mapNotNullToSet { li ->
+			val cateId = li.attr("cate_id") ?: return@mapNotNullToSet null
+			val a = li.selectFirst("a") ?: return@mapNotNullToSet null
+			MangaTag(
+				title = a.text().toTitleCase(),
+				key = cateId,
+				source = source
+			)
+		} ?: parseFailed("Root not found")
+	}
+
+	class English(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_EN,
+		"www.ninemanga.com",
+	)
+
+	class Spanish(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_ES,
+		"es.ninemanga.com",
+	)
+
+	class Russian(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_RU,
+		"ru.ninemanga.com",
+	)
+
+	class Deutsch(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_DE,
+		"de.ninemanga.com",
+	)
+
+	class Brazil(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_BR,
+		"br.ninemanga.com",
+	)
+
+	class Italiano(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_IT,
+		"it.ninemanga.com",
+	)
+
+	class Francais(loaderContext: MangaLoaderContext) : NineMangaRepository(
+		loaderContext,
+		MangaSource.NINEMANGA_FR,
+		"fr.ninemanga.com",
+	)
+
+	private companion object {
+
+		const val PAGE_SIZE = 26
+
+		val PREDEFINED_HEADERS = Headers.Builder()
+			.add("Accept-Language", "en-US;q=0.7,en;q=0.3")
+			.build()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
index 79d0d2581..17a3dd5d7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
@@ -9,7 +9,6 @@ import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.utils.ext.*
 import java.util.*
-import kotlin.collections.ArrayList
 
 class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
 
@@ -18,18 +17,17 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 	override val defaultDomain = "remanga.org"
 
 	override val sortOrders: Set<SortOrder> = EnumSet.of(
+		SortOrder.UPDATED,
 		SortOrder.POPULARITY,
 		SortOrder.RATING,
-		SortOrder.ALPHABETICAL,
-		SortOrder.UPDATED,
 		SortOrder.NEWEST
 	)
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		val domain = getDomain()
 		val urlBuilder = StringBuilder()
@@ -41,8 +39,9 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 		} else {
 			urlBuilder.append("/api/search/catalog/?ordering=")
 				.append(getSortKey(sortOrder))
-			if (tag != null) {
-				urlBuilder.append("&genres=" + tag.key)
+			tags?.forEach { tag ->
+				urlBuilder.append("&genres=")
+				urlBuilder.append(tag.key)
 			}
 		}
 		urlBuilder
@@ -162,7 +161,7 @@ class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposito
 		SortOrder.POPULARITY -> "-rating"
 		SortOrder.RATING -> "-votes"
 		SortOrder.NEWEST -> "-id"
-		else -> "-rating"
+		else -> "-chapter_date"
 	}
 
 	private fun parsePage(jo: JSONObject, referer: String) = MangaPage(
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 2c2839576..a2f2fbc59 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -41,6 +41,8 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 
 	val isAmoledTheme by BoolPreferenceDelegate(KEY_THEME_AMOLED, defaultValue = false)
 
+	val isToolbarHideWhenScrolling by BoolPreferenceDelegate(KEY_HIDE_TOOLBAR, defaultValue = true)
+
 	var gridSize by IntPreferenceDelegate(KEY_GRID_SIZE, defaultValue = 100)
 
 	val readerPageSwitch by StringSetPreferenceDelegate(
@@ -99,6 +101,9 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 
 	var hiddenSources by StringSetPreferenceDelegate(KEY_SOURCES_HIDDEN)
 
+	val isSourcesSelected: Boolean
+		get() = KEY_SOURCES_HIDDEN in prefs
+
 	fun getStorageDir(context: Context): File? {
 		val value = prefs.getString(KEY_LOCAL_STORAGE, null)?.let {
 			File(it)
@@ -147,6 +152,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_APP_SECTION = "app_section"
 		const val KEY_THEME = "theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
+		const val KEY_HIDE_TOOLBAR = "hide_toolbar"
 		const val KEY_SOURCES_ORDER = "sources_order"
 		const val KEY_SOURCES_HIDDEN = "sources_hidden"
 		const val KEY_TRAFFIC_WARNING = "traffic_warning"
@@ -160,8 +166,7 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_LOCAL_STORAGE = "local_storage"
 		const val KEY_READER_SWITCHERS = "reader_switchers"
 		const val KEY_TRACK_SOURCES = "track_sources"
-		const val KEY_APP_UPDATE = "app_update"
-		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
+		const val KEY_TRACK_WARNING = "track_warning"
 		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
 		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
 		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
@@ -177,5 +182,14 @@ class AppSettings private constructor(private val prefs: SharedPreferences) :
 		const val KEY_RESTORE = "restore"
 		const val KEY_HISTORY_GROUPING = "history_grouping"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
+
+		// About
+		const val KEY_APP_UPDATE = "app_update"
+		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
+		const val KEY_APP_TRANSLATION = "about_app_translation"
+		const val KEY_APP_GRATITUDES = "about_gratitudes"
+		const val KEY_FEEDBACK_4PDA = "about_feedback_4pda"
+		const val KEY_FEEDBACK_GITHUB = "about_feedback_github"
+		const val KEY_SUPPORT_DEVELOPER = "about_support_developer"
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
index 6ee3d0747..7a6036d06 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
@@ -27,5 +27,6 @@ interface SourceSettings {
 
 		const val KEY_DOMAIN = "domain"
 		const val KEY_USE_SSL = "ssl"
+		const val KEY_AUTH = "auth"
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt b/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
index bc8ec0a3d..7e3bd8622 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
@@ -2,13 +2,12 @@ package org.koitharu.kotatsu.details
 
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
-import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.details.ui.DetailsViewModel
 
 val detailsModule
 	get() = module {
 
-		viewModel { (intent: MangaIntent) ->
-			DetailsViewModel(intent, get(), get(), get(), get(), get(), get())
+		viewModel { intent ->
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get())
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index fdf29d88e..c2205bf30 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -15,19 +15,20 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import org.koitharu.kotatsu.download.DownloadService
+import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 
 class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
-	OnListItemClickListener<MangaChapter>, ActionMode.Callback, AdapterView.OnItemSelectedListener {
+	OnListItemClickListener<ChapterListItem>,
+	ActionMode.Callback,
+	AdapterView.OnItemSelectedListener {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 
@@ -105,9 +106,9 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 		else -> super.onOptionsItemSelected(item)
 	}
 
-	override fun onItemClick(item: MangaChapter, view: View) {
+	override fun onItemClick(item: ChapterListItem, view: View) {
 		if (selectionDecoration?.checkedItemsCount != 0) {
-			selectionDecoration?.toggleItemChecked(item.id)
+			selectionDecoration?.toggleItemChecked(item.chapter.id)
 			if (selectionDecoration?.checkedItemsCount == 0) {
 				actionMode?.finish()
 			} else {
@@ -116,6 +117,10 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			}
 			return
 		}
+		if (item.isMissing) {
+			(activity as? DetailsActivity)?.showChapterMissingDialog(item.chapter.id)
+			return
+		}
 		val options = ActivityOptions.makeScaleUpAnimation(
 			view,
 			0,
@@ -127,17 +132,17 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			ReaderActivity.newIntent(
 				view.context,
 				viewModel.manga.value ?: return,
-				ReaderState(item.id, 0, 0)
+				ReaderState(item.chapter.id, 0, 0)
 			), options.toBundle()
 		)
 	}
 
-	override fun onItemLongClick(item: MangaChapter, view: View): Boolean {
+	override fun onItemLongClick(item: ChapterListItem, view: View): Boolean {
 		if (actionMode == null) {
 			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
 		}
 		return actionMode?.also {
-			selectionDecoration?.setItemIsChecked(item.id, true)
+			selectionDecoration?.setItemIsChecked(item.chapter.id, true)
 			binding.recyclerViewChapters.invalidateItemDecorations()
 			it.invalidate()
 		} != null
@@ -148,7 +153,7 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			R.id.action_save -> {
 				DownloadService.start(
 					context ?: return false,
-					viewModel.manga.value ?: return false,
+					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
 					selectionDecoration?.checkedItemsIds
 				)
 				mode.finish()
@@ -174,17 +179,20 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
 		val manga = viewModel.manga.value
 		mode.menuInflater.inflate(R.menu.mode_chapters, menu)
-		menu.findItem(R.id.action_save).isVisible = manga?.source != MangaSource.LOCAL
 		mode.title = manga?.title
 		return true
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		val count = selectionDecoration?.checkedItemsCount ?: return false
+		val selectedIds = selectionDecoration?.checkedItemsIds ?: return false
+		val items = chaptersAdapter?.items?.filter { x -> x.chapter.id in selectedIds }.orEmpty()
+		menu.findItem(R.id.action_save).isVisible = items.none { x ->
+			x.chapter.source == MangaSource.LOCAL
+		}
 		mode.subtitle = resources.getQuantityString(
 			R.plurals.chapters_from_x,
-			count,
-			count,
+			items.size,
+			items.size,
 			chaptersAdapter?.itemCount ?: 0
 		)
 		return true
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index eacf132f9..84745b56d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -33,9 +33,12 @@ import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
-import org.koitharu.kotatsu.download.DownloadService
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
 import org.koitharu.kotatsu.utils.ShareHelper
+import org.koitharu.kotatsu.utils.ext.buildAlertDialog
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
 class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
@@ -113,7 +116,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.opt_details, menu)
 		return super.onCreateOptionsMenu(menu)
 	}
@@ -228,6 +231,33 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
 		binding.pager.isUserInputEnabled = true
 	}
 
+	fun showChapterMissingDialog(chapterId: Long) {
+		val remoteManga = viewModel.getRemoteManga()
+		if (remoteManga == null) {
+			Snackbar.make(binding.pager, R.string.chapter_is_missing, Snackbar.LENGTH_LONG)
+				.show()
+			return
+		}
+		buildAlertDialog(this) {
+			setMessage(R.string.chapter_is_missing_text)
+			setTitle(R.string.chapter_is_missing)
+			setNegativeButton(android.R.string.cancel, null)
+			setPositiveButton(R.string.read) { _, _ ->
+				startActivity(
+					ReaderActivity.newIntent(
+						this@DetailsActivity,
+						remoteManga,
+						ReaderState(chapterId, 0, 0)
+					)
+				)
+			}
+			setNeutralButton(R.string.download) { _, _ ->
+				DownloadService.start(this@DetailsActivity, remoteManga, setOf(chapterId))
+			}
+			setCancelable(true)
+		}.show()
+	}
+
 	companion object {
 
 		const val ACTION_MANGA_VIEW = "${BuildConfig.APPLICATION_ID}.action.VIEW_MANGA"
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index 50a5d7302..a427f2b3e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -13,7 +13,6 @@ import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.util.CoilUtils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
@@ -23,20 +22,20 @@ import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesDialog
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.FileSizeUtils
 import org.koitharu.kotatsu.utils.ext.*
-import kotlin.math.roundToInt
+import kotlin.random.Random
 
 class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickListener,
 	View.OnLongClickListener {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
-	private var tagsJob: Job? = null
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
@@ -61,16 +60,43 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 				.enqueueWith(coil)
 			textViewTitle.text = manga.title
 			textViewSubtitle.textAndVisible = manga.altTitle
+			textViewAuthor.textAndVisible = manga.author
+			sourceContainer.isVisible = manga.source != MangaSource.LOCAL
+			textViewSource.text = manga.source.title
 			textViewDescription.text =
 				manga.description?.parseAsHtml()?.takeUnless(Spanned::isBlank)
 					?: getString(R.string.no_description)
-			if (manga.rating == Manga.NO_RATING) {
-				ratingBar.isVisible = false
+			if (manga.chapters?.isNotEmpty() == true) {
+				chaptersContainer.isVisible = true
+				textViewChapters.text = manga.chapters.let {
+					resources.getQuantityString(
+						R.plurals.chapters,
+						it.size,
+						manga.chapters.size
+					)
+				}
 			} else {
-				ratingBar.progress = (ratingBar.max * manga.rating).roundToInt()
-				ratingBar.isVisible = true
+				chaptersContainer.isVisible = false
 			}
-			imageViewFavourite.setOnClickListener(this@DetailsFragment)
+			if (manga.rating == Manga.NO_RATING) {
+				ratingContainer.isVisible = false
+			} else {
+				textViewRating.text = String.format("%.1f", manga.rating * 5)
+				ratingContainer.isVisible = true
+			}
+			val file = manga.url.toUri().toFileOrNull()
+			if (file != null) {
+				viewLifecycleScope.launch {
+					val size = withContext(Dispatchers.IO) {
+						file.length()
+					}
+					textViewSize.text = FileSizeUtils.formatBytes(requireContext(), size)
+				}
+				sizeContainer.isVisible = true
+			} else {
+				sizeContainer.isVisible = false
+			}
+			buttonFavorite.setOnClickListener(this@DetailsFragment)
 			buttonRead.setOnClickListener(this@DetailsFragment)
 			buttonRead.setOnLongClickListener(this@DetailsFragment)
 			buttonRead.isEnabled = !manga.chapters.isNullOrEmpty()
@@ -91,33 +117,42 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 	}
 
 	private fun onFavouriteChanged(isFavourite: Boolean) {
-		binding.imageViewFavourite.setImageResource(
+		with(binding.buttonFavorite) {
 			if (isFavourite) {
-				R.drawable.ic_heart
+				this.setIconResource(R.drawable.ic_heart)
 			} else {
-				R.drawable.ic_heart_outline
+				this.setIconResource(R.drawable.ic_heart_outline)
 			}
-		)
+		}
 	}
 
 	private fun onLoadingStateChanged(isLoading: Boolean) {
-		binding.progressBar.isVisible = isLoading
+		if (isLoading) {
+			binding.progressBar.show()
+		} else {
+			binding.progressBar.hide()
+		}
 	}
 
 	override fun onClick(v: View) {
-		val manga = viewModel.manga.value
+		val manga = viewModel.manga.value ?: return
 		when (v.id) {
-			R.id.imageView_favourite -> {
-				FavouriteCategoriesDialog.show(childFragmentManager, manga ?: return)
+			R.id.button_favorite -> {
+				FavouriteCategoriesDialog.show(childFragmentManager, manga)
 			}
 			R.id.button_read -> {
-				startActivity(
-					ReaderActivity.newIntent(
-						context ?: return,
-						manga ?: return,
-						null
+				val chapterId = viewModel.readingHistory.value?.chapterId
+				if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
+					(activity as? DetailsActivity)?.showChapterMissingDialog(chapterId)
+				} else {
+					startActivity(
+						ReaderActivity.newIntent(
+							context ?: return,
+							manga,
+							null
+						)
 					)
-				)
+				}
 			}
 		}
 	}
@@ -160,37 +195,13 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 	}
 
 	private fun bindTags(manga: Manga) {
-		tagsJob?.cancel()
-		tagsJob = viewLifecycleScope.launch {
-			val tags = ArrayList<ChipsView.ChipModel>(manga.tags.size + 2)
-			if (manga.author != null) {
-				tags += ChipsView.ChipModel(
-					title = manga.author,
-					icon = R.drawable.ic_chip_user
-				)
-			}
-			for (tag in manga.tags) {
-				tags += ChipsView.ChipModel(
+		binding.chipsTags.setChips(
+			manga.tags.map { tag ->
+				ChipsView.ChipModel(
 					title = tag.title,
-					icon = R.drawable.ic_chip_tag
+					icon = 0
 				)
 			}
-			val file = manga.url.toUri().toFileOrNull()
-			if (file != null) {
-				val size = withContext(Dispatchers.IO) {
-					file.length()
-				}
-				tags += ChipsView.ChipModel(
-					title = FileSizeUtils.formatBytes(requireContext(), size),
-					icon = R.drawable.ic_chip_storage
-				)
-			} else {
-				tags += ChipsView.ChipModel(
-					title = manga.source.title,
-					icon = R.drawable.ic_chip_web
-				)
-			}
-			binding.chipsTags.setChips(tags)
-		}
+		)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 4c0292ad5..ebd377a50 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -11,7 +11,11 @@ import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.toListItem
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.ChapterExtra
@@ -29,7 +33,7 @@ class DetailsViewModel(
 	private val localMangaRepository: LocalMangaRepository,
 	private val trackingRepository: TrackingRepository,
 	private val mangaDataRepository: MangaDataRepository,
-	private val settings: AppSettings
+	private val settings: AppSettings,
 ) : BaseViewModel() {
 
 	private val mangaData = MutableStateFlow<Manga?>(intent.manga)
@@ -53,6 +57,18 @@ class DetailsViewModel(
 			trackingRepository.getNewChaptersCount(mangaId)
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
 
+	private val remoteManga = MutableStateFlow<Manga?>(null)
+	/*private val remoteManga = mangaData.mapLatest {
+		if (it?.source == MangaSource.LOCAL) {
+			runCatching {
+				val m = localMangaRepository.getRemoteManga(it) ?: return@mapLatest null
+				MangaRepository(m.source).getDetails(m)
+			}.getOrNull()
+		} else {
+			null
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)*/
+
 	private val chaptersReversed = settings.observe()
 		.filter { it == AppSettings.KEY_REVERSE_CHAPTERS }
 		.map { settings.chaptersReverse }
@@ -85,24 +101,19 @@ class DetailsViewModel(
 
 	val chapters = combine(
 		mangaData.map { it?.chapters.orEmpty() },
+		remoteManga,
 		history.map { it?.chapterId },
 		newChapters,
-		chaptersReversed,
 		selectedBranch
-	) { chapters, currentId, newCount, reversed, branch ->
-		val currentIndex = chapters.indexOfFirst { it.id == currentId }
-		val firstNewIndex = chapters.size - newCount
-		val res = chapters.mapIndexed { index, chapter ->
-			chapter.toListItem(
-				when {
-					index >= firstNewIndex -> ChapterExtra.NEW
-					index == currentIndex -> ChapterExtra.CURRENT
-					index < currentIndex -> ChapterExtra.READ
-					else -> ChapterExtra.UNREAD
-				}
-			)
-		}.filter { it.chapter.branch == branch }
-		if (reversed) res.asReversed() else res
+	) { chapters, sourceManga, currentId, newCount, branch ->
+		val sourceChapters = sourceManga?.chapters
+		if (sourceChapters.isNullOrEmpty()) {
+			mapChapters(chapters, currentId, newCount, branch)
+		} else {
+			mapChaptersWithSource(chapters, sourceChapters, currentId, newCount, branch)
+		}
+	}.combine(chaptersReversed) { list, reversed ->
+		if (reversed) list.asReversed() else list
 	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	init {
@@ -121,6 +132,12 @@ class DetailsViewModel(
 					?.maxByOrNull { it.value.size }?.key
 			}
 			mangaData.value = manga
+			if (manga.source == MangaSource.LOCAL) {
+				remoteManga.value = runCatching {
+					val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
+					MangaRepository(m.source).getDetails(m)
+				}.getOrNull()
+			}
 		}
 	}
 
@@ -142,4 +159,80 @@ class DetailsViewModel(
 	fun setSelectedBranch(branch: String?) {
 		selectedBranch.value = branch
 	}
+
+	fun getRemoteManga(): Manga? {
+		return remoteManga.value
+	}
+
+	private fun mapChapters(
+		chapters: List<MangaChapter>,
+		currentId: Long?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val result = ArrayList<ChapterListItem>(chapters.size)
+		val currentIndex = chapters.indexOfFirst { it.id == currentId }
+		val firstNewIndex = chapters.size - newCount
+		for (i in chapters.indices) {
+			val chapter = chapters[i]
+			if (chapter.branch != branch) {
+				continue
+			}
+			result += chapter.toListItem(
+				extra = when {
+					i >= firstNewIndex -> ChapterExtra.NEW
+					i == currentIndex -> ChapterExtra.CURRENT
+					i < currentIndex -> ChapterExtra.READ
+					else -> ChapterExtra.UNREAD
+				},
+				isMissing = false
+			)
+		}
+		return result
+	}
+
+	private fun mapChaptersWithSource(
+		chapters: List<MangaChapter>,
+		sourceChapters: List<MangaChapter>,
+		currentId: Long?,
+		newCount: Int,
+		branch: String?,
+	): List<ChapterListItem> {
+		val chaptersMap = chapters.associateByTo(HashMap(chapters.size)) { it.id }
+		val result = ArrayList<ChapterListItem>(sourceChapters.size)
+		val currentIndex = sourceChapters.indexOfFirst { it.id == currentId }
+		val firstNewIndex = sourceChapters.size - newCount
+		for (i in sourceChapters.indices) {
+			val chapter = sourceChapters[i]
+			if (chapter.branch != branch) {
+				continue
+			}
+			val localChapter = chaptersMap.remove(chapter.id)
+			result += localChapter?.toListItem(
+				extra = when {
+					i >= firstNewIndex -> ChapterExtra.NEW
+					i == currentIndex -> ChapterExtra.CURRENT
+					i < currentIndex -> ChapterExtra.READ
+					else -> ChapterExtra.UNREAD
+				},
+				isMissing = false
+			) ?: chapter.toListItem(
+				extra = when {
+					i >= firstNewIndex -> ChapterExtra.NEW
+					i == currentIndex -> ChapterExtra.CURRENT
+					i < currentIndex -> ChapterExtra.READ
+					else -> ChapterExtra.UNREAD
+				},
+				isMissing = true
+			)
+		}
+		if (chaptersMap.isNotEmpty()) { // some chapters on device but not online source
+			result.ensureCapacity(result.size + chaptersMap.size)
+			chaptersMap.values.mapTo(result) {
+				it.toListItem(ChapterExtra.UNREAD, false)
+			}
+			result.sortBy { it.chapter.number }
+		}
+		return result
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt
index d339216c0..983f322a8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt
@@ -3,23 +3,22 @@ package org.koitharu.kotatsu.details.ui.adapter
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.databinding.ItemChapterBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.history.domain.ChapterExtra
 import org.koitharu.kotatsu.utils.ext.getThemeColor
 
 fun chapterListItemAD(
-	clickListener: OnListItemClickListener<MangaChapter>
+	clickListener: OnListItemClickListener<ChapterListItem>,
 ) = adapterDelegateViewBinding<ChapterListItem, ChapterListItem, ItemChapterBinding>(
 	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) }
 ) {
 
 	itemView.setOnClickListener {
-		clickListener.onItemClick(item.chapter, it)
+		clickListener.onItemClick(item, it)
 	}
 	itemView.setOnLongClickListener {
-		clickListener.onItemLongClick(item.chapter, it)
+		clickListener.onItemLongClick(item, it)
 	}
 
 	bind { payload ->
@@ -43,5 +42,7 @@ fun chapterListItemAD(
 				binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorPrimaryInverse))
 			}
 		}
+		binding.textViewTitle.alpha = if (item.isMissing) 0.3f else 1f
+		binding.textViewNumber.alpha = if (item.isMissing) 0.3f else 1f
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
index b98a427e7..46dc930d1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
@@ -3,12 +3,11 @@ package org.koitharu.kotatsu.details.ui.adapter
 import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import kotlin.jvm.internal.Intrinsics
 
 class ChaptersAdapter(
-	onItemClickListener: OnListItemClickListener<MangaChapter>
+	onItemClickListener: OnListItemClickListener<ChapterListItem>,
 ) :	AsyncListDifferDelegationAdapter<ChapterListItem>(DiffCallback()) {
 
 	init {
@@ -38,7 +37,7 @@ class ChaptersAdapter(
 		}
 
 		override fun getChangePayload(oldItem: ChapterListItem, newItem: ChapterListItem): Any? {
-			if (oldItem.extra != newItem.extra) {
+			if (oldItem.extra != newItem.extra && oldItem.chapter == newItem.chapter) {
 				return newItem.extra
 			}
 			return null
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
index 5fad6e03a..82f00decf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
@@ -5,5 +5,6 @@ import org.koitharu.kotatsu.history.domain.ChapterExtra
 
 data class ChapterListItem(
 	val chapter: MangaChapter,
-	val extra: ChapterExtra
+	val extra: ChapterExtra,
+	val isMissing: Boolean,
 )
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
index dc1df8e0f..0a1609989 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
@@ -3,7 +3,11 @@ package org.koitharu.kotatsu.details.ui.model
 import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.history.domain.ChapterExtra
 
-fun MangaChapter.toListItem(extra: ChapterExtra) = ChapterListItem(
+fun MangaChapter.toListItem(
+	extra: ChapterExtra,
+	isMissing: Boolean,
+) = ChapterListItem(
 	chapter = this,
-	extra = extra
+	extra = extra,
+	isMissing = isMissing,
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/DownloadNotification.kt
deleted file mode 100644
index 10868d5e3..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/download/DownloadNotification.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.koitharu.kotatsu.download
-
-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 androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import kotlin.math.roundToInt
-
-class DownloadNotification(private val context: Context) {
-
-	private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-	private val manager =
-		context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-	init {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-			&& 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)
-		}
-		builder.setOnlyAlertOnce(true)
-		builder.setDefaults(0)
-		builder.color = ContextCompat.getColor(context, R.color.blue_primary)
-	}
-
-	fun fillFrom(manga: Manga) {
-		builder.setContentTitle(manga.title)
-		builder.setContentText(context.getString(R.string.manga_downloading_))
-		builder.setProgress(1, 0, true)
-		builder.setSmallIcon(android.R.drawable.stat_sys_download)
-		builder.setLargeIcon(null)
-		builder.setContentIntent(null)
-		builder.setStyle(null)
-	}
-
-	fun setCancelId(startId: Int) {
-		if (startId == 0) {
-			builder.clearActions()
-		} else {
-			val intent = DownloadService.getCancelIntent(context, startId)
-			builder.addAction(
-				R.drawable.ic_cross,
-				context.getString(android.R.string.cancel),
-				PendingIntent.getService(
-					context,
-					startId,
-					intent,
-					PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-				)
-			)
-		}
-	}
-
-	fun setError(e: Throwable) {
-		val message = e.getDisplayMessage(context.resources)
-		builder.setProgress(0, 0, false)
-		builder.setSmallIcon(android.R.drawable.stat_notify_error)
-		builder.setSubText(context.getString(R.string.error))
-		builder.setContentText(message)
-		builder.setAutoCancel(true)
-		builder.setContentIntent(null)
-		builder.setCategory(NotificationCompat.CATEGORY_ERROR)
-		builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
-	}
-
-	fun setLargeIcon(icon: Drawable?) {
-		builder.setLargeIcon(icon?.toBitmap())
-	}
-
-	fun setProgress(chaptersTotal: Int, pagesTotal: Int, chapter: Int, page: Int) {
-		val max = chaptersTotal * PROGRESS_STEP
-		val progress =
-			chapter * PROGRESS_STEP + (page / pagesTotal.toFloat() * PROGRESS_STEP).roundToInt()
-		val percent = (progress / max.toFloat() * 100).roundToInt()
-		builder.setProgress(max, progress, false)
-		builder.setContentText("%d%%".format(percent))
-		builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-		builder.setStyle(null)
-	}
-
-	fun setWaitingForNetwork() {
-		builder.setProgress(0, 0, false)
-		builder.setContentText(context.getString(R.string.waiting_for_network))
-		builder.setStyle(null)
-	}
-
-	fun setPostProcessing() {
-		builder.setProgress(1, 0, true)
-		builder.setContentText(context.getString(R.string.processing_))
-		builder.setStyle(null)
-	}
-
-	fun setDone(manga: Manga) {
-		builder.setProgress(0, 0, false)
-		builder.setContentText(context.getString(R.string.download_complete))
-		builder.setContentIntent(createIntent(context, manga))
-		builder.setAutoCancel(true)
-		builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
-		builder.setCategory(null)
-		builder.setStyle(null)
-	}
-
-	fun setCancelling() {
-		builder.setProgress(1, 0, true)
-		builder.setContentText(context.getString(R.string.cancelling_))
-		builder.setContentIntent(null)
-		builder.setStyle(null)
-	}
-
-	fun update(id: Int = NOTIFICATION_ID) {
-		manager.notify(id, builder.build())
-	}
-
-	fun dismiss(id: Int = NOTIFICATION_ID) {
-		manager.cancel(id)
-	}
-
-	operator fun invoke(): Notification = builder.build()
-
-	companion object {
-
-		const val NOTIFICATION_ID = 201
-		const val CHANNEL_ID = "download"
-
-		private const val PROGRESS_STEP = 20
-
-		private fun createIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
-			context,
-			manga.hashCode(),
-			DetailsActivity.newIntent(context, manga),
-			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-		)
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/DownloadService.kt
deleted file mode 100644
index 2cc0ca30d..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/download/DownloadService.kt
+++ /dev/null
@@ -1,274 +0,0 @@
-package org.koitharu.kotatsu.download
-
-import android.content.Context
-import android.content.Intent
-import android.net.ConnectivityManager
-import android.os.PowerManager
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import coil.ImageLoader
-import coil.request.ImageRequest
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okio.IOException
-import org.koin.android.ext.android.get
-import org.koin.android.ext.android.inject
-import org.koin.core.context.GlobalContext
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseService
-import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.local.data.MangaZip
-import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.utils.CacheUtils
-import org.koitharu.kotatsu.utils.ext.*
-import java.io.File
-import java.util.concurrent.TimeUnit
-import kotlin.collections.set
-import kotlin.math.absoluteValue
-
-class DownloadService : BaseService() {
-
-	private lateinit var notification: DownloadNotification
-	private lateinit var wakeLock: PowerManager.WakeLock
-	private lateinit var connectivityManager: ConnectivityManager
-
-	private val okHttp by inject<OkHttpClient>()
-	private val cache by inject<PagesCache>()
-	private val settings by inject<AppSettings>()
-	private val imageLoader by inject<ImageLoader>()
-	private val jobs = HashMap<Int, Job>()
-	private val mutex = Mutex()
-
-	override fun onCreate() {
-		super.onCreate()
-		notification = DownloadNotification(this)
-		connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-		wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
-			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		when (intent?.action) {
-			ACTION_DOWNLOAD_START -> {
-				val manga = intent.getParcelableExtra<Manga>(EXTRA_MANGA)
-				val chapters = intent.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
-				if (manga != null) {
-					jobs[startId] = downloadManga(manga, chapters, startId)
-					Toast.makeText(this, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
-				} else {
-					stopSelf(startId)
-				}
-			}
-			ACTION_DOWNLOAD_CANCEL -> {
-				val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
-				jobs.remove(cancelId)?.cancel()
-				stopSelf(startId)
-			}
-			else -> stopSelf(startId)
-		}
-		return START_NOT_STICKY
-	}
-
-	private fun downloadManga(manga: Manga, chaptersIds: Set<Long>?, startId: Int): Job {
-		return lifecycleScope.launch(Dispatchers.Default) {
-			mutex.lock()
-			wakeLock.acquire(TimeUnit.HOURS.toMillis(1))
-			notification.fillFrom(manga)
-			notification.setCancelId(startId)
-			withContext(Dispatchers.Main) {
-				startForeground(DownloadNotification.NOTIFICATION_ID, notification())
-			}
-			val destination = settings.getStorageDir(this@DownloadService)
-			checkNotNull(destination) { getString(R.string.cannot_find_available_storage) }
-			var output: MangaZip? = null
-			try {
-				val repo = mangaRepositoryOf(manga.source)
-				val cover = runCatching {
-					imageLoader.execute(
-						ImageRequest.Builder(this@DownloadService)
-							.data(manga.coverUrl)
-							.build()
-					).drawable
-				}.getOrNull()
-				notification.setLargeIcon(cover)
-				notification.update()
-				val data = if (manga.chapters == null) repo.getDetails(manga) else manga
-				output = MangaZip.findInDir(destination, data)
-				output.prepare(data)
-				val coverUrl = data.largeCoverUrl ?: data.coverUrl
-				downloadFile(coverUrl, data.publicUrl, destination).let { file ->
-					output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
-				}
-				val chapters = if (chaptersIds == null) {
-					data.chapters.orEmpty()
-				} else {
-					data.chapters.orEmpty().filter { x -> x.id in chaptersIds }
-				}
-				for ((chapterIndex, chapter) in chapters.withIndex()) {
-					if (chaptersIds == null || chapter.id in chaptersIds) {
-						val pages = repo.getPages(chapter)
-						for ((pageIndex, page) in pages.withIndex()) {
-							failsafe@ do {
-								try {
-									val url = repo.getPageUrl(page)
-									val file =
-										cache[url] ?: downloadFile(url, page.referer, destination)
-									output.addPage(
-										chapter,
-										file,
-										pageIndex,
-										MimeTypeMap.getFileExtensionFromUrl(url)
-									)
-								} catch (e: IOException) {
-									notification.setWaitingForNetwork()
-									notification.update()
-									connectivityManager.waitForNetwork()
-									continue@failsafe
-								}
-							} while (false)
-							notification.setProgress(
-								chapters.size,
-								pages.size,
-								chapterIndex,
-								pageIndex
-							)
-							notification.update()
-						}
-					}
-				}
-				notification.setCancelId(0)
-				notification.setPostProcessing()
-				notification.update()
-				if (!output.compress()) {
-					throw RuntimeException("Cannot create target file")
-				}
-				val result = get<LocalMangaRepository>().getFromFile(output.file)
-				notification.setDone(result)
-				notification.dismiss()
-				notification.update(manga.id.toInt().absoluteValue)
-			} catch (_: CancellationException) {
-				withContext(NonCancellable) {
-					notification.setCancelling()
-					notification.setCancelId(0)
-					notification.update()
-				}
-			} catch (e: Throwable) {
-				if (BuildConfig.DEBUG) {
-					e.printStackTrace()
-				}
-				notification.setError(e)
-				notification.setCancelId(0)
-				notification.dismiss()
-				notification.update(manga.id.toInt().absoluteValue)
-			} finally {
-				withContext(NonCancellable) {
-					jobs.remove(startId)
-					output?.cleanup()
-					destination.sub(TEMP_PAGE_FILE).deleteAwait()
-					withContext(Dispatchers.Main) {
-						stopForeground(true)
-						notification.dismiss()
-						stopSelf(startId)
-					}
-					if (wakeLock.isHeld) {
-						wakeLock.release()
-					}
-					mutex.unlock()
-				}
-			}
-		}
-	}
-
-	private suspend fun downloadFile(url: String, referer: String, destination: File): File {
-		val request = Request.Builder()
-			.url(url)
-			.header(CommonHeaders.REFERER, referer)
-			.cacheControl(CacheUtils.CONTROL_DISABLED)
-			.get()
-			.build()
-		val call = okHttp.newCall(request)
-		var attempts = MAX_DOWNLOAD_ATTEMPTS
-		val file = destination.sub(TEMP_PAGE_FILE)
-		while (true) {
-			try {
-				val response = call.clone().await()
-				withContext(Dispatchers.IO) {
-					file.outputStream().use { out ->
-						checkNotNull(response.body).byteStream().copyTo(out)
-					}
-				}
-				return file
-			} catch (e: IOException) {
-				attempts--
-				if (attempts <= 0) {
-					throw e
-				} else {
-					delay(DOWNLOAD_ERROR_DELAY)
-				}
-			}
-		}
-	}
-
-	companion object {
-
-		private const val ACTION_DOWNLOAD_START =
-			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_START"
-		private const val ACTION_DOWNLOAD_CANCEL =
-			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
-
-		private const val EXTRA_MANGA = "manga"
-		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
-		private const val EXTRA_CANCEL_ID = "cancel_id"
-
-		private const val MAX_DOWNLOAD_ATTEMPTS = 3
-		private const val DOWNLOAD_ERROR_DELAY = 500L
-		private const val TEMP_PAGE_FILE = "page.tmp"
-
-		fun start(context: Context, manga: Manga, chaptersIds: Collection<Long>? = null) {
-			confirmDataTransfer(context) {
-				val intent = Intent(context, DownloadService::class.java)
-				intent.action = ACTION_DOWNLOAD_START
-				intent.putExtra(EXTRA_MANGA, manga)
-				if (chaptersIds != null) {
-					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
-				}
-				ContextCompat.startForegroundService(context, intent)
-			}
-		}
-
-		fun getCancelIntent(context: Context, startId: Int) =
-			Intent(context, DownloadService::class.java)
-				.setAction(ACTION_DOWNLOAD_CANCEL)
-				.putExtra(ACTION_DOWNLOAD_CANCEL, startId)
-
-		private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
-			val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-			val settings = GlobalContext.get().get<AppSettings>()
-			if (cm.isActiveNetworkMetered && settings.isTrafficWarningEnabled) {
-				CheckBoxAlertDialog.Builder(context)
-					.setTitle(R.string.warning)
-					.setMessage(R.string.network_consumption_warning)
-					.setCheckBoxText(R.string.dont_ask_again)
-					.setCheckBoxChecked(false)
-					.setNegativeButton(android.R.string.cancel, null)
-					.setPositiveButton(R.string._continue) { _, doNotAsk ->
-						settings.isTrafficWarningEnabled = !doNotAsk
-						callback()
-					}.create()
-					.show()
-			} else {
-				callback()
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
new file mode 100644
index 000000000..75905aa51
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -0,0 +1,239 @@
+package org.koitharu.kotatsu.download.domain
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.net.ConnectivityManager
+import android.webkit.MimeTypeMap
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.size.Scale
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okio.IOException
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.local.data.MangaZip
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.utils.CacheUtils
+import org.koitharu.kotatsu.utils.ext.await
+import org.koitharu.kotatsu.utils.ext.deleteAwait
+import org.koitharu.kotatsu.utils.ext.waitForNetwork
+import java.io.File
+
+class DownloadManager(
+	private val context: Context,
+	private val settings: AppSettings,
+	private val imageLoader: ImageLoader,
+	private val okHttp: OkHttpClient,
+	private val cache: PagesCache,
+	private val localMangaRepository: LocalMangaRepository,
+) {
+
+	private val connectivityManager = context.getSystemService(
+		Context.CONNECTIVITY_SERVICE
+	) as ConnectivityManager
+	private val coverWidth = context.resources.getDimensionPixelSize(
+		androidx.core.R.dimen.compat_notification_large_icon_max_width
+	)
+	private val coverHeight = context.resources.getDimensionPixelSize(
+		androidx.core.R.dimen.compat_notification_large_icon_max_height
+	)
+
+	fun downloadManga(manga: Manga, chaptersIds: Set<Long>?, startId: Int) = flow<State> {
+		emit(State.Preparing(startId, manga, null))
+		var cover: Drawable? = null
+		val destination = settings.getStorageDir(context)
+		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
+		var output: MangaZip? = null
+		try {
+			val repo = MangaRepository(manga.source)
+			cover = runCatching {
+				imageLoader.execute(
+					ImageRequest.Builder(context)
+						.data(manga.coverUrl)
+						.size(coverWidth, coverHeight)
+						.scale(Scale.FILL)
+						.build()
+				).drawable
+			}.getOrNull()
+			emit(State.Preparing(startId, manga, cover))
+			val data = if (manga.chapters == null) repo.getDetails(manga) else manga
+			output = MangaZip.findInDir(destination, data)
+			output.prepare(data)
+			val coverUrl = data.largeCoverUrl ?: data.coverUrl
+			downloadFile(coverUrl, data.publicUrl, destination).let { file ->
+				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
+			}
+			val chapters = if (chaptersIds == null) {
+				data.chapters.orEmpty()
+			} else {
+				data.chapters.orEmpty().filter { x -> x.id in chaptersIds }
+			}
+			for ((chapterIndex, chapter) in chapters.withIndex()) {
+				if (chaptersIds == null || chapter.id in chaptersIds) {
+					val pages = repo.getPages(chapter)
+					for ((pageIndex, page) in pages.withIndex()) {
+						failsafe@ do {
+							try {
+								val url = repo.getPageUrl(page)
+								val file =
+									cache[url] ?: downloadFile(url, page.referer, destination)
+								output.addPage(
+									chapter,
+									file,
+									pageIndex,
+									MimeTypeMap.getFileExtensionFromUrl(url)
+								)
+							} catch (e: IOException) {
+								emit(State.WaitingForNetwork(startId, manga, cover))
+								connectivityManager.waitForNetwork()
+								continue@failsafe
+							}
+						} while (false)
+
+						emit(State.Progress(
+							startId, manga, cover,
+							totalChapters = chapters.size,
+							currentChapter = chapterIndex,
+							totalPages = pages.size,
+							currentPage = pageIndex,
+						))
+					}
+				}
+			}
+			emit(State.PostProcessing(startId, manga, cover))
+			if (!output.compress()) {
+				throw RuntimeException("Cannot create target file")
+			}
+			val localManga = localMangaRepository.getFromFile(output.file)
+			emit(State.Done(startId, manga, cover, localManga))
+		} catch (_: CancellationException) {
+			emit(State.Cancelling(startId, manga, cover))
+		} catch (e: Throwable) {
+			if (BuildConfig.DEBUG) {
+				e.printStackTrace()
+			}
+			emit(State.Error(startId, manga, cover, e))
+		} finally {
+			withContext(NonCancellable) {
+				output?.cleanup()
+				File(destination, TEMP_PAGE_FILE).deleteAwait()
+			}
+		}
+	}.catch { e ->
+		emit(State.Error(startId, manga, null, e))
+	}
+
+	private suspend fun downloadFile(url: String, referer: String, destination: File): File {
+		val request = Request.Builder()
+			.url(url)
+			.header(CommonHeaders.REFERER, referer)
+			.cacheControl(CacheUtils.CONTROL_DISABLED)
+			.get()
+			.build()
+		val call = okHttp.newCall(request)
+		var attempts = MAX_DOWNLOAD_ATTEMPTS
+		val file = File(destination, TEMP_PAGE_FILE)
+		while (true) {
+			try {
+				val response = call.clone().await()
+				withContext(Dispatchers.IO) {
+					file.outputStream().use { out ->
+						checkNotNull(response.body).byteStream().copyTo(out)
+					}
+				}
+				return file
+			} catch (e: IOException) {
+				attempts--
+				if (attempts <= 0) {
+					throw e
+				} else {
+					delay(DOWNLOAD_ERROR_DELAY)
+				}
+			}
+		}
+	}
+
+	sealed interface State {
+
+		val startId: Int
+		val manga: Manga
+		val cover: Drawable?
+
+		data class Queued(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		) : State
+
+		data class Preparing(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		) : State
+
+		data class Progress(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+			val totalChapters: Int,
+			val currentChapter: Int,
+			val totalPages: Int,
+			val currentPage: Int,
+		): State {
+
+			val max: Int = totalChapters * totalPages
+
+			val progress: Int = totalPages * currentChapter + currentPage + 1
+
+			val percent: Float = progress.toFloat() / max
+		}
+
+		data class WaitingForNetwork(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		): State
+
+		data class Done(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+			val localManga: Manga,
+		) : State
+
+		data class Error(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+			val error: Throwable,
+		) : State
+
+		data class Cancelling(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		): State
+
+		data class PostProcessing(
+			override val startId: Int,
+			override val manga: Manga,
+			override val cover: Drawable?,
+		) : State
+	}
+
+	private companion object {
+
+		private const val MAX_DOWNLOAD_ATTEMPTS = 3
+		private const val DOWNLOAD_ERROR_DELAY = 500L
+		private const val TEMP_PAGE_FILE = "page.tmp"
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
new file mode 100644
index 000000000..649b67342
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
@@ -0,0 +1,101 @@
+package org.koitharu.kotatsu.download.ui
+
+import androidx.core.view.isVisible
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemDownloadBinding
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.utils.JobStateFlow
+import org.koitharu.kotatsu.utils.ext.format
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.setIndeterminateCompat
+
+fun downloadItemAD(
+	scope: CoroutineScope,
+) = adapterDelegateViewBinding<JobStateFlow<DownloadManager.State>, JobStateFlow<DownloadManager.State>, ItemDownloadBinding>(
+	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
+) {
+
+	var job: Job? = null
+
+	bind {
+		job?.cancel()
+		job = item.onEach { state ->
+			binding.textViewTitle.text = state.manga.title
+			binding.imageViewCover.setImageDrawable(
+				state.cover ?: getDrawable(R.drawable.ic_placeholder)
+			)
+			when (state) {
+				is DownloadManager.State.Cancelling -> {
+					binding.textViewStatus.setText(R.string.cancelling_)
+					binding.progressBar.setIndeterminateCompat(true)
+					binding.progressBar.isVisible = true
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Done -> {
+					binding.textViewStatus.setText(R.string.download_complete)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Error -> {
+					binding.textViewStatus.setText(R.string.error_occurred)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
+					binding.textViewDetails.isVisible = true
+				}
+				is DownloadManager.State.PostProcessing -> {
+					binding.textViewStatus.setText(R.string.processing_)
+					binding.progressBar.setIndeterminateCompat(true)
+					binding.progressBar.isVisible = true
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Preparing -> {
+					binding.textViewStatus.setText(R.string.preparing_)
+					binding.progressBar.setIndeterminateCompat(true)
+					binding.progressBar.isVisible = true
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Progress -> {
+					binding.textViewStatus.setText(R.string.manga_downloading_)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = true
+					binding.progressBar.max = state.max
+					binding.progressBar.setProgressCompat(state.progress, true)
+					binding.textViewPercent.text = (state.percent * 100f).format(1) + "%"
+					binding.textViewPercent.isVisible = true
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.Queued -> {
+					binding.textViewStatus.setText(R.string.queued)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+				is DownloadManager.State.WaitingForNetwork -> {
+					binding.textViewStatus.setText(R.string.waiting_for_network)
+					binding.progressBar.setIndeterminateCompat(false)
+					binding.progressBar.isVisible = false
+					binding.textViewPercent.isVisible = false
+					binding.textViewDetails.isVisible = false
+				}
+			}
+		}.launchIn(scope)
+	}
+
+	onViewRecycled {
+		job?.cancel()
+		job = null
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
new file mode 100644
index 000000000..5b39881ed
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
@@ -0,0 +1,58 @@
+package org.koitharu.kotatsu.download.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.utils.LifecycleAwareServiceConnection
+
+class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		val adapter = DownloadsAdapter(lifecycleScope)
+		binding.recyclerView.setHasFixedSize(true)
+		binding.recyclerView.adapter = adapter
+		LifecycleAwareServiceConnection.bindService(
+			this,
+			this,
+			Intent(this, DownloadService::class.java),
+			0
+		).service.flatMapLatest { binder ->
+			(binder as? DownloadService.DownloadBinder)?.downloads ?: flowOf(null)
+		}.onEach {
+			adapter.items = it?.toList().orEmpty()
+			binding.textViewHolder.isVisible = it.isNullOrEmpty()
+		}.launchIn(lifecycleScope)
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.recyclerView.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom
+		)
+		binding.toolbar.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			top = insets.top
+		)
+	}
+
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, DownloadsActivity::class.java)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
new file mode 100644
index 000000000..e6998f894
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.download.ui
+
+import androidx.recyclerview.widget.DiffUtil
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlinx.coroutines.CoroutineScope
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.utils.JobStateFlow
+
+class DownloadsAdapter(
+	scope: CoroutineScope,
+) : AsyncListDifferDelegationAdapter<JobStateFlow<DownloadManager.State>>(DiffCallback()) {
+
+	init {
+		delegatesManager.addDelegate(downloadItemAD(scope))
+		setHasStableIds(true)
+	}
+
+	override fun getItemId(position: Int): Long {
+		return items[position].value.startId.toLong()
+	}
+
+	private class DiffCallback : DiffUtil.ItemCallback<JobStateFlow<DownloadManager.State>>() {
+
+		override fun areItemsTheSame(
+			oldItem: JobStateFlow<DownloadManager.State>,
+			newItem: JobStateFlow<DownloadManager.State>,
+		): Boolean {
+			return oldItem.value.startId == newItem.value.startId
+		}
+
+		override fun areContentsTheSame(
+			oldItem: JobStateFlow<DownloadManager.State>,
+			newItem: JobStateFlow<DownloadManager.State>,
+		): Boolean {
+			return oldItem.value == newItem.value
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
new file mode 100644
index 000000000..0d38a3326
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -0,0 +1,144 @@
+package org.koitharu.kotatsu.download.ui.service
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toBitmap
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.download.ui.DownloadsActivity
+import org.koitharu.kotatsu.utils.PendingIntentCompat
+import org.koitharu.kotatsu.utils.ext.format
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+class DownloadNotification(
+	private val context: Context,
+	startId: Int,
+) {
+
+	private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+	private val cancelAction = NotificationCompat.Action(
+		R.drawable.ic_cross,
+		context.getString(android.R.string.cancel),
+		PendingIntent.getBroadcast(
+			context,
+			startId,
+			DownloadService.getCancelIntent(startId),
+			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+		)
+	)
+	private val listIntent = PendingIntent.getActivity(
+		context,
+		REQUEST_LIST,
+		DownloadsActivity.newIntent(context),
+		PendingIntentCompat.FLAG_IMMUTABLE,
+	)
+
+	init {
+		builder.setOnlyAlertOnce(true)
+		builder.setDefaults(0)
+		builder.color = ContextCompat.getColor(context, R.color.blue_primary)
+	}
+
+	fun create(state: DownloadManager.State): Notification {
+		builder.setContentTitle(state.manga.title)
+		builder.setContentText(context.getString(R.string.manga_downloading_))
+		builder.setProgress(1, 0, true)
+		builder.setSmallIcon(android.R.drawable.stat_sys_download)
+		builder.setContentIntent(listIntent)
+		builder.setStyle(null)
+		builder.setLargeIcon(state.cover?.toBitmap())
+		builder.clearActions()
+		when (state) {
+			is DownloadManager.State.Cancelling -> {
+				builder.setProgress(1, 0, true)
+				builder.setContentText(context.getString(R.string.cancelling_))
+				builder.setContentIntent(null)
+				builder.setStyle(null)
+			}
+			is DownloadManager.State.Done -> {
+				builder.setProgress(0, 0, false)
+				builder.setContentText(context.getString(R.string.download_complete))
+				builder.setContentIntent(createMangaIntent(context, state.localManga))
+				builder.setAutoCancel(true)
+				builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
+				builder.setCategory(null)
+				builder.setStyle(null)
+			}
+			is DownloadManager.State.Error -> {
+				val message = state.error.getDisplayMessage(context.resources)
+				builder.setProgress(0, 0, false)
+				builder.setSmallIcon(android.R.drawable.stat_notify_error)
+				builder.setSubText(context.getString(R.string.error))
+				builder.setContentText(message)
+				builder.setAutoCancel(true)
+				builder.setCategory(NotificationCompat.CATEGORY_ERROR)
+				builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
+			}
+			is DownloadManager.State.PostProcessing -> {
+				builder.setProgress(1, 0, true)
+				builder.setContentText(context.getString(R.string.processing_))
+				builder.setStyle(null)
+			}
+			is DownloadManager.State.Queued,
+			is DownloadManager.State.Preparing -> {
+				builder.setProgress(1, 0, true)
+				builder.setContentText(context.getString(R.string.preparing_))
+				builder.setStyle(null)
+				builder.addAction(cancelAction)
+			}
+			is DownloadManager.State.Progress -> {
+				builder.setProgress(state.max, state.progress, false)
+				builder.setContentText((state.percent * 100).format() + "%")
+				builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
+				builder.setStyle(null)
+				builder.addAction(cancelAction)
+			}
+			is DownloadManager.State.WaitingForNetwork -> {
+				builder.setProgress(0, 0, false)
+				builder.setContentText(context.getString(R.string.waiting_for_network))
+				builder.setStyle(null)
+				builder.addAction(cancelAction)
+			}
+		}
+		return builder.build()
+	}
+
+	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
+		context,
+		manga.hashCode(),
+		DetailsActivity.newIntent(context, manga),
+		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+	)
+
+	companion object {
+
+		private const val CHANNEL_ID = "download"
+		private const val REQUEST_LIST = 6
+
+		fun createChannel(context: Context) {
+			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)
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
new file mode 100644
index 000000000..d44204533
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -0,0 +1,201 @@
+package org.koitharu.kotatsu.download.ui.service
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.os.Binder
+import android.os.IBinder
+import android.os.PowerManager
+import android.widget.Toast
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.get
+import org.koin.core.context.GlobalContext
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseService
+import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.utils.JobStateFlow
+import org.koitharu.kotatsu.utils.ext.toArraySet
+import java.util.concurrent.TimeUnit
+import kotlin.collections.set
+
+class DownloadService : BaseService() {
+
+	private lateinit var notificationManager: NotificationManagerCompat
+	private lateinit var wakeLock: PowerManager.WakeLock
+	private lateinit var downloadManager: DownloadManager
+
+	private val jobs = LinkedHashMap<Int, JobStateFlow<DownloadManager.State>>()
+	private val jobCount = MutableStateFlow(0)
+	private val mutex = Mutex()
+	private val controlReceiver = ControlReceiver()
+	private var binder: DownloadBinder? = null
+
+	override fun onCreate() {
+		super.onCreate()
+		notificationManager = NotificationManagerCompat.from(this)
+		wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
+			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
+		downloadManager = DownloadManager(this, get(), get(), get(), get(), get())
+		DownloadNotification.createChannel(this)
+		registerReceiver(controlReceiver, IntentFilter(ACTION_DOWNLOAD_CANCEL))
+	}
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		val manga = intent?.getParcelableExtra<Manga>(EXTRA_MANGA)
+		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
+		return if (manga != null) {
+			jobs[startId] = downloadManga(startId, manga, chapters)
+			jobCount.value = jobs.size
+			Toast.makeText(this, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
+			START_REDELIVER_INTENT
+		} else {
+			stopSelf(startId)
+			START_NOT_STICKY
+		}
+	}
+
+	override fun onBind(intent: Intent): IBinder {
+		super.onBind(intent)
+		return binder ?: DownloadBinder(this).also { binder = it }
+	}
+
+	override fun onDestroy() {
+		unregisterReceiver(controlReceiver)
+		binder = null
+		super.onDestroy()
+	}
+
+	private fun downloadManga(
+		startId: Int,
+		manga: Manga,
+		chaptersIds: Set<Long>?,
+	): JobStateFlow<DownloadManager.State> {
+		val initialState = DownloadManager.State.Queued(startId, manga, null)
+		val stateFlow = MutableStateFlow<DownloadManager.State>(initialState)
+		val job = lifecycleScope.launch {
+			mutex.withLock {
+				wakeLock.acquire(TimeUnit.HOURS.toMillis(1))
+				val notification = DownloadNotification(this@DownloadService, startId)
+				startForeground(startId, notification.create(initialState))
+				try {
+					withContext(Dispatchers.Default) {
+						downloadManager.downloadManga(manga, chaptersIds, startId)
+							.collect { state ->
+								stateFlow.value = state
+								notificationManager.notify(startId, notification.create(state))
+							}
+					}
+					if (stateFlow.value is DownloadManager.State.Done) {
+						sendBroadcast(
+							Intent(ACTION_DOWNLOAD_COMPLETE)
+								.putExtra(EXTRA_MANGA, manga)
+						)
+					}
+				} finally {
+					ServiceCompat.stopForeground(
+						this@DownloadService,
+						if (isActive) {
+							ServiceCompat.STOP_FOREGROUND_DETACH
+						} else {
+							ServiceCompat.STOP_FOREGROUND_REMOVE
+						}
+					)
+					if (wakeLock.isHeld) {
+						wakeLock.release()
+					}
+					stopSelf(startId)
+				}
+			}
+		}
+		return JobStateFlow(stateFlow, job)
+	}
+
+	inner class ControlReceiver : BroadcastReceiver() {
+
+		override fun onReceive(context: Context, intent: Intent?) {
+			when (intent?.action) {
+				ACTION_DOWNLOAD_CANCEL -> {
+					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
+					jobs.remove(cancelId)?.cancel()
+					jobCount.value = jobs.size
+				}
+			}
+		}
+	}
+
+	class DownloadBinder(private val service: DownloadService) : Binder() {
+
+		val downloads: Flow<Collection<JobStateFlow<DownloadManager.State>>>
+			get() = service.jobCount.mapLatest { service.jobs.values }
+	}
+
+	companion object {
+
+		const val ACTION_DOWNLOAD_COMPLETE =
+			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_COMPLETE"
+
+		private const val ACTION_DOWNLOAD_CANCEL =
+			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
+
+		private const val EXTRA_MANGA = "manga"
+		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
+		private const val EXTRA_CANCEL_ID = "cancel_id"
+
+		fun start(context: Context, manga: Manga, chaptersIds: Collection<Long>? = null) {
+			if (chaptersIds?.isEmpty() == true) {
+				return
+			}
+			confirmDataTransfer(context) {
+				val intent = Intent(context, DownloadService::class.java)
+				intent.putExtra(EXTRA_MANGA, manga)
+				if (chaptersIds != null) {
+					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
+				}
+				ContextCompat.startForegroundService(context, intent)
+			}
+		}
+
+		fun getCancelIntent(startId: Int) = Intent(ACTION_DOWNLOAD_CANCEL)
+			.putExtra(ACTION_DOWNLOAD_CANCEL, startId)
+
+		private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
+			val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+			val settings = GlobalContext.get().get<AppSettings>()
+			if (cm.isActiveNetworkMetered && settings.isTrafficWarningEnabled) {
+				CheckBoxAlertDialog.Builder(context)
+					.setTitle(R.string.warning)
+					.setMessage(R.string.network_consumption_warning)
+					.setCheckBoxText(R.string.dont_ask_again)
+					.setCheckBoxChecked(false)
+					.setNegativeButton(android.R.string.cancel, null)
+					.setPositiveButton(R.string._continue) { _, doNotAsk ->
+						settings.isTrafficWarningEnabled = !doNotAsk
+						callback()
+					}.create()
+					.show()
+			} else {
+				callback()
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
index c0237f1cf..4db6c0c27 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.favourites
 
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
 import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel
@@ -13,11 +12,11 @@ val favouritesModule
 
 		single { FavouritesRepository(get()) }
 
-		viewModel { (categoryId: Long) ->
-			FavouritesListViewModel(categoryId, get(), get())
+		viewModel { categoryId ->
+			FavouritesListViewModel(categoryId.get(), get(), get())
 		}
 		viewModel { FavouritesCategoriesViewModel(get()) }
-		viewModel { (manga: Manga) ->
-			MangaCategoriesViewModel(manga, get())
+		viewModel { manga ->
+			MangaCategoriesViewModel(manga.get(), get())
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
index e56cf6999..436dc12ea 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.favourites.data
 
 import androidx.room.*
 import kotlinx.coroutines.flow.Flow
-import org.koitharu.kotatsu.core.model.FavouriteCategory
 
 @Dao
 abstract class FavouriteCategoriesDao {
@@ -13,6 +12,9 @@ abstract class FavouriteCategoriesDao {
 	@Query("SELECT * FROM favourite_categories ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<FavouriteCategoryEntity>>
 
+	@Query("SELECT * FROM favourite_categories WHERE category_id = :id")
+	abstract fun observe(id: Long): Flow<FavouriteCategoryEntity>
+
 	@Insert(onConflict = OnConflictStrategy.ABORT)
 	abstract suspend fun insert(category: FavouriteCategoryEntity): Long
 
@@ -23,10 +25,13 @@ abstract class FavouriteCategoriesDao {
 	abstract suspend fun delete(id: Long)
 
 	@Query("UPDATE favourite_categories SET title = :title WHERE category_id = :id")
-	abstract suspend fun update(id: Long, title: String)
+	abstract suspend fun updateTitle(id: Long, title: String)
+
+	@Query("UPDATE favourite_categories SET `order` = :order WHERE category_id = :id")
+	abstract suspend fun updateOrder(id: Long, order: String)
 
 	@Query("UPDATE favourite_categories SET sort_key = :sortKey WHERE category_id = :id")
-	abstract suspend fun update(id: Long, sortKey: Int)
+	abstract suspend fun updateSortKey(id: Long, sortKey: Int)
 
 	@Query("SELECT MAX(sort_key) FROM favourite_categories")
 	protected abstract suspend fun getMaxSortKey(): Int?
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
index 1da715ae5..f66c87fae 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
@@ -4,6 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.SortOrder
 import java.util.*
 
 @Entity(tableName = "favourite_categories")
@@ -12,13 +13,15 @@ data class FavouriteCategoryEntity(
 	@ColumnInfo(name = "category_id") val categoryId: Int,
 	@ColumnInfo(name = "created_at") val createdAt: Long,
 	@ColumnInfo(name = "sort_key") val sortKey: Int,
-	@ColumnInfo(name = "title") val title: String
+	@ColumnInfo(name = "title") val title: String,
+	@ColumnInfo(name = "order") val order: String,
 ) {
 
 	fun toFavouriteCategory(id: Long? = null) = FavouriteCategory(
 		id = id ?: categoryId.toLong(),
 		title = title,
 		sortKey = sortKey,
-		createdAt = Date(createdAt)
+		order = SortOrder.values().find { x -> x.name == order } ?: SortOrder.NEWEST,
+		createdAt = Date(createdAt),
 	)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
index 7928ba470..cf7d0f8f9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
@@ -1,8 +1,11 @@
 package org.koitharu.kotatsu.favourites.data
 
 import androidx.room.*
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.model.SortOrder
 
 @Dao
 abstract class FavouritesDao {
@@ -11,9 +14,13 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC")
 	abstract suspend fun findAll(): List<FavouriteManga>
 
-	@Transaction
-	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC")
-	abstract fun observeAll(): Flow<List<FavouriteManga>>
+	fun observeAll(order: SortOrder): Flow<List<FavouriteManga>> {
+		val orderBy = getOrderBy(order)
+		val query = SimpleSQLiteQuery(
+			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id GROUP BY favourites.manga_id ORDER BY $orderBy",
+		)
+		return observeAllRaw(query)
+	}
 
 	@Transaction
 	@Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
@@ -23,9 +30,14 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC")
 	abstract suspend fun findAll(categoryId: Long): List<FavouriteManga>
 
-	@Transaction
-	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC")
-	abstract fun observeAll(categoryId: Long): Flow<List<FavouriteManga>>
+	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<FavouriteManga>> {
+		val orderBy = getOrderBy(order)
+		val query = SimpleSQLiteQuery(
+			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id WHERE category_id = ? GROUP BY favourites.manga_id ORDER BY $orderBy",
+			arrayOf<Any>(categoryId),
+		)
+		return observeAllRaw(query)
+	}
 
 	@Transaction
 	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
@@ -63,4 +75,16 @@ abstract class FavouritesDao {
 			insert(entity)
 		}
 	}
+
+	@Transaction
+	@RawQuery(observedEntities = [FavouriteEntity::class])
+	protected abstract fun observeAllRaw(query: SupportSQLiteQuery): Flow<List<FavouriteManga>>
+
+	private fun getOrderBy(sortOrder: SortOrder) = when(sortOrder) {
+		SortOrder.RATING -> "rating DESC"
+		SortOrder.NEWEST,
+		SortOrder.UPDATED -> "created_at DESC"
+		SortOrder.ALPHABETICAL -> "title ASC"
+		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 15cefac92..48d6a34aa 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -3,12 +3,14 @@ package org.koitharu.kotatsu.favourites.domain
 import androidx.room.withTransaction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.utils.ext.mapItems
@@ -21,26 +23,26 @@ class FavouritesRepository(private val db: MangaDatabase) {
 		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
-	fun observeAll(): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll()
+	fun observeAll(order: SortOrder): Flow<List<Manga>> {
+		return db.favouritesDao.observeAll(order)
 			.mapItems { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
-	suspend fun getAllManga(offset: Int): List<Manga> {
-		val entities = db.favouritesDao.findAll(offset, 20)
-		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
-	}
-
 	suspend fun getManga(categoryId: Long): List<Manga> {
 		val entities = db.favouritesDao.findAll(categoryId)
 		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
-	fun observeAll(categoryId: Long): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll(categoryId)
+	fun observeAll(categoryId: Long, order: SortOrder): Flow<List<Manga>> {
+		return db.favouritesDao.observeAll(categoryId, order)
 			.mapItems { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
 	}
 
+	fun observeAll(categoryId: Long): Flow<List<Manga>> {
+		return observeOrder(categoryId)
+			.flatMapLatest { order -> observeAll(categoryId, order) }
+	}
+
 	suspend fun getManga(categoryId: Long, offset: Int): List<Manga> {
 		val entities = db.favouritesDao.findAll(categoryId, offset, 20)
 		return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
@@ -77,25 +79,30 @@ class FavouritesRepository(private val db: MangaDatabase) {
 			title = title,
 			createdAt = System.currentTimeMillis(),
 			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
-			categoryId = 0
+			categoryId = 0,
+			order = SortOrder.UPDATED.name,
 		)
 		val id = db.favouriteCategoriesDao.insert(entity)
 		return entity.toFavouriteCategory(id)
 	}
 
 	suspend fun renameCategory(id: Long, title: String) {
-		db.favouriteCategoriesDao.update(id, title)
+		db.favouriteCategoriesDao.updateTitle(id, title)
 	}
 
 	suspend fun removeCategory(id: Long) {
 		db.favouriteCategoriesDao.delete(id)
 	}
 
+	suspend fun setCategoryOrder(id: Long, order: SortOrder) {
+		db.favouriteCategoriesDao.updateOrder(id, order.name)
+	}
+
 	suspend fun reorderCategories(orderedIds: List<Long>) {
 		val dao = db.favouriteCategoriesDao
 		db.withTransaction {
 			for ((i, id) in orderedIds.withIndex()) {
-				dao.update(id, i)
+				dao.updateSortKey(id, i)
 			}
 		}
 	}
@@ -117,4 +124,10 @@ class FavouritesRepository(private val db: MangaDatabase) {
 	suspend fun removeFromFavourites(manga: Manga) {
 		db.favouritesDao.delete(manga.id)
 	}
+
+	private fun observeOrder(categoryId: Long): Flow<SortOrder> {
+		return db.favouriteCategoriesDao.observe(categoryId)
+			.map { x -> SortOrder.values().find { it.name == x.order } ?: SortOrder.NEWEST }
+			.distinctUntilChanged()
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index c20c2c6f3..399314311 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.favourites.ui
 import android.os.Bundle
 import android.view.*
 import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
@@ -11,15 +12,17 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
+import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.ext.showPopupMenu
 import java.util.*
-import kotlin.collections.ArrayList
 
 class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 	FavouritesTabLongClickListener, CategoriesEditDelegate.CategoriesEditCallback,
@@ -65,10 +68,22 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.tabs.updatePadding(
-			left = insets.left,
-			right = insets.right
+		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
+		binding.root.updatePadding(
+			top = headerHeight - insets.top
 		)
+		binding.pager.updatePadding(
+			top = -headerHeight
+		)
+		binding.tabs.apply {
+			updatePadding(
+				left = insets.left,
+				right = insets.right
+			)
+			updateLayoutParams<ViewGroup.MarginLayoutParams> {
+				topMargin = insets.top
+			}
+		}
 	}
 
 	private fun onCategoriesChanged(categories: List<FavouriteCategory>) {
@@ -100,11 +115,19 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 
 	override fun onTabLongClick(tabView: View, category: FavouriteCategory): Boolean {
 		val menuRes = if (category.id == 0L) R.menu.popup_category_empty else R.menu.popup_category
-		tabView.showPopupMenu(menuRes) {
+		tabView.showPopupMenu(menuRes, { menu ->
+			createOrderSubmenu(menu, category)
+		}) {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(category)
 				R.id.action_rename -> editDelegate.renameCategory(category)
 				R.id.action_create -> editDelegate.createCategory()
+				R.id.action_order -> return@showPopupMenu false
+				else -> {
+					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)
+						?: return@showPopupMenu false
+					viewModel.setCategoryOrder(category.id, order)
+				}
 			}
 			true
 		}
@@ -125,11 +148,26 @@ class FavouritesContainerFragment : BaseFragment<FragmentFavouritesBinding>(),
 
 	private fun wrapCategories(categories: List<FavouriteCategory>): List<FavouriteCategory> {
 		val data = ArrayList<FavouriteCategory>(categories.size + 1)
-		data += FavouriteCategory(0L, getString(R.string.all_favourites), -1, Date())
+		data += FavouriteCategory(0L, getString(R.string.all_favourites), -1, SortOrder.NEWEST, Date())
 		data += categories
 		return data
 	}
 
+	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
+		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
+		for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
+			val menuItem = submenu.add(
+				R.id.group_order,
+				Menu.NONE,
+				i,
+				item.titleRes
+			)
+			menuItem.isCheckable = true
+			menuItem.isChecked = item == category.order
+		}
+		submenu.setGroupCheckable(R.id.group_order, true, true)
+	}
+
 	companion object {
 
 		fun newInstance() = FavouritesContainerFragment()
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
index 83368d802..29de80809 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
@@ -36,7 +36,7 @@ class FavouritesPagerAdapter(
 	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
 		val item = differ.currentList[position]
 		tab.text = item.title
-		tab.view.tag = item
+		tab.view.tag = item.id
 		tab.view.setOnLongClickListener(this)
 	}
 
@@ -45,7 +45,8 @@ class FavouritesPagerAdapter(
 	}
 
 	override fun onLongClick(v: View): Boolean {
-		val item = v.tag as? FavouriteCategory ?: return false
+		val itemId = v.tag as? Long ?: return false
+		val item = differ.currentList.find { x -> x.id == itemId } ?: return false
 		return longClickListener.onTabLongClick(v, item)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index e2ad1153e..17639f06f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
+import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.Insets
@@ -20,6 +21,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.showPopupMenu
@@ -44,6 +46,7 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 		adapter = CategoriesAdapter(this)
 		editDelegate = CategoriesEditDelegate(this, this)
 		binding.recyclerView.addItemDecoration(DividerItemDecoration(this, RecyclerView.VERTICAL))
+		binding.recyclerView.setHasFixedSize(true)
 		binding.recyclerView.adapter = adapter
 		binding.fabAdd.setOnClickListener(this)
 		reorderHelper = ItemTouchHelper(ReorderHelperCallback())
@@ -60,10 +63,17 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 	}
 
 	override fun onItemClick(item: FavouriteCategory, view: View) {
-		view.showPopupMenu(R.menu.popup_category) {
+		view.showPopupMenu(R.menu.popup_category, { menu ->
+			createOrderSubmenu(menu, item)
+		}) {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(item)
 				R.id.action_rename -> editDelegate.renameCategory(item)
+				R.id.action_order -> return@showPopupMenu false
+				else -> {
+					val order = SORT_ORDERS.getOrNull(it.order) ?: return@showPopupMenu false
+					viewModel.setCategoryOrder(item.id, order)
+				}
 			}
 			true
 		}
@@ -116,6 +126,21 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 		viewModel.createCategory(name)
 	}
 
+	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
+		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
+		for ((i, item) in SORT_ORDERS.withIndex()) {
+			val menuItem = submenu.add(
+				R.id.group_order,
+				Menu.NONE,
+				i,
+				item.titleRes
+			)
+			menuItem.isCheckable = true
+			menuItem.isChecked = item == category.order
+		}
+		submenu.setGroupCheckable(R.id.group_order, true, true)
+	}
+
 	private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
 		ItemTouchHelper.DOWN or ItemTouchHelper.UP, 0
 	) {
@@ -144,6 +169,12 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 
 	companion object {
 
+		val SORT_ORDERS = arrayOf(
+			SortOrder.ALPHABETICAL,
+			SortOrder.NEWEST,
+			SortOrder.RATING,
+		)
+
 		fun newIntent(context: Context) = Intent(context, CategoriesActivity::class.java)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
index 5bc88aa05..adf19ca9c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
@@ -6,7 +6,7 @@ import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 
 class CategoriesAdapter(
-	onItemClickListener: OnListItemClickListener<FavouriteCategory>
+	onItemClickListener: OnListItemClickListener<FavouriteCategory>,
 ) : AsyncListDifferDelegationAdapter<FavouriteCategory>(DiffCallback()) {
 
 	init {
@@ -20,12 +20,27 @@ class CategoriesAdapter(
 
 	private class DiffCallback : DiffUtil.ItemCallback<FavouriteCategory>() {
 
-		override fun areItemsTheSame(oldItem: FavouriteCategory, newItem: FavouriteCategory): Boolean {
+		override fun areItemsTheSame(
+			oldItem: FavouriteCategory,
+			newItem: FavouriteCategory,
+		): Boolean {
 			return oldItem.id == newItem.id
 		}
 
-		override fun areContentsTheSame(oldItem: FavouriteCategory, newItem: FavouriteCategory): Boolean {
+		override fun areContentsTheSame(
+			oldItem: FavouriteCategory,
+			newItem: FavouriteCategory,
+		): Boolean {
 			return oldItem.id == newItem.id && oldItem.title == newItem.title
+					&& oldItem.order == newItem.order
+		}
+
+		override fun getChangePayload(
+			oldItem: FavouriteCategory,
+			newItem: FavouriteCategory,
+		): Any? = when {
+			oldItem.title == newItem.title && oldItem.order != newItem.order -> newItem.order
+			else -> super.getChangePayload(oldItem, newItem)
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index 8c648a47b..a9202d749 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -4,10 +4,10 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import java.util.*
-import kotlin.collections.ArrayList
 
 class FavouritesCategoriesViewModel(
 	private val repository: FavouritesRepository
@@ -19,23 +19,29 @@ class FavouritesCategoriesViewModel(
 		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	fun createCategory(name: String) {
-		launchJob(Dispatchers.Default) {
+		launchJob {
 			repository.addCategory(name)
 		}
 	}
 
 	fun renameCategory(id: Long, name: String) {
-		launchJob(Dispatchers.Default) {
+		launchJob {
 			repository.renameCategory(id, name)
 		}
 	}
 
 	fun deleteCategory(id: Long) {
-		launchJob(Dispatchers.Default) {
+		launchJob {
 			repository.removeCategory(id)
 		}
 	}
 
+	fun setCategoryOrder(id: Long, order: SortOrder) {
+		launchJob {
+			repository.setCategoryOrder(id, order)
+		}
+	}
+
 	fun reorderCategories(oldPos: Int, newPos: Int) {
 		val prevJob = reorderJob
 		reorderJob = launchJob(Dispatchers.Default) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
index bdbd4991a..344c3d5a1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
@@ -22,12 +23,18 @@ class FavouritesListViewModel(
 ) : MangaListViewModel(settings) {
 
 	override val content = combine(
-		if (categoryId == 0L) repository.observeAll() else repository.observeAll(categoryId),
+		if (categoryId == 0L) {
+			repository.observeAll(SortOrder.NEWEST)
+		} else {
+			repository.observeAll(categoryId)
+		},
 		createListModeFlow()
 	) { list, mode ->
 		when {
 			list.isEmpty() -> listOf(
 				EmptyState(
+					R.drawable.ic_heart_outline,
+					R.string.text_empty_holder_primary,
 					if (categoryId == 0L) {
 						R.string.you_have_not_favourites_yet
 					} else {
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
index 081fdc0e0..8422232bd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
@@ -20,7 +20,6 @@ import org.koitharu.kotatsu.utils.ext.daysDiff
 import org.koitharu.kotatsu.utils.ext.onFirst
 import java.util.*
 import java.util.concurrent.TimeUnit
-import kotlin.collections.ArrayList
 
 class HistoryListViewModel(
 	private val repository: HistoryRepository,
@@ -44,7 +43,7 @@ class HistoryListViewModel(
 		createListModeFlow()
 	) { list, grouped, mode ->
 		when {
-			list.isEmpty() -> listOf(EmptyState(R.string.text_history_holder))
+			list.isEmpty() -> listOf(EmptyState(R.drawable.ic_history, R.string.text_history_holder_primary, R.string.text_history_holder_secondary))
 			else -> mapList(list, grouped, mode)
 		}
 	}.onFirst {
@@ -81,8 +80,11 @@ class HistoryListViewModel(
 		grouped: Boolean,
 		mode: ListMode
 	): List<ListModel> {
-		val result = ArrayList<ListModel>(if (grouped) (list.size * 1.4).toInt() else list.size)
+		val result = ArrayList<ListModel>(if (grouped) (list.size * 1.4).toInt() else list.size + 1)
 		var prevDate: DateTimeAgo? = null
+		if (!grouped) {
+			result += ListHeader(null, R.string.history)
+		}
 		for ((manga, history) in list) {
 			if (grouped) {
 				val date = timeAgo(history.updatedAt)
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index da163f722..1fa44344c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -4,16 +4,15 @@ import android.os.Bundle
 import android.view.*
 import androidx.annotation.CallSuper
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.GravityCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.drawerlayout.widget.DrawerLayout
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
@@ -37,11 +36,10 @@ import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
 import org.koitharu.kotatsu.list.ui.filter.FilterAdapter
 import org.koitharu.kotatsu.list.ui.filter.OnFilterChangedListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.main.ui.AppBarOwner
+import org.koitharu.kotatsu.main.ui.MainActivity
 import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
-import org.koitharu.kotatsu.utils.ext.clearItemDecorations
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.toggleDrawer
-import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+import org.koitharu.kotatsu.utils.ext.*
 
 abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 	PaginationScrollListener.Callback, OnListItemClickListener<Manga>, OnFilterChangedListener,
@@ -73,7 +71,13 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 		super.onViewCreated(view, savedInstanceState)
 		drawer = binding.root as? DrawerLayout
 		drawer?.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-		listAdapter = MangaListAdapter(get(), viewLifecycleOwner, this, ::resolveException)
+		listAdapter = MangaListAdapter(
+			coil = get(),
+			lifecycleOwner = viewLifecycleOwner,
+			clickListener = this,
+			onRetryClick = ::resolveException,
+			onTagRemoveClick = viewModel::onRemoveFilterTag
+		)
 		paginationListener = PaginationScrollListener(4, this)
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
@@ -81,6 +85,10 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 			addOnScrollListener(paginationListener!!)
 		}
 		with(binding.swipeRefreshLayout) {
+			setColorSchemeColors(
+				ContextCompat.getColor(context, R.color.color_primary),
+				ContextCompat.getColor(context, R.color.color_primary_variant)
+			)
 			setOnRefreshListener(this@MangaListFragment)
 			isEnabled = isSwipeRefreshEnabled
 		}
@@ -215,22 +223,29 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 		activity?.invalidateOptionsMenu()
 	}
 
-	@CallSuper
-	override fun onFilterChanged(filter: MangaFilter) {
-		drawer?.closeDrawers()
-	}
+	override fun onFilterChanged(filter: MangaFilter) = Unit
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.recyclerView.updatePadding(
-			bottom = insets.bottom
-		)
+		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
 		binding.recyclerViewFilter.updatePadding(
+			top = headerHeight,
 			bottom = insets.bottom
 		)
 		binding.root.updatePadding(
 			left = insets.left,
 			right = insets.right
 		)
+		if (activity is MainActivity) {
+			binding.recyclerView.updatePadding(
+				top = headerHeight,
+				bottom = insets.bottom
+			)
+			binding.swipeRefreshLayout.setProgressViewOffset(
+				true,
+				headerHeight + resources.resolveDp(-72),
+				headerHeight + resources.resolveDp(10)
+			)
+		}
 	}
 
 	private fun onGridScaleChanged(scale: Float) {
@@ -246,13 +261,9 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 			when (mode) {
 				ListMode.LIST -> {
 					layoutManager = LinearLayoutManager(context)
-					addItemDecoration(
-						DividerItemDecoration(
-							context,
-							RecyclerView.VERTICAL
-						)
-					)
-					updatePadding(left = 0, right = 0)
+					val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
+					addItemDecoration(SpacingItemDecoration(spacing))
+					updatePadding(left = spacing, right = spacing)
 				}
 				ListMode.DETAILED_LIST -> {
 					layoutManager = LinearLayoutManager(context)
@@ -282,7 +293,7 @@ abstract class MangaListFragment : BaseFragment<FragmentListBinding>(),
 	final override fun getSectionTitle(position: Int): CharSequence? {
 		return when (binding.recyclerViewFilter.adapter?.getItemViewType(position)) {
 			FilterAdapter.VIEW_TYPE_SORT -> getString(R.string.sort_order)
-			FilterAdapter.VIEW_TYPE_TAG -> getString(R.string.genre)
+			FilterAdapter.VIEW_TYPE_TAG -> getString(R.string.genres)
 			else -> null
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
index 0fa365629..3d94d1b65 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -36,6 +37,8 @@ abstract class MangaListViewModel(
 			}
 		}
 
+	open fun onRemoveFilterTag(tag: MangaTag) = Unit
+
 	abstract fun onRefresh()
 
 	abstract fun onRetry()
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
new file mode 100644
index 000000000..4848a27b8
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.list.ui.adapter
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.base.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.databinding.ItemCurrentFilterBinding
+import org.koitharu.kotatsu.list.ui.model.CurrentFilterModel
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+fun currentFilterAD(
+	onTagRemoveClick: (MangaTag) -> Unit,
+) = adapterDelegateViewBinding<CurrentFilterModel, ListModel, ItemCurrentFilterBinding>(
+	{ inflater, parent -> ItemCurrentFilterBinding.inflate(inflater, parent, false) }
+) {
+
+	binding.chipsTags.onChipCloseClickListener = ChipsView.OnChipCloseClickListener { chip, data ->
+		onTagRemoveClick(data as? MangaTag ?: return@OnChipCloseClickListener)
+	}
+
+	bind {
+		binding.chipsTags.setChips(item.chips)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/EmptyStateListAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/EmptyStateListAD.kt
index 77481c8c5..29ecc9b30 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/EmptyStateListAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/EmptyStateListAD.kt
@@ -1,14 +1,23 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
-import android.widget.TextView
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
-import org.koitharu.kotatsu.R
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
-fun emptyStateListAD() = adapterDelegate<EmptyState, ListModel>(R.layout.item_empty_state) {
+fun emptyStateListAD() = adapterDelegateViewBinding<EmptyState, ListModel, ItemEmptyStateBinding>(
+	{ inflater, parent -> ItemEmptyStateBinding.inflate(inflater, parent, false) }
+) {
 
 	bind {
-		(itemView as TextView).setText(item.text)
+		with(binding.icon) {
+			setImageResource(item.icon)
+		}
+		with(binding.textPrimary) {
+			setText(item.textPrimary)
+		}
+		with(binding.textSecondary) {
+			setText(item.textSecondary)
+		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
new file mode 100644
index 000000000..4d25060ac
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
@@ -0,0 +1,19 @@
+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.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+fun listHeaderAD() = adapterDelegate<ListHeader, ListModel>(R.layout.item_header) {
+
+	bind {
+		val textView = (itemView as TextView)
+		if (item.text != null) {
+			textView.text = item.text
+		} else {
+			textView.setText(item.textRes)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
index 0ca8ecabc..cc4c80967 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
@@ -6,6 +6,7 @@ import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.ui.DateTimeAgo
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaGridModel
@@ -17,7 +18,8 @@ class MangaListAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Manga>,
-	onRetryClick: (Throwable) -> Unit
+	onRetryClick: (Throwable) -> Unit,
+	onTagRemoveClick: (MangaTag) -> Unit,
 ) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
 
 	init {
@@ -37,6 +39,8 @@ class MangaListAdapter(
 			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(onRetryClick))
 			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(onRetryClick))
 			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD())
+			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD())
+			.addDelegate(ITEM_TYPE_FILTER, currentFilterAD(onTagRemoveClick))
 	}
 
 	fun setItems(list: List<ListModel>, commitCallback: Runnable) {
@@ -77,5 +81,7 @@ class MangaListAdapter(
 		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_FILTER = 10
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapter.kt
index b0b32096a..983fdf0f1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapter.kt
@@ -6,20 +6,15 @@ import org.koitharu.kotatsu.base.ui.list.BaseViewHolder
 import org.koitharu.kotatsu.core.model.MangaFilter
 import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.model.SortOrder
-import java.util.*
-import kotlin.collections.ArrayList
 
 class FilterAdapter(
-	sortOrders: List<SortOrder> = emptyList(),
-	tags: List<MangaTag> = emptyList(),
+	private val sortOrders: List<SortOrder> = emptyList(),
+	private val tags: List<MangaTag> = emptyList(),
 	state: MangaFilter?,
 	private val listener: OnFilterChangedListener
 ) : RecyclerView.Adapter<BaseViewHolder<*, Boolean, *>>() {
 
-	private val sortOrders = ArrayList<SortOrder>(sortOrders)
-	private val tags = ArrayList(Collections.singletonList(null) + tags)
-
-	private var currentState = state ?: MangaFilter(sortOrders.first(), null)
+	private var currentState = state ?: MangaFilter(sortOrders.firstOrNull(), emptySet())
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when (viewType) {
 		VIEW_TYPE_SORT -> FilterSortHolder(parent).apply {
@@ -29,7 +24,7 @@ class FilterAdapter(
 		}
 		VIEW_TYPE_TAG -> FilterTagHolder(parent).apply {
 			itemView.setOnClickListener {
-				setCheckedTag(boundData)
+				setCheckedTag(boundData ?: return@setOnClickListener, !isChecked)
 			}
 		}
 		else -> throw IllegalArgumentException("Unknown viewType $viewType")
@@ -45,7 +40,7 @@ class FilterAdapter(
 			}
 			is FilterTagHolder -> {
 				val item = tags[position - sortOrders.size]
-				holder.bind(item, item == currentState.tag)
+				holder.bind(item, item in currentState.tags)
 			}
 		}
 	}
@@ -55,19 +50,25 @@ class FilterAdapter(
 		else -> VIEW_TYPE_TAG
 	}
 
-	fun setCheckedTag(tag: MangaTag?) {
-		if (tag != currentState.tag) {
-			val oldItemPos = tags.indexOf(currentState.tag)
-			val newItemPos = tags.indexOf(tag)
-			currentState = currentState.copy(tag = tag)
-			if (oldItemPos in tags.indices) {
-				notifyItemChanged(sortOrders.size + oldItemPos)
+	fun setCheckedTag(tag: MangaTag, isChecked: Boolean) {
+		currentState = if (tag in currentState.tags) {
+			if (!isChecked) {
+				currentState.copy(tags = currentState.tags - tag)
+			} else {
+				return
 			}
-			if (newItemPos in tags.indices) {
-				notifyItemChanged(sortOrders.size + newItemPos)
+		} else {
+			if (isChecked) {
+				currentState.copy(tags = currentState.tags + tag)
+			} else {
+				return
 			}
-			listener.onFilterChanged(currentState)
 		}
+		val index = tags.indexOf(tag)
+		if (index in tags.indices) {
+			notifyItemChanged(sortOrders.size + index)
+		}
+		listener.onFilterChanged(currentState)
 	}
 
 	fun setCheckedSort(sort: SortOrder) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterSortHolder.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterSortHolder.kt
index a182131b6..9275ae831 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterSortHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterSortHolder.kt
@@ -12,7 +12,7 @@ class FilterSortHolder(parent: ViewGroup) :
 	) {
 
 	override fun onBind(data: SortOrder, extra: Boolean) {
-		binding.radio.setText(data.titleRes)
-		binding.radio.isChecked = extra
+		binding.root.setText(data.titleRes)
+		binding.root.isChecked = extra
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterTagHolder.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterTagHolder.kt
index f3bf89635..2054d4cb9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterTagHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterTagHolder.kt
@@ -2,18 +2,20 @@ package org.koitharu.kotatsu.list.ui.filter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.BaseViewHolder
 import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.databinding.ItemCheckableSingleBinding
+import org.koitharu.kotatsu.databinding.ItemCheckableMultipleBinding
 
 class FilterTagHolder(parent: ViewGroup) :
-	BaseViewHolder<MangaTag?, Boolean, ItemCheckableSingleBinding>(
-		ItemCheckableSingleBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+	BaseViewHolder<MangaTag, Boolean, ItemCheckableMultipleBinding>(
+		ItemCheckableMultipleBinding.inflate(LayoutInflater.from(parent.context), parent, false)
 	) {
 
-	override fun onBind(data: MangaTag?, extra: Boolean) {
-		binding.radio.text = data?.title ?: context.getString(R.string.all)
-		binding.radio.isChecked = extra
+	val isChecked: Boolean
+		get() = binding.root.isChecked
+
+	override fun onBind(data: MangaTag, extra: Boolean) {
+		binding.root.text = data.title
+		binding.root.isChecked = extra
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/CurrentFilterModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/CurrentFilterModel.kt
new file mode 100644
index 000000000..32cebb25c
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/CurrentFilterModel.kt
@@ -0,0 +1,7 @@
+package org.koitharu.kotatsu.list.ui.model
+
+import org.koitharu.kotatsu.base.ui.widgets.ChipsView
+
+data class CurrentFilterModel(
+	val chips: Collection<ChipsView.ChipModel>,
+) : ListModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/EmptyState.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/EmptyState.kt
index e23c5b59b..0613f2e24 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/EmptyState.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/EmptyState.kt
@@ -1,7 +1,10 @@
 package org.koitharu.kotatsu.list.ui.model
 
+import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 
 data class EmptyState(
-	@StringRes val text: Int
+	@DrawableRes val icon: Int,
+	@StringRes val textPrimary: Int,
+	@StringRes val textSecondary: Int
 ) : ListModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
new file mode 100644
index 000000000..209c7227f
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.list.ui.model
+
+import androidx.annotation.StringRes
+
+data class ListHeader(
+	val text: CharSequence?,
+	@StringRes val textRes: Int,
+) : ListModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
index 9f3b2f561..b7a367591 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
@@ -6,7 +6,6 @@ import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.prefs.ListMode
-import kotlin.math.roundToInt
 
 fun Manga.toListModel() = MangaListModel(
 	id = id,
@@ -20,7 +19,7 @@ fun Manga.toListDetailedModel() = MangaListDetailedModel(
 	id = id,
 	title = title,
 	subtitle = altTitle,
-	rating = if (rating == Manga.NO_RATING) null else "${(rating * 10).roundToInt()}/10",
+	rating = if (rating == Manga.NO_RATING) null else String.format("%.1f", rating * 5),
 	tags = tags.joinToString(", ") { it.title },
 	coverUrl = coverUrl,
 	manga = this
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
index b2a756cc1..dbe2d43e1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
@@ -15,5 +15,5 @@ val localModule
 		single { LocalMangaRepository(androidContext()) }
 		factory<MangaRepository>(named(MangaSource.LOCAL)) { get<LocalMangaRepository>() }
 
-		viewModel { LocalListViewModel(get(), get(), get(), get(), androidContext()) }
+		viewModel { LocalListViewModel(get(), get(), get(), get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
index f74c023e1..cd4f5ea83 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
@@ -20,19 +20,22 @@ class CbzFetcher : Fetcher<Uri> {
 		pool: BitmapPool,
 		data: Uri,
 		size: Size,
-		options: Options
+		options: Options,
 	): FetchResult {
 		val zip = ZipFile(data.schemeSpecificPart)
 		val entry = zip.getEntry(data.fragment)
 		val ext = MimeTypeMap.getFileExtensionFromUrl(entry.name)
 		return SourceResult(
-			source = zip.getInputStream(entry).source().buffer(),
+			source = ExtraCloseableBufferedSource(
+				zip.getInputStream(entry).source().buffer(),
+				zip,
+			),
 			mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext),
 			dataSource = DataSource.DISK
 		)
 	}
 
-	override fun key(data: Uri): String? = data.toString()
+	override fun key(data: Uri) = data.toString()
 
 	override fun handles(data: Uri) = data.scheme == "cbz"
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt
index 98f4e73fc..106cbaacd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt
@@ -7,7 +7,7 @@ import java.util.*
 class CbzFilter : FilenameFilter {
 
 	override fun accept(dir: File, name: String): Boolean {
-		val ext = name.substringAfterLast('.', "").toLowerCase(Locale.ROOT)
+		val ext = name.substringAfterLast('.', "").lowercase(Locale.ROOT)
 		return ext == "cbz" || ext == "zip"
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/ExtraCloseableBufferedSource.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/ExtraCloseableBufferedSource.kt
new file mode 100644
index 000000000..69ba2565a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/ExtraCloseableBufferedSource.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.local.data
+
+import okhttp3.internal.closeQuietly
+import okio.BufferedSource
+import okio.Closeable
+
+class ExtraCloseableBufferedSource(
+	private val delegate: BufferedSource,
+	vararg closeable: Closeable,
+) : BufferedSource by delegate {
+
+	private val extraCloseable = closeable
+
+	override fun close() {
+		delegate.close()
+		extraCloseable.forEach { x -> x.closeQuietly() }
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
index 66d1b2f4d..82e70a650 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import com.tomclaw.cache.DiskLruCache
 import org.koitharu.kotatsu.utils.FileSizeUtils
 import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.sub
+import org.koitharu.kotatsu.utils.ext.subdir
 import org.koitharu.kotatsu.utils.ext.takeIfReadable
 import java.io.File
 import java.io.InputStream
@@ -13,8 +13,10 @@ import java.io.OutputStream
 class PagesCache(context: Context) {
 
 	private val cacheDir = context.externalCacheDir ?: context.cacheDir
-	private val lruCache =
-		DiskLruCache.create(cacheDir.sub(Cache.PAGES.dir), FileSizeUtils.mbToBytes(200))
+	private val lruCache = DiskLruCache.create(
+		cacheDir.subdir(Cache.PAGES.dir),
+		FileSizeUtils.mbToBytes(200)
+	)
 
 	operator fun get(url: String): File? {
 		return lruCache.get(url)?.takeIfReadable()
@@ -22,7 +24,7 @@ class PagesCache(context: Context) {
 
 	@Deprecated("Useless lambda")
 	fun put(url: String, writer: (OutputStream) -> Unit): File {
-		val file = cacheDir.sub(url.longHashCode().toString())
+		val file = File(cacheDir, url.longHashCode().toString())
 		file.outputStream().use(writer)
 		val res = lruCache.put(url, file)
 		file.delete()
@@ -30,7 +32,7 @@ class PagesCache(context: Context) {
 	}
 
 	fun put(url: String, inputStream: InputStream): File {
-		val file = cacheDir.sub(url.longHashCode().toString())
+		val file = File(cacheDir, url.longHashCode().toString())
 		file.outputStream().use { out ->
 			inputStream.copyTo(out)
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index 9f84ab52a..3d4c51571 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -15,9 +15,7 @@ import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.MangaIndex
 import org.koitharu.kotatsu.local.data.MangaZip
 import org.koitharu.kotatsu.utils.AlphanumComparator
-import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.readText
-import org.koitharu.kotatsu.utils.ext.sub
+import org.koitharu.kotatsu.utils.ext.*
 import java.io.File
 import java.util.*
 import java.util.zip.ZipEntry
@@ -27,17 +25,16 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 
 	private val filenameFilter = CbzFilter()
 
-	override suspend fun getList(
+	override suspend fun getList2(
 		offset: Int,
 		query: String?,
-		sortOrder: SortOrder?,
-		tag: MangaTag?
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
 	): List<Manga> {
 		require(offset == 0) {
 			"LocalMangaRepository does not support pagination"
 		}
-		val files = getAvailableStorageDirs(context)
-			.flatMap { x -> x.listFiles(filenameFilter)?.toList().orEmpty() }
+		val files = getAllFiles()
 		return files.mapNotNull { x -> runCatching { getFromFile(x) }.getOrNull() }
 	}
 
@@ -78,9 +75,9 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 			}
 	}
 
-	fun delete(manga: Manga): Boolean {
+	suspend fun delete(manga: Manga): Boolean {
 		val file = Uri.parse(manga.url).toFile()
-		return file.delete()
+		return file.deleteAwait()
 	}
 
 	@SuppressLint("DefaultLocale")
@@ -98,11 +95,14 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 					entryName = index.getCoverEntry()
 						?: findFirstEntry(zip.entries(), isImage = true)?.name.orEmpty()
 				),
-				chapters = info.chapters?.map { c -> c.copy(url = fileUri) }
+				chapters = info.chapters?.map { c ->
+					c.copy(url = fileUri,
+						source = MangaSource.LOCAL)
+				}
 			)
 		}
 		// fallback
-		val title = file.nameWithoutExtension.replace("_", " ").capitalize()
+		val title = file.nameWithoutExtension.replace("_", " ").toCamelCase()
 		val chapters = ArraySet<String>()
 		for (x in zip.entries()) {
 			if (!x.isDirectory) {
@@ -120,7 +120,7 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 			chapters = chapters.sortedWith(AlphanumComparator()).mapIndexed { i, s ->
 				MangaChapter(
 					id = "$i$s".longHashCode(),
-					name = if (s.isEmpty()) title else s,
+					name = s.ifEmpty { title },
 					number = i + 1,
 					source = MangaSource.LOCAL,
 					url = uriBuilder.fragment(s).build().toString()
@@ -134,13 +134,36 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 			Uri.parse(localManga.url).toFile()
 		}.getOrNull() ?: return null
 		return withContext(Dispatchers.IO) {
-			val zip = ZipFile(file)
-			val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
-			val index = entry?.let(zip::readText)?.let(::MangaIndex) ?: return@withContext null
-			index.getMangaInfo()
+			@Suppress("BlockingMethodInNonBlockingContext")
+			ZipFile(file).use { zip ->
+				val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
+				val index = entry?.let(zip::readText)?.let(::MangaIndex) ?: return@withContext null
+				index.getMangaInfo()
+			}
 		}
 	}
 
+	suspend fun findSavedManga(remoteManga: Manga): Manga? = withContext(Dispatchers.IO) {
+		val files = getAllFiles()
+		for (file in files) {
+			@Suppress("BlockingMethodInNonBlockingContext")
+			val index = ZipFile(file).use { zip ->
+				val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
+				entry?.let(zip::readText)?.let(::MangaIndex)
+			} ?: continue
+			val info = index.getMangaInfo() ?: continue
+			if (info.id == remoteManga.id) {
+				val fileUri = file.toUri().toString()
+				return@withContext info.copy(
+					source = MangaSource.LOCAL,
+					url = fileUri,
+					chapters = info.chapters?.map { c -> c.copy(url = fileUri) }
+				)
+			}
+		}
+		null
+	}
+
 	private fun zipUri(file: File, entryName: String) =
 		Uri.fromParts("cbz", file.path, entryName).toString()
 
@@ -165,20 +188,26 @@ class LocalMangaRepository(private val context: Context) : MangaRepository {
 
 	override suspend fun getTags() = emptySet<MangaTag>()
 
+	private fun getAllFiles() = getAvailableStorageDirs(context).flatMap { dir ->
+		dir.listFiles(filenameFilter)?.toList().orEmpty()
+	}
+
 	companion object {
 
 		private const val DIR_NAME = "manga"
 
 		fun isFileSupported(name: String): Boolean {
-			val ext = name.substringAfterLast('.').toLowerCase(Locale.ROOT)
+			val ext = name.substringAfterLast('.').lowercase(Locale.ROOT)
 			return ext == "cbz" || ext == "zip"
 		}
 
 		fun getAvailableStorageDirs(context: Context): List<File> {
-			val result = ArrayList<File>(5)
-			result += context.filesDir.sub(DIR_NAME)
+			val result = ArrayList<File?>(5)
+			result += File(context.filesDir, DIR_NAME)
 			result += context.getExternalFilesDirs(DIR_NAME)
-			return result.distinctBy { it.canonicalPath }.filter { it.exists() || it.mkdir() }
+			return result.filterNotNull()
+				.distinctBy { it.canonicalPath }
+				.filter { it.exists() || it.mkdir() }
 		}
 
 		fun getFallbackStorageDir(context: Context): File? {
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
index ba700ecff..319cf5619 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
@@ -1,6 +1,6 @@
 package org.koitharu.kotatsu.local.ui
 
-import android.content.ActivityNotFoundException
+import android.content.*
 import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
@@ -15,6 +15,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.utils.ext.ellipsize
 
@@ -25,12 +26,32 @@ class LocalListFragment : MangaListFragment(), ActivityResultCallback<Uri> {
 		ActivityResultContracts.OpenDocument(),
 		this
 	)
+	private val downloadReceiver = object : BroadcastReceiver() {
+		override fun onReceive(context: Context?, intent: Intent?) {
+			if (intent?.action == DownloadService.ACTION_DOWNLOAD_COMPLETE) {
+				viewModel.onRefresh()
+			}
+		}
+	}
+
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		context.registerReceiver(
+			downloadReceiver,
+			IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE)
+		)
+	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		viewModel.onMangaRemoved.observe(viewLifecycleOwner, ::onItemRemoved)
 	}
 
+	override fun onDetach() {
+		requireContext().unregisterReceiver(downloadReceiver)
+		super.onDetach()
+	}
+
 	override fun onScrolledToEnd() = Unit
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -65,7 +86,7 @@ class LocalListFragment : MangaListFragment(), ActivityResultCallback<Uri> {
 
 	override fun onActivityResult(result: Uri?) {
 		if (result != null) {
-			viewModel.importFile(result)
+			viewModel.importFile(context?.applicationContext ?: return, result)
 		}
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
index 715b287b6..5c12ad115 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
@@ -14,15 +14,12 @@ import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 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.list.ui.model.*
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.utils.MediaStoreCompat
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import org.koitharu.kotatsu.utils.ext.sub
+import java.io.File
 import java.io.IOException
 
 class LocalListViewModel(
@@ -30,12 +27,12 @@ class LocalListViewModel(
 	private val historyRepository: HistoryRepository,
 	private val settings: AppSettings,
 	private val shortcutsRepository: ShortcutsRepository,
-	private val context: Context
 ) : MangaListViewModel(settings) {
 
 	val onMangaRemoved = SingleLiveEvent<Manga>()
 	private val listError = MutableStateFlow<Throwable?>(null)
 	private val mangaList = MutableStateFlow<List<Manga>?>(null)
+	private val headerModel = ListHeader(null, R.string.local_storage)
 
 	override val content = combine(
 		mangaList,
@@ -45,8 +42,11 @@ class LocalListViewModel(
 		when {
 			error != null -> listOf(error.toErrorState(canRetry = true))
 			list == null -> listOf(LoadingState)
-			list.isEmpty() -> listOf(EmptyState(R.string.text_local_holder))
-			else -> list.toUi(mode)
+			list.isEmpty() -> listOf(EmptyState(R.drawable.ic_storage, R.string.text_local_holder_primary, R.string.text_local_holder_secondary))
+			else -> ArrayList<ListModel>(list.size + 1).apply {
+				add(headerModel)
+				list.toUi(this, mode)
+			}
 		}
 	}.asLiveDataDistinct(
 		viewModelScope.coroutineContext + Dispatchers.Default,
@@ -61,7 +61,7 @@ class LocalListViewModel(
 		launchLoadingJob(Dispatchers.Default) {
 			try {
 				listError.value = null
-				mangaList.value = repository.getList(0)
+				mangaList.value = repository.getList2(0)
 			} catch (e: Throwable) {
 				listError.value = e
 			}
@@ -70,7 +70,7 @@ class LocalListViewModel(
 
 	override fun onRetry() = onRefresh()
 
-	fun importFile(uri: Uri) {
+	fun importFile(context: Context, uri: Uri) {
 		launchLoadingJob {
 			val contentResolver = context.contentResolver
 			withContext(Dispatchers.IO) {
@@ -79,8 +79,9 @@ class LocalListViewModel(
 				if (!LocalMangaRepository.isFileSupported(name)) {
 					throw UnsupportedFileException("Unsupported file on $uri")
 				}
-				val dest = settings.getStorageDir(context)?.sub(name)
+				val dest = settings.getStorageDir(context)?.let { File(it, name) }
 					?: throw IOException("External files dir unavailable")
+				@Suppress("BlockingMethodInNonBlockingContext")
 				contentResolver.openInputStream(uri)?.use { source ->
 					dest.outputStream().use { output ->
 						source.copyTo(output)
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/AppBarOwner.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/AppBarOwner.kt
new file mode 100644
index 000000000..d5a2de5bc
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/AppBarOwner.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.main.ui
+
+import com.google.android.material.appbar.AppBarLayout
+
+interface AppBarOwner {
+
+	val appBar: AppBarLayout
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 6abc5fae4..d333fddb7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -6,79 +6,130 @@ import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.*
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentTransaction
+import androidx.fragment.app.commit
+import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
+import androidx.transition.TransitionManager
+import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
+import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSection
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.ActivityMainBinding
+import org.koitharu.kotatsu.databinding.NavigationHeaderBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.favourites.ui.FavouritesContainerFragment
 import org.koitharu.kotatsu.history.ui.HistoryListFragment
 import org.koitharu.kotatsu.local.ui.LocalListFragment
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
-import org.koitharu.kotatsu.search.ui.SearchHelper
+import org.koitharu.kotatsu.search.ui.SearchActivity
+import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
+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.AppUpdateChecker
 import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsFragment
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsWorker
+import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
 import org.koitharu.kotatsu.tracker.ui.FeedFragment
 import org.koitharu.kotatsu.tracker.work.TrackWorker
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.resolveDp
-import java.io.Closeable
+import org.koitharu.kotatsu.utils.ext.*
 
 class MainActivity : BaseActivity<ActivityMainBinding>(),
-	NavigationView.OnNavigationItemSelectedListener,
-	View.OnClickListener {
+	NavigationView.OnNavigationItemSelectedListener, AppBarOwner,
+	View.OnClickListener, View.OnFocusChangeListener, SearchSuggestionListener {
 
 	private val viewModel by viewModel<MainViewModel>(mode = LazyThreadSafetyMode.NONE)
+	private val searchSuggestionViewModel by viewModel<SearchSuggestionViewModel>(
+		mode = LazyThreadSafetyMode.NONE
+	)
 
+	private lateinit var navHeaderBinding: NavigationHeaderBinding
 	private lateinit var drawerToggle: ActionBarDrawerToggle
-	private var closeable: Closeable? = null
+	private var searchViewElevation = 0f
+
+	override val appBar: AppBarLayout
+		get() = binding.appbar
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityMainBinding.inflate(layoutInflater))
-		drawerToggle =
-			ActionBarDrawerToggle(
-				this,
-				binding.drawer,
-				binding.toolbar,
-				R.string.open_menu,
-				R.string.close_menu
-			)
+		searchViewElevation = binding.toolbarCard.cardElevation
+		navHeaderBinding = NavigationHeaderBinding.inflate(layoutInflater)
+		drawerToggle = ActionBarDrawerToggle(
+			this,
+			binding.drawer,
+			binding.toolbar,
+			R.string.open_menu,
+			R.string.close_menu
+		)
+		drawerToggle.setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_arrow_back))
+		drawerToggle.setToolbarNavigationClickListener {
+			binding.searchView.hideKeyboard()
+			onBackPressed()
+		}
 		binding.drawer.addDrawerListener(drawerToggle)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-		binding.navigationView.setNavigationItemSelectedListener(this)
+		if (get<AppSettings>().isAmoledTheme && get<AppSettings>().theme == AppCompatDelegate.MODE_NIGHT_YES) {
+			binding.appbar.setBackgroundColor(Color.BLACK)
+			binding.toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.color_background))
+		} else {
+			binding.toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.color_surface))
+		}
+
+		with(binding.searchView) {
+			onFocusChangeListener = this@MainActivity
+			searchSuggestionListener = this@MainActivity
+		}
+
+		with(binding.navigationView) {
+			val menuView =
+				findViewById<RecyclerView>(com.google.android.material.R.id.design_navigation_view)
+			ViewCompat.setOnApplyWindowInsetsListener(navHeaderBinding.root) { v, insets ->
+				val systemWindowInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+				v.updatePadding(top = systemWindowInsets.top)
+				// NavigationView doesn't dispatch insets to the menu view, so pad the bottom here.
+				menuView.updatePadding(bottom = systemWindowInsets.bottom)
+				insets
+			}
+			addHeaderView(navHeaderBinding.root)
+			itemBackground = navigationItemBackground(context)
+			setNavigationItemSelectedListener(this@MainActivity)
+		}
 
 		with(binding.fab) {
 			imageTintList = ColorStateList.valueOf(Color.WHITE)
 			setOnClickListener(this@MainActivity)
 		}
 
-		supportFragmentManager.findFragmentById(R.id.container)?.let {
+		supportFragmentManager.findFragmentByTag(TAG_PRIMARY)?.let {
 			binding.fab.isVisible = it is HistoryListFragment
 		} ?: run {
 			openDefaultSection()
 		}
 		if (savedInstanceState == null) {
-			TrackWorker.setup(applicationContext)
-			SuggestionsWorker.setup(applicationContext)
-			AppUpdateChecker(this).launchIfNeeded()
+			onFirstStart()
 		}
 
 		viewModel.onOpenReader.observe(this, this::onOpenReader)
@@ -87,9 +138,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		viewModel.remoteSources.observe(this, this::updateSideMenu)
 	}
 
-	override fun onDestroy() {
-		closeable?.close()
-		super.onDestroy()
+	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+		super.onRestoreInstanceState(savedInstanceState)
+		drawerToggle.isDrawerIndicatorEnabled =
+			binding.drawer.getDrawerLockMode(GravityCompat.START) == DrawerLayout.LOCK_MODE_UNLOCKED
 	}
 
 	override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -103,21 +155,20 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 	}
 
 	override fun onBackPressed() {
-		if (binding.drawer.isDrawerOpen(binding.navigationView)) {
-			binding.drawer.closeDrawer(binding.navigationView)
-		} else {
-			super.onBackPressed()
+		val fragment = supportFragmentManager.findFragmentByTag(TAG_SEARCH)
+		binding.searchView.clearFocus()
+		when {
+			binding.drawer.isDrawerOpen(binding.navigationView) -> binding.drawer.closeDrawer(
+				binding.navigationView)
+			fragment != null -> supportFragmentManager.commit {
+				remove(fragment)
+				setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+				runOnCommit { onSearchClosed() }
+			}
+			else -> super.onBackPressed()
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		menuInflater.inflate(R.menu.opt_main, menu)
-		menu.findItem(R.id.action_search)?.let { menuItem ->
-			closeable = SearchHelper.setupSearchView(menuItem)
-		}
-		return super.onCreateOptionsMenu(menu)
-	}
-
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return drawerToggle.onOptionsItemSelected(item) || when (item.itemId) {
 			else -> super.onOptionsItemSelected(item)
@@ -134,48 +185,99 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		if (item.groupId == R.id.group_remote_sources) {
 			val source = MangaSource.values().getOrNull(item.itemId) ?: return false
 			setPrimaryFragment(RemoteListFragment.newInstance(source))
-		} else when (item.itemId) {
-			R.id.nav_history -> {
-				viewModel.defaultSection = AppSection.HISTORY
-				setPrimaryFragment(HistoryListFragment.newInstance())
+			searchSuggestionViewModel.onSourceChanged(source)
+		} else {
+			searchSuggestionViewModel.onSourceChanged(null)
+			when (item.itemId) {
+				R.id.nav_history -> {
+					viewModel.defaultSection = AppSection.HISTORY
+					setPrimaryFragment(HistoryListFragment.newInstance())
+				}
+				R.id.nav_favourites -> {
+					viewModel.defaultSection = AppSection.FAVOURITES
+					setPrimaryFragment(FavouritesContainerFragment.newInstance())
+				}
+				R.id.nav_local_storage -> {
+					viewModel.defaultSection = AppSection.LOCAL
+					setPrimaryFragment(LocalListFragment.newInstance())
+				}
+				R.id.nav_suggestions -> {
+					viewModel.defaultSection = AppSection.SUGGESTIONS
+					setPrimaryFragment(SuggestionsFragment.newInstance())
+				}
+				R.id.nav_feed -> {
+					viewModel.defaultSection = AppSection.FEED
+					setPrimaryFragment(FeedFragment.newInstance())
+				}
+				R.id.nav_action_settings -> {
+					startActivity(SettingsActivity.newIntent(this))
+					return true
+				}
+				else -> return false
 			}
-			R.id.nav_favourites -> {
-				viewModel.defaultSection = AppSection.FAVOURITES
-				setPrimaryFragment(FavouritesContainerFragment.newInstance())
-			}
-			R.id.nav_local_storage -> {
-				viewModel.defaultSection = AppSection.LOCAL
-				setPrimaryFragment(LocalListFragment.newInstance())
-			}
-			R.id.nav_suggestions -> {
-				viewModel.defaultSection = AppSection.SUGGESTIONS
-				setPrimaryFragment(SuggestionsFragment.newInstance())
-			}
-			R.id.nav_feed -> {
-				viewModel.defaultSection = AppSection.FEED
-				setPrimaryFragment(FeedFragment.newInstance())
-			}
-			R.id.nav_action_settings -> {
-				startActivity(SettingsActivity.newIntent(this))
-				return true
-			}
-			else -> return false
 		}
 		binding.drawer.closeDrawers()
 		return true
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		binding.toolbar.updatePadding(
-			top = insets.top,
-			left = insets.left,
-			right = insets.right
-		)
-		binding.fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+		binding.toolbarCard.updateLayoutParams<MarginLayoutParams> {
+			topMargin = insets.top + resources.resolveDp(8)
+		}
+		binding.fab.updateLayoutParams<MarginLayoutParams> {
 			bottomMargin = insets.bottom + topMargin
 			leftMargin = insets.left + topMargin
 			rightMargin = insets.right + topMargin
 		}
+		binding.container.updateLayoutParams<MarginLayoutParams> {
+			topMargin = -(binding.appbar.measureHeight())
+		}
+	}
+
+	override fun onFocusChange(v: View?, hasFocus: Boolean) {
+		val fragment = supportFragmentManager.findFragmentByTag(TAG_SEARCH)
+		if (v?.id == R.id.searchView && hasFocus) {
+			if (fragment == null) {
+				supportFragmentManager.commit {
+					add(R.id.container, SearchSuggestionFragment.newInstance(), TAG_SEARCH)
+					setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+					runOnCommit { onSearchOpened() }
+				}
+			}
+		}
+	}
+
+	override fun onMangaClick(manga: Manga) {
+		startActivity(DetailsActivity.newIntent(this, manga))
+	}
+
+	override fun onQueryClick(query: String, submit: Boolean) {
+		binding.searchView.query = query
+		if (submit) {
+			if (query.isNotEmpty()) {
+				val source = searchSuggestionViewModel.getLocalSearchSource()
+				if (source != null) {
+					startActivity(SearchActivity.newIntent(this, source, query))
+				} else {
+					startActivity(GlobalSearchActivity.newIntent(this, query))
+				}
+				searchSuggestionViewModel.saveQuery(query)
+			}
+		}
+	}
+
+	override fun onQueryChanged(query: String) {
+		searchSuggestionViewModel.onQueryChanged(query)
+	}
+
+	override fun onClearSearchHistory() {
+		AlertDialog.Builder(this)
+			.setTitle(R.string.clear_search_history)
+			.setMessage(R.string.text_clear_search_history_prompt)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.clear) { _, _ ->
+				searchSuggestionViewModel.clearSearchHistory()
+			}.show()
 	}
 
 	private fun onOpenReader(manga: Manga) {
@@ -245,8 +347,62 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 
 	private fun setPrimaryFragment(fragment: Fragment) {
 		supportFragmentManager.beginTransaction()
-			.replace(R.id.container, fragment)
+			.replace(R.id.container, fragment, TAG_PRIMARY)
 			.commit()
 		binding.fab.isVisible = fragment is HistoryListFragment
 	}
+
+	private fun onSearchOpened() {
+		binding.drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+		drawerToggle.isDrawerIndicatorEnabled = false
+		TransitionManager.beginDelayedTransition(binding.appbar)
+		// Avoiding shadows on the sides if the color is transparent, so we make the AppBarLayout white/grey/black
+		if (isDarkAmoledTheme()) {
+			binding.toolbar.setBackgroundColor(Color.BLACK)
+		} else {
+			binding.appbar.setBackgroundColor(ContextCompat.getColor(this, R.color.color_surface))
+		}
+		binding.toolbarCard.apply {
+			cardElevation = 0f
+			// Remove margin
+			updateLayoutParams<MarginLayoutParams> {
+				leftMargin = 0
+				rightMargin = 0
+			}
+
+		}
+		binding.appbar.elevation = searchViewElevation
+	}
+
+	private fun onSearchClosed() {
+		binding.drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+		drawerToggle.isDrawerIndicatorEnabled = true
+		if (isDarkAmoledTheme()) {
+			binding.toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.color_background))
+		}
+		TransitionManager.beginDelayedTransition(binding.appbar)
+		// Returning transparent color
+		binding.appbar.setBackgroundColor(Color.TRANSPARENT)
+		binding.appbar.elevation = 0f
+		binding.toolbarCard.apply {
+			cardElevation = searchViewElevation
+			updateLayoutParams<MarginLayoutParams> {
+				leftMargin = resources.resolveDp(16)
+				rightMargin = resources.resolveDp(16)
+			}
+		}
+	}
+
+	private fun onFirstStart() {
+		TrackWorker.setup(applicationContext)
+		SuggestionsWorker.setup(applicationContext)
+		AppUpdateChecker(this@MainActivity).launchIfNeeded()
+		OnboardDialogFragment.showWelcome(get(), supportFragmentManager)
+	}
+
+	private companion object {
+
+		const val TAG_PRIMARY = "primary"
+		const val TAG_SEARCH = "search"
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
index d031b9aec..74ea5b618 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
@@ -3,9 +3,7 @@ package org.koitharu.kotatsu.reader
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.local.data.PagesCache
-import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 
 val readerModule
@@ -14,7 +12,7 @@ val readerModule
 		single { MangaDataRepository(get()) }
 		single { PagesCache(get()) }
 
-		viewModel { (intent: MangaIntent, state: ReaderState?) ->
-			ReaderViewModel(intent, state, get(), get(), get(), get())
+		viewModel { params ->
+			ReaderViewModel(params[0], params[1], get(), get(), get(), get())
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersDialog.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersDialog.kt
index 667d7113a..78d713fff 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ChaptersDialog.kt
@@ -15,16 +15,17 @@ import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.MangaChapter
 import org.koitharu.kotatsu.databinding.DialogChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
+import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.model.toListItem
 import org.koitharu.kotatsu.history.domain.ChapterExtra
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class ChaptersDialog : AlertDialogFragment<DialogChaptersBinding>(),
-	OnListItemClickListener<MangaChapter> {
+	OnListItemClickListener<ChapterListItem> {
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
-		container: ViewGroup?
+		container: ViewGroup?,
 	) = DialogChaptersBinding.inflate(inflater, container, false)
 
 	override fun onBuildDialog(builder: AlertDialog.Builder) {
@@ -51,7 +52,8 @@ class ChaptersDialog : AlertDialogFragment<DialogChaptersBinding>(),
 						index < currentPosition -> ChapterExtra.READ
 						index == currentPosition -> ChapterExtra.CURRENT
 						else -> ChapterExtra.UNREAD
-					}
+					},
+					isMissing = false
 				)
 			}) {
 				if (currentPosition >= 0) {
@@ -66,11 +68,11 @@ class ChaptersDialog : AlertDialogFragment<DialogChaptersBinding>(),
 		}
 	}
 
-	override fun onItemClick(item: MangaChapter, view: View) {
+	override fun onItemClick(item: ChapterListItem, view: View) {
 		((parentFragment as? OnChapterChangeListener)
 			?: (activity as? OnChapterChangeListener))?.let {
 			dismiss()
-			it.onChapterChanged(item)
+			it.onChapterChanged(item.chapter)
 		}
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
index 5b53b41ff..b8b7bcb19 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
@@ -38,7 +38,7 @@ import org.koitharu.kotatsu.reader.ui.pager.BaseReader
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
 import org.koitharu.kotatsu.reader.ui.pager.reversed.ReversedReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
-import org.koitharu.kotatsu.reader.ui.pager.wetoon.WebtoonReaderFragment
+import org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonReaderFragment
 import org.koitharu.kotatsu.reader.ui.thumbnails.OnPageSelectListener
 import org.koitharu.kotatsu.reader.ui.thumbnails.PagesThumbnailsSheet
 import org.koitharu.kotatsu.utils.GridTouchHelper
@@ -124,7 +124,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.opt_reader_top, menu)
 		return super.onCreateOptionsMenu(menu)
 	}
@@ -220,7 +220,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 	}
 
 	override fun onGridTouch(area: Int) {
-		controlDelegate.onGridTouch(area)
+		controlDelegate.onGridTouch(area, binding.container)
 	}
 
 	override fun onProcessTouch(rawX: Int, rawY: Int): Boolean {
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderControlDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderControlDelegate.kt
index eb408f5f7..f8c5d73c0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderControlDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderControlDelegate.kt
@@ -1,6 +1,8 @@
 package org.koitharu.kotatsu.reader.ui
 
 import android.view.KeyEvent
+import android.view.SoundEffectConstants
+import android.view.View
 import androidx.lifecycle.LifecycleCoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
@@ -30,18 +32,27 @@ class ReaderControlDelegate(
 			}.launchIn(scope)
 	}
 
-	fun onGridTouch(area: Int) {
+	fun onGridTouch(area: Int, view: View) {
 		when (area) {
 			GridTouchHelper.AREA_CENTER -> {
 				listener.toggleUiVisibility()
+				view.playSoundEffect(SoundEffectConstants.CLICK)
+			}
+			GridTouchHelper.AREA_TOP -> if (isTapSwitchEnabled) {
+				listener.switchPageBy(-1)
+				view.playSoundEffect(SoundEffectConstants.NAVIGATION_UP)
 			}
-			GridTouchHelper.AREA_TOP,
 			GridTouchHelper.AREA_LEFT -> if (isTapSwitchEnabled) {
 				listener.switchPageBy(-1)
+				view.playSoundEffect(SoundEffectConstants.NAVIGATION_LEFT)
+			}
+			GridTouchHelper.AREA_BOTTOM -> if (isTapSwitchEnabled) {
+				listener.switchPageBy(1)
+				view.playSoundEffect(SoundEffectConstants.NAVIGATION_DOWN)
 			}
-			GridTouchHelper.AREA_BOTTOM,
 			GridTouchHelper.AREA_RIGHT -> if (isTapSwitchEnabled) {
 				listener.switchPageBy(1)
+				view.playSoundEffect(SoundEffectConstants.NAVIGATION_RIGHT)
 			}
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
index 1c62b2cce..0113bb475 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
@@ -3,16 +3,19 @@ package org.koitharu.kotatsu.reader.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.Parcelable
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.ActivitySettingsSimpleBinding
 import org.koitharu.kotatsu.settings.MainSettingsFragment
 import org.koitharu.kotatsu.settings.NetworkSettingsFragment
 import org.koitharu.kotatsu.settings.ReaderSettingsFragment
+import org.koitharu.kotatsu.settings.SourceSettingsFragment
 
 class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 
@@ -25,6 +28,9 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 				R.id.container, when (intent?.action) {
 					Intent.ACTION_MANAGE_NETWORK_USAGE -> NetworkSettingsFragment()
 					ACTION_READER -> ReaderSettingsFragment()
+					ACTION_SOURCE -> SourceSettingsFragment.newInstance(
+						intent.getParcelableExtra(EXTRA_SOURCE) ?: MangaSource.LOCAL
+					)
 					else -> MainSettingsFragment()
 				}
 			)
@@ -43,9 +49,17 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
 
 		private const val ACTION_READER =
 			"${BuildConfig.APPLICATION_ID}.action.MANAGE_READER_SETTINGS"
+		private const val ACTION_SOURCE =
+			"${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCE_SETTINGS"
+		private const val EXTRA_SOURCE = "source"
 
 		fun newReaderSettingsIntent(context: Context) =
 			Intent(context, SimpleSettingsActivity::class.java)
 				.setAction(ACTION_READER)
+
+		fun newSourceSettingsIntent(context: Context, source: MangaSource) =
+			Intent(context, SimpleSettingsActivity::class.java)
+				.setAction(ACTION_SOURCE)
+				.putExtra(EXTRA_SOURCE, source as Parcelable)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/ListPaginationListener.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/ListPaginationListener.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/ListPaginationListener.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/ListPaginationListener.kt
index bcd6ec292..a3879a762 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/ListPaginationListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/ListPaginationListener.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonAdapter.kt
similarity index 94%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonAdapter.kt
index 34e3b4713..a089d4d17 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonFrameLayout.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonFrameLayout.kt
similarity index 91%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonFrameLayout.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonFrameLayout.kt
index cf0879e4c..2fe267156 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonFrameLayout.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonFrameLayout.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
similarity index 97%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonHolder.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
index f7ac4b541..fcb81c602 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import android.net.Uri
 import android.view.View
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonImageView.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
similarity index 97%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonImageView.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
index 88845b512..09cb044c0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonImageView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import android.content.Context
 import android.graphics.PointF
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonReaderFragment.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
similarity index 98%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonReaderFragment.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
index e1b1ab879..1cb0b1079 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonReaderFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonRecyclerView.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt
similarity index 97%
rename from app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonRecyclerView.kt
rename to app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt
index 16287fbeb..f4535d7be 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/wetoon/WebtoonRecyclerView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.reader.ui.pager.wetoon
+package org.koitharu.kotatsu.reader.ui.pager.webtoon
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
index 06083d02e..0a2f4f2cb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import org.koin.android.ext.android.get
@@ -53,6 +54,21 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+
+		val title = arguments?.getString(ARG_TITLE)
+		binding.toolbar.title = title
+		binding.toolbar.setNavigationOnClickListener { dismiss() }
+		binding.toolbar.subtitle = null
+
+		if (!resources.getBoolean(R.bool.is_tablet)) {
+			binding.toolbar.navigationIcon = null
+		} else {
+			binding.toolbar.subtitle =
+				resources.getQuantityString(R.plurals.pages, thumbnails.size, thumbnails.size)
+		}
+
+		val initialTopPosition = binding.recyclerView.top
+
 		with(binding.recyclerView) {
 			addItemDecoration(
 				SpacingItemDecoration(view.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
@@ -64,40 +80,36 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 				get(),
 				this@PagesThumbnailsSheet
 			)
+			addOnScrollListener(object : RecyclerView.OnScrollListener() {
+				override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) = Unit
+
+				override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+					super.onScrolled(recyclerView, dx, dy)
+					binding.appbar.isLifted = getChildAt(0).top < initialTopPosition
+				}
+			})
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver.setGridSize(get<AppSettings>().gridSize / 100f, this)
 		}
-
-		val title = arguments?.getString(ARG_TITLE)
-		binding.toolbar.title = title
-		binding.toolbar.setNavigationOnClickListener { dismiss() }
-		binding.toolbar.subtitle =
-			resources.getQuantityString(R.plurals.pages, thumbnails.size, thumbnails.size)
-		binding.textViewTitle.text = title
-		if (dialog !is BottomSheetDialog) {
-			binding.toolbar.isVisible = true
-			binding.textViewTitle.isVisible = false
-			binding.appbar.elevation = resources.getDimension(R.dimen.elevation_large)
-		}
 	}
 
 	override fun onCreateDialog(savedInstanceState: Bundle?) =
 		super.onCreateDialog(savedInstanceState).also {
 			val behavior = (it as? BottomSheetDialog)?.behavior ?: return@also
 			behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
-				private val elevation = resources.getDimension(R.dimen.elevation_large)
 
 				override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
 
 				override fun onStateChanged(bottomSheet: View, newState: Int) {
 					if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-						binding.toolbar.isVisible = true
-						binding.textViewTitle.isVisible = false
-						binding.appbar.elevation = elevation
+						binding.toolbar.setNavigationIcon(R.drawable.ic_cross)
+						binding.toolbar.subtitle =
+							resources.getQuantityString(R.plurals.pages,
+								thumbnails.size,
+								thumbnails.size)
 					} else {
-						binding.toolbar.isVisible = false
-						binding.textViewTitle.isVisible = true
-						binding.appbar.elevation = 0f
+						binding.toolbar.navigationIcon = null
+						binding.toolbar.subtitle = null
 					}
 				}
 			})
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
index 802d35ab9..4555fe10e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
 val remoteListModule
 	get() = module {
 
-		viewModel { (source: MangaSource) ->
-			RemoteListViewModel(get(named(source)), get())
+		viewModel { source ->
+			RemoteListViewModel(get(named(source.get<MangaSource>())), get())
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
index b16d446d6..1f9b543a6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
@@ -9,7 +9,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaFilter
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.search.ui.SearchActivity
+import org.koitharu.kotatsu.reader.ui.SimpleSettingsActivity
 import org.koitharu.kotatsu.utils.ext.parcelableArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 
@@ -25,26 +25,32 @@ class RemoteListFragment : MangaListFragment() {
 		viewModel.loadNextPage()
 	}
 
-	override fun getTitle(): CharSequence? {
+	override fun getTitle(): CharSequence {
 		return source.title
 	}
 
 	override fun onFilterChanged(filter: MangaFilter) {
 		viewModel.applyFilter(filter)
-		super.onFilterChanged(filter)
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		inflater.inflate(R.menu.opt_remote, menu)
 		super.onCreateOptionsMenu(menu, inflater)
+		inflater.inflate(R.menu.opt_list_remote, menu)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_search_internal -> {
-			context?.startActivity(SearchActivity.newIntent(requireContext(), source, null))
-			true
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when (item.itemId) {
+			R.id.action_source_settings -> {
+				startActivity(
+					SimpleSettingsActivity.newSourceSettingsIntent(
+						context ?: return false,
+						source,
+					)
+				)
+				true
+			}
+			else -> super.onOptionsItemSelected(item)
 		}
-		else -> super.onOptionsItemSelected(item)
 	}
 
 	companion object {
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
index b36ead35a..d8df693a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
@@ -7,15 +7,17 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaFilter
+import org.koitharu.kotatsu.core.model.MangaTag
 import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaFilterConfig
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import java.util.*
 
 class RemoteListViewModel(
 	private val repository: MangaRepository,
@@ -27,6 +29,7 @@ class RemoteListViewModel(
 	private val listError = MutableStateFlow<Throwable?>(null)
 	private var appliedFilter: MangaFilter? = null
 	private var loadingJob: Job? = null
+	private val headerModel = ListHeader((repository as RemoteMangaRepository).title, 0)
 
 	override val content = combine(
 		mangaList,
@@ -37,9 +40,11 @@ class RemoteListViewModel(
 		when {
 			list.isNullOrEmpty() && error != null -> listOf(error.toErrorState(canRetry = true))
 			list == null -> listOf(LoadingState)
-			list.isEmpty() -> listOf(EmptyState(R.string.nothing_found))
+			list.isEmpty() -> listOf(EmptyState(R.drawable.ic_book_cross, R.string.nothing_found, R.string._empty))
 			else -> {
-				val result = ArrayList<ListModel>(list.size + 1)
+				val result = ArrayList<ListModel>(list.size + 3)
+				result += headerModel
+				createFilterModel()?.let { result.add(it) }
 				list.toUi(result, mode)
 				when {
 					error != null -> result += error.toErrorFooter()
@@ -63,6 +68,16 @@ class RemoteListViewModel(
 		loadList(append = !mangaList.value.isNullOrEmpty())
 	}
 
+	override fun onRemoveFilterTag(tag: MangaTag) {
+		val filter = appliedFilter ?: return
+		if (tag !in filter.tags) {
+			return
+		}
+		applyFilter(
+			filter.copy(tags = filter.tags - tag)
+		)
+	}
+
 	fun loadNextPage() {
 		if (hasNextPage.value && listError.value == null) {
 			loadList(append = true)
@@ -76,10 +91,10 @@ class RemoteListViewModel(
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			try {
 				listError.value = null
-				val list = repository.getList(
+				val list = repository.getList2(
 					offset = if (append) mangaList.value?.size ?: 0 else 0,
 					sortOrder = appliedFilter?.sortOrder,
-					tag = appliedFilter?.tag
+					tags = appliedFilter?.tags,
 				)
 				if (!append) {
 					mangaList.value = list
@@ -88,6 +103,9 @@ class RemoteListViewModel(
 				}
 				hasNextPage.value = list.isNotEmpty()
 			} catch (e: Throwable) {
+				if (BuildConfig.DEBUG) {
+					e.printStackTrace()
+				}
 				listError.value = e
 			}
 		}
@@ -103,6 +121,10 @@ class RemoteListViewModel(
 		}
 	}
 
+	private fun createFilterModel() = appliedFilter?.run {
+		CurrentFilterModel(tags.map { ChipsView.ChipModel(0, it.title, it) })
+	}
+
 	private fun loadFilter() {
 		launchJob(Dispatchers.Default) {
 			try {
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
index a6a7db5c5..d0b42326b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
@@ -1,22 +1,28 @@
 package org.koitharu.kotatsu.search
 
+import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
+import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.search.ui.SearchViewModel
 import org.koitharu.kotatsu.search.ui.global.GlobalSearchViewModel
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 
 val searchModule
 	get() = module {
 
-		single { MangaSearchRepository(get()) }
+		single { MangaSearchRepository(get(), get(), androidContext(), get()) }
 
-		viewModel { (source: MangaSource, query: String) ->
-			SearchViewModel(get(named(source)), query, get())
+		factory { MangaSuggestionsProvider.createSuggestions(androidContext()) }
+
+		viewModel { params ->
+			SearchViewModel(get(named(params.get<MangaSource>(0))), params[1], get())
 		}
-		viewModel { (query: String) ->
-			GlobalSearchViewModel(query, get(), get())
+		viewModel { query ->
+			GlobalSearchViewModel(query.get(), get(), get())
 		}
+		viewModel { SearchSuggestionViewModel(get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt b/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
index 1efec6723..d099f54c5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt
@@ -1,20 +1,39 @@
 package org.koitharu.kotatsu.search.domain
 
 import android.annotation.SuppressLint
+import android.app.SearchManager
+import android.content.Context
+import android.provider.SearchRecentSuggestions
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.base.domain.MangaProviderFactory
+import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.utils.ext.levenshteinDistance
 
-class MangaSearchRepository(private val settings: AppSettings) {
+class MangaSearchRepository(
+	private val settings: AppSettings,
+	private val db: MangaDatabase,
+	private val context: Context,
+	private val recentSuggestions: SearchRecentSuggestions,
+) {
 
 	fun globalSearch(query: String, concurrency: Int = DEFAULT_CONCURRENCY): Flow<Manga> =
 		MangaProviderFactory.getSources(settings, includeHidden = false).asFlow()
 			.flatMapMerge(concurrency) { source ->
 				runCatching {
-					source.repository.getList(0, query, SortOrder.POPULARITY)
+					source.repository.getList2(
+						offset = 0,
+						query = query,
+						sortOrder = SortOrder.POPULARITY
+					)
 				}.getOrElse {
 					emptyList()
 				}.asFlow()
@@ -22,16 +41,81 @@ class MangaSearchRepository(private val settings: AppSettings) {
 				match(it, query)
 			}
 
+	suspend fun getMangaSuggestion(query: String, limit: Int, source: MangaSource?): List<Manga> {
+		if (query.isEmpty()) {
+			return emptyList()
+		}
+		return if (source != null) {
+			db.mangaDao.searchByTitle("%$query%", source.name, limit)
+		} else {
+			db.mangaDao.searchByTitle("%$query%", limit)
+		}.map { it.toManga() }
+			.sortedBy { x -> x.title.levenshteinDistance(query) }
+	}
+
+	suspend fun getQuerySuggestion(
+		query: String,
+		limit: Int,
+	): List<String> = withContext(Dispatchers.IO) {
+		context.contentResolver.query(
+			MangaSuggestionsProvider.QUERY_URI,
+			SUGGESTION_PROJECTION,
+			"${SearchManager.SUGGEST_COLUMN_QUERY} LIKE ?",
+			arrayOf("%$query%"),
+			"date DESC"
+		)?.use { cursor ->
+			val count = minOf(cursor.count, limit)
+			if (count == 0) {
+				return@withContext emptyList()
+			}
+			val result = ArrayList<String>(count)
+			if (cursor.moveToFirst()) {
+				val index = cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_QUERY)
+				do {
+					result += cursor.getString(index)
+				} while (currentCoroutineContext().isActive && cursor.moveToNext())
+			}
+			result
+		}.orEmpty()
+	}
+
+	fun saveSearchQuery(query: String) {
+		recentSuggestions.saveRecentQuery(query, null)
+	}
+
+	suspend fun clearSearchHistory(): Unit = withContext(Dispatchers.IO) {
+		recentSuggestions.clearHistory()
+	}
+
+	suspend fun deleteSearchQuery(query: String) = withContext(Dispatchers.IO) {
+		context.contentResolver.delete(
+			MangaSuggestionsProvider.URI,
+			"display1 = ?",
+			arrayOf(query),
+		)
+	}
+
+	suspend fun getSearchHistoryCount(): Int = withContext(Dispatchers.IO) {
+		context.contentResolver.query(
+			MangaSuggestionsProvider.QUERY_URI,
+			SUGGESTION_PROJECTION,
+			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.toLowerCase().split(REGEX_SPACE)
-			words += manga.altTitle?.toLowerCase()?.split(REGEX_SPACE).orEmpty()
-			val words2 = query.toLowerCase().split(REGEX_SPACE).toSet()
+			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)
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaSuggestionsProvider.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaSuggestionsProvider.kt
index 2889a24cf..c708db286 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaSuggestionsProvider.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaSuggestionsProvider.kt
@@ -4,49 +4,14 @@ import android.app.SearchManager
 import android.content.ContentResolver
 import android.content.Context
 import android.content.SearchRecentSuggestionsProvider
-import android.database.Cursor
 import android.net.Uri
 import android.provider.SearchRecentSuggestions
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.cursoradapter.widget.CursorAdapter
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
 
 class MangaSuggestionsProvider : SearchRecentSuggestionsProvider() {
 
 	init {
-		setupSuggestions(
-			AUTHORITY,
-			MODE
-		)
-	}
-
-	private class SearchSuggestionAdapter(context: Context, cursor: Cursor) : CursorAdapter(
-		context, cursor,
-		FLAG_REGISTER_CONTENT_OBSERVER
-	) {
-
-		override fun newView(context: Context, cursor: Cursor?, parent: ViewGroup?): View {
-			return LayoutInflater.from(context)
-				.inflate(R.layout.item_search_complete, parent, false)
-		}
-
-		override fun bindView(view: View, context: Context, cursor: Cursor) {
-			if (view !is TextView) return
-			view.text = cursor.getString(cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_QUERY))
-		}
-
-		override fun convertToString(cursor: Cursor?): CharSequence {
-			return cursor?.getString(cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_QUERY))
-				.orEmpty()
-		}
+		setupSuggestions(AUTHORITY, MODE)
 	}
 
 	companion object {
@@ -54,65 +19,16 @@ class MangaSuggestionsProvider : SearchRecentSuggestionsProvider() {
 		private const val AUTHORITY = "${BuildConfig.APPLICATION_ID}.MangaSuggestionsProvider"
 		private const val MODE = DATABASE_MODE_QUERIES
 
-		private val uri = Uri.Builder()
+		fun createSuggestions(context: Context): SearchRecentSuggestions {
+			return SearchRecentSuggestions(context, AUTHORITY, MODE)
+		}
+
+		val QUERY_URI: Uri = Uri.Builder()
 			.scheme(ContentResolver.SCHEME_CONTENT)
 			.authority(AUTHORITY)
 			.appendPath(SearchManager.SUGGEST_URI_PATH_QUERY)
 			.build()
 
-		private val projection = arrayOf("_id", SearchManager.SUGGEST_COLUMN_QUERY)
-
-		fun saveQueryAsync(context: Context, query: String) {
-			GlobalScope.launch(Dispatchers.IO) {
-				saveQuery(context, query)
-			}
-		}
-
-		fun saveQuery(context: Context, query: String) {
-			runCatching {
-				SearchRecentSuggestions(
-					context,
-					AUTHORITY,
-					MODE
-				).saveRecentQuery(query, null)
-			}.onFailure {
-				if (BuildConfig.DEBUG) {
-					it.printStackTrace()
-				}
-			}
-		}
-
-		suspend fun clearHistory(context: Context) = withContext(Dispatchers.IO) {
-			SearchRecentSuggestions(
-				context,
-				AUTHORITY,
-				MODE
-			).clearHistory()
-		}
-
-		suspend fun getItemsCount(context: Context) = withContext(Dispatchers.IO) {
-			getCursor(context)?.use { it.count } ?: 0
-		}
-
-		private fun getCursor(context: Context): Cursor? {
-			return context.contentResolver?.query(uri, projection, null, arrayOf(""), null)
-		}
-
-		@Deprecated("Need async implementation")
-		fun getSuggestionAdapter(context: Context): CursorAdapter? = getCursor(
-			context
-		)?.let { cursor ->
-			SearchSuggestionAdapter(context, cursor).also {
-				it.setFilterQueryProvider { q ->
-					context.contentResolver?.query(
-						uri,
-						projection,
-						" ?",
-						arrayOf(q?.toString().orEmpty()),
-						null
-					)
-				}
-			}
-		}
+		val URI: Uri = Uri.parse("content://$AUTHORITY/suggestions")
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
index 05092438f..7221f6d11 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
@@ -7,14 +7,20 @@ import android.os.Parcelable
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
+import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.ActivitySearchBinding
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.utils.ext.showKeyboard
 
 class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQueryTextListener {
 
+	private val searchSuggestionViewModel by viewModel<SearchSuggestionViewModel>(
+		mode = LazyThreadSafetyMode.NONE
+	)
 	private lateinit var source: MangaSource
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -28,8 +34,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		with(binding.searchView) {
 			queryHint = getString(R.string.search_on_s, source.title)
-			suggestionsAdapter = MangaSuggestionsProvider.getSuggestionAdapter(this@SearchActivity)
-			setOnSuggestionListener(SearchHelper.SuggestionListener(this))
 			setOnQueryTextListener(this@SearchActivity)
 
 			if (query.isNullOrBlank()) {
@@ -41,11 +45,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 		}
 	}
 
-	override fun onDestroy() {
-		binding.searchView.suggestionsAdapter.changeCursor(null) //close cursor
-		super.onDestroy()
-	}
-
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.toolbar.updatePadding(
 			top = insets.top,
@@ -55,19 +54,20 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
 	}
 
 	override fun onQueryTextSubmit(query: String?): Boolean {
-		return if (!query.isNullOrBlank()) {
-			title = query
-			supportFragmentManager
-				.beginTransaction()
-				.replace(R.id.container, SearchFragment.newInstance(source, query))
-				.commit()
-			binding.searchView.clearFocus()
-			MangaSuggestionsProvider.saveQueryAsync(applicationContext, query)
-			true
-		} else false
+		val q = query?.trim()
+		if (q.isNullOrEmpty()) {
+			return false
+		}
+		title = query
+		supportFragmentManager.commit {
+			replace(R.id.container, SearchFragment.newInstance(source, q))
+		}
+		binding.searchView.clearFocus()
+		searchSuggestionViewModel.saveQuery(q)
+		return true
 	}
 
-	override fun onQueryTextChange(newText: String?) = false
+	override fun onQueryTextChange(newText: String?): Boolean = false
 
 	companion object {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchHelper.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchHelper.kt
deleted file mode 100644
index 6f937b2eb..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchHelper.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.koitharu.kotatsu.search.ui
-
-import android.app.SearchManager
-import android.content.Context
-import android.database.Cursor
-import android.view.MenuItem
-import androidx.appcompat.widget.SearchView
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
-import java.io.Closeable
-
-object SearchHelper {
-
-	fun setupSearchView(menuItem: MenuItem): Closeable? {
-		val view = menuItem.actionView as? SearchView ?: return null
-		val context = view.context
-		val adapter = MangaSuggestionsProvider.getSuggestionAdapter(context)
-		view.queryHint = context.getString(R.string.search_manga)
-		view.suggestionsAdapter = adapter
-		view.setOnQueryTextListener(QueryListener(context))
-		view.setOnSuggestionListener(SuggestionListener(view))
-		return adapter?.cursor
-	}
-
-	private class QueryListener(private val context: Context) :
-		SearchView.OnQueryTextListener {
-
-		override fun onQueryTextSubmit(query: String?): Boolean {
-			return if (!query.isNullOrBlank()) {
-				context.startActivity(GlobalSearchActivity.newIntent(context, query.trim()))
-				MangaSuggestionsProvider.saveQueryAsync(context.applicationContext, query)
-				true
-			} else false
-		}
-
-		override fun onQueryTextChange(newText: String?) = false
-	}
-
-	class SuggestionListener(private val view: SearchView) :
-		SearchView.OnSuggestionListener {
-
-		override fun onSuggestionSelect(position: Int) = false
-
-		override fun onSuggestionClick(position: Int): Boolean {
-			val query = runCatching {
-				val c = view.suggestionsAdapter.getItem(position) as? Cursor
-				c?.getString(c.getColumnIndex(SearchManager.SUGGEST_COLUMN_QUERY))
-			}.getOrNull() ?: return false
-			view.setQuery(query, true)
-			return true
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt
index 14b3711a1..659e12082 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt
@@ -12,7 +12,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import java.util.*
 
 class SearchViewModel(
 	private val repository: MangaRepository,
@@ -34,7 +33,7 @@ class SearchViewModel(
 		when {
 			list.isNullOrEmpty() && error != null -> listOf(error.toErrorState(canRetry = true))
 			list == null -> listOf(LoadingState)
-			list.isEmpty() -> listOf(EmptyState(R.string.nothing_found))
+			list.isEmpty() -> listOf(EmptyState(R.drawable.ic_book_search, R.string.nothing_found, R.string.text_search_holder_secondary))
 			else -> {
 				val result = ArrayList<ListModel>(list.size + 1)
 				list.toUi(result, mode)
@@ -72,9 +71,9 @@ class SearchViewModel(
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			try {
 				listError.value = null
-				val list = repository.getList(
+				val list = repository.getList2(
 					offset = if (append) mangaList.value?.size ?: 0 else 0,
-					query = query
+					query = query,
 				)
 				if (!append) {
 					mangaList.value = list
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt
index 72b64f509..fff40209e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/global/GlobalSearchViewModel.kt
@@ -35,7 +35,7 @@ class GlobalSearchViewModel(
 		when {
 			list.isNullOrEmpty() && error != null -> listOf(error.toErrorState(canRetry = true))
 			list == null -> listOf(LoadingState)
-			list.isEmpty() -> listOf(EmptyState(R.string.nothing_found))
+			list.isEmpty() -> listOf(EmptyState(R.drawable.ic_book_search, R.string.nothing_found, R.string.text_search_holder_secondary))
 			else -> {
 				val result = ArrayList<ListModel>(list.size + 1)
 				list.toUi(result, mode)
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt
new file mode 100644
index 000000000..f48e9b0da
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt
@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.search.ui.suggestion
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import androidx.recyclerview.widget.ItemTouchHelper
+import org.koin.android.ext.android.get
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.databinding.FragmentSearchSuggestionBinding
+import org.koitharu.kotatsu.main.ui.AppBarOwner
+import org.koitharu.kotatsu.search.ui.suggestion.adapter.SearchSuggestionAdapter
+import org.koitharu.kotatsu.utils.ext.measureHeight
+
+class SearchSuggestionFragment : BaseFragment<FragmentSearchSuggestionBinding>(),
+	SearchSuggestionItemCallback.SuggestionItemListener {
+
+	private val viewModel by sharedViewModel<SearchSuggestionViewModel>()
+
+	override fun onInflateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	) = FragmentSearchSuggestionBinding.inflate(inflater, container, false)
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		val adapter = SearchSuggestionAdapter(
+			coil = get(),
+			lifecycleOwner = viewLifecycleOwner,
+			listener = requireActivity() as SearchSuggestionListener,
+		)
+		binding.root.adapter = adapter
+		viewModel.suggestion.observe(viewLifecycleOwner) {
+			adapter.items = it
+		}
+		ItemTouchHelper(SearchSuggestionItemCallback(this))
+			.attachToRecyclerView(binding.root)
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
+		binding.root.updatePadding(
+			top = headerHeight,
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom,
+		)
+	}
+
+	override fun onRemoveQuery(query: String) {
+		viewModel.deleteQuery(query)
+	}
+
+	companion object {
+
+		fun newInstance() = SearchSuggestionFragment()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt
new file mode 100644
index 000000000..e983be92b
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt
@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.search.ui.suggestion
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.search.ui.suggestion.adapter.SearchSuggestionAdapter
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+import org.koitharu.kotatsu.utils.ext.getItem
+
+class SearchSuggestionItemCallback(
+	private val listener: SuggestionItemListener,
+) : ItemTouchHelper.Callback() {
+
+	private val movementFlags = makeMovementFlags(
+		0,
+		ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+	)
+
+	override fun getMovementFlags(
+		recyclerView: RecyclerView,
+		viewHolder: RecyclerView.ViewHolder,
+	): Int = if (viewHolder.itemViewType == SearchSuggestionAdapter.ITEM_TYPE_QUERY) {
+		movementFlags
+	} else {
+		0
+	}
+
+	override fun onMove(
+		recyclerView: RecyclerView,
+		viewHolder: RecyclerView.ViewHolder,
+		target: RecyclerView.ViewHolder,
+	): Boolean = false
+
+	override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+		val item = viewHolder.getItem<SearchSuggestionItem.RecentQuery>() ?: return
+		listener.onRemoveQuery(item.query)
+	}
+
+	interface SuggestionItemListener {
+
+		fun onRemoveQuery(query: String)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
new file mode 100644
index 000000000..d82a47bb0
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.search.ui.suggestion
+
+import org.koitharu.kotatsu.core.model.Manga
+
+interface SearchSuggestionListener {
+
+	fun onMangaClick(manga: Manga)
+
+	fun onQueryClick(query: String, submit: Boolean)
+
+	fun onQueryChanged(query: String)
+
+	fun onClearSearchHistory()
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
new file mode 100644
index 000000000..d05382e72
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt
@@ -0,0 +1,95 @@
+package org.koitharu.kotatsu.search.ui.suggestion
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.search.domain.MangaSearchRepository
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+
+class SearchSuggestionViewModel(
+	private val repository: MangaSearchRepository,
+) : BaseViewModel() {
+
+	private val query = MutableStateFlow("")
+	private val source = MutableStateFlow<MangaSource?>(null)
+	private val isLocalSearch = MutableStateFlow(false)
+	private var suggestionJob: Job? = null
+
+	val suggestion = MutableLiveData<List<SearchSuggestionItem>>()
+
+	init {
+		setupSuggestion()
+	}
+
+	fun onQueryChanged(newQuery: String) {
+		query.value = newQuery
+	}
+
+	fun onSourceChanged(newSource: MangaSource?) {
+		source.value = newSource
+	}
+
+	fun saveQuery(query: String) {
+		repository.saveSearchQuery(query)
+	}
+
+	fun getLocalSearchSource(): MangaSource? {
+		return source.value?.takeIf { isLocalSearch.value }
+	}
+
+	fun clearSearchHistory() {
+		launchJob {
+			repository.clearSearchHistory()
+			setupSuggestion()
+		}
+	}
+
+	fun deleteQuery(query: String) {
+		launchJob {
+			repository.deleteSearchQuery(query)
+			setupSuggestion()
+		}
+	}
+
+	private fun setupSuggestion() {
+		suggestionJob?.cancel()
+		suggestionJob = combine(
+			query
+				.debounce(DEBOUNCE_TIMEOUT)
+				.mapLatest { q ->
+					q to repository.getQuerySuggestion(q, MAX_QUERY_ITEMS)
+				},
+			source,
+			isLocalSearch
+		) { (q, queries), src, srcOnly ->
+			val result = ArrayList<SearchSuggestionItem>(MAX_SUGGESTION_ITEMS)
+			if (src != null) {
+				result += SearchSuggestionItem.Header(src, isLocalSearch)
+			}
+			if (q.length >= SEARCH_THRESHOLD) {
+				repository.getMangaSuggestion(q, MAX_MANGA_ITEMS, src.takeIf { srcOnly })
+					.mapTo(result) {
+						SearchSuggestionItem.MangaItem(it)
+					}
+			}
+			queries.mapTo(result) { SearchSuggestionItem.RecentQuery(it) }
+			result
+		}.onEach {
+			suggestion.postValue(it)
+		}.launchIn(viewModelScope + Dispatchers.Default)
+	}
+
+	private companion object {
+
+		const val DEBOUNCE_TIMEOUT = 500L
+		const val SEARCH_THRESHOLD = 3
+		const val MAX_MANGA_ITEMS = 3
+		const val MAX_QUERY_ITEMS = 120
+		const val MAX_SUGGESTION_ITEMS = MAX_MANGA_ITEMS + MAX_QUERY_ITEMS + 1
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt
new file mode 100644
index 000000000..06e6af858
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt
@@ -0,0 +1,51 @@
+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.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+import kotlin.jvm.internal.Intrinsics
+
+class SearchSuggestionAdapter(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	listener: SearchSuggestionListener,
+) : AsyncListDifferDelegationAdapter<SearchSuggestionItem>(DiffCallback()) {
+
+	init {
+		delegatesManager.addDelegate(ITEM_TYPE_MANGA, searchSuggestionMangaAD(coil, lifecycleOwner, listener))
+			.addDelegate(ITEM_TYPE_QUERY, searchSuggestionQueryAD(listener))
+			.addDelegate(ITEM_TYPE_HEADER, searchSuggestionHeaderAD(listener))
+	}
+
+	private class DiffCallback : DiffUtil.ItemCallback<SearchSuggestionItem>() {
+
+		override fun areItemsTheSame(
+			oldItem: SearchSuggestionItem,
+			newItem: SearchSuggestionItem,
+		): Boolean = when {
+			oldItem is SearchSuggestionItem.MangaItem && newItem is SearchSuggestionItem.MangaItem -> {
+				oldItem.manga.id == newItem.manga.id
+			}
+			oldItem is SearchSuggestionItem.RecentQuery && newItem is SearchSuggestionItem.RecentQuery -> {
+				oldItem.query == newItem.query
+			}
+			oldItem is SearchSuggestionItem.Header && newItem is SearchSuggestionItem.Header -> true
+			else -> false
+		}
+
+		override fun areContentsTheSame(
+			oldItem: SearchSuggestionItem,
+			newItem: SearchSuggestionItem,
+		): Boolean = Intrinsics.areEqual(oldItem, newItem)
+	}
+
+	companion object {
+
+		const val ITEM_TYPE_MANGA = 0
+		const val ITEM_TYPE_QUERY = 1
+		const val ITEM_TYPE_HEADER = 2
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionHeaderAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionHeaderAD.kt
new file mode 100644
index 000000000..be60708cd
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionHeaderAD.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.search.ui.suggestion.adapter
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemSearchSuggestionHeaderBinding
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+
+fun searchSuggestionHeaderAD(
+	listener: SearchSuggestionListener,
+) = adapterDelegateViewBinding<SearchSuggestionItem.Header, SearchSuggestionItem, ItemSearchSuggestionHeaderBinding>(
+		{ inflater, parent -> ItemSearchSuggestionHeaderBinding.inflate(inflater, parent, false) }
+	) {
+
+		binding.switchLocal.setOnCheckedChangeListener { _, isChecked ->
+			item.isChecked.value = isChecked
+		}
+		binding.buttonClear.setOnClickListener {
+			listener.onClearSearchHistory()
+		}
+
+		bind {
+			binding.switchLocal.text = getString(
+				R.string.search_only_on_s,
+				item.source.title,
+			)
+			binding.switchLocal.isChecked = item.isChecked.value
+		}
+	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionMangaAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionMangaAD.kt
new file mode 100644
index 000000000..2eed6b932
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionMangaAD.kt
@@ -0,0 +1,46 @@
+package org.koitharu.kotatsu.search.ui.suggestion.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import coil.request.Disposable
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemSearchSuggestionMangaBinding
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
+import org.koitharu.kotatsu.utils.ext.textAndVisible
+
+fun searchSuggestionMangaAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	listener: SearchSuggestionListener,
+) = adapterDelegateViewBinding<SearchSuggestionItem.MangaItem, SearchSuggestionItem, ItemSearchSuggestionMangaBinding>(
+	{ inflater, parent -> ItemSearchSuggestionMangaBinding.inflate(inflater, parent, false) }
+) {
+
+	var imageRequest: Disposable? = null
+
+	itemView.setOnClickListener {
+		listener.onMangaClick(item.manga)
+	}
+
+	bind {
+		imageRequest?.dispose()
+		imageRequest = binding.imageViewCover.newImageRequest(item.manga.coverUrl)
+			.placeholder(R.drawable.ic_placeholder)
+			.fallback(R.drawable.ic_placeholder)
+			.error(R.drawable.ic_placeholder)
+			.allowRgb565(true)
+			.lifecycle(lifecycleOwner)
+			.enqueueWith(coil)
+		binding.textViewTitle.text = item.manga.title
+		binding.textViewSubtitle.textAndVisible = item.manga.altTitle
+	}
+
+	onViewRecycled {
+		imageRequest?.dispose()
+		binding.imageViewCover.setImageDrawable(null)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionQueryAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionQueryAD.kt
new file mode 100644
index 000000000..70854cb2f
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionQueryAD.kt
@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.search.ui.suggestion.adapter
+
+import android.view.View
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.ItemSearchSuggestionQueryBinding
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
+
+fun searchSuggestionQueryAD(
+	listener: SearchSuggestionListener,
+) = adapterDelegateViewBinding<SearchSuggestionItem.RecentQuery, SearchSuggestionItem, ItemSearchSuggestionQueryBinding>(
+	{ inflater, parent -> ItemSearchSuggestionQueryBinding.inflate(inflater, parent, false) }
+) {
+
+	val viewClickListener = View.OnClickListener { v ->
+		listener.onQueryClick(item.query, v.id != R.id.button_complete)
+	}
+
+	binding.root.setOnClickListener(viewClickListener)
+	binding.buttonComplete.setOnClickListener(viewClickListener)
+
+	bind {
+		binding.textViewTitle.text = item.query
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
new file mode 100644
index 000000000..d2d9d04d7
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt
@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.search.ui.suggestion.model
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaSource
+
+sealed class SearchSuggestionItem {
+
+	data class MangaItem(
+		val manga: Manga,
+	) : SearchSuggestionItem()
+
+	data class RecentQuery(
+		val query: String,
+	) : SearchSuggestionItem()
+
+	data class Header(
+		val source: MangaSource,
+		val isChecked: MutableStateFlow<Boolean>,
+	) : SearchSuggestionItem()
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchBehavior.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchBehavior.kt
new file mode 100644
index 000000000..ebd18fe81
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchBehavior.kt
@@ -0,0 +1,54 @@
+package org.koitharu.kotatsu.search.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.bottomnavigation.BottomNavigationView
+
+class SearchBehavior(context: Context?, attrs: AttributeSet?) :
+	CoordinatorLayout.Behavior<SearchToolbar>(context, attrs) {
+
+	override fun layoutDependsOn(
+		parent: CoordinatorLayout,
+		child: SearchToolbar,
+		dependency: View,
+	): Boolean {
+		return if (dependency is AppBarLayout) {
+			true
+		} else
+			if (dependency is LinearLayout || dependency is BottomNavigationView) {
+				dependency.z = child.z + 1
+				true
+			} else {
+				super.layoutDependsOn(parent, child, dependency)
+			}
+	}
+
+	override fun onDependentViewChanged(
+		parent: CoordinatorLayout,
+		child: SearchToolbar,
+		dependency: View,
+	): Boolean {
+		if (dependency is AppBarLayout) {
+			child.translationY = dependency.getY()
+			return true
+		}
+		return super.onDependentViewChanged(parent, child, dependency)
+	}
+
+	override fun onStartNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: SearchToolbar,
+		directTargetChild: View,
+		target: View,
+		axes: Int,
+		type: Int,
+	): Boolean {
+		return axes == ViewCompat.SCROLL_AXIS_VERTICAL
+	}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
new file mode 100644
index 000000000..350b82aab
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
@@ -0,0 +1,60 @@
+package org.koitharu.kotatsu.search.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.KeyEvent
+import android.view.inputmethod.EditorInfo
+import androidx.annotation.AttrRes
+import androidx.appcompat.widget.AppCompatEditText
+import com.google.android.material.R
+import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+
+class SearchEditText @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = R.attr.editTextStyle,
+) : AppCompatEditText(context, attrs, defStyleAttr) {
+
+	var searchSuggestionListener: SearchSuggestionListener? = null
+
+	var query: String
+		get() = text?.trim()?.toString().orEmpty()
+		set(value) {
+			if (value != text?.toString()) {
+				setText(value)
+				setSelection(value.length)
+			}
+		}
+
+	override fun onKeyPreIme(keyCode: Int, event: KeyEvent): Boolean {
+		if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+			if (hasFocus()) {
+				clearFocus()
+				// return true
+			}
+		}
+		return super.onKeyPreIme(keyCode, event)
+	}
+
+	override fun onEditorAction(actionCode: Int) {
+		super.onEditorAction(actionCode)
+		if (actionCode == EditorInfo.IME_ACTION_SEARCH) {
+			searchSuggestionListener?.onQueryClick(query, submit = true)
+		}
+	}
+
+	override fun onTextChanged(
+		text: CharSequence?,
+		start: Int,
+		lengthBefore: Int,
+		lengthAfter: Int,
+	) {
+		super.onTextChanged(text, start, lengthBefore, lengthAfter)
+		searchSuggestionListener?.onQueryChanged(query)
+	}
+
+	override fun clearFocus() {
+		super.clearFocus()
+		text?.clear()
+	}
+} 
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt
new file mode 100644
index 000000000..b5a8729d4
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt
@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.search.ui.widget
+
+import android.content.Context
+import android.graphics.Color
+import android.util.AttributeSet
+import androidx.annotation.AttrRes
+import com.google.android.material.R
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.shape.MaterialShapeDrawable
+
+class SearchToolbar @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = R.attr.toolbarStyle,
+) : MaterialToolbar(context, attrs, defStyleAttr) {
+
+	private val bgDrawable = MaterialShapeDrawable(context, attrs, defStyleAttr, 0)
+
+	init {
+		bgDrawable.initializeElevationOverlay(context)
+		bgDrawable.setShadowColor(Color.DKGRAY)
+		background = bgDrawable
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
index cf380cffe..99ec51e9c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.settings
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
@@ -11,10 +12,10 @@ import org.koin.android.ext.android.get
 import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.core.network.CookieJar
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.Cache
-import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
+import org.koitharu.kotatsu.search.domain.MangaSearchRepository
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.CacheUtils
 import org.koitharu.kotatsu.utils.FileSizeUtils
@@ -24,6 +25,7 @@ import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cache) {
 
 	private val trackerRepo by inject<TrackingRepository>(mode = LazyThreadSafetyMode.NONE)
+	private val searchRepository by inject<MangaSearchRepository>(mode = LazyThreadSafetyMode.NONE)
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_history)
@@ -49,7 +51,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 		}
 		findPreference<Preference>(AppSettings.KEY_SEARCH_HISTORY_CLEAR)?.let { pref ->
 			viewLifecycleScope.launchWhenResumed {
-				val items = MangaSuggestionsProvider.getItemsCount(pref.context)
+				val items = searchRepository.getSearchHistoryCount()
 				pref.summary =
 					pref.context.resources.getQuantityString(R.plurals.items, items, items)
 			}
@@ -74,28 +76,11 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				true
 			}
 			AppSettings.KEY_COOKIES_CLEAR -> {
-				viewLifecycleScope.launch {
-					val cookieJar = get<CookieJar>()
-					cookieJar.clear()
-					Snackbar.make(
-						listView ?: return@launch,
-						R.string.cookies_cleared,
-						Snackbar.LENGTH_SHORT
-					).show()
-				}
+				clearCookies()
 				true
 			}
 			AppSettings.KEY_SEARCH_HISTORY_CLEAR -> {
-				viewLifecycleScope.launch {
-					MangaSuggestionsProvider.clearHistory(preference.context)
-					preference.summary = preference.context.resources
-						.getQuantityString(R.plurals.items, 0, 0)
-					Snackbar.make(
-						view ?: return@launch,
-						R.string.search_history_cleared,
-						Snackbar.LENGTH_SHORT
-					).show()
-				}
+				clearSearchHistory(preference)
 				true
 			}
 			AppSettings.KEY_UPDATES_FEED_CLEAR -> {
@@ -132,4 +117,41 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 			}
 		}
 	}
+
+	private fun clearSearchHistory(preference: Preference) {
+		AlertDialog.Builder(context ?: return)
+			.setTitle(R.string.clear_search_history)
+			.setMessage(R.string.text_clear_search_history_prompt)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.clear) { _, _ ->
+				viewLifecycleScope.launch {
+					searchRepository.clearSearchHistory()
+					preference.summary = preference.context.resources
+						.getQuantityString(R.plurals.items, 0, 0)
+					Snackbar.make(
+						view ?: return@launch,
+						R.string.search_history_cleared,
+						Snackbar.LENGTH_SHORT
+					).show()
+				}
+			}.show()
+	}
+
+	private fun clearCookies() {
+		AlertDialog.Builder(context ?: return)
+			.setTitle(R.string.clear_cookies)
+			.setMessage(R.string.text_clear_cookies_prompt)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.clear) { _, _ ->
+				viewLifecycleScope.launch {
+					val cookieJar = get<AndroidCookieJar>()
+					cookieJar.clear()
+					Snackbar.make(
+						listView ?: return@launch,
+						R.string.cookies_cleared,
+						Snackbar.LENGTH_SHORT
+					).show()
+				}
+			}.show()
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
index c1a4a104d..a61eaa361 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
@@ -44,19 +44,12 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		findPreference<Preference>(AppSettings.KEY_APP_UPDATE_AUTO)?.run {
-			isVisible = AppUpdateChecker.isUpdateSupported(context)
-		}
 		findPreference<Preference>(AppSettings.KEY_LOCAL_STORAGE)?.run {
 			summary = settings.getStorageDir(context)?.getStorageName(context)
 				?: getString(R.string.not_available)
 		}
 		findPreference<SwitchPreference>(AppSettings.KEY_PROTECT_APP)?.isChecked =
 			!settings.appPassword.isNullOrEmpty()
-		findPreference<Preference>(AppSettings.KEY_APP_VERSION)?.run {
-			title = getString(R.string.app_version, BuildConfig.VERSION_NAME)
-			isEnabled = AppUpdateChecker.isUpdateSupported(context)
-		}
 		settings.subscribe(this)
 	}
 
@@ -73,6 +66,9 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 			AppSettings.KEY_THEME_AMOLED -> {
 				findPreference<Preference>(key)?.setSummary(R.string.restart_required)
 			}
+			AppSettings.KEY_HIDE_TOOLBAR -> {
+				findPreference<SwitchPreference>(key)?.setSummary(R.string.restart_required)
+			}
 			AppSettings.KEY_LOCAL_STORAGE -> {
 				findPreference<Preference>(key)?.run {
 					summary = settings.getStorageDir(context)?.getStorageName(context)
@@ -117,10 +113,6 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 				}
 				true
 			}
-			AppSettings.KEY_APP_VERSION -> {
-				checkForUpdates()
-				true
-			}
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
@@ -178,24 +170,4 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 			.create()
 			.show()
 	}
-
-	private fun checkForUpdates() {
-		viewLifecycleScope.launch {
-			findPreference<Preference>(AppSettings.KEY_APP_VERSION)?.run {
-				setSummary(R.string.checking_for_updates)
-				isSelectable = false
-			}
-			val result = AppUpdateChecker(activity ?: return@launch).checkNow()
-			findPreference<Preference>(AppSettings.KEY_APP_VERSION)?.run {
-				setSummary(
-					when (result) {
-						true -> R.string.check_for_updates
-						false -> R.string.no_update_available
-						null -> R.string.update_check_failed
-					}
-				)
-				isSelectable = true
-			}
-		}
-	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
index 222f20258..24fe705d3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.core.backup.RestoreRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.backup.BackupViewModel
 import org.koitharu.kotatsu.settings.backup.RestoreViewModel
+import org.koitharu.kotatsu.settings.onboard.OnboardViewModel
 import org.koitharu.kotatsu.settings.protect.ProtectSetupViewModel
 
 val settingsModule
@@ -19,6 +20,9 @@ val settingsModule
 		single { AppSettings(androidContext()) }
 
 		viewModel { BackupViewModel(get(), androidContext()) }
-		viewModel { (uri: Uri?) -> RestoreViewModel(uri, get(), androidContext()) }
+		viewModel { params ->
+			RestoreViewModel(params.getOrNull(Uri::class), get(), androidContext())
+		}
 		viewModel { ProtectSetupViewModel(get()) }
+		viewModel { OnboardViewModel(get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt
index 4bccaf8e2..da9115e80 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt
@@ -9,8 +9,10 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.TwoStatePreference
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import org.koitharu.kotatsu.settings.utils.EditTextBindListener
 import org.koitharu.kotatsu.settings.utils.EditTextDefaultSummaryProvider
 import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
@@ -20,6 +22,7 @@ import org.koitharu.kotatsu.utils.ext.withArgs
 class SourceSettingsFragment : PreferenceFragmentCompat() {
 
 	private val source by parcelableArgument<MangaSource>(EXTRA_SOURCE)
+	private var repository: RemoteMangaRepository? = null
 
 	override fun onResume() {
 		super.onResume()
@@ -29,6 +32,7 @@ class SourceSettingsFragment : PreferenceFragmentCompat() {
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		preferenceManager.sharedPreferencesName = source.name
 		val repo = mangaRepositoryOf(source) as? RemoteMangaRepository ?: return
+		repository = repo
 		addPreferencesFromResource(R.xml.pref_source)
 		val screen = preferenceScreen
 		val prefsMap = ArrayMap<String, Any>(screen.preferenceCount)
@@ -41,13 +45,32 @@ class SourceSettingsFragment : PreferenceFragmentCompat() {
 				initPreferenceWithDefaultValue(pref, defValue)
 			}
 		}
+		findPreference<Preference>(SourceSettings.KEY_AUTH)?.run {
+			isVisible = repo is MangaRepositoryAuthProvider
+			isEnabled = (repo as? MangaRepositoryAuthProvider)?.isAuthorized() == false
+		}
+	}
+
+	override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+		return when (preference?.key) {
+			SourceSettings.KEY_AUTH -> {
+				startActivity(
+					SourceAuthActivity.newIntent(
+						context ?: return false,
+						source,
+					)
+				)
+				true
+			}
+			else -> super.onPreferenceTreeClick(preference)
+		}
 	}
 
 	private fun initPreferenceWithDefaultValue(preference: Preference, defaultValue: Any) {
-		when(preference) {
+		when (preference) {
 			is EditTextPreference -> {
 				preference.summaryProvider = EditTextDefaultSummaryProvider(defaultValue.toString())
-				when(preference.key) {
+				when (preference.key) {
 					SourceSettings.KEY_DOMAIN -> preference.setOnBindEditTextListener(
 						EditTextBindListener(
 							EditorInfo.TYPE_CLASS_TEXT or EditorInfo.TYPE_TEXT_VARIATION_URI,
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt
index f83beb33c..a4c489f8b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt
@@ -4,6 +4,9 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.text.style.URLSpan
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.Preference
 import org.koitharu.kotatsu.R
@@ -19,6 +22,17 @@ class TrackerSettingsFragment : BasePreferenceFragment(R.string.new_chapters_che
 
 		findPreference<MultiSelectListPreference>(AppSettings.KEY_TRACK_SOURCES)
 			?.summaryProvider = MultiSummaryProvider(R.string.dont_check)
+		val warningPreference = findPreference<Preference>(AppSettings.KEY_TRACK_WARNING)
+		if (warningPreference != null) {
+			warningPreference.summary = buildSpannedString {
+				append(getString(R.string.tracker_warning))
+				append(" ")
+				inSpans(URLSpan("https://dontkillmyapp.com/")) {
+					append(getString(R.string.read_more))
+				}
+			}
+			warningPreference
+		}
 	}
 
 	override fun onPreferenceTreeClick(preference: Preference?): Boolean {
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt
new file mode 100644
index 000000000..19107be54
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/about/AboutSettingsFragment.kt
@@ -0,0 +1,92 @@
+package org.koitharu.kotatsu.settings.about
+
+import android.os.Bundle
+import android.view.View
+import androidx.preference.Preference
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
+import org.koitharu.kotatsu.browser.BrowserActivity
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.settings.AppUpdateChecker
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+
+class AboutSettingsFragment : BasePreferenceFragment(R.string.about) {
+
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+		addPreferencesFromResource(R.xml.pref_about)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		findPreference<Preference>(AppSettings.KEY_APP_UPDATE_AUTO)?.run {
+			isVisible = AppUpdateChecker.isUpdateSupported(context)
+		}
+		findPreference<Preference>(AppSettings.KEY_APP_VERSION)?.run {
+			title = getString(R.string.app_version, BuildConfig.VERSION_NAME)
+			isEnabled = AppUpdateChecker.isUpdateSupported(context)
+		}
+	}
+
+
+	override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+		return when (preference?.key) {
+			AppSettings.KEY_APP_VERSION -> {
+				checkForUpdates()
+				true
+			}
+			AppSettings.KEY_APP_TRANSLATION -> {
+				startActivity(context?.let { BrowserActivity.newIntent(it,
+					"https://hosted.weblate.org/engage/kotatsu",
+					resources.getString(R.string.about_app_translation)) })
+				true
+			}
+			AppSettings.KEY_FEEDBACK_4PDA -> {
+				startActivity(context?.let { BrowserActivity.newIntent(it,
+					"https://4pda.to/forum/index.php?showtopic=697669",
+					resources.getString(R.string.about_feedback_4pda)) })
+				true
+			}
+			AppSettings.KEY_FEEDBACK_GITHUB -> {
+				startActivity(context?.let { BrowserActivity.newIntent(it,
+					"https://github.com/nv95/Kotatsu/issues",
+					"GitHub") })
+				true
+			}
+			AppSettings.KEY_SUPPORT_DEVELOPER -> {
+				startActivity(context?.let { BrowserActivity.newIntent(it,
+					"https://yoomoney.ru/to/410012543938752",
+					resources.getString(R.string.about_support_developer)) })
+				true
+			}
+			AppSettings.KEY_APP_GRATITUDES -> {
+				startActivity(context?.let { BrowserActivity.newIntent(it,
+					"https://github.com/nv95/Kotatsu/graphs/contributors",
+					resources.getString(R.string.about_gratitudes)) })
+				true
+			}
+			else -> super.onPreferenceTreeClick(preference)
+		}
+	}
+
+	private fun checkForUpdates() {
+		viewLifecycleScope.launch {
+			findPreference<Preference>(AppSettings.KEY_APP_VERSION)?.run {
+				setSummary(R.string.checking_for_updates)
+				isSelectable = false
+			}
+			val result = AppUpdateChecker(activity ?: return@launch).checkNow()
+			findPreference<Preference>(AppSettings.KEY_APP_VERSION)?.run {
+				setSummary(
+					when (result) {
+						true -> R.string.check_for_updates
+						false -> R.string.no_update_available
+						null -> R.string.update_check_failed
+					}
+				)
+				isSelectable = true
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/about/LicenseFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/about/LicenseFragment.kt
new file mode 100644
index 000000000..8d25e3ca9
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/about/LicenseFragment.kt
@@ -0,0 +1,41 @@
+package org.koitharu.kotatsu.settings.about
+
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.core.text.HtmlCompat
+import androidx.core.text.parseAsHtml
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.databinding.FragmentCopyrightBinding
+
+class LicenseFragment : BaseFragment<FragmentCopyrightBinding>() {
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		binding.textView.apply {
+			text =
+				SpannableStringBuilder(resources.openRawResource(R.raw.copyright).bufferedReader()
+					.readText()
+					.parseAsHtml(HtmlCompat.FROM_HTML_SEPARATOR_LINE_BREAK_LIST))
+			movementMethod = LinkMovementMethod.getInstance()
+		}
+	}
+
+	override fun onInflateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?
+	) = FragmentCopyrightBinding.inflate(inflater, container, false)
+
+	override fun onResume() {
+		super.onResume()
+		activity?.setTitle(R.string.about_license)
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) = Unit
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt
index 5cd21c629..50c448149 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt
@@ -1,27 +1,42 @@
 package org.koitharu.kotatsu.settings.backup
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.databinding.DialogProgressBinding
-import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.setIndeterminateCompat
 import org.koitharu.kotatsu.utils.progress.Progress
 import java.io.File
+import java.io.FileOutputStream
 
 class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 
 	private val viewModel by viewModel<BackupViewModel>(mode = LazyThreadSafetyMode.NONE)
 
+	private var backup: File? = null
+	private val saveFileContract =
+		registerForActivityResult(ActivityResultContracts.CreateDocument()) { uri ->
+			val file = backup
+			if (uri != null && file != null) {
+				saveBackup(file, uri)
+			} else {
+				dismiss()
+			}
+		}
+
 	override fun onInflateView(
 		inflater: LayoutInflater,
-		container: ViewGroup?
+		container: ViewGroup?,
 	) = DialogProgressBinding.inflate(inflater, container, false)
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -50,8 +65,8 @@ class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 
 	private fun onProgressChanged(progress: Progress?) {
 		with(binding.progressBar) {
+			setIndeterminateCompat(progress == null)
 			isVisible = true
-			isIndeterminate = progress == null
 			if (progress != null) {
 				this.max = progress.total
 				this.progress = progress.value
@@ -60,8 +75,22 @@ class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 	}
 
 	private fun onBackupDone(file: File) {
-		ShareHelper(context ?: return).shareBackup(file)
-		dismiss()
+		this.backup = file
+		saveFileContract.launch(file.name)
+	}
+
+	private fun saveBackup(file: File, output: Uri) {
+		try {
+			requireContext().contentResolver.openFileDescriptor(output, "w")?.use { fd ->
+				FileOutputStream(fd.fileDescriptor).use {
+					it.write(file.readBytes())
+				}
+			}
+			Toast.makeText(requireContext(), R.string.backup_saved, Toast.LENGTH_LONG).show()
+			dismiss()
+		} catch (e: Exception) {
+			onError(e)
+		}
 	}
 
 	companion object {
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
new file mode 100644
index 000000000..b6945a7e4
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
@@ -0,0 +1,86 @@
+package org.koitharu.kotatsu.settings.onboard
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.FragmentManager
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.AlertDialogFragment
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.databinding.DialogOnboardBinding
+import org.koitharu.kotatsu.settings.onboard.adapter.SourceLocalesAdapter
+import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
+import org.koitharu.kotatsu.utils.ext.observeNotNull
+import org.koitharu.kotatsu.utils.ext.withArgs
+
+class OnboardDialogFragment : AlertDialogFragment<DialogOnboardBinding>(),
+	OnListItemClickListener<SourceLocale>, DialogInterface.OnClickListener {
+
+	private val viewModel by viewModel<OnboardViewModel>(mode = LazyThreadSafetyMode.NONE)
+	private var isWelcome: Boolean = false
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		arguments?.run {
+			isWelcome = getBoolean(ARG_WELCOME, false)
+		}
+	}
+
+	override fun onInflateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	) = DialogOnboardBinding.inflate(inflater, container, false)
+
+	override fun onBuildDialog(builder: AlertDialog.Builder) {
+		builder
+			.setPositiveButton(R.string.done, this)
+			.setCancelable(true)
+		if (isWelcome) {
+			builder.setTitle(R.string.welcome)
+		} else {
+			builder
+				.setTitle(R.string.remote_sources)
+				.setNegativeButton(android.R.string.cancel, this)
+		}
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		val adapter = SourceLocalesAdapter(this)
+		binding.recyclerView.adapter = adapter
+		viewModel.list.observeNotNull(viewLifecycleOwner) {
+			adapter.items = it
+		}
+	}
+
+	override fun onItemClick(item: SourceLocale, view: View) {
+		viewModel.setItemChecked(item.key, !item.isChecked)
+	}
+
+	override fun onClick(dialog: DialogInterface?, which: Int) {
+		when (which) {
+			DialogInterface.BUTTON_POSITIVE -> viewModel.apply()
+		}
+	}
+
+	companion object {
+
+		private const val TAG = "OnboardDialog"
+		private const val ARG_WELCOME = "welcome"
+
+		fun show(fm: FragmentManager) = OnboardDialogFragment().show(fm, TAG)
+
+		fun showWelcome(settings: AppSettings, fm: FragmentManager) {
+			if (!settings.isSourcesSelected) {
+				OnboardDialogFragment().withArgs(1) {
+					putBoolean(ARG_WELCOME, true)
+				}.show(fm, TAG)
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
new file mode 100644
index 000000000..b0f2a4ee4
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
@@ -0,0 +1,94 @@
+package org.koitharu.kotatsu.settings.onboard
+
+import androidx.collection.ArraySet
+import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.MutableLiveData
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
+import org.koitharu.kotatsu.utils.ext.map
+import org.koitharu.kotatsu.utils.ext.mapToSet
+import java.util.*
+
+class OnboardViewModel(
+	private val settings: AppSettings,
+) : BaseViewModel() {
+
+	private val allSources = MangaSource.values().filterNot { x -> x == MangaSource.LOCAL }
+
+	private val locales = allSources.mapTo(ArraySet()) {
+			it.locale
+		}
+
+	private val selectedLocales = locales.toMutableSet()
+
+	val list = MutableLiveData<List<SourceLocale>?>()
+
+	init {
+		if (settings.isSourcesSelected) {
+			selectedLocales.removeAll(settings.hiddenSources.map { x -> MangaSource.valueOf(x).locale })
+		} else {
+			val deviceLocales = LocaleListCompat.getDefault().map { x ->
+				x.language
+			}
+			selectedLocales.retainAll(deviceLocales)
+			if (selectedLocales.isEmpty()) {
+				selectedLocales += "en"
+			}
+		}
+		rebuildList()
+	}
+
+	fun setItemChecked(key: String?, isChecked: Boolean) {
+		val isModified = if (isChecked) {
+			selectedLocales.add(key)
+		} else {
+			selectedLocales.remove(key)
+		}
+		if (isModified) {
+			rebuildList()
+		}
+	}
+
+	fun apply() {
+		settings.hiddenSources = allSources.filterNot { x ->
+			x.locale in selectedLocales
+		}.mapToSet { x -> x.name }
+	}
+
+	private fun rebuildList() {
+		list.value = locales.map { key ->
+			val locale = if (key != null) {
+				Locale(key)
+			} else null
+			SourceLocale(
+				key = key,
+				title = locale?.getDisplayLanguage(locale)?.capitalize(locale),
+				isChecked = key in selectedLocales
+			)
+		}.sortedWith(SourceLocaleComparator())
+	}
+
+	private class SourceLocaleComparator : Comparator<SourceLocale?> {
+
+		private val deviceLocales = LocaleListCompat.getAdjustedDefault()
+			.map { it.language }
+
+		override fun compare(a: SourceLocale?, b: SourceLocale?): Int {
+			return when {
+				a === b -> 0
+				a?.key == null -> 1
+				b?.key == null -> -1
+				else -> {
+					val index = deviceLocales.indexOf(a.key)
+					if (index == -1) {
+						compareValues(a.title, b.title)
+					} else {
+						-2 - index
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocaleAD.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocaleAD.kt
new file mode 100644
index 000000000..d46bafd3d
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocaleAD.kt
@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.settings.onboard.adapter
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.databinding.ItemSourceLocaleBinding
+import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
+
+fun sourceLocaleAD(
+	clickListener: OnListItemClickListener<SourceLocale>
+) = adapterDelegateViewBinding<SourceLocale, SourceLocale, ItemSourceLocaleBinding>(
+	{ inflater, parent -> ItemSourceLocaleBinding.inflate(inflater, parent, false) }
+) {
+
+	binding.root.setOnClickListener {
+		clickListener.onItemClick(item, it)
+	}
+
+	bind {
+		binding.root.text = item.title ?: getString(R.string.other)
+		binding.root.isChecked = item.isChecked
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt
new file mode 100644
index 000000000..0d4112f31
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/adapter/SourceLocalesAdapter.kt
@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.settings.onboard.adapter
+
+import androidx.recyclerview.widget.DiffUtil
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
+
+class SourceLocalesAdapter(
+	clickListener: OnListItemClickListener<SourceLocale>,
+) : AsyncListDifferDelegationAdapter<SourceLocale>(DiffCallback()) {
+
+	init {
+		delegatesManager.addDelegate(sourceLocaleAD(clickListener))
+	}
+
+	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
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt
new file mode 100644
index 000000000..c2bce3718
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/model/SourceLocale.kt
@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.settings.onboard.model
+
+import java.util.*
+
+data class SourceLocale(
+	val key: String?,
+	val title: String?,
+	val isChecked: Boolean,
+) : Comparable<SourceLocale> {
+
+	override fun compareTo(other: SourceLocale): Int {
+		return when {
+			this === other -> 0
+			key == Locale.getDefault().language -> -2
+			key == null -> 1
+			other.key == null -> -1
+			else -> compareValues(title, other.title)
+		}
+	}
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
index 9c30c32cb..ac2d96c79 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
@@ -1,9 +1,7 @@
 package org.koitharu.kotatsu.settings.sources
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -16,6 +14,7 @@ import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.databinding.FragmentSettingsSourcesBinding
 import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
 
 class SourcesSettingsFragment : BaseFragment<FragmentSettingsSourcesBinding>(),
 	OnListItemClickListener<MangaSource> {
@@ -25,6 +24,7 @@ class SourcesSettingsFragment : BaseFragment<FragmentSettingsSourcesBinding>(),
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		reorderHelper = ItemTouchHelper(SourcesReorderCallback())
+		setHasOptionsMenu(true)
 	}
 
 	override fun onInflateView(
@@ -51,6 +51,22 @@ class SourcesSettingsFragment : BaseFragment<FragmentSettingsSourcesBinding>(),
 		super.onDestroyView()
 	}
 
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+		super.onCreateOptionsMenu(menu, inflater)
+		// TODO handle changes in dialog
+		// inflater.inflate(R.menu.opt_sources, menu)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when(item.itemId) {
+			R.id.action_languages -> {
+				OnboardDialogFragment.show(parentFragmentManager)
+				true
+			}
+			else -> super.onOptionsItemSelected(item)
+		}
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.recyclerView.updatePadding(
 			bottom = insets.bottom,
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
new file mode 100644
index 000000000..896c92780
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
@@ -0,0 +1,114 @@
+package org.koitharu.kotatsu.settings.sources.auth
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.MenuItem
+import android.widget.Toast
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.browser.BrowserCallback
+import org.koitharu.kotatsu.browser.BrowserClient
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import org.koitharu.kotatsu.utils.ext.mangaRepositoryOf
+
+class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
+
+	private lateinit var repository: MangaRepositoryAuthProvider
+
+	@SuppressLint("SetJavaScriptEnabled")
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityBrowserBinding.inflate(layoutInflater))
+		val source = intent?.getParcelableExtra<MangaSource>(EXTRA_SOURCE)
+		if (source == null) {
+			finish()
+			return
+		}
+		repository = mangaRepositoryOf(source) as? MangaRepositoryAuthProvider ?: run {
+			Toast.makeText(
+				this,
+				getString(R.string.auth_not_supported_by, source.title),
+				Toast.LENGTH_SHORT
+			).show()
+			finishAfterTransition()
+			return
+		}
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(R.drawable.ic_cross)
+		}
+		with(binding.webView.settings) {
+			javaScriptEnabled = true
+		}
+		binding.webView.webViewClient = BrowserClient(this)
+		val url = repository.authUrl
+		onTitleChanged(
+			source.title,
+			getString(R.string.loading_)
+		)
+		binding.webView.loadUrl(url)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+		android.R.id.home -> {
+			binding.webView.stopLoading()
+			finishAfterTransition()
+			true
+		}
+		else -> super.onOptionsItemSelected(item)
+	}
+
+	override fun onBackPressed() {
+		if (binding.webView.canGoBack()) {
+			binding.webView.goBack()
+		} else {
+			super.onBackPressed()
+		}
+	}
+
+	override fun onPause() {
+		binding.webView.onPause()
+		super.onPause()
+	}
+
+	override fun onResume() {
+		super.onResume()
+		binding.webView.onResume()
+	}
+
+	override fun onLoadingStateChanged(isLoading: Boolean) {
+		binding.progressBar.isVisible = isLoading
+		if (!isLoading && repository.isAuthorized()) {
+			Toast.makeText(this, R.string.auth_complete, Toast.LENGTH_SHORT).show()
+			finishAfterTransition()
+		}
+	}
+
+	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
+		this.title = title
+		supportActionBar?.subtitle = subtitle
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.appbar.updatePadding(top = insets.top)
+		binding.webView.updatePadding(bottom = insets.bottom)
+	}
+
+	companion object {
+
+		private const val EXTRA_SOURCE = "source"
+
+		fun newIntent(context: Context, source: MangaSource): Intent {
+			return Intent(context, SourceAuthActivity::class.java)
+				.putExtra(EXTRA_SOURCE, source as Parcelable)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/utils/LinksPreference.kt b/app/src/main/java/org/koitharu/kotatsu/settings/utils/LinksPreference.kt
new file mode 100644
index 000000000..cd61ba247
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/utils/LinksPreference.kt
@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.settings.utils
+
+import android.content.Context
+import android.text.method.LinkMovementMethod
+import android.util.AttributeSet
+import android.widget.TextView
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
+
+class LinksPreference @JvmOverloads constructor(
+	context: Context?,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = androidx.preference.R.attr.preferenceStyle,
+	defStyleRes: Int = 0,
+) : Preference(context, attrs, defStyleAttr, defStyleRes) {
+
+
+	override fun onBindViewHolder(holder: PreferenceViewHolder) {
+		super.onBindViewHolder(holder)
+		val summaryView = holder.findViewById(android.R.id.summary) as TextView
+		summaryView.movementMethod = LinkMovementMethod.getInstance()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt
index cc3e52d2f..3d2c9b9e1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt
@@ -24,7 +24,11 @@ class SuggestionsViewModel(
 		createListModeFlow()
 	) { list, mode ->
 		when {
-			list.isEmpty() -> listOf(EmptyState(R.string.text_suggestion_holder))
+			list.isEmpty() -> listOf(EmptyState(
+				icon = R.drawable.ic_book_cross,
+				textPrimary = R.string.nothing_found,
+				textSecondary = R.string.text_suggestion_holder,
+			))
 			else -> mapList(list, mode)
 		}
 	}.onFirst {
diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
index 895508592..3eaeaba29 100644
--- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
@@ -26,10 +26,10 @@ class SuggestionsWorker(appContext: Context, params: WorkerParameters) :
 		for ((source, tags) in tagsBySources) {
 			val repo = mangaRepositoryOf(source)
 			tags.flatMapTo(rawResults) { tag ->
-				repo.getList(
+				repo.getList2(
 					offset = 0,
 					sortOrder = SortOrder.UPDATED,
-					tag = tag,
+					tags = setOf(tag),
 				)
 			}
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
index 4abb468a9..66413a5f5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
@@ -12,14 +12,15 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.FragmentFeedBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.tracker.ui.adapter.FeedAdapter
 import org.koitharu.kotatsu.tracker.work.TrackWorker
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.progress.Progress
 
 class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListener.Callback,
@@ -47,9 +48,6 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 		feedAdapter = FeedAdapter(get(), viewLifecycleOwner, this)
 		with(binding.recyclerView) {
 			adapter = feedAdapter
-			addItemDecoration(
-				SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing))
-			)
 			setHasFixedSize(true)
 			addOnScrollListener(PaginationScrollListener(4, this@FeedFragment))
 		}
@@ -100,7 +98,9 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
+		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
 		binding.recyclerView.updatePadding(
+			top = headerHeight,
 			left = insets.left,
 			right = insets.right,
 			bottom = insets.bottom
@@ -134,7 +134,7 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 			return
 		}
 		val summaryText = getString(
-			R.string.chapers_checking_progress,
+			R.string.chapters_checking_progress,
 			progress.value + 1,
 			progress.total
 		)
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt
index c187bde99..d0bee70ce 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt
@@ -39,7 +39,7 @@ class FeedViewModel(
 		hasNextPage
 	) { list, isHasNextPage ->
 		when {
-			list.isEmpty() -> listOf(EmptyState(R.string.text_feed_holder))
+			list.isEmpty() -> listOf(EmptyState(R.drawable.ic_feed, R.string.text_empty_holder_primary, R.string.text_feed_holder))
 			isHasNextPage -> list + LoadingFooter
 			else -> list
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
index 75ffadd6d..2e3bdf446 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
@@ -37,7 +37,7 @@ fun feedItemAD(
 			.lifecycle(lifecycleOwner)
 			.enqueueWith(coil)
 		binding.textViewTitle.text = item.title
-		binding.textViewSubtitle.text = item.subtitle
+		binding.badge.text = item.subtitle
 		binding.textViewChapters.text = item.chapters
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt
index 87c7efd2f..29ebb4790 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt
@@ -1,10 +1,8 @@
 package org.koitharu.kotatsu.tracker.ui.model
 
 import android.content.res.Resources
-import android.text.format.DateUtils
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.TrackingLogItem
-import org.koitharu.kotatsu.utils.ext.formatRelative
 
 fun TrackingLogItem.toFeedItem(resources: Resources): FeedItem {
 	val chaptersString = if (chapters.size > MAX_CHAPTERS) {
@@ -23,17 +21,7 @@ fun TrackingLogItem.toFeedItem(resources: Resources): FeedItem {
 		id = id,
 		imageUrl = manga.coverUrl,
 		title = manga.title,
-		subtitle = buildString {
-			append(createdAt.formatRelative(DateUtils.DAY_IN_MILLIS))
-			append(" ")
-			append(
-				resources.getQuantityString(
-					R.plurals.new_chapters,
-					chapters.size,
-					chapters.size
-				)
-			)
-		},
+		subtitle = chapters.size.toString(),
 		chapters = chaptersString,
 		manga = manga
 	)
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/CacheUtils.kt b/app/src/main/java/org/koitharu/kotatsu/utils/CacheUtils.kt
index 2760b831e..37487e297 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/CacheUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/CacheUtils.kt
@@ -23,12 +23,12 @@ object CacheUtils {
 
 	@WorkerThread
 	fun computeCacheSize(context: Context, name: String) = getCacheDirs(context)
-		.map { it.sub(name) }
+		.map { File(it, name) }
 		.sumOf { x -> x.computeSize() }
 
 	@WorkerThread
 	fun clearCache(context: Context, name: String) = getCacheDirs(context)
-		.map { it.sub(name) }
+		.map { File(it, name) }
 		.forEach { it.deleteRecursively() }
 
 	// FIXME need async implementation
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/DeferredStateFlow.kt b/app/src/main/java/org/koitharu/kotatsu/utils/DeferredStateFlow.kt
new file mode 100644
index 000000000..5cb69e049
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/DeferredStateFlow.kt
@@ -0,0 +1,22 @@
+package org.koitharu.kotatsu.utils
+
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.launchIn
+
+class DeferredStateFlow<R, S>(
+	private val stateFlow: StateFlow<S>,
+	private val deferred: Deferred<R>,
+) : StateFlow<S> by stateFlow, Deferred<R> by deferred {
+
+	suspend fun collectAndAwait(): R {
+		return coroutineScope {
+			val collectJob = launchIn(this)
+			val result = await()
+			collectJob.cancelAndJoin()
+			result
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/JobStateFlow.kt b/app/src/main/java/org/koitharu/kotatsu/utils/JobStateFlow.kt
new file mode 100644
index 000000000..05af51f10
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/JobStateFlow.kt
@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.utils
+
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.launchIn
+
+class JobStateFlow<S>(
+	private val stateFlow: StateFlow<S>,
+	private val job: Job,
+) : StateFlow<S> by stateFlow, Job by job {
+
+	suspend fun collectAndJoin(): Unit {
+		coroutineScope {
+			val collectJob = launchIn(this)
+			join()
+			collectJob.cancelAndJoin()
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/LifecycleAwareServiceConnection.kt b/app/src/main/java/org/koitharu/kotatsu/utils/LifecycleAwareServiceConnection.kt
new file mode 100644
index 000000000..03dd423ea
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/LifecycleAwareServiceConnection.kt
@@ -0,0 +1,49 @@
+package org.koitharu.kotatsu.utils
+
+import android.app.Activity
+import android.content.ComponentName
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+class LifecycleAwareServiceConnection private constructor(
+	private val host: Activity,
+) : ServiceConnection, DefaultLifecycleObserver {
+
+	private val serviceStateFlow = MutableStateFlow<IBinder?>(null)
+
+	val service: StateFlow<IBinder?>
+		get() = serviceStateFlow
+
+	override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+		serviceStateFlow.value = service
+	}
+
+	override fun onServiceDisconnected(name: ComponentName?) {
+		serviceStateFlow.value = null
+	}
+
+	override fun onDestroy(owner: LifecycleOwner) {
+		super.onDestroy(owner)
+		host.unbindService(this)
+	}
+
+	companion object {
+
+		fun bindService(
+			host: Activity,
+			lifecycleOwner: LifecycleOwner,
+			service: Intent,
+			flags: Int,
+		): LifecycleAwareServiceConnection {
+			val connection = LifecycleAwareServiceConnection(host)
+			host.bindService(service, connection, flags)
+			lifecycleOwner.lifecycle.addObserver(connection)
+			return connection
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index b9cc851c4..87278b1d7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -1,8 +1,10 @@
 package org.koitharu.kotatsu.utils.ext
 
+import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkRequest
+import androidx.appcompat.app.AlertDialog
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
@@ -19,4 +21,8 @@ suspend fun ConnectivityManager.waitForNetwork(): Network {
 			unregisterNetworkCallback(callback)
 		}
 	}
+}
+
+inline fun buildAlertDialog(context: Context, block: AlertDialog.Builder.() -> Unit): AlertDialog {
+	return AlertDialog.Builder(context).apply(block).create()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt
index 5b3081d8e..e31e3e20b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt
@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.core.network.CommonHeaders
 @Suppress("NOTHING_TO_INLINE")
 inline fun ImageView.newImageRequest(url: String) = ImageRequest.Builder(context)
 	.data(url)
+	.crossfade(true)
 	.target(this)
 
 @Suppress("NOTHING_TO_INLINE")
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt
new file mode 100644
index 000000000..d188cadbe
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CookieJarExt.kt
@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.utils.ext
+
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+
+private const val SCHEME_HTTPS = "https"
+
+fun CookieJar.insertCookies(domain: String, vararg cookies: String) {
+	val url = HttpUrl.Builder()
+		.scheme(SCHEME_HTTPS)
+		.host(domain)
+		.build()
+	saveFromResponse(url, cookies.mapNotNull {
+		Cookie.parse(url, it)
+	})
+}
+
+fun CookieJar.getCookies(domain: String): List<Cookie> {
+	val url = HttpUrl.Builder()
+		.scheme(SCHEME_HTTPS)
+		.host(domain)
+		.build()
+	return loadForRequest(url)
+}
+
+fun CookieJar.copyCookies(oldDomain: String, newDomain: String, names: Array<String>? = null) {
+	val url = HttpUrl.Builder()
+		.scheme(SCHEME_HTTPS)
+		.host(oldDomain)
+	var cookies = loadForRequest(url.build())
+	if (names != null) {
+		cookies = cookies.filter { c -> c.name in names }
+	}
+	url.host(newDomain)
+	saveFromResponse(url.build(), cookies)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FileExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FileExt.kt
index 0c2d9b579..248f0f158 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FileExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FileExt.kt
@@ -13,8 +13,13 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
 @Suppress("NOTHING_TO_INLINE")
+@Deprecated("Useless", ReplaceWith("File(this, name)", "java.io.File"))
 inline fun File.sub(name: String) = File(this, name)
 
+fun File.subdir(name: String) = File(this, name).also {
+	if (!it.exists()) it.mkdirs()
+}
+
 fun File.takeIfReadable() = takeIf { it.exists() && it.canRead() }
 
 fun ZipFile.readText(entry: ZipEntry) = getInputStream(entry).bufferedReader().use {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt
index a3de68094..ef2f7a422 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FlowExt.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.utils.ext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.transform
 
 fun <T> Flow<T>.onFirst(action: suspend (T) -> Unit): Flow<T> {
 	var isFirstCall = true
@@ -16,4 +17,10 @@ fun <T> Flow<T>.onFirst(action: suspend (T) -> Unit): Flow<T> {
 
 inline fun <T, R> Flow<List<T>>.mapItems(crossinline transform: (T) -> R): Flow<List<R>> {
 	return map { list -> list.map(transform) }
+}
+
+inline fun <T> Flow<T?>.filterNotNull(
+	crossinline predicate: suspend (T) -> Boolean,
+): Flow<T> = transform { value ->
+	if (value != null && predicate(value)) return@transform emit(value)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
index 92dab70d6..069d685ff 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
@@ -1,9 +1,12 @@
 package org.koitharu.kotatsu.utils.ext
 
+import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.coroutineScope
+import org.koitharu.kotatsu.utils.LifecycleAwareServiceConnection
 
 inline fun <T : Fragment> T.withArgs(size: Int, block: Bundle.() -> Unit): T {
 	val b = Bundle(size)
@@ -27,4 +30,10 @@ inline fun <T : Parcelable> Fragment.parcelableArgument(name: String): Lazy<T> {
 @Suppress("NOTHING_TO_INLINE")
 inline fun Fragment.stringArgument(name: String) = lazy(LazyThreadSafetyMode.NONE) {
 	arguments?.getString(name)
-}
\ No newline at end of file
+}
+
+fun Fragment.bindService(
+	lifecycleOwner: LifecycleOwner,
+	service: Intent,
+	flags: Int,
+) = LifecycleAwareServiceConnection.bindService(requireActivity(), lifecycleOwner, service, flags)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt
new file mode 100644
index 000000000..1ad4cc003
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LocaleExt.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.utils.ext
+
+import androidx.core.os.LocaleListCompat
+import java.util.*
+import kotlin.collections.ArrayList
+
+fun LocaleListCompat.toList(): List<Locale> {
+	val list = ArrayList<Locale>(size())
+	for (i in 0 until size()) {
+		list += get(i)
+	}
+	return list
+}
+
+inline fun <R, C : MutableCollection<in R>> LocaleListCompat.mapTo(
+	destination: C,
+	block: (Locale) -> R,
+): C {
+	val len = size()
+	for (i in 0 until len) {
+		val item = get(i)
+		destination.add(block(item))
+	}
+	return destination
+}
+
+inline fun <T> LocaleListCompat.map(block: (Locale) -> T): List<T> {
+	return mapTo(ArrayList(size()), block)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
index 0e0c10433..7968b5ba2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt
@@ -80,7 +80,7 @@ fun String.toRelativeUrl(domain: String): String {
 }
 
 fun Element.relUrl(attributeKey: String): String {
-	val attr = attr(attributeKey)
+	val attr = attr(attributeKey).trim()
 	if (attr.isEmpty()) {
 		return ""
 	}
@@ -91,4 +91,10 @@ fun Element.relUrl(attributeKey: String): String {
 	return attr.removePrefix(baseUrl.dropLast(1))
 }
 
-private val REGEX_URL_BASE = Regex("^[^/]{2,6}://[^/]+/", RegexOption.IGNORE_CASE)
\ No newline at end of file
+private val REGEX_URL_BASE = Regex("^[^/]{2,6}://[^/]+/", RegexOption.IGNORE_CASE)
+
+fun Element.css(property: String): String? {
+	val regex = Regex("${Regex.escape(property)}\\s*:\\s*[^;]+")
+	val css = attr("style").find(regex) ?: return null
+	return css.substringAfter(':').removeSuffix(';').trim()
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
index 05ec233ae..05d310506 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt
@@ -29,20 +29,47 @@ fun String.removeSurrounding(vararg chars: Char): String {
 	return this
 }
 
+fun String.toCamelCase(): String {
+	if (isEmpty()) {
+		return this
+	}
+	val result = StringBuilder(length)
+	var capitalize = true
+	for (char in this) {
+		result.append(
+			if (capitalize) {
+				char.uppercase()
+			} else {
+				char.lowercase()
+			}
+		)
+		capitalize = char.isWhitespace()
+	}
+	return result.toString()
+}
+
+fun String.toTitleCase(): String {
+	return replaceFirstChar { x -> x.uppercase() }
+}
+
 fun String.transliterate(skipMissing: Boolean): String {
 	val cyr = charArrayOf(
-		'a', 'б', 'в', 'г', 'д', 'ё', 'ж', 'з', 'и', 'к', 'л', 'м', 'н',
-		'п', 'р', 'с', 'т', 'у', 'ў', 'ф', 'х', 'ц', 'ш', 'щ', 'ы', 'э', 'ю', 'я'
+		'а', 'б', 'в', 'г', 'д', 'е', 'ж', 'з', 'и', 'й', 'к', 'л', 'м', 'н', 'о', 'п',
+		'р', 'с', 'т', 'у', 'ф', 'х', 'ц', 'ч', 'ш', 'щ', 'ъ', 'ы', 'ь', 'э', 'ю', 'я', 'ё', 'ў'
 	)
 	val lat = arrayOf(
-		"a", "b", "v", "g", "d", "jo", "zh", "z", "i", "k", "l", "m", "n",
-		"p", "r", "s", "t", "u", "w", "f", "h", "ts", "sh", "sch", "", "e", "ju", "ja"
+		"a", "b", "v", "g", "d", "e", "zh", "z", "i", "y", "k", "l", "m", "n", "o", "p",
+		"r", "s", "t", "u", "f", "h", "ts", "ch", "sh", "sch", "", "i", "", "e", "ju", "ja", "jo", "w"
 	)
 	return buildString(length + 5) {
 		for (c in this@transliterate) {
-			val p = cyr.binarySearch(c.toLowerCase())
+			val p = cyr.binarySearch(c.lowercaseChar())
 			if (p in lat.indices) {
-				append(lat[p])
+				if (c.isUpperCase()) {
+					append(lat[p].uppercase())
+				} else {
+					append(lat[p])
+				}
 			} else if (!skipMissing) {
 				append(c)
 			}
@@ -58,6 +85,20 @@ fun String.ellipsize(maxLength: Int) = if (this.length > maxLength) {
 	this.take(maxLength - 1) + Typography.ellipsis
 } else this
 
+fun String.splitTwoParts(delimiter: Char): Pair<String, String>? {
+	val indices = ArrayList<Int>(4)
+	for ((i, c) in this.withIndex()) {
+		if (c == delimiter) {
+			indices += i
+		}
+	}
+	if (indices.isEmpty() || indices.size and 1 == 0) {
+		return null
+	}
+	val index = indices[indices.size / 2]
+	return substring(0, index) to substring(index + 1)
+}
+
 fun String.urlEncoded(): String = URLEncoder.encode(this, Charsets.UTF_8.name())
 
 fun String.toUriOrNull(): Uri? = if (isEmpty()) {
@@ -92,7 +133,7 @@ fun String.md5(): String {
 		.padStart(32, '0')
 }
 
-fun String.substringBetween(from: String, to: String, fallbackValue: String): String {
+fun String.substringBetween(from: String, to: String, fallbackValue: String = this): String {
 	val fromIndex = indexOf(from)
 	if (fromIndex == -1) {
 		return fallbackValue
@@ -105,8 +146,28 @@ fun String.substringBetween(from: String, to: String, fallbackValue: String): St
 	}
 }
 
+fun String.substringBetweenLast(from: String, to: String, fallbackValue: String = this): String {
+	val fromIndex = lastIndexOf(from)
+	if (fromIndex == -1) {
+		return fallbackValue
+	}
+	val toIndex = lastIndexOf(to)
+	return if (toIndex == -1) {
+		fallbackValue
+	} else {
+		substring(fromIndex + from.length, toIndex)
+	}
+}
+
 fun String.find(regex: Regex) = regex.find(this)?.value
 
+fun String.removeSuffix(suffix: Char): String {
+	if (lastOrNull() == suffix) {
+		return substring(0, length - 1)
+	}
+	return this
+}
+
 fun String.levenshteinDistance(other: String): Int {
 	if (this == other) {
 		return 0
@@ -143,4 +204,20 @@ fun String.levenshteinDistance(other: String): Int {
 	}
 
 	return cost[lhsLength - 1]
+}
+
+inline fun <T> StringBuilder.appendAll(
+	items: Iterable<T>,
+	separator: CharSequence,
+	transform: (T) -> CharSequence = { it.toString() },
+) {
+	var isFirst = true
+	for (item in items) {
+		if (isFirst) {
+			isFirst = false
+		} else {
+			append(separator)
+		}
+		append(transform(item))
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt
new file mode 100644
index 000000000..f66e9f880
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/UiExt.kt
@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.utils.ext
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.graphics.drawable.DrawableCompat
+import org.koitharu.kotatsu.R
+
+fun navigationItemBackground(context: Context): Drawable? {
+	// Need to inflate the drawable and CSL via AppCompatResources to work on Lollipop
+	// From Google I/O repo (https://github.com/google/iosched)
+	var background = AppCompatResources.getDrawable(context, R.drawable.navigation_item_background)
+	if (background != null) {
+		val tint = AppCompatResources.getColorStateList(
+			context, R.color.navigation_item_background_tint
+		)
+		background = DrawableCompat.wrap(background.mutate())
+		background.setTintList(tint)
+	}
+	return background
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
index 9a0fe450b..ac6950379 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
@@ -16,6 +16,8 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.progressindicator.BaseProgressIndicator
+import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
 
 fun View.hideKeyboard() {
 	val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
@@ -153,4 +155,20 @@ fun RecyclerView.findCenterViewPosition(): Int {
 	val centerY = height / 2f
 	val view = findChildViewUnder(centerX, centerY) ?: return RecyclerView.NO_POSITION
 	return getChildAdapterPosition(view)
+}
+
+inline fun <reified T> RecyclerView.ViewHolder.getItem(): T? {
+	return ((this as? AdapterDelegateViewBindingViewHolder<*, *>)?.item as? T)
+}
+
+fun BaseProgressIndicator<*>.setIndeterminateCompat(indeterminate: Boolean) {
+	if (isIndeterminate != indeterminate) {
+		if (indeterminate && visibility == View.VISIBLE) {
+			visibility = View.INVISIBLE
+			isIndeterminate = indeterminate
+			visibility = View.VISIBLE
+		} else {
+			isIndeterminate = indeterminate
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt b/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt
index 793d0d7c3..16d12ebbd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.retry
+import org.koitharu.kotatsu.core.model.SortOrder
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
@@ -17,7 +18,7 @@ import org.koitharu.kotatsu.widget.shelf.ShelfWidgetProvider
 class WidgetUpdater(private val context: Context) {
 
 	fun subscribeToFavourites(repository: FavouritesRepository) {
-		repository.observeAll()
+		repository.observeAll(SortOrder.NEWEST)
 			.onEach { updateWidget(ShelfWidgetProvider::class.java) }
 			.retry { error -> error !is CancellationException }
 			.launchIn(processLifecycleScope)
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt
index fabf1fbba..1946fb0dd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt
@@ -58,7 +58,7 @@ class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(), OnListIte
 		viewModel.onError.observe(this, this::onError)
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.opt_config, menu)
 		return super.onCreateOptionsMenu(menu)
 	}
diff --git a/app/src/main/res/color/navigation_item_background_tint.xml b/app/src/main/res/color/navigation_item_background_tint.xml
new file mode 100644
index 000000000..06c5673d1
--- /dev/null
+++ b/app/src/main/res/color/navigation_item_background_tint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?attr/colorSecondary" android:alpha="0.12" android:state_checked="true" />
+	<item android:color="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/navigation_item_color_tint.xml b/app/src/main/res/color/navigation_item_color_tint.xml
new file mode 100644
index 000000000..bffbeeb10
--- /dev/null
+++ b/app/src/main/res/color/navigation_item_color_tint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?attr/colorSecondary" android:state_checked="true" />
+	<item android:color="?attr/colorControlNormal" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_overlay.xml b/app/src/main/res/color/selector_overlay.xml
new file mode 100644
index 000000000..c99447ac2
--- /dev/null
+++ b/app/src/main/res/color/selector_overlay.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:alpha="0.2" android:color="?attr/colorAccent" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-w600dp/tab_indicator.xml b/app/src/main/res/drawable-w600dp/tab_indicator.xml
new file mode 100644
index 000000000..e2b1ad5c9
--- /dev/null
+++ b/app/src/main/res/drawable-w600dp/tab_indicator.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:topLeftRadius="3dp"
+		android:topRightRadius="3dp"
+		android:bottomLeftRadius="3dp"
+		android:bottomRightRadius="3dp"/>
+	<size android:height="3dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/badge.xml b/app/src/main/res/drawable/badge.xml
new file mode 100644
index 000000000..dc4263e17
--- /dev/null
+++ b/app/src/main/res/drawable/badge.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners android:radius="32dp" />
+	<solid android:color="@color/red_accent" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 000000000..2a31b2ef3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_book_cross.xml b/app/src/main/res/drawable/ic_book_cross.xml
new file mode 100644
index 000000000..3fdb5d217
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book_cross.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13.09 20C13.21 20.72 13.46 21.39 13.81 22H6C4.89 22 4 21.11 4 20V4C4 2.9 4.89 2 6 2H18C19.11 2 20 2.9 20 4V13.09C19.67 13.04 19.34 13 19 13C18.66 13 18.33 13.04 18 13.09V4H13V12L10.5 9.75L8 12V4H6V20H13.09M22.54 16.88L21.12 15.47L19 17.59L16.88 15.47L15.47 16.88L17.59 19L15.47 21.12L16.88 22.54L19 20.41L21.12 22.54L22.54 21.12L20.41 19L22.54 16.88Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_book_page.xml b/app/src/main/res/drawable/ic_book_page.xml
index e53b1da5c..375e7b424 100644
--- a/app/src/main/res/drawable/ic_book_page.xml
+++ b/app/src/main/res/drawable/ic_book_page.xml
@@ -1,11 +1,10 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-    android:tint="?colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M19,2L14,6.5V17.5L19,13V2M6.5,5C4.55,5 2.45,5.4 1,6.5V21.16C1,21.41 1.25,21.66 1.5,21.66C1.6,21.66 1.65,21.59 1.75,21.59C3.1,20.94 5.05,20.5 6.5,20.5C8.45,20.5 10.55,20.9 12,22C13.35,21.15 15.8,20.5 17.5,20.5C19.15,20.5 20.85,20.81 22.25,21.56C22.35,21.61 22.4,21.59 22.5,21.59C22.75,21.59 23,21.34 23,21.09V6.5C22.4,6.05 21.75,5.75 21,5.5V7.5L21,13V19C19.9,18.65 18.7,18.5 17.5,18.5C15.8,18.5 13.35,19.15 12,20V13L12,8.5V6.5C10.55,5.4 8.45,5 6.5,5V5Z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19 1L14 6V17L19 12.5V1M21 5V18.5C19.9 18.15 18.7 18 17.5 18C15.8 18 13.35 18.65 12 19.5V6C10.55 4.9 8.45 4.5 6.5 4.5C4.55 4.5 2.45 4.9 1 6V20.65C1 20.9 1.25 21.15 1.5 21.15C1.6 21.15 1.65 21.1 1.75 21.1C3.1 20.45 5.05 20 6.5 20C8.45 20 10.55 20.4 12 21.5C13.35 20.65 15.8 20 17.5 20C19.15 20 20.85 20.3 22.25 21.05C22.35 21.1 22.4 21.1 22.5 21.1C22.75 21.1 23 20.85 23 20.6V6C22.4 5.55 21.75 5.25 21 5M10 18.41C8.75 18.09 7.5 18 6.5 18C5.44 18 4.18 18.19 3 18.5V7.13C3.91 6.73 5.14 6.5 6.5 6.5C7.86 6.5 9.09 6.73 10 7.13V18.41Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_book_search.xml b/app/src/main/res/drawable/ic_book_search.xml
new file mode 100644
index 000000000..0c342bf4e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book_search.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.5,12C18,12 20,14 20,16.5C20,17.38 19.75,18.21 19.31,18.9L22.39,22L21,23.39L17.88,20.32C17.19,20.75 16.37,21 15.5,21C13,21 11,19 11,16.5C11,14 13,12 15.5,12M15.5,14A2.5,2.5 0 0,0 13,16.5A2.5,2.5 0 0,0 15.5,19A2.5,2.5 0 0,0 18,16.5A2.5,2.5 0 0,0 15.5,14M13,4V12L10.5,9.75L8,12V4H6V20H10C10.54,20.81 11.23,21.5 12.03,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2H18A2,2 0 0,1 20,4V11.81C19.42,11.26 18.75,10.81 18,10.5V4H13Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_chip_storage.xml b/app/src/main/res/drawable/ic_chip_storage.xml
deleted file mode 100644
index 6e8a580b1..000000000
--- a/app/src/main/res/drawable/ic_chip_storage.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M18,4v16L6,20L6,8.83L10.83,4L18,4m0,-2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM9,7h2v4L9,11zM12,7h2v4h-2zM15,7h2v4h-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_chip_tag.xml b/app/src/main/res/drawable/ic_chip_tag.xml
deleted file mode 100644
index d5df0cdda..000000000
--- a/app/src/main/res/drawable/ic_chip_tag.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M21.41 11.58L12.41 2.58A2 2 0 0 0 11 2H4A2 2 0 0 0 2 4V11A2 2 0 0 0 2.59 12.42L11.59 21.42A2 2 0 0 0 13 22A2 2 0 0 0 14.41 21.41L21.41 14.41A2 2 0 0 0 22 13A2 2 0 0 0 21.41 11.58M13 20L4 11V4H11L20 13M6.5 5A1.5 1.5 0 1 1 5 6.5A1.5 1.5 0 0 1 6.5 5Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_chip_user.xml b/app/src/main/res/drawable/ic_chip_user.xml
deleted file mode 100644
index 7766cafe5..000000000
--- a/app/src/main/res/drawable/ic_chip_user.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_chip_web.xml b/app/src/main/res/drawable/ic_chip_web.xml
deleted file mode 100644
index da38fecd3..000000000
--- a/app/src/main/res/drawable/ic_chip_web.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
new file mode 100644
index 000000000..938bb9922
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_clear_all.xml b/app/src/main/res/drawable/ic_clear_all.xml
new file mode 100644
index 000000000..99c92f173
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear_all.xml
@@ -0,0 +1,11 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+    android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_complete.xml b/app/src/main/res/drawable/ic_complete.xml
new file mode 100644
index 000000000..3735578eb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_complete.xml
@@ -0,0 +1,11 @@
+<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="@android:color/white"
+		android:pathData="M19,17.59L17.59,19L7,8.41V15H5V5H15V7H8.41L19,17.59Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_copyleft.xml b/app/src/main/res/drawable/ic_copyleft.xml
new file mode 100644
index 000000000..0227f2d77
--- /dev/null
+++ b/app/src/main/res/drawable/ic_copyleft.xml
@@ -0,0 +1,16 @@
+<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:pathData="M11.9653,11.9653m-8.6321,0a8.6321,8.6321 0,1 1,17.2642 0a8.6321,8.6321 0,1 1,-17.2642 0"
+		android:strokeWidth="2"
+		android:strokeColor="@android:color/white" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="m6.8889,10.7775l2.4533,0a2.8091,2.8707 0,1 1,0 2.3923l-2.4533,0a5.1501,5.263 0,1 0,0 -2.3923z"
+		android:strokeWidth="1" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml
deleted file mode 100644
index 52e210215..000000000
--- a/app/src/main/res/drawable/ic_eye.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="#000"
-		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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_eye_checkable.xml b/app/src/main/res/drawable/ic_eye_checkable.xml
deleted file mode 100644
index 7f35e1761..000000000
--- a/app/src/main/res/drawable/ic_eye_checkable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:enterFadeDuration="@android:integer/config_mediumAnimTime"
-	android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-	<item android:drawable="@drawable/ic_eye" android:state_checked="true" />
-	<item android:drawable="@drawable/ic_eye_off" android:state_checked="false" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
deleted file mode 100644
index e558a36c4..000000000
--- a/app/src/main/res/drawable/ic_eye_off.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="#000"
-		android:fillAlpha="0.3"
-		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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_outilne.xml b/app/src/main/res/drawable/ic_info_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info_outilne.xml
rename to app/src/main/res/drawable/ic_info_outline.xml
diff --git a/app/src/main/res/drawable/ic_locale.xml b/app/src/main/res/drawable/ic_locale.xml
new file mode 100644
index 000000000..1bc2d39de
--- /dev/null
+++ b/app/src/main/res/drawable/ic_locale.xml
@@ -0,0 +1,11 @@
+<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="@android:color/white"
+		android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 220e1b503..0781a7c4a 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -2,7 +2,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:width="24dp"
 	android:height="24dp"
-	android:tint="#FFFFFF"
+	android:tint="?attr/colorControlNormal"
 	android:viewportWidth="24"
 	android:viewportHeight="24">
 	<path
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
new file mode 100644
index 000000000..4350ba96a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mic_none.xml b/app/src/main/res/drawable/ic_mic_none.xml
new file mode 100644
index 000000000..2810bc9a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mic_none.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 3,-1.34 3,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,5zM17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5L5,11c0,3.53 2.61,6.43 6,6.92L11,21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 753697107..0d7a0a664 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,11 +1,10 @@
-<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="@android:color/white"
-		android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 8ed8e7e87..6709b5625 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,5 +1,11 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
new file mode 100644
index 000000000..0850e55fd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_manga_info.xml b/app/src/main/res/drawable/ic_star_manga_info.xml
new file mode 100644
index 000000000..e4f9e867d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_manga_info.xml
@@ -0,0 +1,11 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="20dp"
+	android:height="20dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_rating.xml b/app/src/main/res/drawable/ic_star_rating.xml
deleted file mode 100644
index c96d7ace6..000000000
--- a/app/src/main/res/drawable/ic_star_rating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="16dp"
-	android:height="16dp"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="?attr/colorAccent"
-		android:pathData="M12,15.4l-3.76,2.27l1,-4.28l-3.32,-2.88l4.38,-0.38l1.7,-4.03l1.71,4.04l4.38,0.38l-3.32,2.88l1,4.28z" />
-	<path
-		android:fillColor="?android:textColorPrimary"
-		android:pathData="M22,9.24l-7.19,-0.62L12,2L9.19,8.63L2,9.24l5.46,4.73L5.82,21L12,17.27L18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27l1,-4.28l-3.32,-2.88l4.38,-0.38L12,6.1l1.71,4.04l4.38,0.38l-3.32,2.88l1,4.28L12,15.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_totoro.xml b/app/src/main/res/drawable/ic_totoro.xml
new file mode 100644
index 000000000..988727dc6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_totoro.xml
@@ -0,0 +1,14 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="48dp"
+	android:height="48dp"
+	android:tint="@color/color_primary"
+	android:viewportWidth="256"
+	android:viewportHeight="256">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M74.308,55.808c2.523,-4.021 5.102,-7.985 7.502,-12.051c0.713,-1.206 1.105,-2.677 1.327,-4.074c0.688,-4.373 0.867,-8.861 1.911,-13.141c1.771,-7.276 4.654,-14.036 11.621,-18.063c0.885,-0.515 1.845,-0.547 2.805,0c1.01,0.814 2.208,1.48 3.005,2.468c4.222,5.265 8.392,10.573 12.466,15.959c0.844,1.113 1.613,1.609 3.025,1.591c6.683,-0.071 13.374,-0.071 20.064,0c1.406,0.018 2.104,-0.497 3.006,-1.604c1.617,-1.986 3.461,-4.591 5.227,-6.783c1.945,-2.416 6.141,-7.578 10.264,-11.63c0.482,-0.503 2.156,-0.513 2.805,0c2.217,1.91 4.654,3.669 6.344,5.974c4.357,5.929 5.961,12.917 6.74,20.113c0.275,2.543 -0.211,5.441 0.859,7.567c2.402,4.752 5.555,9.132 8.496,13.799M181.773,55.933c0.266,0.646 16.383,31.534 16.676,32.172c8.545,19.018 15.4,38.547 18.205,59.341c1.76,13.039 1.504,25.957 -2.25,38.639c-6.184,20.874 -17.623,38.693 -32.281,54.565c-0.988,1.077 -2.498,2.001 -3.916,2.313c-5.99,1.332 -12.018,2.538 -18.078,3.519c-4.283,0.698 -8.637,0.976 -12.959,1.438c-3.428,0 -6.855,0 -10.283,0c-1.623,-1.291 -3.217,-2.613 -4.875,-3.861c-0.646,-0.482 -1.398,-1.024 -2.154,-1.115c-2.833,-0.331 -5.499,-0.19 -7.432,2.538c-0.744,1.062 -2.187,1.639 -3.312,2.438c-3.428,0 -6.858,0 -10.292,0c-0.673,-0.136 -1.347,-0.307 -2.034,-0.403c-8.843,-1.275 -17.695,-2.513 -26.539,-3.829c-3.089,-0.458 -5.604,-1.89 -7.743,-4.323c-10.403,-11.816 -19.325,-24.604 -25.71,-39.045c-4.428,-10.027 -7.481,-20.433 -8.268,-31.435c-0.851,-11.933 0.703,-23.63 3.27,-35.22c3.493,-15.786 9.089,-30.86 15.754,-45.56c0.37,-0.824 16.383,-31.413 16.755,-32.297M63.16,157.981c0.104,2.327 0.17,4.584 0.318,6.846c0.073,1.081 0.266,2.157 0.42,3.231c3.086,21.161 12.976,38.176 31.01,49.963c25.894,16.909 59.219,11.783 79.781,-11.621c14.611,-16.627 20.221,-36.24 17.361,-58.085c-2.805,-21.377 -13.094,-38.362 -31.234,-50.299c-22.924,-15.087 -54.563,-12.171 -74.555,6.72C70.928,119.22 63.557,137.122 63.16,157.981zM105.778,55.368c-0.11,-1.433 -0.121,-2.833 -0.352,-4.19c-0.281,-1.659 -1.018,-2.882 -3.081,-2.731c-5.135,0.369 -9.276,4.767 -9.259,9.937c0.02,5.349 4.42,9.827 9.767,9.94c5.157,0.105 9.718,-4.003 10.138,-9.06c0.135,-1.659 -0.483,-2.775 -2.089,-3.129C109.324,55.785 107.695,55.644 105.778,55.368zM155.746,55.4c-0.146,-1.402 -0.211,-2.792 -0.453,-4.146c-0.453,-2.474 -1.256,-3.021 -3.678,-2.699c-5.189,0.688 -8.959,5.265 -8.617,10.452c0.342,5.085 4.574,9.166 9.662,9.312c5.191,0.149 9.59,-3.785 10.162,-8.981c0.191,-1.805 -0.502,-2.9 -2.191,-3.26C159.053,55.747 157.436,55.626 155.746,55.4zM128.085,63.475c0,-0.012 0,-0.023 0,-0.038c-1.867,0 -3.759,-0.216 -5.586,0.042c-4.225,0.599 -5.864,5.037 -3.066,8.238c1.586,1.814 3.32,3.516 5.12,5.114c2.196,1.953 4.737,1.938 6.94,-0.037c1.795,-1.606 3.535,-3.303 5.107,-5.12c2.721,-3.131 1.152,-7.519 -2.93,-8.153C131.85,63.241 129.952,63.475 128.085,63.475z" />
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M182.898,158.152c-0.553,19.748 -7.695,36.341 -23.342,48.856c-18.242,14.592 -45.103,14.656 -63.208,-0.121c-18.63,-15.2 -25.615,-35.193 -22.318,-58.648c2.483,-17.675 11.284,-31.786 26.331,-41.735c17.934,-11.854 42.376,-10.729 59.218,2.759C175.223,121.786 182.361,138.383 182.898,158.152zM148.051,142.781c0.025,4.332 4.141,6.775 7.729,4.394c5.059,-3.353 9.455,-3.182 14.387,0.096c2.77,1.85 5.902,0.704 7.146,-1.905c1.277,-2.664 0.238,-5.343 -2.809,-6.947c-2.955,-1.553 -5.881,-3.211 -8.977,-4.422c-1.453,-0.564 -3.457,-0.674 -4.871,-0.127c-3.322,1.287 -6.459,3.051 -9.631,4.695C149.191,139.52 148,140.987 148.051,142.781zM107.937,143.068c0.018,-2.121 -1.141,-3.539 -2.888,-4.453c-3.164,-1.664 -6.306,-3.424 -9.618,-4.716c-1.425,-0.558 -3.438,-0.502 -4.875,0.056c-3.169,1.242 -6.172,2.926 -9.193,4.528c-2.898,1.534 -3.925,4.253 -2.716,6.791c1.244,2.618 4.137,3.484 7.189,2.082c1.971,-0.91 3.861,-2.031 5.869,-2.846c0.802,-0.317 1.951,-0.337 2.74,-0.006c2.219,0.92 4.295,2.191 6.509,3.132C104.476,149.135 108.01,146.768 107.937,143.068zM125.218,119.127c-4.406,2.225 -6.967,2.754 -11.085,6.05c-0.11,0.087 -0.153,0.266 -0.231,0.396c-1.219,1.955 -1.071,4.082 0.419,5.826c1.579,1.856 4.109,2.521 6.537,0.862c4.838,-3.307 9.254,-3.511 14.16,-0.068c2.793,1.957 5.93,0.93 7.264,-1.573c1.471,-2.765 0.404,-5.555 -2.877,-7.266c-2.889,-1.508 -5.814,-2.971 -8.75,-4.388C129.834,118.567 126.472,118.349 125.218,119.127z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_web.xml b/app/src/main/res/drawable/ic_web.xml
new file mode 100644
index 000000000..3f70646ba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_web.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
new file mode 100644
index 000000000..14508c152
--- /dev/null
+++ b/app/src/main/res/drawable/list_selector.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/selector_overlay">
+	<item>
+		<selector>
+			<item
+				android:state_selected="true"
+				android:top="2dp"
+				android:right="2dp"
+				android:bottom="2dp"
+				android:left="2dp">
+				<shape android:shape="rectangle">
+					<corners android:radius="4dp" />
+					<solid android:color="@color/selector_overlay" />
+				</shape>
+			</item>
+
+			<item
+				android:state_activated="true"
+				android:top="2dp"
+				android:right="2dp"
+				android:bottom="2dp"
+				android:left="2dp">
+				<shape android:shape="rectangle">
+					<corners android:radius="4dp" />
+					<solid android:color="@color/selector_overlay" />
+				</shape>
+			</item>
+
+			<item
+				android:top="2dp"
+				android:right="2dp"
+				android:bottom="2dp"
+				android:left="2dp">
+				<shape android:shape="rectangle">
+					<corners android:radius="4dp" />
+					<solid android:color="?android:attr/windowBackground" />
+				</shape>
+			</item>
+		</selector>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/navigation_item_background.xml b/app/src/main/res/drawable/navigation_item_background.xml
new file mode 100644
index 000000000..8c635e7a3
--- /dev/null
+++ b/app/src/main/res/drawable/navigation_item_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="true">
+		<inset
+			android:insetLeft="@dimen/nav_item_background_inset_left"
+			android:insetRight="@dimen/nav_item_background_inset_right">
+			<shape>
+				<corners
+					android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left"
+					android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right"
+					android:topLeftRadius="@dimen/nav_item_background_corner_radius_left"
+					android:topRightRadius="@dimen/nav_item_background_corner_radius_right" />
+			</shape>
+		</inset>
+	</item>
+	<item>
+		<color android:color="@android:color/transparent" />
+	</item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_indicator.xml b/app/src/main/res/drawable/tab_indicator.xml
index 85211f67c..7f0ba0c38 100644
--- a/app/src/main/res/drawable/tab_indicator.xml
+++ b/app/src/main/res/drawable/tab_indicator.xml
@@ -4,6 +4,6 @@
 	android:shape="rectangle">
 	<corners
 		android:topLeftRadius="3dp"
-		android:topRightRadius="3dp" />
+		android:topRightRadius="3dp"/>
 	<size android:height="3dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tabs_background.xml b/app/src/main/res/drawable/tabs_background.xml
index 6c1544f5f..9743b040f 100644
--- a/app/src/main/res/drawable/tabs_background.xml
+++ b/app/src/main/res/drawable/tabs_background.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="?colorSurface" />
+			<solid android:color="?android:attr/colorBackground" />
 		</shape>
 	</item>
 	<item
@@ -14,7 +14,7 @@
 			<solid android:color="@android:color/transparent" />
 			<stroke
 				android:width="1dp"
-				android:color="@color/tabs_line" />
+				android:color="@color/list_divider" />
 		</shape>
 	</item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml
index 71e0a8113..8d1b235a1 100644
--- a/app/src/main/res/drawable/thumb.xml
+++ b/app/src/main/res/drawable/thumb.xml
@@ -9,6 +9,6 @@
 		android:paddingLeft="22dp"
 		android:paddingRight="22dp" />
 
-	<solid android:color="?colorPrimaryDark" />
+	<solid android:color="?colorPrimary" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp-land/fragment_details.xml b/app/src/main/res/layout-w600dp-land/fragment_details.xml
new file mode 100644
index 000000000..f1b1f770c
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-land/fragment_details.xml
@@ -0,0 +1,282 @@
+<?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"
+	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">
+
+		<LinearLayout
+			android:id="@+id/main_container"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_margin="8dp"
+			android:gravity="center_horizontal"
+			android:orientation="horizontal"
+			android:weightSum="4"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent">
+
+			<com.google.android.material.card.MaterialCardView
+				android:id="@+id/cover_card"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="1"
+				app:cardCornerRadius="4dp"
+				app:cardElevation="4dp">
+
+				<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+					android:id="@+id/imageView_cover"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:scaleType="centerCrop"
+					tools:background="@tools:sample/backgrounds/scenic"
+					tools:ignore="ContentDescription" />
+
+			</com.google.android.material.card.MaterialCardView>
+
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:id="@+id/text_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="3">
+
+				<TextView
+					android:id="@+id/textView_title"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="20sp"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					tools:text="@tools:sample/lorem[15]" />
+
+				<TextView
+					android:id="@+id/textView_subtitle"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:ellipsize="end"
+					android:textSize="14sp"
+					app:layout_constraintEnd_toEndOf="@id/textView_title"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/textView_title"
+					tools:text="@tools:sample/lorem[15]" />
+
+				<TextView
+					android:id="@+id/textView_author"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:requiresFadingEdge="horizontal"
+					android:textColor="?colorAccent"
+					android:textStyle="bold"
+					app:layout_constraintEnd_toEndOf="@id/textView_title"
+					app:layout_constraintStart_toStartOf="@id/textView_title"
+					app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+					tools:text="@tools:sample/full_names" />
+
+				<LinearLayout
+					android:id="@+id/info_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:baselineAligned="false"
+					android:divider="?android:dividerHorizontal"
+					android:dividerPadding="8dp"
+					android:orientation="horizontal"
+					android:showDividers="middle"
+					app:layout_constraintTop_toBottomOf="@+id/textView_author">
+
+					<LinearLayout
+						android:id="@+id/rating_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_rating"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:padding="4dp"
+							android:textSize="20sp"
+							app:drawableEndCompat="@drawable/ic_star_manga_info"
+							tools:text="4.8" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/chapters_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_chapters"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:gravity="center_horizontal"
+							android:padding="4dp"
+							android:textSize="12sp"
+							app:drawableTopCompat="@drawable/ic_book_page"
+							tools:text="52 chapters" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/source_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_source"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:gravity="center_horizontal"
+							android:padding="4dp"
+							android:textSize="12sp"
+							app:drawableTopCompat="@drawable/ic_web"
+							tools:text="Source" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/size_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_size"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:gravity="center_horizontal"
+							android:padding="4dp"
+							android:textSize="12sp"
+							app:drawableTopCompat="@drawable/ic_storage"
+							tools:text="1.8 GiB" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:id="@+id/buttons_layout"
+					android:layout_width="match_parent"
+					android:layout_height="48dp"
+					android:layout_marginTop="4dp"
+					android:gravity="center"
+					android:orientation="horizontal"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/info_layout">
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/button_favorite"
+						style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						app:icon="@drawable/ic_heart_outline"
+						app:iconGravity="textTop"
+						app:iconPadding="0dp" />
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/button_read"
+						style="@style/Widget.MaterialComponents.Button"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginStart="16dp"
+						android:layout_weight="1"
+						android:enabled="false"
+						android:text="@string/read"
+						android:textAllCaps="false"
+						app:elevation="0dp"
+						app:iconGravity="textStart"
+						app:iconPadding="8dp"
+						tools:text="@string/_continue" />
+
+				</LinearLayout>
+
+				<org.koitharu.kotatsu.base.ui.widgets.ChipsView
+					android:id="@+id/chips_tags"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="8dp"
+					app:chipSpacingHorizontal="6dp"
+					app:chipSpacingVertical="6dp"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@+id/buttons_layout" />
+
+				<TextView
+					android:id="@+id/desc_header"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="8dp"
+					android:paddingBottom="8dp"
+					android:text="@string/description"
+					android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="18sp"
+					app:layout_constraintTop_toBottomOf="@id/chips_tags" />
+
+				<TextView
+					android:id="@+id/textView_description"
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:layout_marginBottom="16dp"
+					android:lineSpacingMultiplier="1.2"
+					android:textIsSelectable="true"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/desc_header"
+					tools:ignore="UnusedAttribute"
+					tools:text="@tools:sample/lorem/random[25]" />
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+		</LinearLayout>
+
+		<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:showAnimationBehavior="inward"
+			app:hideAnimationBehavior="outward"
+			app:layout_constraintBottom_toTopOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:visibility="visible" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp-port/fragment_details.xml b/app/src/main/res/layout-w600dp-port/fragment_details.xml
new file mode 100644
index 000000000..e9d6d8eed
--- /dev/null
+++ b/app/src/main/res/layout-w600dp-port/fragment_details.xml
@@ -0,0 +1,289 @@
+<?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"
+	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">
+
+		<LinearLayout
+			android:id="@+id/main_container"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_margin="8dp"
+			android:gravity="center_horizontal"
+			android:orientation="horizontal"
+			android:weightSum="3"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent">
+
+			<com.google.android.material.card.MaterialCardView
+				android:id="@+id/cover_card"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="1"
+				app:cardCornerRadius="4dp"
+				app:cardElevation="4dp">
+
+				<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+					android:id="@+id/imageView_cover"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:scaleType="centerCrop"
+					tools:background="@tools:sample/backgrounds/scenic"
+					tools:ignore="ContentDescription" />
+
+			</com.google.android.material.card.MaterialCardView>
+
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:id="@+id/text_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_margin="8dp"
+				android:layout_weight="2">
+
+				<TextView
+					android:id="@+id/textView_title"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="20sp"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					tools:text="@tools:sample/lorem[30]" />
+
+				<TextView
+					android:id="@+id/textView_subtitle"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:ellipsize="end"
+					android:textSize="14sp"
+					app:layout_constraintEnd_toEndOf="@id/textView_title"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/textView_title"
+					tools:text="@tools:sample/lorem[2]" />
+
+				<TextView
+					android:id="@+id/textView_author"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:requiresFadingEdge="horizontal"
+					android:textColor="?colorAccent"
+					android:textStyle="bold"
+					app:layout_constraintEnd_toEndOf="@id/textView_title"
+					app:layout_constraintStart_toStartOf="@id/textView_title"
+					app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+					tools:text="@tools:sample/full_names" />
+
+				<LinearLayout
+					android:id="@+id/info_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:baselineAligned="false"
+					android:divider="?android:dividerHorizontal"
+					android:dividerPadding="8dp"
+					android:orientation="horizontal"
+					android:showDividers="middle"
+					app:layout_constraintTop_toBottomOf="@+id/textView_author">
+
+					<LinearLayout
+						android:id="@+id/rating_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_rating"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:padding="4dp"
+							android:textSize="20sp"
+							app:drawableEndCompat="@drawable/ic_star_manga_info"
+							tools:text="4.8" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/chapters_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_chapters"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:gravity="center_horizontal"
+							android:padding="4dp"
+							android:textSize="12sp"
+							app:drawableTopCompat="@drawable/ic_book_page"
+							tools:text="52 chapters" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/source_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_source"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:gravity="center_horizontal"
+							android:padding="4dp"
+							android:textSize="12sp"
+							app:drawableTopCompat="@drawable/ic_web"
+							tools:text="Source" />
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/size_container"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:layout_weight="1"
+						android:gravity="center">
+
+						<TextView
+							android:id="@+id/textView_size"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:drawablePadding="4dp"
+							android:gravity="center_horizontal"
+							android:padding="4dp"
+							android:textSize="12sp"
+							app:drawableTopCompat="@drawable/ic_storage"
+							tools:text="1.8 GiB" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+				<LinearLayout
+					android:id="@+id/buttons_layout"
+					android:layout_width="match_parent"
+					android:layout_height="48dp"
+					android:layout_marginTop="4dp"
+					android:gravity="center"
+					android:orientation="horizontal"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/info_layout">
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/button_favorite"
+						style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						app:icon="@drawable/ic_heart_outline"
+						app:iconGravity="textTop"
+						app:iconPadding="0dp" />
+
+					<com.google.android.material.button.MaterialButton
+						android:id="@+id/button_read"
+						style="@style/Widget.MaterialComponents.Button"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginStart="16dp"
+						android:layout_weight="1"
+						android:enabled="false"
+						android:text="@string/read"
+						android:textAllCaps="false"
+						app:elevation="0dp"
+						app:iconGravity="textStart"
+						app:iconPadding="8dp"
+						tools:text="@string/_continue" />
+
+				</LinearLayout>
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+		</LinearLayout>
+
+		<org.koitharu.kotatsu.base.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/main_container" />
+
+		<TextView
+			android:id="@+id/desc_header"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginEnd="16dp"
+			android:paddingTop="8dp"
+			android:paddingBottom="8dp"
+			android:text="@string/description"
+			android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="18sp"
+			app:layout_constraintTop_toBottomOf="@id/chips_tags" />
+
+		<TextView
+			android:id="@+id/textView_description"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_marginStart="16dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginBottom="16dp"
+			android:lineSpacingMultiplier="1.2"
+			android:textIsSelectable="true"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/desc_header"
+			tools:ignore="UnusedAttribute"
+			tools:text="@tools:sample/lorem/random[25]" />
+
+		<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:showAnimationBehavior="inward"
+			app:hideAnimationBehavior="outward"
+			app:layout_constraintBottom_toTopOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:visibility="visible" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp/activity_details.xml b/app/src/main/res/layout-w600dp/activity_details.xml
index e5fc1b45a..af351d3aa 100644
--- a/app/src/main/res/layout-w600dp/activity_details.xml
+++ b/app/src/main/res/layout-w600dp/activity_details.xml
@@ -9,29 +9,27 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		app:elevation="0dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme">
+			app:layout_scrollFlags="scroll|enterAlways">
 
 			<com.google.android.material.tabs.TabLayout
 				android:id="@+id/tabs"
-				style="@style/Widget.MaterialComponents.TabLayout.PrimarySurface"
+				style="@style/Widget.Kotatsu.Tabs"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="end"
 				android:background="@android:color/transparent"
-				app:tabGravity="start"
-				app:tabMode="scrollable"
-				app:tabIndicatorColor="?colorOnPrimarySurface"
-				app:tabSelectedTextColor="?colorOnPrimarySurface" />
+				app:tabGravity="center"
+				app:tabMode="fixed" />
 
 		</com.google.android.material.appbar.MaterialToolbar>
 
diff --git a/app/src/main/res/layout-w600dp/activity_settings.xml b/app/src/main/res/layout-w600dp/activity_settings.xml
index 8d031bc79..3b6db9d0b 100644
--- a/app/src/main/res/layout-w600dp/activity_settings.xml
+++ b/app/src/main/res/layout-w600dp/activity_settings.xml
@@ -8,33 +8,33 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		app:elevation="0dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<com.google.android.material.card.MaterialCardView
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/appbar"
-		app:layout_constraintWidth_percent="0.6"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
 		android:layout_marginTop="12dp"
 		android:layout_marginBottom="12dp"
-		android:layout_width="0dp"
-		android:layout_height="0dp">
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/appbar"
+		app:layout_constraintWidth_percent="0.6">
 
 		<androidx.fragment.app.FragmentContainerView
 			android:id="@id/container"
diff --git a/app/src/main/res/layout-w600dp/fragment_details.xml b/app/src/main/res/layout-w600dp/fragment_details.xml
deleted file mode 100644
index b224f5bc1..000000000
--- a/app/src/main/res/layout-w600dp/fragment_details.xml
+++ /dev/null
@@ -1,145 +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:clipToPadding="false"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<ImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="8dp"
-			android:scaleType="fitCenter"
-			app:layout_constraintDimensionRatio="13:18"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintWidth_percent="0.3" />
-
-		<org.koitharu.kotatsu.base.ui.widgets.ChipsView
-			android:id="@+id/chips_tags"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="4dp"
-			android:padding="6dp"
-			app:chipSpacingHorizontal="4dp"
-			app:chipSpacingVertical="6dp"
-			app:layout_constraintEnd_toEndOf="@id/imageView_cover"
-			app:layout_constraintStart_toStartOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/imageView_cover" />
-
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="8dp"
-			android:layout_marginEnd="8dp"
-			android:maxLines="3"
-			android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-			android:textColor="?android:textColorPrimary"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toTopOf="parent"
-			tools:text="@tools:sample/lorem[20]" />
-
-		<TextView
-			android:id="@+id/textView_subtitle"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="4dp"
-			android:maxLines="2"
-			android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-			android:textColor="?android:textColorSecondary"
-			app:layout_constraintEnd_toEndOf="@id/textView_title"
-			app:layout_constraintStart_toStartOf="@id/textView_title"
-			app:layout_constraintTop_toBottomOf="@id/textView_title"
-			tools:text="@tools:sample/lorem[20]" />
-
-		<RatingBar
-			android:id="@+id/ratingBar"
-			style="@style/Widget.AppCompat.RatingBar.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="10dp"
-			android:isIndicator="true"
-			android:max="100"
-			app:layout_constraintStart_toStartOf="@id/textView_title"
-			app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
-			tools:progress="70" />
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_read"
-			style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="4dp"
-			android:enabled="false"
-			android:text="@string/read"
-			app:icon="@drawable/ic_read"
-			app:iconPadding="12dp"
-			app:layout_constraintEnd_toEndOf="@id/textView_title"
-			app:layout_constraintTop_toBottomOf="@id/ratingBar" />
-
-		<ImageView
-			android:id="@+id/imageView_favourite"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_marginEnd="4dp"
-			android:background="?selectableItemBackgroundBorderless"
-			android:contentDescription="@string/add_to_favourites"
-			android:scaleType="center"
-			android:src="@drawable/ic_heart_outline"
-			app:layout_constraintBottom_toBottomOf="@id/button_read"
-			app:layout_constraintDimensionRatio="1:1"
-			app:layout_constraintEnd_toStartOf="@id/button_read"
-			app:layout_constraintTop_toTopOf="@id/button_read"
-			app:tint="?colorAccent" />
-
-		<View
-			android:id="@+id/divider_top"
-			android:layout_width="0dp"
-			android:layout_height="1dp"
-			android:layout_marginTop="8dp"
-			android:background="?android:listDivider"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/button_read" />
-
-		<TextView
-			android:id="@+id/textView_description"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:justificationMode="inter_word"
-			android:lineSpacingMultiplier="1.2"
-			android:padding="12dp"
-			android:textIsSelectable="true"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/divider_top"
-			tools:ignore="UnusedAttribute"
-			tools:text="@tools:sample/lorem/random" />
-
-		<ProgressBar
-			android:id="@+id/progressBar"
-			style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:indeterminate="true"
-			android:visibility="gone"
-			app:layout_constraintBottom_toBottomOf="@id/divider_top"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/divider_top"
-			tools:visibility="visible" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_browser.xml b/app/src/main/res/layout/activity_browser.xml
index 0c2add382..b230edce1 100644
--- a/app/src/main/res/layout/activity_browser.xml
+++ b/app/src/main/res/layout/activity_browser.xml
@@ -8,20 +8,20 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme"
+		android:elevation="4dp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
@@ -34,9 +34,8 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/appbar" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.LinearProgressIndicator
 		android:id="@+id/progressBar"
-		style="@style/Widget.AppCompat.ProgressBar.Horizontal"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:indeterminate="true"
diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml
index 57166010a..48043eb74 100644
--- a/app/src/main/res/layout/activity_categories.xml
+++ b/app/src/main/res/layout/activity_categories.xml
@@ -2,22 +2,22 @@
 <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"
-	xmlns:tools="http://schemas.android.com/tools">
+	android:layout_height="match_parent">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		android:elevation="4dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@+id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			app:popupTheme="@style/AppPopupTheme" />
+			android:layout_height="wrap_content" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
@@ -25,9 +25,9 @@
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:clipToPadding="false"
 		android:orientation="vertical"
 		android:scrollbars="vertical"
-		android:clipToPadding="false"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
@@ -36,13 +36,13 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
-		android:gravity="center"
-		android:visibility="gone"
-		tools:visibility="visible"
 		android:layout_margin="20dp"
+		android:gravity="center"
+		android:text="@string/text_categories_holder"
 		android:textAppearance="?android:textAppearanceMedium"
 		android:textColor="?android:textColorSecondary"
-		android:text="@string/text_categories_holder"/>
+		android:visibility="gone"
+		tools:visibility="visible" />
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		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 d39f66ee8..0fa69b528 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -8,24 +9,26 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		app:elevation="0dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 		<com.google.android.material.tabs.TabLayout
 			android:id="@+id/tabs"
+			style="@style/Widget.Kotatsu.Tabs"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:tabGravity="center"
-			app:tabMode="scrollable" />
+			app:tabGravity="fill"
+			app:tabMaxWidth="0dp"
+			app:tabMode="fixed" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_downloads.xml b/app/src/main/res/layout/activity_downloads.xml
new file mode 100644
index 000000000..65096b931
--- /dev/null
+++ b/app/src/main/res/layout/activity_downloads.xml
@@ -0,0 +1,47 @@
+<?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"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:elevation="4dp">
+
+		<com.google.android.material.appbar.MaterialToolbar
+			android:id="@+id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content" />
+
+	</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:scrollbars="vertical"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+	<TextView
+		android:id="@+id/textView_holder"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:layout_margin="20dp"
+		android:gravity="center"
+		android:text="@string/text_downloads_holder"
+		android:textAppearance="?android:textAppearanceMedium"
+		android:textColor="?android:textColorSecondary"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 62aee8a5f..64e125d8d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,34 +6,69 @@
 	android:id="@+id/drawer"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:context=".main.ui.MainActivity"
-	tools:openDrawer="start">
+	tools:context=".main.ui.MainActivity">
 
 	<androidx.coordinatorlayout.widget.CoordinatorLayout
 		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:background="?colorPrimary"
-			android:theme="@style/AppToolbarTheme">
-
-			<com.google.android.material.appbar.MaterialToolbar
-				android:id="@id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				app:layout_scrollFlags="scroll|enterAlways" />
-
-		</com.google.android.material.appbar.AppBarLayout>
-
 		<androidx.fragment.app.FragmentContainerView
 			android:id="@id/container"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
+		<com.google.android.material.appbar.AppBarLayout
+			android:id="@+id/appbar"
+			style="@style/Widget.Kotatsu.AppBar"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="@android:color/transparent"
+			android:stateListAnimator="@null"
+			app:elevation="0dp">
+
+			<com.google.android.material.card.MaterialCardView
+				android:id="@+id/toolbar_card"
+				android:layout_width="match_parent"
+				android:layout_height="50dp"
+				android:layout_marginStart="16dp"
+				android:layout_marginTop="8dp"
+				android:layout_marginEnd="16dp"
+				android:layout_marginBottom="8dp"
+				app:cardCornerRadius="8dp"
+				app:cardElevation="4dp">
+
+				<com.google.android.material.appbar.MaterialToolbar
+					android:id="@id/toolbar"
+					style="@style/Widget.Kotatsu.Toolbar"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:focusable="true"
+					android:focusableInTouchMode="true"
+					app:contentInsetStartWithNavigation="0dp"
+					app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle"
+					app:titleTextColor="?android:colorControlNormal"
+					tools:title="@string/app_name">
+
+					<org.koitharu.kotatsu.search.ui.widget.SearchEditText
+						android:id="@+id/searchView"
+						style="@style/Widget.Kotatsu.SearchView"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:background="@null"
+						android:gravity="center_vertical"
+						android:hint="@string/search_manga"
+						android:imeOptions="actionSearch"
+						android:importantForAutofill="no"
+						android:paddingBottom="1dp"
+						android:singleLine="true" />
+
+				</com.google.android.material.appbar.MaterialToolbar>
+
+			</com.google.android.material.card.MaterialCardView>
+
+		</com.google.android.material.appbar.AppBarLayout>
+
 		<com.google.android.material.floatingactionbutton.FloatingActionButton
 			android:id="@+id/fab"
 			android:layout_width="wrap_content"
@@ -54,10 +89,13 @@
 
 	<com.google.android.material.navigation.NavigationView
 		android:id="@+id/navigationView"
-		android:layout_width="260dp"
+		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:layout_gravity="start"
 		app:insetForeground="@android:color/transparent"
+		app:itemHorizontalPadding="16dp"
+		app:itemIconPadding="24dp"
+		app:itemIconTint="@color/navigation_item_color_tint"
 		app:menu="@menu/nav_drawer" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_protect.xml b/app/src/main/res/layout/activity_protect.xml
index b17229948..28cc9060b 100644
--- a/app/src/main/res/layout/activity_protect.xml
+++ b/app/src/main/res/layout/activity_protect.xml
@@ -36,6 +36,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
+		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index cc5ade39d..1060cba33 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -19,8 +19,8 @@
 		android:layout_gravity="bottom|center_horizontal"
 		android:layout_marginBottom="20dp"
 		android:background="@drawable/bg_reader_indicator"
-		android:singleLine="true"
 		android:drawablePadding="6dp"
+		android:singleLine="true"
 		android:textAppearance="?android:textAppearanceSmall"
 		android:textColor="?android:textColorPrimary"
 		android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
@@ -32,14 +32,14 @@
 		android:layout_height="wrap_content"
 		android:background="@color/dim"
 		android:elevation="0dp"
-		android:theme="@style/AppToolbarTheme"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
 		app:elevation="0dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:popupTheme="@style/ThemeOverlay.Kotatsu" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
@@ -50,7 +50,7 @@
 		android:layout_gravity="bottom"
 		android:background="@color/dim"
 		android:elevation="0dp"
-		android:theme="@style/AppToolbarTheme"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
 		app:elevation="0dp"
 		tools:visibility="gone">
 
@@ -59,7 +59,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="top"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:popupTheme="@style/ThemeOverlay.Kotatsu" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
@@ -71,7 +71,7 @@
 		android:gravity="center_horizontal"
 		android:orientation="vertical">
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progressBar"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index a12c6daf6..914660497 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -7,17 +7,17 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		android:elevation="4dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme">
+			app:layout_scrollFlags="scroll|enterAlways">
 
 			<androidx.appcompat.widget.SearchView
 				android:id="@+id/searchView"
diff --git a/app/src/main/res/layout/activity_search_global.xml b/app/src/main/res/layout/activity_search_global.xml
index 4f6c56541..af3e55e34 100644
--- a/app/src/main/res/layout/activity_search_global.xml
+++ b/app/src/main/res/layout/activity_search_global.xml
@@ -7,17 +7,17 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		android:elevation="4dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2fa97a72c..7f892aba5 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -6,19 +6,19 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		android:elevation="4dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_simple.xml b/app/src/main/res/layout/activity_settings_simple.xml
index 4f6c56541..af3e55e34 100644
--- a/app/src/main/res/layout/activity_settings_simple.xml
+++ b/app/src/main/res/layout/activity_settings_simple.xml
@@ -7,17 +7,17 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?colorPrimary"
-		android:theme="@style/AppToolbarTheme">
+		android:elevation="4dp">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways"
-			app:popupTheme="@style/AppPopupTheme" />
+			app:layout_scrollFlags="scroll|enterAlways" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_setup_protect.xml b/app/src/main/res/layout/activity_setup_protect.xml
index 7f3aae3c8..e061e7139 100644
--- a/app/src/main/res/layout/activity_setup_protect.xml
+++ b/app/src/main/res/layout/activity_setup_protect.xml
@@ -36,6 +36,7 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/layout_password"
+		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
diff --git a/app/src/main/res/layout/dialog_chapters.xml b/app/src/main/res/layout/dialog_chapters.xml
index e53b0af80..58fdf931d 100644
--- a/app/src/main/res/layout/dialog_chapters.xml
+++ b/app/src/main/res/layout/dialog_chapters.xml
@@ -7,6 +7,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
+	android:paddingTop="16dp"
 	android:scrollbars="vertical"
 	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 	tools:listitem="@layout/item_chapter" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/dialog_favorite_categories.xml
index 064a9a733..469cd6f7f 100644
--- a/app/src/main/res/layout/dialog_favorite_categories.xml
+++ b/app/src/main/res/layout/dialog_favorite_categories.xml
@@ -9,9 +9,9 @@
 
 	<TextView
 		style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-		android:padding="16dp"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:padding="16dp"
 		android:text="@string/add_to_favourites" />
 
 	<View
@@ -24,8 +24,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:scrollbars="vertical"
 		android:overScrollMode="never"
+		android:scrollbars="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_category_checkable" />
 
diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml
index 6c035d585..895bacb61 100644
--- a/app/src/main/res/layout/dialog_input.xml
+++ b/app/src/main/res/layout/dialog_input.xml
@@ -11,21 +11,16 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/inputLayout"
+		style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:boxBackgroundColor="@android:color/transparent"
-		app:boxBackgroundMode="filled">
+		android:layout_height="wrap_content">
 
 		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/inputEdit"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:imeOptions="actionDone"
-			android:paddingStart="0dp"
-			android:paddingTop="28dp"
-			android:paddingEnd="0dp"
 			android:singleLine="true"
-			tools:hint="@tools:sample/cities"
 			tools:text="@tools:sample/lorem[2]" />
 
 	</com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/dialog_list_mode.xml b/app/src/main/res/layout/dialog_list_mode.xml
index 01d5e426e..8fb04828e 100644
--- a/app/src/main/res/layout/dialog_list_mode.xml
+++ b/app/src/main/res/layout/dialog_list_mode.xml
@@ -18,7 +18,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_list"
-			style="@style/AppToggleButton"
+			style="@style/Widget.Kotatsu.ToggleButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/list"
@@ -26,7 +26,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_list_detailed"
-			style="@style/AppToggleButton"
+			style="@style/Widget.Kotatsu.ToggleButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/detailed_list"
@@ -34,7 +34,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_grid"
-			style="@style/AppToggleButton"
+			style="@style/Widget.Kotatsu.ToggleButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/grid"
diff --git a/app/src/main/res/layout/dialog_onboard.xml b/app/src/main/res/layout/dialog_onboard.xml
new file mode 100644
index 000000000..2845055a6
--- /dev/null
+++ b/app/src/main/res/layout/dialog_onboard.xml
@@ -0,0 +1,29 @@
+<?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="wrap_content"
+	android:orientation="vertical">
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingStart="?listPreferredItemPaddingStart"
+		android:paddingTop="6dp"
+		android:paddingEnd="?listPreferredItemPaddingEnd"
+		android:paddingBottom="6dp"
+		android:text="Select languages which you want to read manga. You can change it later in settings."
+		android:textAppearance="?android:textAppearanceSmall" />
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:scrollbars="vertical"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		tools:listitem="@layout/item_source_locale" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml
index ad0935059..d3e6dc809 100644
--- a/app/src/main/res/layout/dialog_progress.xml
+++ b/app/src/main/res/layout/dialog_progress.xml
@@ -16,9 +16,8 @@
 		android:textColor="?android:textColorPrimary"
 		tools:text="Title" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.LinearProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:progressBarStyleHorizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="6dp" />
diff --git a/app/src/main/res/layout/dialog_reader_config.xml b/app/src/main/res/layout/dialog_reader_config.xml
index a9f153883..d83db28e3 100644
--- a/app/src/main/res/layout/dialog_reader_config.xml
+++ b/app/src/main/res/layout/dialog_reader_config.xml
@@ -16,7 +16,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_standard"
-			style="@style/AppToggleButton"
+			style="@style/Widget.Kotatsu.ToggleButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/standard"
@@ -24,7 +24,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_reversed"
-			style="@style/AppToggleButton"
+			style="@style/Widget.Kotatsu.ToggleButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/right_to_left"
@@ -32,7 +32,7 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_webtoon"
-			style="@style/AppToggleButton"
+			style="@style/Widget.Kotatsu.ToggleButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/webtoon"
diff --git a/app/src/main/res/layout/fragment_chapters.xml b/app/src/main/res/layout/fragment_chapters.xml
index cecae9f2a..755056519 100644
--- a/app/src/main/res/layout/fragment_chapters.xml
+++ b/app/src/main/res/layout/fragment_chapters.xml
@@ -14,7 +14,8 @@
 		android:layout_alignParentTop="true"
 		android:layout_alignParentEnd="true"
 		android:visibility="gone"
-		tools:listitem="@layout/item_branch" />
+		tools:listitem="@layout/item_branch"
+		tools:visibility="visible" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView_chapters"
@@ -26,9 +27,8 @@
 		android:layout_alignParentEnd="true"
 		android:layout_alignParentBottom="true"
 		android:orientation="vertical"
-		android:scrollbars="vertical"
-		app:fastScrollEnabled="true"
 		android:scrollbarStyle="outsideOverlay"
+		app:fastScrollEnabled="true"
 		app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb"
 		app:fastScrollHorizontalTrackDrawable="@drawable/list_track"
 		app:fastScrollVerticalThumbDrawable="@drawable/list_thumb"
@@ -36,12 +36,12 @@
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_chapter" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="@style/Widget.AppCompat.ProgressBar"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_centerInParent="true"
+		android:indeterminate="true"
 		android:layout_gravity="center"
 		android:visibility="gone"
 		tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_cloudflare.xml b/app/src/main/res/layout/fragment_cloudflare.xml
index 1b3d00249..91a115312 100644
--- a/app/src/main/res/layout/fragment_cloudflare.xml
+++ b/app/src/main/res/layout/fragment_cloudflare.xml
@@ -10,7 +10,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_copyright.xml b/app/src/main/res/layout/fragment_copyright.xml
new file mode 100644
index 000000000..fe9c3e4e1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_copyright.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/scrollView"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<TextView
+		android:id="@+id/textView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="16dp"
+		android:textIsSelectable="true" />
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index e632e28f8..de9d42076 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -3,153 +3,286 @@
 	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:clipToPadding="false"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="match_parent"
+	android:scrollbars="vertical"
+	app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="match_parent">
 
-		<ImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="0dp"
+		<LinearLayout
+			android:id="@+id/main_container"
+			android:layout_width="match_parent"
 			android:layout_height="0dp"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="8dp"
-			android:scaleType="centerCrop"
-			app:layout_constraintDimensionRatio="13:18"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintWidth_percent="0.3" />
-
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="8dp"
-			android:layout_marginEnd="8dp"
-			android:maxLines="3"
-			android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-			android:textColor="?android:textColorPrimary"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toTopOf="parent"
-			tools:text="@tools:sample/lorem[20]" />
-
-		<TextView
-			android:id="@+id/textView_subtitle"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="4dp"
-			android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-			android:textColor="?android:textColorSecondary"
-			app:layout_constraintEnd_toEndOf="@id/textView_title"
-			app:layout_constraintStart_toStartOf="@id/textView_title"
-			app:layout_constraintTop_toBottomOf="@id/textView_title"
-			tools:text="@tools:sample/lorem[25]" />
-
-		<RatingBar
-			android:id="@+id/ratingBar"
-			style="@style/Widget.AppCompat.RatingBar.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="10dp"
-			android:isIndicator="true"
-			android:max="100"
-			app:layout_constraintStart_toStartOf="@id/textView_title"
-			app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
-			tools:progress="70" />
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_read"
-			style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="10dp"
-			android:layout_marginEnd="4dp"
-			android:enabled="false"
-			android:text="@string/read"
-			app:icon="@drawable/ic_read"
-			app:iconPadding="12dp"
-			app:layout_constraintBottom_toBottomOf="@id/barrier_title"
-			app:layout_constraintEnd_toEndOf="@id/textView_title"
-			app:layout_constraintTop_toBottomOf="@id/ratingBar"
-			app:layout_constraintVertical_bias="1"
-			tools:text="@string/_continue" />
-
-		<ImageView
-			android:id="@+id/imageView_favourite"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_marginEnd="4dp"
-			android:background="?selectableItemBackgroundBorderless"
-			android:contentDescription="@string/add_to_favourites"
-			android:scaleType="center"
-			android:src="@drawable/ic_heart_outline"
-			app:layout_constraintBottom_toBottomOf="@id/button_read"
-			app:layout_constraintDimensionRatio="1:1"
-			app:layout_constraintEnd_toStartOf="@id/button_read"
-			app:layout_constraintHorizontal_bias="1"
-			app:layout_constraintStart_toStartOf="@id/textView_title"
-			app:layout_constraintTop_toTopOf="@id/button_read"
-			app:tint="?colorAccent" />
-
-		<androidx.constraintlayout.widget.Barrier
-			android:id="@+id/barrier_title"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			app:barrierDirection="bottom"
-			app:constraint_referenced_ids="imageView_cover, button_read" />
-
-		<View
-			android:id="@+id/divider_top"
-			android:layout_width="0dp"
-			android:layout_height="1dp"
-			android:layout_marginTop="8dp"
-			android:background="?android:listDivider"
+			android:layout_margin="8dp"
+			android:gravity="center_horizontal"
+			android:orientation="horizontal"
+			android:weightSum="3"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/barrier_title" />
+			app:layout_constraintTop_toTopOf="parent">
+
+			<com.google.android.material.card.MaterialCardView
+				android:id="@+id/cover_card"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="1"
+				app:cardCornerRadius="4dp"
+				app:cardElevation="4dp">
+
+				<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+					android:id="@+id/imageView_cover"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:scaleType="centerCrop"
+					tools:background="@tools:sample/backgrounds/scenic"
+					tools:ignore="ContentDescription" />
+
+			</com.google.android.material.card.MaterialCardView>
+
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:id="@+id/text_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="2">
+
+				<TextView
+					android:id="@+id/textView_title"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="20sp"
+					app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					tools:text="@tools:sample/lorem[15]" />
+
+				<TextView
+					android:id="@+id/textView_subtitle"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:ellipsize="end"
+					android:textSize="14sp"
+					app:layout_constraintEnd_toEndOf="@id/textView_title"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toBottomOf="@id/textView_title"
+					tools:text="@tools:sample/lorem[12]" />
+
+				<TextView
+					android:id="@+id/textView_author"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="4dp"
+					android:requiresFadingEdge="horizontal"
+					android:textColor="?colorAccent"
+					android:textStyle="bold"
+					app:layout_constraintEnd_toEndOf="@id/textView_title"
+					app:layout_constraintStart_toStartOf="@id/textView_title"
+					app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+					tools:text="@tools:sample/full_names" />
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/info_layout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:baselineAligned="false"
+			android:divider="?android:dividerHorizontal"
+			android:dividerPadding="8dp"
+			android:orientation="horizontal"
+			android:paddingStart="8dp"
+			android:paddingEnd="8dp"
+			android:showDividers="middle"
+			app:layout_constraintTop_toBottomOf="@+id/main_container">
+
+			<LinearLayout
+				android:id="@+id/rating_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:gravity="center">
+
+				<TextView
+					android:id="@+id/textView_rating"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:drawablePadding="4dp"
+					android:padding="4dp"
+					android:textSize="20sp"
+					app:drawableEndCompat="@drawable/ic_star_manga_info"
+					tools:text="4.8" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/chapters_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:gravity="center">
+
+				<TextView
+					android:id="@+id/textView_chapters"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:drawablePadding="4dp"
+					android:gravity="center_horizontal"
+					android:padding="4dp"
+					android:textSize="12sp"
+					app:drawableTopCompat="@drawable/ic_book_page"
+					tools:text="52 chapters" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/source_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:gravity="center">
+
+				<TextView
+					android:id="@+id/textView_source"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:drawablePadding="4dp"
+					android:gravity="center_horizontal"
+					android:padding="4dp"
+					android:textSize="12sp"
+					app:drawableTopCompat="@drawable/ic_web"
+					tools:text="Source" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/size_container"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_weight="1"
+				android:gravity="center">
+
+				<TextView
+					android:id="@+id/textView_size"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:drawablePadding="4dp"
+					android:gravity="center_horizontal"
+					android:padding="4dp"
+					android:textSize="12sp"
+					app:drawableTopCompat="@drawable/ic_storage"
+					tools:text="1.8 GiB" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/buttons_layout"
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:gravity="center"
+			android:orientation="horizontal"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/info_layout">
+
+			<com.google.android.material.button.MaterialButton
+				android:id="@+id/button_favorite"
+				style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				app:icon="@drawable/ic_heart_outline"
+				app:iconGravity="textTop"
+				app:iconPadding="0dp" />
+
+			<com.google.android.material.button.MaterialButton
+				android:id="@+id/button_read"
+				style="@style/Widget.MaterialComponents.Button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="16dp"
+				android:layout_weight="1"
+				android:enabled="false"
+				android:text="@string/read"
+				android:textAllCaps="false"
+				app:elevation="0dp"
+				app:iconGravity="textStart"
+				app:iconPadding="8dp"
+				tools:text="@string/_continue" />
+
+		</LinearLayout>
 
 		<org.koitharu.kotatsu.base.ui.widgets.ChipsView
 			android:id="@+id/chips_tags"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="4dp"
-			android:padding="6dp"
-			app:chipSpacingHorizontal="4dp"
+			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/divider_top" />
+			app:layout_constraintTop_toBottomOf="@+id/buttons_layout" />
+
+		<TextView
+			android:id="@+id/desc_header"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginEnd="16dp"
+			android:paddingTop="8dp"
+			android:paddingBottom="8dp"
+			android:text="@string/description"
+			android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="18sp"
+			app:layout_constraintTop_toBottomOf="@id/chips_tags" />
 
 		<TextView
 			android:id="@+id/textView_description"
 			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:justificationMode="inter_word"
+			android:layout_height="match_parent"
+			android:layout_marginStart="16dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginBottom="16dp"
 			android:lineSpacingMultiplier="1.2"
-			android:padding="12dp"
 			android:textIsSelectable="true"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/chips_tags"
+			app:layout_constraintTop_toBottomOf="@id/desc_header"
 			tools:ignore="UnusedAttribute"
-			tools:text="@tools:sample/lorem/random" />
+			tools:text="@tools:sample/lorem/random[25]" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.LinearProgressIndicator
 			android:id="@+id/progressBar"
-			style="@style/Widget.AppCompat.ProgressBar.Horizontal"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:indeterminate="true"
 			android:visibility="gone"
-			app:layout_constraintBottom_toBottomOf="@id/divider_top"
+			app:showAnimationBehavior="inward"
+			app:hideAnimationBehavior="outward"
+			app:layout_constraintBottom_toTopOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/divider_top"
+			app:layout_constraintTop_toTopOf="parent"
 			tools:visibility="visible" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_reader_webtoon.xml b/app/src/main/res/layout/fragment_reader_webtoon.xml
index ff906ec6e..bf60f0a5a 100644
--- a/app/src/main/res/layout/fragment_reader_webtoon.xml
+++ b/app/src/main/res/layout/fragment_reader_webtoon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.koitharu.kotatsu.reader.ui.pager.wetoon.WebtoonRecyclerView
+<org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonRecyclerView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/recyclerView"
diff --git a/app/src/main/res/layout/fragment_search_suggestion.xml b/app/src/main/res/layout/fragment_search_suggestion.xml
new file mode 100644
index 000000000..a2ff52eda
--- /dev/null
+++ b/app/src/main/res/layout/fragment_search_suggestion.xml
@@ -0,0 +1,13 @@
+<?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:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?android:windowBackground"
+	android:clickable="true"
+	android:orientation="vertical"
+	android:scrollbars="vertical"
+	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+	tools:ignore="KeyboardInaccessibleWidget" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_checkable_multiple.xml b/app/src/main/res/layout/item_checkable_multiple.xml
new file mode 100644
index 000000000..14b97b714
--- /dev/null
+++ b/app/src/main/res/layout/item_checkable_multiple.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="?android:listPreferredItemHeightSmall"
+	android:background="?android:selectableItemBackground"
+	android:drawableStart="?android:listChoiceIndicatorMultiple"
+	android:drawablePadding="12dp"
+	android:gravity="center_vertical|start"
+	android:paddingStart="?android:listPreferredItemPaddingStart"
+	android:paddingEnd="?android:listPreferredItemPaddingEnd"
+	tools:text="@tools:sample/full_names" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_checkable_single.xml b/app/src/main/res/layout/item_checkable_single.xml
index af15894cd..12eb91d8d 100644
--- a/app/src/main/res/layout/item_checkable_single.xml
+++ b/app/src/main/res/layout/item_checkable_single.xml
@@ -2,7 +2,6 @@
 <CheckedTextView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/radio"
 	android:layout_width="match_parent"
 	android:layout_height="?android:listPreferredItemHeightSmall"
 	android:background="?android:selectableItemBackground"
diff --git a/app/src/main/res/layout/item_current_filter.xml b/app/src/main/res/layout/item_current_filter.xml
new file mode 100644
index 000000000..1014b0fdd
--- /dev/null
+++ b/app/src/main/res/layout/item_current_filter.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HorizontalScrollView
+	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="wrap_content">
+
+	<org.koitharu.kotatsu.base.ui.widgets.ChipsView
+		android:id="@+id/chips_tags"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		app:closeIconEnabled="true"
+		app:singleLine="true" />
+
+</HorizontalScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
new file mode 100644
index 000000000..d7a0f05c2
--- /dev/null
+++ b/app/src/main/res/layout/item_download.xml
@@ -0,0 +1,103 @@
+<?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="?attr/selectableItemBackground"
+	android:paddingStart="8dp"
+	android:paddingTop="4dp"
+	android:paddingEnd="8dp"
+	android:paddingBottom="6dp">
+
+	<com.google.android.material.card.MaterialCardView
+		android:id="@+id/card_cover"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
+		android:layout_margin="8dp"
+		app:cardCornerRadius="4dp"
+		app:cardElevation="4dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintDimensionRatio="h,1:1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.0">
+
+		<ImageView
+			android:id="@+id/imageView_cover"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:contentDescription="@null"
+			android:scaleType="centerCrop"
+			tools:src="@tools:sample/backgrounds/scenic" />
+
+	</com.google.android.material.card.MaterialCardView>
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:singleLine="true"
+		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/card_cover"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="@tools:sample/lorem" />
+
+	<com.google.android.material.progressindicator.LinearProgressIndicator
+		android:id="@+id/progressBar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/card_cover"
+		app:layout_constraintTop_toBottomOf="@id/textView_title" />
+
+	<TextView
+		android:id="@+id/textView_status"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:singleLine="true"
+		android:textAppearance="@style/TextAppearance.AppCompat.Small"
+		app:layout_constraintEnd_toStartOf="@id/textView_percent"
+		app:layout_constraintStart_toEndOf="@id/card_cover"
+		app:layout_constraintTop_toBottomOf="@id/progressBar"
+		tools:text="@string/manga_downloading_" />
+
+	<TextView
+		android:id="@+id/textView_percent"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+		app:layout_constraintBaseline_toBaselineOf="@id/textView_status"
+		app:layout_constraintEnd_toEndOf="parent"
+		android:layout_marginEnd="8dp"
+		tools:text="25%" />
+
+	<TextView
+		android:id="@+id/textView_details"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
+		android:ellipsize="end"
+		android:maxLines="4"
+		android:textAppearance="@style/TextAppearance.AppCompat.Small"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/card_cover"
+		app:layout_constraintTop_toBottomOf="@id/textView_status"
+		tools:text="@tools:sample/lorem[3]" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_empty_state.xml b/app/src/main/res/layout/item_empty_state.xml
index caf0845ad..12407626e 100644
--- a/app/src/main/res/layout/item_empty_state.xml
+++ b/app/src/main/res/layout/item_empty_state.xml
@@ -1,11 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
+<LinearLayout
 	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"
+	android:orientation="vertical"
 	android:gravity="center"
-	android:padding="20dp"
-	android:textAppearance="?android:textAppearanceMedium"
-	android:textColor="?android:textColorSecondary"
-	tools:text="@tools:sample/lorem[3]" />
\ No newline at end of file
+	android:layout_marginHorizontal="32dp">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="98dp"
+		android:layout_height="98dp"
+		android:src="@drawable/ic_alert_outline" />
+
+	<TextView
+		android:id="@+id/textPrimary"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_normal"
+		android:gravity="center"
+		android:textAppearance="@style/TextAppearance.Kotatsu.H1"
+		tools:text="@tools:sample/lorem[3]" />
+
+	<TextView
+		android:id="@+id/textSecondary"
+		style="@style/TextAppearance.Kotatsu.NoticeBody"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_normal"
+		android:gravity="center"
+		tools:text="@tools:sample/lorem[15]" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_error_footer.xml b/app/src/main/res/layout/item_error_footer.xml
index 347256105..2328a1fa0 100644
--- a/app/src/main/res/layout/item_error_footer.xml
+++ b/app/src/main/res/layout/item_error_footer.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/list_footer_height"
+	android:layout_height="@dimen/list_footer_height_outer"
 	android:background="?selectableItemBackground"
 	android:gravity="center"
 	android:orientation="horizontal"
diff --git a/app/src/main/res/layout/item_filter_header.xml b/app/src/main/res/layout/item_filter_header.xml
new file mode 100644
index 000000000..2ffa3c374
--- /dev/null
+++ b/app/src/main/res/layout/item_filter_header.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical|start"
+	android:minHeight="@dimen/header_height"
+	android:paddingStart="?android:listPreferredItemPaddingStart"
+	android:paddingEnd="?android:listPreferredItemPaddingEnd"
+	android:singleLine="true"
+	android:textAllCaps="true"
+	android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+	android:textColor="?android:textColorSecondary"
+	android:textStyle="bold"
+	tools:text="@tools:sample/lorem[2]" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
index 7031727d6..416e0ec12 100644
--- a/app/src/main/res/layout/item_header.xml
+++ b/app/src/main/res/layout/item_header.xml
@@ -5,10 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:gravity="center_vertical|start"
-	android:paddingStart="?android:listPreferredItemPaddingStart"
-	android:paddingEnd="?android:listPreferredItemPaddingEnd"
-	android:minHeight="@dimen/header_height"
+	android:paddingStart="8dp"
+	android:paddingEnd="8dp"
 	android:singleLine="true"
+	android:textAllCaps="true"
 	android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
 	android:textColor="?android:textColorSecondary"
 	android:textStyle="bold"
diff --git a/app/src/main/res/layout/item_loading_footer.xml b/app/src/main/res/layout/item_loading_footer.xml
index 9e0affa63..0af71b68f 100644
--- a/app/src/main/res/layout/item_loading_footer.xml
+++ b/app/src/main/res/layout/item_loading_footer.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	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="@dimen/list_footer_height"
-	android:padding="6dp">
+	android:layout_height="@dimen/list_footer_height_outer">
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
 		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
+		android:layout_height="wrap_content"
 		android:layout_gravity="center"
-		android:indeterminate="true" />
+		android:indeterminate="true"
+		app:indicatorSize="@dimen/list_footer_height_inner" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_loading_state.xml b/app/src/main/res/layout/item_loading_state.xml
index f096fd875..7c3e72de2 100644
--- a/app/src/main/res/layout/item_loading_state.xml
+++ b/app/src/main/res/layout/item_loading_state.xml
@@ -4,8 +4,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<ProgressBar
-		style="?android:progressBarStyle"
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml
index ea10b632e..801ab2d7b 100644
--- a/app/src/main/res/layout/item_manga_grid.xml
+++ b/app/src/main/res/layout/item_manga_grid.xml
@@ -1,34 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<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">
+	android:layout_height="wrap_content"
+	android:background="@drawable/list_selector"
+	android:orientation="vertical">
 
-	<LinearLayout
-		android:layout_width="wrap_content"
+	<com.google.android.material.card.MaterialCardView
+		android:id="@+id/card"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:layout_marginTop="8dp"
+		android:layout_marginBottom="4dp"
+		android:layout_marginHorizontal="8dp"
+		app:cardCornerRadius="4dp"
+		app:cardElevation="4dp">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:scaleType="centerCrop" />
+			android:scaleType="centerCrop"
+			android:orientation="horizontal"
+			tools:ignore="ContentDescription" />
 
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:gravity="center_vertical|start"
-			android:lines="2"
-			android:elegantTextHeight="true"
-			android:padding="6dp"
-			android:textColor="?android:textColorPrimary"
-			tools:text="@tools:sample/lorem" />
+	</com.google.android.material.card.MaterialCardView>
 
-	</LinearLayout>
+	<TextView
+		android:id="@+id/textView_title"
+		style="@style/TextAppearance.AppCompat.Body2"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:ellipsize="end"
+		android:lineSpacingExtra="-2dp"
+		android:maxLines="2"
+		android:paddingHorizontal="8dp"
+		android:paddingBottom="4dp"
+		android:elegantTextHeight="false"
+		tools:text="Sample name" />
 
-
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index f6d964cdc..333115285 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -1,24 +1,37 @@
 <?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="@dimen/manga_list_item_height"
-	android:background="?selectableItemBackground"
+	android:background="@drawable/list_selector"
+	android:gravity="center_vertical"
 	android:orientation="horizontal">
 
-	<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
-		android:id="@+id/imageView_cover"
+	<com.google.android.material.card.MaterialCardView
 		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:scaleType="centerCrop" />
+		android:layout_height="wrap_content"
+		android:layout_margin="8dp"
+		app:cardCornerRadius="4dp"
+		app:cardElevation="4dp">
+
+		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+			android:id="@+id/imageView_cover"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:scaleType="centerCrop"
+			tools:src="@tools:sample/backgrounds/scenic" />
+
+	</com.google.android.material.card.MaterialCardView>
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
 		android:orientation="vertical"
-		android:paddingStart="16dp"
+		android:paddingStart="20dp"
 		android:paddingEnd="16dp">
 
 		<TextView
@@ -27,7 +40,8 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:maxLines="2"
-			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
+			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+			tools:text="@tools:sample/lorem/random" />
 
 		<TextView
 			android:id="@+id/textView_subtitle"
@@ -36,7 +50,8 @@
 			android:ellipsize="end"
 			android:maxLines="1"
 			android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
-			android:textColor="?android:textColorSecondary" />
+			android:textColor="?android:textColorSecondary"
+			tools:text="@tools:sample/lorem/random" />
 
 	</LinearLayout>
 
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 7f899c6ed..63d959bf8 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<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="@dimen/manga_list_details_item_height">
+	android:layout_height="@dimen/manga_list_details_item_height"
+	android:background="@drawable/list_selector"
+	android:orientation="horizontal">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
+	<com.google.android.material.card.MaterialCardView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="8dp"
+		app:cardElevation="4dp">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
@@ -18,81 +21,67 @@
 			android:orientation="vertical"
 			android:scaleType="centerCrop" />
 
+	</com.google.android.material.card.MaterialCardView>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_margin="8dp"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/textView_title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="4dp"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:textAppearance="@style/TextAppearance.Kotatsu.ToolbarTitle"
+			android:textSize="18sp"
+			tools:text="@tools:sample/lorem/random" />
+
+		<TextView
+			android:id="@+id/textView_subtitle"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="4dp"
+			android:ellipsize="none"
+			android:gravity="center_vertical"
+			android:requiresFadingEdge="horizontal"
+			android:singleLine="true"
+			android:textSize="16sp"
+			tools:text="@tools:sample/lorem/random" />
+
 		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
 
 			<TextView
-				android:id="@+id/textView_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="6dp"
-				android:layout_marginTop="6dp"
-				android:layout_marginEnd="6dp"
-				android:ellipsize="end"
-				android:maxLines="2"
-				android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-				tools:text="@tools:sample/lorem[6]" />
-
-			<TextView
-				android:id="@+id/textView_subtitle"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="6dp"
-				android:layout_marginTop="4dp"
-				android:layout_marginEnd="6dp"
-				android:layout_marginBottom="6dp"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
-				android:textColor="?android:textColorSecondary"
-				tools:text="@tools:sample/lorem[6]" />
-
-			<Space
-				android:layout_width="wrap_content"
-				android:layout_height="0dp"
-				android:layout_weight="1" />
-
-			<View
-				android:id="@+id/divider"
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="?android:listDivider" />
-
-			<LinearLayout
-				android:layout_width="match_parent"
+				android:id="@+id/textView_tags"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:ellipsize="none"
 				android:gravity="center_vertical"
-				android:orientation="horizontal"
+				android:requiresFadingEdge="horizontal"
+				android:singleLine="true"
+				tools:text="@tools:sample/lorem/random" />
+
+			<TextView
+				android:id="@+id/textView_rating"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="bottom"
+				android:drawablePadding="4dp"
 				android:paddingStart="6dp"
-				android:paddingEnd="6dp">
-
-				<TextView
-					android:id="@+id/textView_tags"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="12dp"
-					android:layout_marginBottom="12dp"
-					android:layout_weight="1"
-					android:ellipsize="none"
-					android:gravity="center_vertical"
-					android:requiresFadingEdge="horizontal"
-					android:singleLine="true" />
-
-				<TextView
-					android:id="@+id/textView_rating"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:drawablePadding="4dp"
-					android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
-					app:drawableStartCompat="@drawable/ic_star_rating"
-					tools:text="10/10" />
-
-			</LinearLayout>
+				app:drawableEndCompat="@drawable/ic_star"
+				tools:ignore="RtlSymmetry"
+				tools:text="9.6" />
 
 		</LinearLayout>
 
 	</LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_page.xml b/app/src/main/res/layout/item_page.xml
index cf4798de0..307f2db03 100644
--- a/app/src/main/res/layout/item_page.xml
+++ b/app/src/main/res/layout/item_page.xml
@@ -3,17 +3,18 @@
 	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:background="?android:windowBackground"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?android:windowBackground">
 
 	<com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 		android:id="@+id/ssiv"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
+		android:indeterminate="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center" />
@@ -37,8 +38,8 @@
 			android:drawablePadding="12dp"
 			android:gravity="center_horizontal"
 			android:textAppearance="@style/TextAppearance.AppCompat.Small"
-			tools:text="@tools:sample/lorem[6]"
-			app:drawableTopCompat="@drawable/ic_error_large" />
+			app:drawableTopCompat="@drawable/ic_error_large"
+			tools:text="@tools:sample/lorem[6]" />
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_retry"
diff --git a/app/src/main/res/layout/item_page_webtoon.xml b/app/src/main/res/layout/item_page_webtoon.xml
index f032e1819..c66df5034 100644
--- a/app/src/main/res/layout/item_page_webtoon.xml
+++ b/app/src/main/res/layout/item_page_webtoon.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.koitharu.kotatsu.reader.ui.pager.wetoon.WebtoonFrameLayout
+<org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonFrameLayout
 	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">
 
-	<org.koitharu.kotatsu.reader.ui.pager.wetoon.WebtoonImageView
+	<org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonImageView
 		android:id="@+id/ssiv"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		app:zoomEnabled="false"
+		app:panEnabled="false"
 		app:quickScaleEnabled="false"
-		app:panEnabled="false" />
+		app:zoomEnabled="false" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
+		android:indeterminate="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center" />
@@ -39,8 +40,8 @@
 			android:drawablePadding="12dp"
 			android:gravity="center_horizontal"
 			android:textAppearance="@style/TextAppearance.AppCompat.Small"
-			tools:text="@tools:sample/lorem[6]"
-			app:drawableTopCompat="@drawable/ic_error_large" />
+			app:drawableTopCompat="@drawable/ic_error_large"
+			tools:text="@tools:sample/lorem[6]" />
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_retry"
@@ -52,4 +53,4 @@
 
 	</LinearLayout>
 
-</org.koitharu.kotatsu.reader.ui.pager.wetoon.WebtoonFrameLayout>
\ No newline at end of file
+</org.koitharu.kotatsu.reader.ui.pager.webtoon.WebtoonFrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_complete.xml b/app/src/main/res/layout/item_search_complete.xml
deleted file mode 100644
index 6bb124b06..000000000
--- a/app/src/main/res/layout/item_search_complete.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-	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="?listPreferredItemHeightSmall"
-	android:background="?selectableItemBackground"
-	android:drawablePadding="20dp"
-	android:gravity="center_vertical"
-	android:paddingStart="?listPreferredItemPaddingStart"
-	android:paddingEnd="?listPreferredItemPaddingEnd"
-	android:textAppearance="?textAppearanceListItemSmall"
-	android:textColor="?android:textColorPrimary"
-	android:theme="@style/AppPopupTheme"
-	tools:text="@tools:sample/full_names"
-	app:drawableStartCompat="@drawable/ic_history" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_suggestion_header.xml b/app/src/main/res/layout/item_search_suggestion_header.xml
new file mode 100644
index 000000000..62b29b12d
--- /dev/null
+++ b/app/src/main/res/layout/item_search_suggestion_header.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical"
+	android:minHeight="?listPreferredItemHeightSmall"
+	android:paddingStart="?listPreferredItemPaddingStart"
+	android:paddingEnd="?listPreferredItemPaddingEnd">
+
+	<com.google.android.material.switchmaterial.SwitchMaterial
+		android:id="@+id/switch_local"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="?listPreferredItemPaddingEnd"
+		android:layout_weight="1"
+		tools:text="@string/search_only_on_s" />
+
+	<ImageButton
+		android:id="@+id/button_clear"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:background="?selectableItemBackgroundBorderless"
+		android:padding="8dp"
+		android:src="@drawable/ic_clear_all" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_suggestion_manga.xml b/app/src/main/res/layout/item_search_suggestion_manga.xml
new file mode 100644
index 000000000..a92340c02
--- /dev/null
+++ b/app/src/main/res/layout/item_search_suggestion_manga.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?selectableItemBackground"
+	android:gravity="center_vertical"
+	android:paddingStart="?listPreferredItemPaddingStart"
+	android:paddingTop="2dp"
+	android:paddingEnd="?listPreferredItemPaddingEnd"
+	android:paddingBottom="2dp">
+
+	<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+		android:id="@+id/imageView_cover"
+		android:layout_width="42dp"
+		android:layout_height="wrap_content" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="12dp"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/textView_title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+			tools:text="@tools:sample/lorem[6]" />
+
+		<TextView
+			android:id="@+id/textView_subtitle"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+			android:textColor="?android:textColorSecondary"
+			tools:text="@tools:sample/lorem[6]" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_suggestion_query.xml b/app/src/main/res/layout/item_search_suggestion_query.xml
new file mode 100644
index 000000000..ace877682
--- /dev/null
+++ b/app/src/main/res/layout/item_search_suggestion_query.xml
@@ -0,0 +1,35 @@
+<?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="wrap_content"
+	android:background="?selectableItemBackground"
+	android:gravity="center_vertical"
+	android:minHeight="?listPreferredItemHeightSmall"
+	android:paddingStart="?listPreferredItemPaddingStart"
+	android:paddingEnd="?listPreferredItemPaddingEnd">
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:drawablePadding="12dp"
+		android:ellipsize="end"
+		android:gravity="center_vertical"
+		android:singleLine="true"
+		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+		app:drawableStartCompat="@drawable/ic_history"
+		tools:text="@tools:sample/lorem[6]" />
+
+	<ImageButton
+		android:id="@+id/button_complete"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:background="?selectableItemBackgroundBorderless"
+		android:padding="8dp"
+		android:src="@drawable/ic_complete" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_source_config.xml b/app/src/main/res/layout/item_source_config.xml
index 69e2815f3..21a2bb0d9 100644
--- a/app/src/main/res/layout/item_source_config.xml
+++ b/app/src/main/res/layout/item_source_config.xml
@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="?android:listPreferredItemHeightSmall"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:background="?android:windowBackground"
 	android:gravity="center_vertical"
 	android:orientation="horizontal">
@@ -32,7 +31,7 @@
 	<com.google.android.material.switchmaterial.SwitchMaterial
 		android:id="@+id/switch_toggle"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"/>
+		android:layout_height="wrap_content" />
 
 	<ImageView
 		android:id="@+id/imageView_config"
diff --git a/app/src/main/res/layout/item_source_locale.xml b/app/src/main/res/layout/item_source_locale.xml
new file mode 100644
index 000000000..1ccef475e
--- /dev/null
+++ b/app/src/main/res/layout/item_source_locale.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="?android:listPreferredItemHeightSmall"
+	android:background="?selectableItemBackground"
+	android:drawableStart="?android:listChoiceIndicatorMultiple"
+	android:drawablePadding="10dp"
+	android:gravity="center_vertical"
+	android:paddingStart="?listPreferredItemPaddingStart"
+	android:paddingEnd="?listPreferredItemPaddingEnd"
+	android:singleLine="true"
+	android:textAppearance="?android:attr/textAppearanceMedium"
+	android:textColor="?android:attr/textColorPrimary"
+	tools:text="@tools:sample/lorem[2]" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_tracklog.xml b/app/src/main/res/layout/item_tracklog.xml
index d99dc5f14..e55c1ff7d 100644
--- a/app/src/main/res/layout/item_tracklog.xml
+++ b/app/src/main/res/layout/item_tracklog.xml
@@ -1,75 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<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:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:paddingStart="8dp"
+	android:paddingEnd="8dp">
 
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+	<com.google.android.material.card.MaterialCardView
+		android:id="@+id/card_cover"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
+		android:layout_margin="8dp"
+		app:cardCornerRadius="4dp"
+		app:cardElevation="4dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintDimensionRatio="h,1:1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.0">
 
-		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+		<ImageView
 			android:id="@+id/imageView_cover"
-			android:layout_width="87dp"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignParentStart="true"
-			android:layout_alignParentTop="true" />
+			android:scaleType="centerCrop"
+			tools:src="@tools:sample/backgrounds/scenic" />
+
+	</com.google.android.material.card.MaterialCardView>
+
+	<LinearLayout
+		android:id="@+id/title_container"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="4dp"
+		android:layout_marginEnd="8dp"
+		android:orientation="horizontal"
+		app:layout_constraintBottom_toTopOf="@id/textView_chapters"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/card_cover"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="packed">
 
 		<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="6dp"
-			android:layout_marginTop="6dp"
-			android:layout_marginEnd="6dp"
-			android:layout_toEndOf="@id/imageView_cover"
-			android:ellipsize="end"
-			android:maxLines="2"
-			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-			tools:text="@tools:sample/lorem[6]" />
-
-		<TextView
-			android:id="@+id/textView_subtitle"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/textView_title"
-			android:layout_alignParentEnd="true"
-			android:layout_marginStart="6dp"
-			android:layout_marginTop="4dp"
-			android:layout_marginEnd="6dp"
-			android:layout_marginBottom="6dp"
-			android:layout_toEndOf="@id/imageView_cover"
+			android:layout_weight="1"
 			android:ellipsize="end"
 			android:maxLines="1"
-			android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
-			android:textColor="?android:textColorSecondary"
-			tools:text="@tools:sample/lorem[6]" />
-
-		<View
-			android:id="@+id/divider"
-			android:layout_width="match_parent"
-			android:layout_height="1dp"
-			android:layout_below="@id/textView_subtitle"
-			android:layout_alignParentEnd="true"
-			android:layout_toEndOf="@id/imageView_cover"
-			android:background="?android:listDivider" />
+			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+			tools:text="@tools:sample/lorem" />
 
 		<TextView
-			android:id="@+id/textView_chapters"
-			android:layout_width="0dp"
+			android:id="@+id/badge"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/divider"
-			android:layout_alignParentEnd="true"
-			android:layout_marginStart="6dp"
-			android:layout_marginTop="8dp"
-			android:layout_marginEnd="6dp"
-			android:layout_toEndOf="@id/imageView_cover"
-			android:ellipsize="none"
-			android:paddingBottom="12dp" />
+			android:layout_gravity="center"
+			android:background="@drawable/badge"
+			android:paddingHorizontal="6dp"
+			android:paddingVertical="2dp"
+			android:textColor="@android:color/white"
+			android:textSize="12sp"
+			android:textStyle="bold"
+			tools:text="54" />
 
-	</RelativeLayout>
+	</LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+	<TextView
+		android:id="@+id/textView_chapters"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="4dp"
+		android:ellipsize="none"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/card_cover"
+		app:layout_constraintTop_toBottomOf="@id/title_container"
+		tools:text="@tools:sample/lorem[25]" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
new file mode 100644
index 000000000..4b3527d16
--- /dev/null
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/navigation_header"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:fitsSystemWindows="true">
+
+	<ImageView
+		android:id="@+id/imageView_logo"
+		android:layout_width="@dimen/nav_header_logo_size"
+		android:layout_height="@dimen/nav_header_logo_size"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentTop="true"
+		android:layout_marginStart="@dimen/margin_normal"
+		android:layout_marginTop="24dp"
+		android:layout_marginBottom="24dp"
+		android:contentDescription="@string/app_name"
+		android:src="@drawable/ic_totoro" />
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignTop="@id/imageView_logo"
+		android:layout_alignBottom="@id/imageView_logo"
+		android:layout_marginStart="@dimen/nav_item_horizontal_padding"
+		android:layout_toEndOf="@id/imageView_logo"
+		android:gravity="center_vertical"
+		android:singleLine="true"
+		android:text="@string/app_name"
+		android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+
+	<View
+		android:id="@+id/divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_below="@id/imageView_logo"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentEnd="true"
+		android:background="?android:attr/listDivider" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_pages.xml b/app/src/main/res/layout/sheet_pages.xml
index 74573b6c2..c3309fd05 100644
--- a/app/src/main/res/layout/sheet_pages.xml
+++ b/app/src/main/res/layout/sheet_pages.xml
@@ -9,33 +9,17 @@
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbar"
+		style="@style/Widget.Kotatsu.Sheet.AppBar"
 		android:layout_width="match_parent"
 		android:layout_height="?attr/actionBarSize"
-		android:background="?android:windowBackground"
-		android:elevation="0dp"
-		app:elevation="0dp">
+		app:liftOnScroll="true">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@+id/toolbar"
-			style="@style/Widget.MaterialComponents.Toolbar.Surface"
+			style="@style/Widget.Kotatsu.Toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:elevation="0dp"
-			android:outlineProvider="@null"
-			android:visibility="gone"
-			app:elevation="0dp"
-			app:navigationIcon="@drawable/ic_cross"
-			tools:visibility="visible" />
-
-		<TextView
-			android:id="@+id/textView_title"
-			style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:gravity="center_vertical"
-			android:padding="16dp"
-			android:textColor="?android:textColorSecondary"
-			tools:visibility="gone" />
+			app:navigationIcon="@drawable/ic_cross" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
@@ -43,6 +27,7 @@
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:clipToPadding="false"
 		android:padding="@dimen/grid_spacing"
 		android:scrollbars="vertical"
 		app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
diff --git a/app/src/main/res/menu/opt_remote.xml b/app/src/main/res/menu/opt_list_remote.xml
similarity index 62%
rename from app/src/main/res/menu/opt_remote.xml
rename to app/src/main/res/menu/opt_list_remote.xml
index e18367ea1..deb531840 100644
--- a/app/src/main/res/menu/opt_remote.xml
+++ b/app/src/main/res/menu/opt_list_remote.xml
@@ -4,9 +4,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-		android:id="@+id/action_search_internal"
-		android:orderInCategory="26"
-		android:title="@string/search"
+		android:id="@+id/action_source_settings"
+		android:orderInCategory="50"
+		android:title="@string/settings"
 		app:showAsAction="never" />
-
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/opt_main.xml b/app/src/main/res/menu/opt_main.xml
deleted file mode 100644
index e7c152f16..000000000
--- a/app/src/main/res/menu/opt_main.xml
+++ /dev/null
@@ -1,14 +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_search"
-		android:icon="@drawable/ic_search"
-		android:orderInCategory="0"
-		android:title="@string/search"
-		app:actionViewClass="androidx.appcompat.widget.SearchView"
-		app:showAsAction="always|collapseActionView" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/opt_sources.xml b/app/src/main/res/menu/opt_sources.xml
new file mode 100644
index 000000000..35c7034be
--- /dev/null
+++ b/app/src/main/res/menu/opt_sources.xml
@@ -0,0 +1,12 @@
+<?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_languages"
+		android:icon="@drawable/ic_locale"
+		android:title="@string/languages"
+		app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/popup_category.xml b/app/src/main/res/menu/popup_category.xml
index 92dd0a0e9..1c4fc96d2 100644
--- a/app/src/main/res/menu/popup_category.xml
+++ b/app/src/main/res/menu/popup_category.xml
@@ -10,4 +10,17 @@
 		android:id="@+id/action_rename"
 		android:title="@string/rename" />
 
+	<item
+		android:id="@+id/action_order"
+		android:title="@string/sort_order">
+
+		<menu>
+
+			<group
+				android:id="@+id/group_order"
+				android:checkableBehavior="single" />
+		</menu>
+
+	</item>
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/raw/copyright b/app/src/main/res/raw/copyright
new file mode 100644
index 000000000..bf4212730
--- /dev/null
+++ b/app/src/main/res/raw/copyright
@@ -0,0 +1,24 @@
+<p><a href="https://github.com/nv95/Kotatsu">Kotatsu</a> is a free and open source manga reader for Android.</p>
+<p>Copyright (C) 2020 by Koitharu</p>
+<p>This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.</p>
+<p>This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.</p>
+<p>You should have received a copy of the GNU General Public License
+   along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
+<h3>Open Source Licenses</h3>
+<ul>
+   <li>AOSP: <a href="https://source.android.com/setup/start/licenses">APL 2.0</a></li>
+   <li>OkHttp: <a href="https://github.com/square/okhttp/blob/master/LICENSE.txt">APL 2.0</a></li>
+   <li>Okio: <a href="https://github.com/square/okio/blob/master/LICENSE.txt">APL 2.0</a></li>
+   <li>jsoup: <a href="https://github.com/jhy/jsoup/blob/master/LICENSE">MIT</a></li>
+   <li>AdapterDelegates: <a href="https://github.com/sockeqwe/AdapterDelegates/blob/master/LICENSE">APL 2.0</a></li>
+   <li>Koin: <a href="https://github.com/InsertKoinIO/koin/blob/master/LICENSE">APL 2.0</a></li>
+   <li>Coil: <a href="https://github.com/coil-kt/coil/blob/main/LICENSE.txt">APL 2.0</a></li>
+   <li>Subsampling Scale Image View: <a href="https://github.com/davemorrissey/subsampling-scale-image-view/blob/master/LICENSE">APL 2.0</a></li>
+   <li>Disk LRU Cache: <a href="https://github.com/solkin/disk-lru-cache/blob/master/LICENSE">MIT</a></li>
+</ul>
\ No newline at end of file
diff --git a/app/src/main/res/raw/keep.xml b/app/src/main/res/raw/keep.xml
new file mode 100644
index 000000000..7f40321a2
--- /dev/null
+++ b/app/src/main/res/raw/keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+	tools:keep="@drawable/ic_denied_large,@drawable/ic_alert_outline,@drawable/ic_error_large" />
\ 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
new file mode 100644
index 000000000..ca76348da
--- /dev/null
+++ b/app/src/main/res/values-be/plurals.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<plurals name="pages">
+		<item quantity="one">Усяго %1$d старонка</item>
+		<item quantity="few">Усяго %1$d старонкі</item>
+		<item quantity="many">Усяго %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>
+	</plurals>
+	<plurals name="new_chapters">
+		<item quantity="one">%1$d новая частка</item>
+		<item quantity="few">%1$d новых часткi</item>
+		<item quantity="many">%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="chapters_from_x">
+		<item quantity="one">%1$d частка з %2$d</item>
+		<item quantity="few">%1$d часткi з %2$d</item>
+		<item quantity="many">%1$d частак з %2$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>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
new file mode 100644
index 000000000..2959c53bb
--- /dev/null
+++ b/app/src/main/res/values-be/strings.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="close_menu">Зачыніць меню</string>
+    <string name="open_menu">Адкрыць меню</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="details">Падрабязнасцi</string>
+    <string name="chapters">Часткi</string>
+    <string name="list">Спіс</string>
+    <string name="detailed_list">Падрабязны спіс</string>
+    <string name="grid">Табліца</string>
+    <string name="list_mode">Выгляд спісу</string>
+    <string name="settings">Наладжвання</string>
+    <string name="remote_sources">Онлайн каталогі</string>
+    <string name="loading_">Загрузка…</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="add_bookmark">Дадаць закладку</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="enter_category_name">Увядзіце назву</string>
+    <string name="save">Захаваць</string>
+    <string name="share">Падзяліцца</string>
+    <string name="create_shortcut">Стварыць ярлык…</string>
+    <string name="share_s">Падзялiцца %s</string>
+    <string name="search">Пошук</string>
+    <string name="search_manga">Пошук мангі</string>
+    <string name="manga_downloading_">Загрузка мангі…</string>
+    <string name="processing_">Апрацоўка…</string>
+    <string name="download_complete">Загрузка завершана</string>
+    <string name="downloads">Загрузкi</string>
+    <string name="by_name">Па імя</string>
+    <string name="popular">Папулярная</string>
+    <string name="updated">Абноўленая</string>
+    <string name="newest">Новая</string>
+    <string name="by_rating">Па рэйтынгу</string>
+    <string name="all">Усе</string>
+    <string name="sort_order">Сартаванне</string>
+    <string name="genre">Жанр</string>
+    <string name="filter">Фільтр</string>
+    <string name="theme">Тэма</string>
+    <string name="light">Светлая</string>
+    <string name="dark">Цёмная</string>
+    <string name="automatic">Аўтаматычна</string>
+    <string name="pages">Старонкi</string>
+    <string name="clear">Ачысціць</string>
+    <string name="text_clear_history_prompt">Вы ўпэўненыя, што жадаеце ачысціць гісторыю? Гэта дзеянне нельга будзе адмяніць.</string>
+    <string name="remove">Выдаліць</string>
+    <string name="_s_removed_from_history">\"%s\" выдалена з гiсторыi</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" выдалена з прылады</string>
+    <string name="wait_for_loading_finish">Дачакайцеся заканчэння загрузкі</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="history_and_cache">Гісторыя і кэш</string>
+    <string name="clear_pages_cache">Ачысціць кэш старонак</string>
+    <string name="cache">Кэш</string>
+    <string name="text_file_sizes">Б|кБ|МБ|ГБ|ТБ</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="reader_settings">Настаўленні чытання</string>
+    <string name="switch_pages">Гартанне старонак</string>
+    <string name="text_delete_local_manga">Вы ўпэўненыя, што жадаеце выдаліць \"%s\" з прылады? Гэта дзеянне нельга будзе адмяніць.</string>
+    <string name="taps_on_edges">Націску па краях</string>
+    <string name="volume_buttons">Кнопкі гучнасці</string>
+    <string name="_continue">Прадоўжыць</string>
+    <string name="warning">Папярэджанне</string>
+    <string name="network_consumption_warning">Дадзеная аперацыя можа прывесці да вялікага выдатку трафіку</string>
+    <string name="dont_ask_again">Больш не пытацца</string>
+    <string name="cancelling_">Адмена…</string>
+    <string name="error">Памылка</string>
+    <string name="clear_thumbs_cache">Ачысціць кэш мініяцюр</string>
+    <string name="search_history_cleared">Гісторыя пошуку ачышчана</string>
+    <string name="clear_search_history">Ачысціць гісторыю пошуку</string>
+    <string name="gestures_only">Толькі жэсты</string>
+    <string name="internal_storage">Унутраны назапашвальнік</string>
+    <string name="external_storage">Знешняе сховішча</string>
+    <string name="domain">Дамен</string>
+    <string name="application_update">Правяраць абнаўленне прыкладання</string>
+    <string name="app_update_available">Даступна абнаўленне прыкладання</string>
+    <string name="show_notification_app_update">Паказваць апавяшчэнне пры наяўнасці новай версіі</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="enabled_d_of_d">Уключана %1$d з %2$d</string>
+    <string name="new_chapters">Новыя часткi</string>
+    <string name="show_notification_new_chapters">Апавяшчаць аб абнаўленні мангі, якую вы чытаеце</string>
+    <string name="download">Загрузіць</string>
+    <string name="read_from_start">Чытаць з пачатку</string>
+    <string name="restart">Перазапусціць</string>
+    <string name="notifications_settings">Налады апавяшчэнняў</string>
+    <string name="notification_sound">Гук апавяшчэння</string>
+    <string name="light_indicator">Светлавая iндыкацыя</string>
+    <string name="vibration">Вібрацыя</string>
+    <string name="favourites_categories">Катэгорыі абранага</string>
+    <string name="categories_">Катэгорыi…</string>
+    <string name="rename">Перайменаваць</string>
+    <string name="category_delete_confirm">Вы ўпэўненыя, што хочаце выдаліць катэгорыю \"%s\"? Уся манга з дадзенай катэгорыі будзе страчана.</string>
+    <string name="remove_category">Выдаліць катэгорыю</string>
+    <string name="text_categories_holder">Катэгорыі дапамагаюць парадкаваць выбраную мангу. Націсніце «+», каб стварыць катэгорыю</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="use_ssl">Абароненае злучэнне (HTTPS)</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="related">Падобныя</string>
+    <string name="new_version_s">Новая версія: %s</string>
+    <string name="size_s">Памер: %s</string>
+    <string name="waiting_for_network">Чаканне падлучэння…</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">Запытваць пароль пры запуску прыкладання</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="checking_for_updates">Праверка абнаўлення…</string>
+    <string name="update_check_failed">Памылка пры праверцы абнаўлення</string>
+    <string name="no_update_available">Няма даступных абнаўленняў</string>
+    <string name="right_to_left">Справа налева</string>
+    <string name="prefer_rtl_reader">Аддаваць перавагу рэжым Справа налева</string>
+    <string name="prefer_rtl_reader_summary">Вы можаце наладзіць рэжым чытання для кожнай мангі асобна</string>
+    <string name="create_category">Стварыць катэгорыю</string>
+    <string name="report_github">Стварыць праблему на GitHub</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="restart_required">Патрабуецца перазапуск</string>
+    <string name="backup_restore">Рэзервовае капіраванне</string>
+    <string name="create_backup">Стварыць рэзервовую копію</string>
+    <string name="restore_backup">Аднавіць дадзеныя</string>
+    <string name="data_restored">Дадзеныя адноўлены</string>
+    <string name="preparing_">Падрыхтоўка…</string>
+    <string name="file_not_found">Файл не знойдзены</string>
+    <string name="data_restored_success">Усе дадзеныя паспяхова адноўлены</string>
+    <string name="data_restored_with_errors">Дадзеныя адноўлены, але ўзніклі некаторыя памылкі</string>
+    <string name="backup_information">Вы можаце стварыць рэзервовую копію абранага і гісторыі і потым аднавіць іх</string>
+    <string name="just_now">Толькі што</string>
+    <string name="yesterday">Учора</string>
+    <string name="long_ago">Даўно</string>
+    <string name="group">Групаваць</string>
+    <string name="today">Сёння</string>
+    <string name="tap_to_try_again">Паспрабаваць яшчэ раз</string>
+    <string name="reader_mode_hint">Абраны рэжым будзе захаваны для бягучай мангі</string>
+    <string name="silent">Без гуку</string>
+    <string name="captcha_required">Неабходна прайсці CAPTCHA</string>
+    <string name="captcha_solve">Прайсці</string>
+    <string name="clear_cookies">Ачысціць кукi</string>
+    <string name="cookies_cleared">Усе кукi выдалены</string>
+    <string name="chapters_checking_progress">Праверка новых частак: %1$d з %2$d</string>
+    <string name="clear_feed">Ачысціць стужку</string>
+    <string name="text_clear_updates_feed_prompt">Уся гісторыя абнаўленняў будзе ачышчана і яе нельга будзе вярнуць. Вы ўпэўненыя?</string>
+    <string name="new_chapters_checking">Праверка новых частак</string>
+    <string name="reverse">У зваротным парадку</string>
+    <string name="sign_in">Увайсці</string>
+    <string name="auth_required">Для прагляду гэтага кантэнту патрабуецца аўтарызацыя</string>
+    <string name="default_s">Прадвызначаны: %s</string>
+    <string name="_and_x_more">…і яшчэ %1$d</string>
+    <string name="next">Далей</string>
+    <string name="protect_application_subtitle">Калі ласка, увядзіце пароль, які спатрэбіцца пры запуску прыкладання</string>
+    <string name="confirm">Пацвярджаць</string>
+    <string name="password_length_hint">Пароль павінен змяшчаць не менш за 4 сімвалаў</string>
+    <string name="hide_toolbar">Схаваць загаловак пры прагортцы</string>
+    <string name="search_only_on_s">Пошук толькі па %s</string>
+    <string name="text_clear_search_history_prompt">Вы сапраўды хочаце выдаліць усе апошнія пошукавыя запыты? Гэта дзеянне не можа быць адменена.</string>
+    <string name="description">Апісанне</string>
+    <string name="read_more">Падрабязна</string>
+    <string name="tracker_warning">Некаторыя вытворцы могуць змяняць паводзіны сістэмы, што можа парушаць выкананне фонавых задач.</string>
+    <string name="backup_saved">Рэзервовая копія паспяхова захавана</string>
+    <string name="welcome">Вітаю</string>
+    <string name="languages">Мовы</string>
+    <string name="other">Іншыя</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_primary">Тут будзе адлюстроўвацца манга, якую вы чытаеце</string>
+    <string name="text_search_holder_secondary">Паспрабуйце перафармуляваць запыт.</string>
+    <string name="text_empty_holder_primary">Тут неяк пуста…</string>
+    <string name="chapter_is_missing">Частка адсутнічае</string>
+    <string name="chapter_is_missing_text">Гэтая частка адсутнічае на вашым прыладзе. Загрузіце або прачытайце яе онлайн.</string>
+    <string name="text_downloads_holder">На дадзены момант няма актыўных загрузак</string>
+    <string name="queued">У чарзе</string>
+    <string name="about_license">Ліцэнзія</string>
+    <string name="about_copyright_and_licenses">Аўтарскія правы і ліцэнзіі</string>
+    <string name="about_gratitudes_summary">Гэтыя людзі робяць Kotatsu лепш!</string>
+    <string name="about_gratitudes">Падзяка</string>
+    <string name="about_support_developer_summary">Калі вам падабаецца гэта дадатак, вы можаце дапамагчы фінансава з дапамогай Yoomoney (Яндэкс.Грошы)</string>
+    <string name="about_support_developer">Падтрымаць распрацоўніка</string>
+    <string name="about_feedback_4pda">Тэма на 4PDA</string>
+    <string name="about_feedback">Зваротная сувязь</string>
+    <string name="about_author">Аўтар</string>
+    <string name="about_app_translation_summary">Перавесці гэты дадатак</string>
+    <string name="about_app_translation">Пераклад</string>
+</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
new file mode 100644
index 000000000..6f80ea1c8
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,239 @@
+<?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">Möchtest du wirklich deinen gesamten Leseverlauf löschen\? Diese Aktion kann nicht rückgängig gemacht werden.</string>
+    <string name="theme">Design</string>
+    <string name="pages">Seiten</string>
+    <string name="automatic">Automatisch</string>
+    <string name="dark">Dunkel</string>
+    <string name="light">Hell</string>
+    <string name="filter">Filter</string>
+    <string name="genre">Genre</string>
+    <string name="sort_order">Sortierung</string>
+    <string name="all">Alle</string>
+    <string name="by_rating">Nach Bewertung</string>
+    <string name="newest">Neuestes</string>
+    <string name="popular">Beliebt</string>
+    <string name="by_name">Nach Name</string>
+    <string name="downloads">Heruntergeladene</string>
+    <string name="download_complete">Herunterladen abgeschlossen</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="enter_category_name">Gib den Name der Kategorie ein</string>
+    <string name="add">Hinzufügen</string>
+    <string name="add_new_category">Neue Kategorie hinzufügen</string>
+    <string name="add_to_favourites">Zu Favoriten hinzufügen</string>
+    <string name="you_have_not_favourites_yet">Du hast noch keine Favoriten</string>
+    <string name="add_bookmark">Lesezeichen hinzufügen</string>
+    <string name="read">Lesen</string>
+    <string name="history_is_empty">Verlauf ist leer</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">Entfernte 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">Der gesamte Aktualisierungsverlauf wird gelöscht und diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher\?</string>
+    <string name="no_update_available">Keine Aktualisierungen verfügbar</string>
+    <string name="update_check_failed">Suche nach Aktualisierungen fehlgeschlagen</string>
+    <string name="check_for_updates">Nach Aktualisierungen suchen</string>
+    <string name="track_sources">Aktualisierungen für Manga überprüfen</string>
+    <string name="feed_will_update_soon">Die Feed-Aktualisierung beginnt in Kürze</string>
+    <string name="update">Aktualisieren</string>
+    <string name="updates_feed_cleared">Aktualisierungsfeed gelöscht</string>
+    <string name="clear_updates_feed">Aktualisierungsfeed löschen</string>
+    <string name="updates">Aktualisierungen</string>
+    <string name="show_notification_new_chapters">Über Aktualisierungen von Manga benachrichtigen, die du liest</string>
+    <string name="show_notification_app_update">Benachrichtigung anzeigen, wenn eine Aktualisierung verfügbar ist</string>
+    <string name="app_update_available">Anwendungsaktualisierung ist verfügbar</string>
+    <string name="application_update">Automatisch nach Aktualisierungen suchen</string>
+    <string name="updated">Aktualisiert</string>
+    <string name="_and_x_more">… und %1$d mehr</string>
+    <string name="preparing_">Vorbereitung …</string>
+    <string name="checking_for_updates">Suche nach Aktualisierungen …</string>
+    <string name="waiting_for_network">Warte auf Netzwerk …</string>
+    <string name="text_empty_holder_primary">Hier ist es irgendwie leer …</string>
+    <string name="categories_">Kategorien …</string>
+    <string name="cancelling_">Abbrechen …</string>
+    <string name="processing_">Verarbeiten …</string>
+    <string name="manga_downloading_">Manga wird heruntergeladen …</string>
+    <string name="create_shortcut">Verknüpfung erstellen …</string>
+    <string name="loading_">Wird geladen …</string>
+    <string name="category_delete_confirm">Möchtest du die Kategorie „%s“ wirklich aus deinen Favoriten entfernen\?
+\nAlle enthaltenen Manga gehen dabei verloren.</string>
+    <string name="text_delete_local_manga">Möchtest du wirklich „%s“ aus dem lokalen Speicher des Telefons löschen\?
+\nDieser Vorgang kann nicht rückgängig gemacht werden.</string>
+    <string name="_s_deleted_from_local_storage">„%s“ aus lokalem Speicher gelöscht</string>
+    <string name="_s_removed_from_history">„%s“ aus dem Verlauf entfernt</string>
+    <string name="detailed_list">Detaillierte Liste</string>
+    <string name="list">Liste</string>
+    <string name="chapters">Kapitel</string>
+    <string name="details">Einzelheiten</string>
+    <string name="network_error">Fehler bei der Netzwerkverbindung</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="open_menu">Menü öffnen</string>
+    <string name="close_menu">Menü schließen</string>
+    <string name="report_github">Ein Problem auf GitHub melden</string>
+    <string name="manga_save_location">Speicherort, um die Manga zu herunterladen</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 halten</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">Nützlich für AMOLED-Bildschirme</string>
+    <string name="black_dark_theme">Schwarzer dunkler Modus</string>
+    <string name="restart_required">Neustart erforderlich</string>
+    <string name="prefer_rtl_reader_summary">Du kannst den Lesemodus für jeden Manga separat einrichten</string>
+    <string name="right_to_left">Von rechts nach links</string>
+    <string name="prefer_rtl_reader">Von rechts nach links-Lesemodus bevorzugen</string>
+    <string name="create_category">Neue Kategorie</string>
+    <string name="backup_restore">Sicherung und Wiederherstellung</string>
+    <string name="data_restored">Daten wiederhergestellt</string>
+    <string name="restore_backup">Von Datensicherung wiederherstellen</string>
+    <string name="create_backup">Datensicherung 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="chapters_checking_progress">Suche nach neuen Kapiteln: %1$d von %2$d</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">Du solltest diesen Inhalt autorisieren, um ihn zu sehen</string>
+    <string name="reverse">Umkehren</string>
+    <string name="new_chapters_checking">Neue Kapitel prüfen</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 das Passwort ein, das beim Starten der Anwendung benötigt wird</string>
+    <string name="next">Nächste</string>
+    <string name="other">Anderes</string>
+    <string name="text_clear_search_history_prompt">Möchtest du wirklich alle letzten Suchanfragen entfernen\? Diese Aktion kann nicht rückgängig gemacht werden.</string>
+    <string name="search_only_on_s">Nur auf %s suchen</string>
+    <string name="hide_toolbar">Symbolleiste beim Blättern ausblenden</string>
+    <string name="read_more">Mehr erfahren</string>
+    <string name="tracker_warning">Einige Hersteller können das Systemverhalten ändern, wodurch Hintergrundaufgaben unterbrochen werden können.</string>
+    <string name="backup_saved">Sicherung erfolgreich gespeichert</string>
+    <string name="description">Beschreibung</string>
+    <string name="welcome">Willkommen</string>
+    <string name="languages">Sprachen</string>
+    <string name="remove_category">Kategorie 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="related">Verwandte</string>
+    <string name="search_results">Suchergebnisse</string>
+    <string name="text_feed_holder">Hier siehst du die neuen Kapitel des Mangas, den du gerade 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="use_ssl">Sichere Verbindung verwenden (HTTPS)</string>
+    <string name="other_storage">Sonstiger Speicherort</string>
+    <string name="cannot_find_available_storage">Verfügbarer Speicher kann nicht gefunden werden</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">Mangaregal</string>
+    <string name="text_local_holder_secondary">Du kannst es aus Online-Quellen speichern oder aus einer Datei importieren.</string>
+    <string name="text_local_holder_primary">Du hast noch keinen Manga gespeichert</string>
+    <string name="text_history_holder_secondary">Was du lesen kannst, findest du im Seitenmenü.</string>
+    <string name="text_search_holder_secondary">Versuche, die Abfrage umzuformulieren.</string>
+    <string name="text_categories_holder">Du kannst Kategorien verwenden, um deine Lieblingsmangas zu organisieren. Drücke +, um eine Kategorie zu erstellen</string>
+    <string name="rename">Umbenennen</string>
+    <string name="favourites_categories">Favoriten-Kategorien</string>
+    <string name="vibration">Vibration</string>
+    <string name="light_indicator">Leuchtanzeige</string>
+    <string name="notification_sound">Benachrichtigungston</string>
+    <string name="notifications_settings">Einstellungen für Benachrichtigungen</string>
+    <string name="restart">Neu starten</string>
+    <string name="read_from_start">Von Anfang an lesen</string>
+    <string name="download">Herunterladen</string>
+    <string name="new_chapters">Neue Kapitel</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Aktiviert %1$d von %2$d</string>
+    <string name="notifications">Benachrichtigungen</string>
+    <string name="save_manga">Manga speichern</string>
+    <string name="large_manga_save_confirm">Dieser Manga hat %s. Möchtest du 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">Suchverlauf gelöscht</string>
+    <string name="clear_search_history">Suchverlauf löschen</string>
+    <string name="clear_thumbs_cache">Cache für Miniaturansichten löschen</string>
+    <string name="error">Fehler</string>
+    <string name="dont_ask_again">Nicht mehr fragen</string>
+    <string name="network_consumption_warning">Dieser Vorgang kann viel Netzwerkverkehr verbrauchen</string>
+    <string name="warning">Warnung</string>
+    <string name="_continue">Weiter</string>
+    <string name="volume_buttons">Lautstärketasten</string>
+    <string name="switch_pages">Seiten wechseln</string>
+    <string name="reader_settings">Lesemoduseinstellungen</string>
+    <string name="delete_manga">Manga löschen</string>
+    <string name="search_on_s">Auf %s suchen</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="cache">Cache</string>
+    <string name="clear_pages_cache">Seitencache löschen</string>
+    <string name="history_and_cache">Verlauf und Cache</string>
+    <string name="no_description">Keine Beschreibung</string>
+    <string name="text_file_not_supported">Ungültige Datei. Nur ZIP und CBZ werden unterstützt.</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">Seite erfolgreich gespeichert</string>
+    <string name="save_page">Seite speichern</string>
+    <string name="wait_for_loading_finish">Warte, bis der Ladevorgang beendet ist</string>
+    <string name="clear">Löschen</string>
+    <string name="taps_on_edges">Auf Kanten tippen</string>
+    <string name="captcha_solve">Löse</string>
+    <string name="captcha_required">CAPTCHA ist 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 eine Sicherung deines Verlaufs und deiner Favoriten erstellen und diese wiederherstellen</string>
+    <string name="data_restored_with_errors">Die Daten wurden wiederhergestellt, aber es gibt Fehler</string>
+    <string name="data_restored_success">Alle Daten erfolgreich 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 der Anwendung nach dem Passwort fragen</string>
+    <string name="protect_application">Anwendung schützen</string>
+    <string name="wrong_password">Falsches Passwort</string>
+    <string name="enter_password">Gib das Passwort ein</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">Kapitel fehlt</string>
+    <string name="chapter_is_missing_text">Dieses Kapitel fehlt auf deinem Gerät. Lade ihn herunter oder lese ihn online.</string>
+    <string name="text_downloads_holder">Zurzeit sind keine aktiven Datenübertragungen vorhanden</string>
+    <string name="queued">In Warteschlange</string>
+    <string name="about_support_developer_summary">Wenn diese Anwendung dir gefällt, kannst du über Yoomoney (Yandex.Money) finanziell helfen</string>
+    <string name="about_license">Lizenz</string>
+    <string name="about_copyright_and_licenses">Urheberrecht und Lizenzen</string>
+    <string name="about_gratitudes_summary">Diese Leute machen Kotatsu besser!</string>
+    <string name="about_gratitudes">Danksagung</string>
+    <string name="about_support_developer">Den Entwickler unterstützen</string>
+    <string name="about_feedback_4pda">Thema auf 4PDA</string>
+    <string name="about_feedback">Rückmeldung</string>
+    <string name="about_author">Autor</string>
+    <string name="about_app_translation">Übersetzung</string>
+    <string name="about_app_translation_summary">Diese Anwendung übersetzen</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
new file mode 100644
index 000000000..d68590bf5
--- /dev/null
+++ b/app/src/main/res/values-es/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<plurals name="pages">
+		<item quantity="one">Total %1$d página</item>
+		<item quantity="other">Total %1$d páginas</item>
+	</plurals>
+	<plurals name="items">
+		<item quantity="one">%1$d elemento</item>
+		<item quantity="other">%1$d elementos</item>
+	</plurals>
+	<plurals name="new_chapters">
+		<item quantity="one">%1$d nuevo capítulo</item>
+		<item quantity="other">%1$d nuevos capítulos</item>
+	</plurals>
+	<plurals name="chapters">
+		<item quantity="one">%1$d capítulo</item>
+		<item quantity="other">%1$d capítulos</item>
+	</plurals>
+	<plurals name="chapters_from_x">
+		<item quantity="one">%1$d capítulo desde %2$d</item>
+		<item quantity="other">%1$d capítulos desde %2$d</item>
+	</plurals>
+	<plurals name="minutes_ago">
+		<item quantity="one">%hace 1$d minuto</item>
+		<item quantity="other">hace %1$d minutos</item>
+	</plurals>
+	<plurals name="hours_ago">
+		<item quantity="one">hace %1$d hora</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="other">hace %1$d días</item>
+	</plurals>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 000000000..72a0f75e1
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="close_menu">Cerrar menú</string>
+    <string name="open_menu">Abrir menú</string>
+    <string name="local_storage">Dispositivo</string>
+    <string name="favourites">Favoritos</string>
+    <string name="history">Historial</string>
+    <string name="error_occurred">Ocurrió un error</string>
+    <string name="network_error">Error de red</string>
+    <string name="details">Detalles</string>
+    <string name="chapters">Capítulos</string>
+    <string name="list">Lista</string>
+    <string name="detailed_list">Lista detallada</string>
+    <string name="grid">Cuadrículas</string>
+    <string name="list_mode">Vista de lista</string>
+    <string name="settings">Ajustes</string>
+    <string name="remote_sources">Fuentes remotas</string>
+    <string name="loading_">Cargando…</string>
+    <string name="chapter_d_of_d">Capítulo %1$d de %2$d</string>
+    <string name="close">Cerrar</string>
+    <string name="try_again">Reintentar</string>
+    <string name="clear_history">Borrar historial</string>
+    <string name="nothing_found">No se encontró nada</string>
+    <string name="history_is_empty">Historial vacío</string>
+    <string name="read">Leer</string>
+    <string name="add_bookmark">Añadir marcador</string>
+    <string name="you_have_not_favourites_yet">Añade tu manga favorito primero</string>
+    <string name="add_to_favourites">Añadir a favoritos</string>
+    <string name="add_new_category">Añadir categoría</string>
+    <string name="add">Añadir</string>
+    <string name="enter_category_name">Introduce categoría</string>
+    <string name="save">Guardar</string>
+    <string name="share">Compartir</string>
+    <string name="create_shortcut">Crear acceso directo…</string>
+    <string name="share_s">Compartir %s</string>
+    <string name="search">Buscar</string>
+    <string name="search_manga">Buscar manga</string>
+    <string name="manga_downloading_">Descargar manga…</string>
+    <string name="processing_">Procesando…</string>
+    <string name="download_complete">Descarga completa</string>
+    <string name="downloads">Descargas</string>
+    <string name="by_name">Por nombre</string>
+    <string name="popular">Popularidad</string>
+    <string name="updated">Actualización</string>
+    <string name="newest">Recientes</string>
+    <string name="by_rating">Por calificación</string>
+    <string name="all">Todo</string>
+    <string name="sort_order">Establecer orden</string>
+    <string name="genre">Género</string>
+    <string name="filter">Filtrar</string>
+    <string name="theme">Tema</string>
+    <string name="light">Claro</string>
+    <string name="dark">Oscuro</string>
+    <string name="automatic">Automático</string>
+    <string name="pages">Páginas</string>
+    <string name="clear">Borrar</string>
+    <string name="text_clear_history_prompt">¿Realmente quieres borrar todo tu historial de lectura? Esta acción no se puede deshacer.</string>
+    <string name="remove">Eliminar</string>
+    <string name="_s_removed_from_history">\"%s\" retirado del historial</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" borrado del almacenamiento local</string>
+    <string name="wait_for_loading_finish">Espera que termine la carga</string>
+    <string name="save_page">Guardar página</string>
+    <string name="page_saved">Página guardada con éxito</string>
+    <string name="share_image">Compartir imagen</string>
+    <string name="_import">Importar</string>
+    <string name="delete">Borrar</string>
+    <string name="operation_not_supported">Esta operación no está admitida</string>
+    <string name="text_file_not_supported">Archivo no válido. Sólo se admiten ZIP y CBZ.</string>
+    <string name="no_description">Sin descripción</string>
+    <string name="history_and_cache">Historial y caché</string>
+    <string name="clear_pages_cache">Borrar la caché de páginas</string>
+    <string name="cache">Caché</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="standard">Estándar</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="read_mode">Modo de lectura</string>
+    <string name="grid_size">Tamaño de la cuadrícula</string>
+    <string name="search_on_s">Buscar en %s</string>
+    <string name="delete_manga">Borrar manga</string>
+    <string name="text_delete_local_manga">¿Realmente quieres borrar \"%s\"  del almacenamiento local de tu teléfono? \nEsta operación no se puede deshacer.</string>
+    <string name="reader_settings">Ajustes del lector</string>
+    <string name="switch_pages">Cambiar de página</string>
+    <string name="taps_on_edges">Tapas en los bordes</string>
+    <string name="volume_buttons">Botones de volumen</string>
+    <string name="_continue">Continuar</string>
+    <string name="warning">Advertencia</string>
+    <string name="network_consumption_warning">Esta operación puede consumir mucho tráfico de red</string>
+    <string name="dont_ask_again">No volver a preguntar</string>
+    <string name="cancelling_">Cancelar…</string>
+    <string name="error">Error</string>
+    <string name="clear_thumbs_cache">Borrar la caché de miniaturas</string>
+    <string name="clear_search_history">Borrar el historial de búsqueda</string>
+    <string name="search_history_cleared">Historial de búsqueda borrado</string>
+    <string name="gestures_only">Sólo gestos</string>
+    <string name="internal_storage">Almacenamiento interno</string>
+    <string name="external_storage">Almacenamiento externo</string>
+    <string name="domain">Dominio</string>
+    <string name="application_update">Comprobar actualizaciones automáticamente</string>
+    <string name="app_update_available">Una nueva versión de la aplicación está disponible</string>
+    <string name="show_notification_app_update">Mostrar notificación si la actualización está disponible</string>
+    <string name="open_in_browser">Abrir en el navegador</string>
+    <string name="large_manga_save_confirm">Este manga tiene %s. ¿Quieres guardarlo todo?</string>
+    <string name="save_manga">Guardar manga</string>
+    <string name="notifications">Notificaciones</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Activado %1$d de %2$d</string>
+    <string name="new_chapters">Nuevos capítulos</string>
+    <string name="show_notification_new_chapters">Notificar sobre las actualizaciones del manga que estás leyendo</string>
+    <string name="download">Descargar</string>
+    <string name="read_from_start">Leer desde el principio</string>
+    <string name="restart">Reiniciar</string>
+    <string name="notifications_settings">Configuración de las notificaciones</string>
+    <string name="notification_sound">Sonido de las notificaciones</string>
+    <string name="light_indicator">Indicador de luz</string>
+    <string name="vibration">Vibración</string>
+    <string name="favourites_categories">Categorías favoritas</string>
+    <string name="categories_">Categorías…</string>
+    <string name="rename">Renombrar</string>
+    <string name="category_delete_confirm">¿Realmente quieres eliminar la categoría \"%s\" de tus favoritos? \nTodo el manga en ella se perderá.</string>
+    <string name="remove_category">Quitar categoría</string>
+    <string name="text_categories_holder">Puedes usar categorías para organizar tus mangas favoritos. Pulsa «+» para crear una categoría</string>
+    <string name="manga_shelf">Estante de manga</string>
+    <string name="recent_manga">Manga reciente</string>
+    <string name="pages_animation">Animación de páginas</string>
+    <string name="manga_save_location">Ubicación de descarga del manga</string>
+    <string name="not_available">No disponible</string>
+    <string name="cannot_find_available_storage">No se puede encontrar ningún almacenamiento disponible</string>
+    <string name="other_storage">Otro almacenamiento</string>
+    <string name="use_ssl">Utilizar conexión segura (HTTPS)</string>
+    <string name="done">Aceptar</string>
+    <string name="all_favourites">Todos los favoritos</string>
+    <string name="favourites_category_empty">Esta categoría está vacía</string>
+    <string name="read_later">Leer más tarde</string>
+    <string name="updates">Actualizaciones</string>
+    <string name="text_feed_holder">Aquí verás los nuevos episodios del manga que estás leyendo</string>
+    <string name="search_results">Resultados de la búsqueda</string>
+    <string name="related">Relación</string>
+    <string name="new_version_s">Nueva versión: %s</string>
+    <string name="size_s">Tamaño: %s</string>
+    <string name="waiting_for_network">Esperando red…</string>
+    <string name="clear_updates_feed">Borrar actualizaciones</string>
+    <string name="updates_feed_cleared">Borrar el feed de actualizaciones</string>
+    <string name="rotate_screen">Girar pantalla</string>
+    <string name="update">Actualizar</string>
+    <string name="feed_will_update_soon">La actualización de la alimentación comenzará pronto</string>
+    <string name="track_sources">Comprueba las actualizaciones del manga</string>
+    <string name="dont_check">No comprobar</string>
+    <string name="enter_password">Introducir contraseña</string>
+    <string name="wrong_password">Contraseña incorrecta</string>
+    <string name="protect_application">Proteger aplicación</string>
+    <string name="protect_application_summary">Pide la contraseña al iniciar la aplicación</string>
+    <string name="repeat_password">Repite la contraseña</string>
+    <string name="passwords_mismatch">Las contraseñas no coinciden</string>
+    <string name="about">Acerca de</string>
+    <string name="app_version">Versión %s</string>
+    <string name="check_for_updates">Comprobar actualizaciones</string>
+    <string name="checking_for_updates">Comprobar si hay actualizaciones…</string>
+    <string name="update_check_failed">Fallo en la comprobación de actualizaciones</string>
+    <string name="no_update_available">No hay actualizaciones disponibles</string>
+    <string name="right_to_left">Derecha a izquierda</string>
+    <string name="prefer_rtl_reader">Preferir lector de derecha a izquierda</string>
+    <string name="prefer_rtl_reader_summary">Puedes configurar el modo de lectura para cada manga por separado</string>
+    <string name="create_category">Nueva categoría</string>
+    <string name="report_github">Crear incidencia en GitHub</string>
+    <string name="scale_mode">Modo de escala</string>
+    <string name="zoom_mode_fit_center">Ajuste al centro</string>
+    <string name="zoom_mode_fit_height">Ajuste a la altura</string>
+    <string name="zoom_mode_fit_width">Ajuste a la anchura</string>
+    <string name="zoom_mode_keep_start">Mantener al iniciar</string>
+    <string name="black_dark_theme">Tema oscuro auténtico</string>
+    <string name="black_dark_theme_summary">Útil para pantallas AMOLED</string>
+    <string name="restart_required">Se requiere reinicio</string>
+    <string name="backup_restore"><![CDATA[Respaldo y restauración]]></string>
+    <string name="create_backup">Crear copia de seguridad de datos</string>
+    <string name="restore_backup">Restaurar desde la copia de seguridad</string>
+    <string name="data_restored">Datos restaurados</string>
+    <string name="preparing_">Preparando…</string>
+    <string name="file_not_found">Archivo no encontrado</string>
+    <string name="data_restored_success">Todos los datos fueron restaurados con éxito</string>
+    <string name="data_restored_with_errors">Los datos fueron restaurados, pero hay errores</string>
+    <string name="backup_information">Puedes crear una copia de seguridad de tu historial y favoritos para restaurarla</string>
+    <string name="just_now">Ahora mismo</string>
+    <string name="yesterday">Ayer</string>
+    <string name="long_ago">Hace mucho tiempo</string>
+    <string name="group">Grupo</string>
+    <string name="today">Hoy</string>
+    <string name="tap_to_try_again">Toca para volver a intentar</string>
+    <string name="reader_mode_hint">Se recordará la configuración elegida para este manga</string>
+    <string name="silent">Silenciar</string>
+    <string name="captcha_required">El captcha es obligatorio</string>
+    <string name="captcha_solve">Resolver</string>
+    <string name="clear_cookies">Borrar cookies</string>
+    <string name="cookies_cleared">Se han eliminado todas las cookies</string>
+    <string name="chapters_checking_progress">Buscando nuevos capítulos: %1$d de %2$d</string>
+    <string name="clear_feed">Limpiar feed</string>
+    <string name="text_clear_updates_feed_prompt">Todo el historial de actualizaciones se borrará y esta acción no se puede deshacer. ¿Está seguro?</string>
+    <string name="new_chapters_checking">Comprobación de nuevos capítulos</string>
+    <string name="reverse">Invertir</string>
+    <string name="sign_in">Iniciar sesión</string>
+    <string name="auth_required">Debes autorizar para ver este contenido</string>
+    <string name="default_s">Por defecto: %s</string>
+    <string name="_and_x_more">…y %1$d más</string>
+    <string name="next">Siguiente</string>
+    <string name="protect_application_subtitle">Introduce la contraseña que se requerirá cuando se inicie la aplicación</string>
+    <string name="confirm">Confirmar</string>
+    <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">Puede encontrar qué leer en el menú lateral.</string>
+    <string name="text_history_holder_primary">El manga que estás leyendo se mostrará aquí</string>
+    <string name="text_empty_holder_primary">Está un poco vacío aquí…</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
new file mode 100644
index 000000000..8f9d8e163
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="wait_for_loading_finish">Attendez la fin du chargement</string>
+    <string name="read_more">Lire la suite</string>
+    <string name="tracker_warning">Certains fabricants peuvent modifier le comportement du système, ce qui peut interrompre les tâches d\'arrière-plan.</string>
+    <string name="backup_saved">Sauvegarde enregistrée avec succès</string>
+    <string name="description">Description</string>
+    <string name="welcome">Bienvenue</string>
+    <string name="languages">Langues</string>
+    <string name="other">Autre</string>
+    <string name="text_clear_search_history_prompt">Voulez-vous vraiment supprimer toutes les requêtes de recherche récentes \? Cette action ne peut pas être annulée.</string>
+    <string name="search_only_on_s">Rechercher uniquement sur %s</string>
+    <string name="hide_toolbar">Masquer la barre d\'outils lors du défilement</string>
+    <string name="password_length_hint">Le mot de passe doit comporter au moins 4 caractères</string>
+    <string name="confirm">Confirmer</string>
+    <string name="protect_application_subtitle">Entrez le mot de passe qui sera demandé au démarrage de l\'application</string>
+    <string name="next">Suivant</string>
+    <string name="_and_x_more">… et %1$d autre(s)</string>
+    <string name="default_s">Par défaut : %s</string>
+    <string name="auth_required">Vous devez autoriser la visualisation de ce contenu</string>
+    <string name="sign_in">Se connecter</string>
+    <string name="reverse">Inverser</string>
+    <string name="new_chapters_checking">Recherche de nouveaux chapitres</string>
+    <string name="text_clear_updates_feed_prompt">L\'historique des mises à jour sera effacé et cette action ne pourra pas être annulée. Êtes-vous sûr·e \?</string>
+    <string name="clear_feed">Effacer le flux</string>
+    <string name="chapters_checking_progress">Recherche de nouveaux chapitres : %1$d sur %2$d</string>
+    <string name="cookies_cleared">Tous les cookies ont été retirés</string>
+    <string name="clear_cookies">Effacer les cookies</string>
+    <string name="captcha_solve">Résoudre</string>
+    <string name="captcha_required">CAPTCHA est requis</string>
+    <string name="silent">Silencieux</string>
+    <string name="reader_mode_hint">La configuration choisie sera mémorisée pour ce manga</string>
+    <string name="tap_to_try_again">Appuyez pour réessayer</string>
+    <string name="today">Aujourd\'hui</string>
+    <string name="group">Groupe</string>
+    <string name="long_ago">Il y a longtemps</string>
+    <string name="yesterday">Hier</string>
+    <string name="just_now">À l\'instant</string>
+    <string name="backup_information">Vous pouvez créer une sauvegarde de votre historique et de vos favoris et la restaurer</string>
+    <string name="data_restored_with_errors">Les données ont été restaurées, mais il y a des erreurs</string>
+    <string name="data_restored_success">Toutes les données ont été restaurées avec succès</string>
+    <string name="file_not_found">Fichier introuvable</string>
+    <string name="preparing_">Préparation…</string>
+    <string name="data_restored">Données restaurées</string>
+    <string name="restore_backup">Restaurer à partir d\'une sauvegarde</string>
+    <string name="create_backup">Créer une sauvegarde des données</string>
+    <string name="backup_restore">Sauvegarde et restauration</string>
+    <string name="restart_required">Redémarrage nécessaire</string>
+    <string name="black_dark_theme_summary">Utile pour les écrans AMOLED</string>
+    <string name="black_dark_theme">Thème noir foncé</string>
+    <string name="zoom_mode_keep_start">Garder au début</string>
+    <string name="zoom_mode_fit_width">Ajuster à la largeur</string>
+    <string name="zoom_mode_fit_height">Ajuster à la hauteur</string>
+    <string name="zoom_mode_fit_center">Ajuster au centre</string>
+    <string name="scale_mode">Mode mise à l\'échelle</string>
+    <string name="report_github">Signaler un problème sur GitHub</string>
+    <string name="create_category">Nouvelle catégorie</string>
+    <string name="prefer_rtl_reader_summary">Vous pouvez configurer le mode de lecture pour chaque manga séparément</string>
+    <string name="prefer_rtl_reader">Préférer le lecteur de droite à gauche</string>
+    <string name="right_to_left">De droite à gauche</string>
+    <string name="no_update_available">Aucune mise à jour disponible</string>
+    <string name="update_check_failed">Échec de la recherche de mise à jour</string>
+    <string name="checking_for_updates">Recherche de mises à jour…</string>
+    <string name="check_for_updates">Vérifier les mises à jour</string>
+    <string name="app_version">Version %s</string>
+    <string name="about">À propos</string>
+    <string name="passwords_mismatch">Les mots de passe ne correspondent pas</string>
+    <string name="repeat_password">Répéter le mot de passe</string>
+    <string name="protect_application_summary">Demander le mot de passe au démarrage de l\'appli</string>
+    <string name="protect_application">Protéger l\'application</string>
+    <string name="wrong_password">Mot de passe erroné</string>
+    <string name="enter_password">Entrez le mot de passe</string>
+    <string name="dont_check">Ne pas vérifier</string>
+    <string name="track_sources">Vérifier les mises à jour pour les mangas</string>
+    <string name="feed_will_update_soon">La mise à jour des flux commencera bientôt</string>
+    <string name="update">Mettre à Jour</string>
+    <string name="rotate_screen">Faire pivoter l\'écran</string>
+    <string name="updates_feed_cleared">Flux de mises à jour effacé</string>
+    <string name="clear_updates_feed">Effacer le flux des mises à jour</string>
+    <string name="waiting_for_network">En attente du réseau…</string>
+    <string name="size_s">Taille : %s</string>
+    <string name="new_version_s">Nouvelle version : %s</string>
+    <string name="related">Connexes</string>
+    <string name="search_results">Résultats de la recherche</string>
+    <string name="text_feed_holder">Ici, vous verrez les nouveaux chapitres du manga que vous lisez</string>
+    <string name="updates">Mises à jour</string>
+    <string name="read_later">Lire plus tard</string>
+    <string name="favourites_category_empty">Cette catégorie est vide</string>
+    <string name="all_favourites">Tous les favoris</string>
+    <string name="done">Terminé</string>
+    <string name="use_ssl">Utiliser une connexion sécurisée (HTTPS)</string>
+    <string name="other_storage">Autre stockage</string>
+    <string name="cannot_find_available_storage">Impossible de trouver un stockage disponible</string>
+    <string name="not_available">Non disponible</string>
+    <string name="manga_save_location">Emplacement des téléchargements de mangas</string>
+    <string name="pages_animation">Animation des pages</string>
+    <string name="recent_manga">Mangas récents</string>
+    <string name="manga_shelf">Étagère à mangas</string>
+    <string name="text_local_holder_secondary">Vous pouvez l\'enregistrer à partir de sources en ligne ou l\'importer à partir d\'un fichier.</string>
+    <string name="text_local_holder_primary">Vous n\'avez pas encore enregistré de manga</string>
+    <string name="text_history_holder_secondary">Vous pouvez trouver ce qu\'il faut lire dans le menu latéral.</string>
+    <string name="text_history_holder_primary">Les mangas que vous lisez seront affichés ici</string>
+    <string name="text_search_holder_secondary">Essayez de reformuler la requête.</string>
+    <string name="text_categories_holder">Vous pouvez utiliser des catégories pour organiser vos mangas préférés. Appuyez sur « + » pour créer une catégorie</string>
+    <string name="text_empty_holder_primary">C\'est un peu vide ici…</string>
+    <string name="remove_category">Retirer la catégorie</string>
+    <string name="category_delete_confirm">Voulez-vous vraiment supprimer la catégorie « %s » de vos favoris \?
+\nTous les mangas qu\'elle contient seront perdus.</string>
+    <string name="rename">Renommer</string>
+    <string name="categories_">Catégories…</string>
+    <string name="favourites_categories">Catégories de favoris</string>
+    <string name="vibration">Vibration</string>
+    <string name="light_indicator">Indicateur lumineux</string>
+    <string name="notification_sound">Son de notification</string>
+    <string name="restart">Recommencer</string>
+    <string name="notifications_settings">Paramètres des notifications</string>
+    <string name="read_from_start">Lire depuis le début</string>
+    <string name="download">Télécharger</string>
+    <string name="show_notification_new_chapters">Avertir des mises à jour des mangas que vous lisez</string>
+    <string name="new_chapters">Nouveaux chapitres</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Activé %1$d sur %2$d</string>
+    <string name="notifications">Notifications</string>
+    <string name="large_manga_save_confirm">Ce manga a %s. Voulez-vous l\'enregistrer en entier \?</string>
+    <string name="save_manga">Enregistrer le manga</string>
+    <string name="open_in_browser">Ouvrir dans le navigateur</string>
+    <string name="show_notification_app_update">Afficher une notification si une mise à jour est disponible</string>
+    <string name="app_update_available">Une mise à jour de l\'application est disponible</string>
+    <string name="application_update">Vérifier les mises à jour automatiquement</string>
+    <string name="domain">Domaine</string>
+    <string name="external_storage">Stockage externe</string>
+    <string name="internal_storage">Stockage interne</string>
+    <string name="gestures_only">Gestes uniquement</string>
+    <string name="search_history_cleared">Historique des recherches effacé</string>
+    <string name="clear_search_history">Effacer l\'historique de recherche</string>
+    <string name="clear_thumbs_cache">Vider le cache des miniatures</string>
+    <string name="error">Erreur</string>
+    <string name="cancelling_">Annulation…</string>
+    <string name="dont_ask_again">Ne plus demander</string>
+    <string name="network_consumption_warning">Cette opération peut consommer beaucoup de trafic réseau</string>
+    <string name="warning">Avertissement</string>
+    <string name="_continue">Continuer</string>
+    <string name="volume_buttons">Boutons de volume</string>
+    <string name="taps_on_edges">Appuis sur les bords</string>
+    <string name="switch_pages">Changer de pages</string>
+    <string name="reader_settings">Paramètres du lecteur</string>
+    <string name="text_delete_local_manga">Voulez-vous vraiment supprimer « %s » de la mémoire locale de votre téléphone \?
+\nCette opération ne peut pas être annulée.</string>
+    <string name="delete_manga">Supprimer le manga</string>
+    <string name="search_on_s">Rechercher sur %s</string>
+    <string name="grid_size">Taille de la grille</string>
+    <string name="read_mode">Mode lecture</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="standard">Standard</string>
+    <string name="text_file_sizes">o|ko|Mo|Go|To</string>
+    <string name="cache">Cache</string>
+    <string name="clear_pages_cache">Vider le cache des pages</string>
+    <string name="history_and_cache">Historique et cache</string>
+    <string name="no_description">Aucune description</string>
+    <string name="text_file_not_supported">Fichier invalide. Seuls les fichiers ZIP et CBZ sont pris en charge.</string>
+    <string name="operation_not_supported">Cette opération n\'est pas prise en charge</string>
+    <string name="delete">Supprimer</string>
+    <string name="_import">Importer</string>
+    <string name="share_image">Partager l\'image</string>
+    <string name="page_saved">Page sauvegardée avec succès</string>
+    <string name="save_page">Sauvegarder la page</string>
+    <string name="_s_deleted_from_local_storage">« %s » supprimé du stockage local</string>
+    <string name="_s_removed_from_history">« %s » retiré de l\'historique</string>
+    <string name="remove">Retirer</string>
+    <string name="text_clear_history_prompt">Voulez-vous vraiment effacer tout votre historique de lecture \? Cette action ne peut pas être annulée.</string>
+    <string name="clear">Effacer</string>
+    <string name="pages">Pages</string>
+    <string name="automatic">Automatique</string>
+    <string name="dark">Sombre</string>
+    <string name="light">Clair</string>
+    <string name="theme">Thème</string>
+    <string name="filter">Filtre</string>
+    <string name="genre">Genre</string>
+    <string name="sort_order">Ordre de tri</string>
+    <string name="all">Tous</string>
+    <string name="by_rating">Par évaluation</string>
+    <string name="newest">Le plus récent</string>
+    <string name="updated">Mis à jour</string>
+    <string name="popular">Populaire</string>
+    <string name="by_name">Par nom</string>
+    <string name="downloads">Téléchargements</string>
+    <string name="download_complete">Téléchargement terminé</string>
+    <string name="processing_">Traitement…</string>
+    <string name="manga_downloading_">Téléchargement de mangas…</string>
+    <string name="search_manga">Rechercher un manga</string>
+    <string name="search">Rechercher</string>
+    <string name="share_s">Partager %s</string>
+    <string name="create_shortcut">Créer un raccourci…</string>
+    <string name="share">Partager</string>
+    <string name="save">Enregistrer</string>
+    <string name="enter_category_name">Entrez le nom de la catégorie</string>
+    <string name="add">Ajouter</string>
+    <string name="add_new_category">Ajouter une nouvelle catégorie</string>
+    <string name="add_to_favourites">Ajouter aux favoris</string>
+    <string name="you_have_not_favourites_yet">Vous n\'avez pas encore de favoris</string>
+    <string name="add_bookmark">Ajouter un marque-page</string>
+    <string name="read">Lire</string>
+    <string name="history_is_empty">L\'historique est vide</string>
+    <string name="nothing_found">Rien n\'a été trouvé</string>
+    <string name="clear_history">Effacer l\'historique</string>
+    <string name="try_again">Réessayer</string>
+    <string name="close">Fermer</string>
+    <string name="chapter_d_of_d">Chapitre %1$d sur %2$d</string>
+    <string name="loading_">Chargement…</string>
+    <string name="remote_sources">Sources distantes</string>
+    <string name="settings">Paramètres</string>
+    <string name="list_mode">Mode liste</string>
+    <string name="grid">Grille</string>
+    <string name="detailed_list">Liste détaillée</string>
+    <string name="list">Liste</string>
+    <string name="chapters">Chapitres</string>
+    <string name="details">Détails</string>
+    <string name="network_error">Erreur de connexion au réseau</string>
+    <string name="error_occurred">Une erreur s\'est produite</string>
+    <string name="history">Historique</string>
+    <string name="favourites">Favoris</string>
+    <string name="local_storage">Stockage local</string>
+    <string name="open_menu">Ouvrir le menu</string>
+    <string name="close_menu">Fermer le menu</string>
+    <string name="chapter_is_missing">Chapitre manquant</string>
+    <string name="chapter_is_missing_text">Ce chapitre est manquant sur votre appareil. Téléchargez-le ou lisez-le en ligne.</string>
+    <string name="text_downloads_holder">Il n\'y a actuellement aucun téléchargement actif</string>
+    <string name="queued">En file d\'attente</string>
+    <string name="about_support_developer_summary">Si vous aimez cette application, vous pouvez aider financièrement par le biais de Yoomoney (Yandex.Money)</string>
+    <string name="about_support_developer">Soutenir le concepteur</string>
+    <string name="about_license">Licence</string>
+    <string name="about_copyright_and_licenses">Droits d\'auteur et licences</string>
+    <string name="about_gratitudes_summary">Ces gens font que Kotatsu s\'améliore !</string>
+    <string name="about_gratitudes">Remerciements</string>
+    <string name="about_feedback_4pda">Sujet sur 4PDA</string>
+    <string name="about_feedback">Remarques</string>
+    <string name="about_author">Auteur</string>
+    <string name="about_app_translation">Traduction</string>
+    <string name="about_app_translation_summary">Traduire cette application</string>
+</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
new file mode 100644
index 000000000..32645cbbf
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="history_and_cache">Cronologia e cache</string>
+    <string name="no_description">Nessuna descrizione</string>
+    <string name="text_file_not_supported">File non valido. Sono supportati solo ZIP e CBZ.</string>
+    <string name="operation_not_supported">Questa operazione non è supportata</string>
+    <string name="delete">Elimina</string>
+    <string name="_import">Importa</string>
+    <string name="share_image">Condividi l\'immagine</string>
+    <string name="page_saved">Pagina salvata correttamente</string>
+    <string name="save_page">Salva la pagina</string>
+    <string name="wait_for_loading_finish">Aspetta che il carico finisca</string>
+    <string name="pages">Pagine</string>
+    <string name="automatic">Automatico</string>
+    <string name="dark">Scuro</string>
+    <string name="light">Chiaro</string>
+    <string name="theme">Tema</string>
+    <string name="filter">Filtro</string>
+    <string name="genre">Genere</string>
+    <string name="sort_order">Ordinamento</string>
+    <string name="all">Tutti</string>
+    <string name="by_rating">Per valutazione</string>
+    <string name="newest">Più recente</string>
+    <string name="updated">Aggiornato</string>
+    <string name="popular">Popolare</string>
+    <string name="by_name">Per nome</string>
+    <string name="downloads">Scaricati</string>
+    <string name="download_complete">Scaricamento finito</string>
+    <string name="processing_">Elaborazione…</string>
+    <string name="manga_downloading_">Scaricamento di manga…</string>
+    <string name="search_manga">Cerca manga</string>
+    <string name="search">Cerca</string>
+    <string name="share_s">Condividi %s</string>
+    <string name="create_shortcut">Crea una scorciatoia…</string>
+    <string name="share">Condividi</string>
+    <string name="save">Salva</string>
+    <string name="enter_category_name">Inserisci il nome della categoria</string>
+    <string name="add">Aggiungi</string>
+    <string name="add_new_category">Aggiungi una nuova categoria</string>
+    <string name="add_to_favourites">Aggiungi ai preferiti</string>
+    <string name="you_have_not_favourites_yet">Non hai ancora preferiti</string>
+    <string name="add_bookmark">Aggiungi un segnalibro</string>
+    <string name="read">Leggi</string>
+    <string name="history_is_empty">La cronologia è vuota</string>
+    <string name="nothing_found">Niente di trovato</string>
+    <string name="clear_history">Cancella la cronologia</string>
+    <string name="try_again">Riprova</string>
+    <string name="text_clear_updates_feed_prompt">Tutta la cronologia degli aggiornamenti sarà cancellata e questa azione non può essere annullata. Sei sicuro/a\?</string>
+    <string name="close">Chiudi</string>
+    <string name="chapter_d_of_d">Capitolo %1$d di %2$d</string>
+    <string name="loading_">Caricamento…</string>
+    <string name="remote_sources">Fonti remote</string>
+    <string name="settings">Impostazioni</string>
+    <string name="list_mode">Modalità elenco</string>
+    <string name="grid">Griglia</string>
+    <string name="detailed_list">Elenco dettagliato</string>
+    <string name="category_delete_confirm">Vuoi davvero rimuovere la categoria «%s» dai tuoi preferiti\?
+\nTutti i manga contenuti saranno persi.</string>
+    <string name="text_delete_local_manga">Vuoi davvero eliminare «%s» dalla memoria locale del tuo telefono\?
+\nQuesta operazione non può essere annullata.</string>
+    <string name="_s_deleted_from_local_storage">«%s» eliminato dall\'archiviazione locale</string>
+    <string name="_s_removed_from_history">«%s» rimosso dalla cronologia</string>
+    <string name="list">Lista</string>
+    <string name="chapters">Capitoli</string>
+    <string name="details">Dettagli</string>
+    <string name="network_error">Errore di connessione alla rete</string>
+    <string name="error_occurred">Si è verificato un errore</string>
+    <string name="history">Cronologia</string>
+    <string name="favourites">Preferiti</string>
+    <string name="local_storage">Archiviazione locale</string>
+    <string name="open_menu">Apri il menù</string>
+    <string name="close_menu">Chiudi il menù</string>
+    <string name="read_more">Leggi di più</string>
+    <string name="description">Descrizione</string>
+    <string name="welcome">Benvenuto/a</string>
+    <string name="languages">Lingue</string>
+    <string name="other">Altro</string>
+    <string name="text_clear_search_history_prompt">Vuoi davvero rimuovere tutte le ricerche recenti\? Questa azione non può essere annullata.</string>
+    <string name="search_only_on_s">Cerca solo su %s</string>
+    <string name="hide_toolbar">Nascondi la barra degli strumenti quando si scorre</string>
+    <string name="password_length_hint">La password deve essere di almeno 4 caratteri</string>
+    <string name="confirm">Conferma</string>
+    <string name="protect_application_subtitle">Inserisci la password che sarà richiesta all\'avvio dell\'applicazione</string>
+    <string name="next">Prossimo</string>
+    <string name="_and_x_more">… e %1$d altri</string>
+    <string name="sign_in">Accedi</string>
+    <string name="clear_feed">Cancella il flusso</string>
+    <string name="silent">Silenzioso</string>
+    <string name="tap_to_try_again">Tocca per riprovare</string>
+    <string name="today">Oggi</string>
+    <string name="group">Gruppo</string>
+    <string name="long_ago">Molto tempo fa</string>
+    <string name="yesterday">Ieri</string>
+    <string name="just_now">Proprio ora</string>
+    <string name="file_not_found">File non trovato</string>
+    <string name="preparing_">Preparazione…</string>
+    <string name="data_restored">Dati ripristinati</string>
+    <string name="restore_backup">Ripristina da un backup</string>
+    <string name="create_backup">Crea un backup dei dati</string>
+    <string name="backup_restore">Backup e ripristino</string>
+    <string name="restart_required">Riavvio richiesto</string>
+    <string name="black_dark_theme_summary">Utile per gli schermi AMOLED</string>
+    <string name="black_dark_theme">Tema nero scuro</string>
+    <string name="report_github">Segnala un problema su GitHub</string>
+    <string name="create_category">Nuova categoria</string>
+    <string name="prefer_rtl_reader_summary">Puoi impostare la modalità di lettura per ogni manga separatamente</string>
+    <string name="prefer_rtl_reader">Preferisci la lettura da destra a sinistra</string>
+    <string name="right_to_left">Da destra a sinistra</string>
+    <string name="no_update_available">Nessun aggiornamento disponibile</string>
+    <string name="update_check_failed">Controllo dell\'aggiornamento fallito</string>
+    <string name="checking_for_updates">Controllo degli aggiornamenti…</string>
+    <string name="check_for_updates">Controlla gli aggiornamenti</string>
+    <string name="app_version">Versione %s</string>
+    <string name="about">Informazioni</string>
+    <string name="passwords_mismatch">Le password non corrispondono</string>
+    <string name="repeat_password">Ripeti la password</string>
+    <string name="protect_application_summary">Chiedi la password all\'avvio dell\'applicazione</string>
+    <string name="protect_application">Proteggi l\'applicazione</string>
+    <string name="wrong_password">Password sbagliata</string>
+    <string name="enter_password">Inserisci la password</string>
+    <string name="dont_check">Non controllare</string>
+    <string name="track_sources">Controlla gli aggiornamenti per il manga</string>
+    <string name="feed_will_update_soon">L\'aggiornamento del flusso inizierà presto</string>
+    <string name="update">Aggiorna</string>
+    <string name="rotate_screen">Ruota lo schermo</string>
+    <string name="updates_feed_cleared">Flusso degli aggiornamenti cancellato</string>
+    <string name="clear_updates_feed">Cancella il flusso degli aggiornamenti</string>
+    <string name="waiting_for_network">In attesa della rete…</string>
+    <string name="size_s">Dimensioni: %s</string>
+    <string name="new_version_s">Nuova versione: %s</string>
+    <string name="related">Correlati</string>
+    <string name="search_results">Risultati della ricerca</string>
+    <string name="text_feed_holder">Qui potrai vedere i nuovi capitoli del manga che stai leggendo</string>
+    <string name="updates">Aggiornamenti</string>
+    <string name="read_later">Leggi più tardi</string>
+    <string name="favourites_category_empty">Questa categoria è vuota</string>
+    <string name="all_favourites">Tutti i preferiti</string>
+    <string name="done">Finito</string>
+    <string name="use_ssl">Usa una connessione sicura (HTTPS)</string>
+    <string name="other_storage">Altro spazio di archiviazione</string>
+    <string name="cannot_find_available_storage">Impossibile trovare uno spazio di archiviazione disponibile</string>
+    <string name="not_available">Non disponibile</string>
+    <string name="manga_save_location">Posizione per lo scaricamento dei manga</string>
+    <string name="pages_animation">Animazione delle pagine</string>
+    <string name="recent_manga">Manga recenti</string>
+    <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_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_categories_holder">Puoi usare le categorie per organizzare i tuoi manga preferiti. Premi + per creare una categoria</string>
+    <string name="text_empty_holder_primary">È un po\' vuoto qui…</string>
+    <string name="remove_category">Rimuovi la categoria</string>
+    <string name="rename">Rinomina</string>
+    <string name="categories_">Categorie…</string>
+    <string name="favourites_categories">Categorie di preferiti</string>
+    <string name="vibration">Vibrazione</string>
+    <string name="light_indicator">Indicatore luminoso</string>
+    <string name="notification_sound">Suono di notifica</string>
+    <string name="notifications_settings">Impostazioni notifiche</string>
+    <string name="restart">Riavvia</string>
+    <string name="read_from_start">Leggi dall\'inizio</string>
+    <string name="download">Scarica</string>
+    <string name="show_notification_new_chapters">Notifica gli aggiornamenti dei manga che stai leggendo</string>
+    <string name="new_chapters">Nuovi capitoli</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Abilitato %1$d di %2$d</string>
+    <string name="notifications">Notifiche</string>
+    <string name="save_manga">Salva il manga</string>
+    <string name="large_manga_save_confirm">Questo manga ha %s. Vuoi salvare tutto\?</string>
+    <string name="open_in_browser">Apri nel browser</string>
+    <string name="show_notification_app_update">Mostra una notifica se un aggiornamento è disponibile</string>
+    <string name="app_update_available">Un aggiornamento per l\'applicazione è disponibile</string>
+    <string name="application_update">Controlla gli aggiornamenti automaticamente</string>
+    <string name="domain">Dominio</string>
+    <string name="external_storage">Archiviazione esterna</string>
+    <string name="internal_storage">Archiviazione interna</string>
+    <string name="gestures_only">Solo gesti</string>
+    <string name="search_history_cleared">Storia della ricerca cancellata</string>
+    <string name="clear_search_history">Cancella la cronologia delle ricerche</string>
+    <string name="clear_thumbs_cache">Svuota la cache delle miniature</string>
+    <string name="error">Errore</string>
+    <string name="cancelling_">Annullamento…</string>
+    <string name="dont_ask_again">Non chiedere di nuovo</string>
+    <string name="network_consumption_warning">Questa operazione può consumare molto traffico di rete</string>
+    <string name="warning">Avviso</string>
+    <string name="_continue">Continua</string>
+    <string name="volume_buttons">Pulsanti volume</string>
+    <string name="taps_on_edges">Tocchi sui bordi</string>
+    <string name="switch_pages">Cambia pagina</string>
+    <string name="reader_settings">Impostazioni del lettore</string>
+    <string name="delete_manga">Elimina il manga</string>
+    <string name="search_on_s">Ricerca su %s</string>
+    <string name="grid_size">Dimensione della griglia</string>
+    <string name="read_mode">Modalità lettura</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="standard">Standard</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="cache">Cache</string>
+    <string name="clear_pages_cache">Cancella la cache delle pagine</string>
+    <string name="remove">Rimuovi</string>
+    <string name="text_clear_history_prompt">Vuoi davvero cancellare tutta la tua cronologia di lettura\? Questa azione non può essere annullata.</string>
+    <string name="clear">Cancella</string>
+    <string name="tracker_warning">Alcuni produttori possono cambiare il comportamento del sistema, che può interrompere le attività nello sfondo.</string>
+    <string name="backup_saved">Backup salvato con successo</string>
+    <string name="default_s">Predefinito: %s</string>
+    <string name="auth_required">Devi autorizzare la visualizzazione di questo contenuto</string>
+    <string name="reverse">Inverti</string>
+    <string name="new_chapters_checking">Controllo dei nuovi capitoli</string>
+    <string name="chapters_checking_progress">Controllo dei nuovi capitoli: %1$d di %2$d</string>
+    <string name="cookies_cleared">Tutti i cookie sono stati rimossi</string>
+    <string name="clear_cookies">Cancella i cookie</string>
+    <string name="captcha_solve">Risolvi</string>
+    <string name="captcha_required">CAPTCHA è richiesto</string>
+    <string name="reader_mode_hint">La configurazione scelta sarà ricordata per questo manga</string>
+    <string name="backup_information">Puoi creare un backup della tua cronologia e dei tuoi preferiti e ripristinarlo</string>
+    <string name="data_restored_with_errors">I dati sono ripristinati, ma ci sono errori</string>
+    <string name="data_restored_success">Tutti i dati ripristinati con successo</string>
+    <string name="zoom_mode_keep_start">Tieni all\'inizio</string>
+    <string name="zoom_mode_fit_height">Adatta all\'altezza</string>
+    <string name="zoom_mode_fit_center">Adatta al centro</string>
+    <string name="zoom_mode_fit_width">Adatta alla larghezza</string>
+    <string name="scale_mode">Modalità scala</string>
+    <string name="chapter_is_missing">Capitolo mancante</string>
+    <string name="chapter_is_missing_text">Questo capitolo manca sul tuo dispositivo. Scaricalo o leggilo in linea.</string>
+    <string name="text_downloads_holder">Attualmente non ci sono scaricamenti attivi</string>
+    <string name="queued">In coda</string>
+    <string name="about_license">Licenza</string>
+    <string name="about_copyright_and_licenses">Diritti d\'autore e licenze</string>
+    <string name="about_gratitudes_summary">Queste persone rendono Kotatsu migliore!</string>
+    <string name="about_gratitudes">Ringraziamenti</string>
+    <string name="about_support_developer_summary">Se ti piace questa applicazione, puoi aiutare finanziariamente via Yoomoney (Yandex.Money)</string>
+    <string name="about_support_developer">Sostieni lo sviluppatore</string>
+    <string name="about_feedback_4pda">Argomento su 4PDA</string>
+    <string name="about_feedback">Commenti</string>
+    <string name="about_author">Autore</string>
+    <string name="about_app_translation">Traduzione</string>
+    <string name="about_app_translation_summary">Traduci questa applicazione</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
new file mode 100644
index 000000000..2289f397e
--- /dev/null
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="cannot_find_available_storage">Finner ikke noen tilgjengelig lagring</string>
+    <string name="manga_save_location">Nedlastingssted</string>
+    <string name="text_local_holder_secondary">Du kan lagre fra nettbaserte kilder, eller importere filer.</string>
+    <string name="tracker_warning">Noen enheter endrer systemoppførselen, noe som kan ødelegge for bakgrunnsoppgaver.</string>
+    <string name="text_clear_search_history_prompt">Fjern alle nylige søkespørringer for godt\?</string>
+    <string name="hide_toolbar">Skjul verktøylinje under rulling</string>
+    <string name="password_length_hint">Passord må være minst fire tegn</string>
+    <string name="protect_application_subtitle">Skriv inn passord å kreve for å starte programmet</string>
+    <string name="_and_x_more">… og %1$d til</string>
+    <string name="auth_required">Autoriser visning av innholdet</string>
+    <string name="reverse">Inverter</string>
+    <string name="new_chapters_checking">Sjekk etter nye kapitler</string>
+    <string name="text_clear_updates_feed_prompt">Tøm all oppdateringshistorikk for godt\?</string>
+    <string name="clear_feed">Tøm flyt</string>
+    <string name="chapters_checking_progress">Ser etter nye kapitler: %1$d av %2$d</string>
+    <string name="reader_mode_hint">Valgt oppsett vil bli husket for denne filen</string>
+    <string name="backup_information">Du kan opprette en sikkerhetskopi av din historikk og favoritter å gjenopprette senere</string>
+    <string name="data_restored_with_errors">Data gjenopprettet, men med feil</string>
+    <string name="file_not_found">Fant ikke filen</string>
+    <string name="backup_restore">Sikkerhetskopiering og gjenoppretting</string>
+    <string name="zoom_mode_keep_start">Behold ved oppstart</string>
+    <string name="zoom_mode_fit_width">Tilpass bredde</string>
+    <string name="zoom_mode_fit_height">Tilpass høyde</string>
+    <string name="zoom_mode_fit_center">Tilpass sentrum</string>
+    <string name="scale_mode">Skaleringsmodus</string>
+    <string name="report_github">Opprett feilrapport på GitHub</string>
+    <string name="prefer_rtl_reader_summary">Du kan sette opp lesemodus for hver fil</string>
+    <string name="right_to_left">Høyre-til-venstre ←</string>
+    <string name="prefer_rtl_reader">Foretrekk høyre-til-venstre -leser</string>
+    <string name="no_update_available">Ingen tilgjengelige oppdateringer</string>
+    <string name="update_check_failed">Kunne ikke se etter oppdateringer</string>
+    <string name="checking_for_updates">Ser etter oppdateringer …</string>
+    <string name="check_for_updates">Se etter oppdateringer</string>
+    <string name="protect_application_summary">Passord ved programoppstart</string>
+    <string name="track_sources">Se etter leseoppdateringer</string>
+    <string name="feed_will_update_soon">Flytoppdatering starter snart</string>
+    <string name="update">Oppdater</string>
+    <string name="updates_feed_cleared">Tømt</string>
+    <string name="clear_updates_feed">Tøm oppdateringsflyt</string>
+    <string name="waiting_for_network">Venter på nettverkstilknytning …</string>
+    <string name="new_version_s">Ny versjon: %s</string>
+    <string name="text_feed_holder">Her kan du se nye kapitler av det du leser</string>
+    <string name="updates">Oppdatering</string>
+    <string name="use_ssl">Bruk sikker (HTTPS)-tilkobling</string>
+    <string name="other_storage">Annen lagring</string>
+    <string name="manga_shelf">Hylle</string>
+    <string name="text_local_holder_primary">Du har ikke lagret noe enda.</string>
+    <string name="text_history_holder_secondary">Du kan finne ting å lese i sidemenyen.</string>
+    <string name="text_history_holder_primary">Det du leser vil vises her</string>
+    <string name="text_search_holder_secondary">Prøv å reformulere spørringen.</string>
+    <string name="text_categories_holder">Bruk kategorier til å organisere mapper. Trykk «+» for å opprette en kategori.</string>
+    <string name="text_empty_holder_primary">Det er ganske tomt her …</string>
+    <string name="category_delete_confirm">Fjern «%s»-kategorien fra favoritter og alt i den\?</string>
+    <string name="restart">Programomstart</string>
+    <string name="show_notification_new_chapters">Gi merknad om oppdateringer av det du leser</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Skrudde på %1$d av %2$d</string>
+    <string name="large_manga_save_confirm">Denne managaen har %s. Ønsker du å lagre hele\?</string>
+    <string name="open_in_browser">Åpne i filutforsker</string>
+    <string name="show_notification_app_update">Vis merknad hvis ny versjon er tilgjengelig</string>
+    <string name="app_update_available">Ny programversjon tilgjengelig</string>
+    <string name="application_update">Se etter oppdateringer automatisk</string>
+    <string name="search_history_cleared">Søkehistorikk tømt</string>
+    <string name="clear_thumbs_cache">Tøm miniatyrbildehurtiglager</string>
+    <string name="network_consumption_warning">Kan laste ned mye data</string>
+    <string name="taps_on_edges">Trykk på kanter</string>
+    <string name="text_delete_local_manga">Slett «%s» fra enhetsminne for godt\?</string>
+    <string name="webtoon">Nettserie</string>
+    <string name="standard">Forvalg</string>
+    <string name="cache">Hurtiglager</string>
+    <string name="clear_pages_cache">Tøm sidehurtiglager</string>
+    <string name="history_and_cache">Historikk og hurtiglager</string>
+    <string name="text_file_not_supported">Velg en ZIP- eller CBZ-fil.</string>
+    <string name="operation_not_supported">Ustøttet handling</string>
+    <string name="_import">Importer</string>
+    <string name="page_saved">Lagret</string>
+    <string name="wait_for_loading_finish">Vent på at innlastingen fullføres</string>
+    <string name="text_clear_history_prompt">Fjern all lesehistorikk for godt\?</string>
+    <string name="read">Les</string>
+    <string name="nothing_found">Resultatløst</string>
+    <string name="remote_sources">Kilder annensteds hen</string>
+    <string name="read_more">Les mer</string>
+    <string name="backup_saved">Sikkerhetskopi lagret</string>
+    <string name="description">Beskrivelse</string>
+    <string name="welcome">Velkommen</string>
+    <string name="languages">Språk</string>
+    <string name="other">Annet</string>
+    <string name="search_only_on_s">Kun søk på %s</string>
+    <string name="confirm">Bekreft</string>
+    <string name="next">Neste</string>
+    <string name="default_s">Forvalg: %s</string>
+    <string name="sign_in">Logg inn</string>
+    <string name="cookies_cleared">Alle kaker ble fjernet</string>
+    <string name="clear_cookies">Tøm kaker</string>
+    <string name="captcha_solve">Løs</string>
+    <string name="captcha_required">CAPTCHA kreves</string>
+    <string name="silent">Stille</string>
+    <string name="tap_to_try_again">Trykk for å prøve igjen</string>
+    <string name="today">I dag</string>
+    <string name="group">Gruppe</string>
+    <string name="long_ago">Lenge siden</string>
+    <string name="yesterday">I går</string>
+    <string name="just_now">Akkurat nå</string>
+    <string name="data_restored_success">All data gjenopprettet</string>
+    <string name="preparing_">Forbereder …</string>
+    <string name="data_restored">Data gjenopprettet</string>
+    <string name="restore_backup">Gjenopprett fra sikkerhetskopi</string>
+    <string name="create_backup">Opprett sikkerhetskopi</string>
+    <string name="restart_required">Omstart kreves</string>
+    <string name="black_dark_theme_summary">Nyttig for AMOLED-skjermer</string>
+    <string name="black_dark_theme">Nattsvart drakt</string>
+    <string name="create_category">Ny kategori</string>
+    <string name="app_version">Versjon %s</string>
+    <string name="about">Om</string>
+    <string name="passwords_mismatch">Passordene samsvarer ikke</string>
+    <string name="repeat_password">Gjenta passord</string>
+    <string name="protect_application">Beskytt programmet</string>
+    <string name="wrong_password">Feil passord</string>
+    <string name="enter_password">Skriv inn passord</string>
+    <string name="dont_check">Ikke sjekk</string>
+    <string name="rotate_screen">Roter skjerm</string>
+    <string name="size_s">Størrelse: %s</string>
+    <string name="related">Relatert</string>
+    <string name="search_results">Søkeresultater</string>
+    <string name="read_later">Les senere</string>
+    <string name="favourites_category_empty">Denne kategorien er tom</string>
+    <string name="all_favourites">Alle favoritter</string>
+    <string name="done">Ferdig</string>
+    <string name="not_available">Ikke tilgjengelig</string>
+    <string name="pages_animation">Sideanimasjon</string>
+    <string name="recent_manga">Nylig manga</string>
+    <string name="remove_category">Fjern kategori</string>
+    <string name="rename">Gi nytt navn</string>
+    <string name="categories_">Kategorier …</string>
+    <string name="favourites_categories">Favorittkategorier</string>
+    <string name="light_indicator">Lysindikator</string>
+    <string name="vibration">Vibrasjon</string>
+    <string name="notification_sound">Merknadslyd</string>
+    <string name="notifications_settings">Merknadsinnstillinger</string>
+    <string name="read_from_start">Les fra begynnelsen</string>
+    <string name="download">Last ned</string>
+    <string name="new_chapters">Nye kapittel</string>
+    <string name="notifications">Merknader</string>
+    <string name="save_manga">Lagre manga</string>
+    <string name="domain">Domene</string>
+    <string name="external_storage">Eksternlagring</string>
+    <string name="internal_storage">Internlagring</string>
+    <string name="gestures_only">Kun håndvendinger</string>
+    <string name="clear_search_history">Tøm søkehistorikk</string>
+    <string name="error">Feil</string>
+    <string name="cancelling_">Avbryter …</string>
+    <string name="dont_ask_again">Ikke spør igjen</string>
+    <string name="warning">Advarsel</string>
+    <string name="_continue">Fortsett</string>
+    <string name="volume_buttons">Lydstyrkeknapper</string>
+    <string name="switch_pages">Bytt sider</string>
+    <string name="reader_settings">Leserinnstillinger</string>
+    <string name="delete_manga">Slett manga</string>
+    <string name="search_on_s">Søk på %s</string>
+    <string name="grid_size">Rutenettsstørrelse</string>
+    <string name="read_mode">Lesemodus</string>
+    <string name="no_description">Ingen beskrivelse</string>
+    <string name="delete">Slett</string>
+    <string name="share_image">Del bilde</string>
+    <string name="save_page">Lagre side</string>
+    <string name="_s_deleted_from_local_storage">«%s» slettet fra lokallagring</string>
+    <string name="_s_removed_from_history">«%s» fjernet fra historikk</string>
+    <string name="remove">Fjern</string>
+    <string name="clear">Tøm</string>
+    <string name="pages">Sider</string>
+    <string name="automatic">Automatisk</string>
+    <string name="dark">Mørk</string>
+    <string name="light">Lys</string>
+    <string name="by_name">Navn</string>
+    <string name="theme">Drakt</string>
+    <string name="filter">Filter</string>
+    <string name="genre">Sjanger</string>
+    <string name="sort_order">Sorteringsrekkefølge</string>
+    <string name="all">Alle</string>
+    <string name="by_rating">Vurdering</string>
+    <string name="newest">Nyeste</string>
+    <string name="updated">Oppdatert</string>
+    <string name="popular">Popularitet</string>
+    <string name="downloads">Nedlastinger</string>
+    <string name="download_complete">Nedlastet</string>
+    <string name="processing_">Behandler …</string>
+    <string name="manga_downloading_">Laster ned manga …</string>
+    <string name="search_manga">Søk manga</string>
+    <string name="search">Søk</string>
+    <string name="share_s">Del %s</string>
+    <string name="create_shortcut">Opprett snarvei …</string>
+    <string name="share">Del</string>
+    <string name="save">Lagre</string>
+    <string name="enter_category_name">Skriv inn kategorinavn</string>
+    <string name="add">Legg til</string>
+    <string name="add_new_category">Legg til ny kategori</string>
+    <string name="add_to_favourites">Legg til i favoritter</string>
+    <string name="you_have_not_favourites_yet">Du har ingen favoritter enda.</string>
+    <string name="add_bookmark">Legg til bokmerke</string>
+    <string name="history_is_empty">Historikken er tom</string>
+    <string name="clear_history">Tøm historikk</string>
+    <string name="try_again">Prøv igjen</string>
+    <string name="close">Lukk</string>
+    <string name="chapter_d_of_d">Kapittel %1$d av %2$d</string>
+    <string name="loading_">Laster inn …</string>
+    <string name="settings">Innstillinger</string>
+    <string name="list_mode">Listemodus</string>
+    <string name="grid">Rutenett</string>
+    <string name="detailed_list">Detaljert liste</string>
+    <string name="list">Liste</string>
+    <string name="chapters">Kapittel</string>
+    <string name="details">Detaljer</string>
+    <string name="network_error">Nettverktilkoblingsfeil</string>
+    <string name="error_occurred">En feil inntraff</string>
+    <string name="history">Historikk</string>
+    <string name="favourites">Favoritter</string>
+    <string name="local_storage">Lokallagring</string>
+    <string name="open_menu">Åpne meny</string>
+    <string name="close_menu">Lukk meny</string>
+    <string name="chapter_is_missing_text">Dette kapitlet mangler på din enhet. Last det ned eller les det på nett.</string>
+    <string name="chapter_is_missing">Kapittel mangler</string>
+    <string name="text_downloads_holder">Det er ingen aktive nedlastinger</string>
+    <string name="queued">I kø</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 7a2753729..af5123d55 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="blue_primary">#1976D2</color>
-	<color name="blue_primary_dark">#0D47A1</color>
-	<color name="blue_primary_darker">#1A237E</color>
-	<color name="red_accent">#FF8A65</color>
-	<color name="dim">#99000000</color>
-	<color name="error">#E57373</color>
-	<color name="tabs_line">#5E636A</color>
+
+	<color name="color_primary">#42A5F5</color>
+	<color name="color_primary_variant">#1565C0</color>
+	<color name="color_on_secondary">@android:color/black</color>
+
+	<color name="color_control_light">#2EFFFFFF</color> <!-- 18% white -->
+	<color name="color_surface">#272727</color>
+	<color name="color_background">#121212</color>
+
+	<!-- Scrim colors -->
+	<color name="system_ui_scrim_light">#2EFFFFFF</color> <!-- 18% white -->
+	<color name="system_ui_scrim_dark">#B3121212</color> <!-- 70% grey -->
+	<color name="status_bar_scrim">@color/system_ui_scrim_dark</color>
+
+	<!-- Other colors with light mode alternatives -->
+	<color name="list_divider">#1fffffff</color>
+	<color name="error">#CF6679</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
deleted file mode 100644
index 65256236f..000000000
--- a/app/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="AppPopupTheme" parent="ThemeOverlay.MaterialComponents.Dark" />
-
-	<style name="AppSuggestion" parent="Widget.AppCompat.AutoCompleteTextView">
-		<item name="android:popupBackground">@android:color/background_dark</item>
-	</style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d839f3aac..1c0c88d29 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="AppTheme.Amoled">
-		<item name="colorPrimary">@color/blue_primary</item>
-		<item name="colorPrimaryDark">@color/blue_primary_darker</item>
-		<item name="android:windowBackground">@android:color/black</item>
+
+	<style name="AppTheme.AMOLED">
+		<item name="android:colorBackground">@android:color/black</item>
+		<item name="colorSurface">@android:color/black</item>
+		<item name="android:statusBarColor">@color/system_ui_scrim_amoled</item>
 	</style>
+
+	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.MaterialComponents.Dark">
+		<item name="colorPrimary">@color/color_primary</item>
+		<item name="colorPrimaryVariant">@color/color_primary_variant</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight-v23/bools.xml b/app/src/main/res/values-notnight-v23/bools.xml
new file mode 100644
index 000000000..3610539ef
--- /dev/null
+++ b/app/src/main/res/values-notnight-v23/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<bool name="use_light_status">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight-v23/colors.xml b/app/src/main/res/values-notnight-v23/colors.xml
new file mode 100644
index 000000000..ef3e00027
--- /dev/null
+++ b/app/src/main/res/values-notnight-v23/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- We use a light scrim on API 23+ since we use a light status bar -->
+	<color name="status_bar_scrim">@color/system_ui_scrim_light</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight-v27/bools.xml b/app/src/main/res/values-notnight-v27/bools.xml
new file mode 100644
index 000000000..2ee1ed1bf
--- /dev/null
+++ b/app/src/main/res/values-notnight-v27/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<bool name="use_light_navigation">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight-v27/colors.xml b/app/src/main/res/values-notnight-v27/colors.xml
new file mode 100644
index 000000000..8e4e067bf
--- /dev/null
+++ b/app/src/main/res/values-notnight-v27/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- We use a light scrim on API 27+ since we use a light nav bar -->
+	<color name="nav_bar_scrim">@color/system_ui_scrim_light</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.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-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e60d85914..862eb79f5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,210 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="close_menu">Закрыть меню</string>
-	<string name="open_menu">Открыть меню</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="details">Подробности</string>
-	<string name="chapters">Главы</string>
-	<string name="list">Список</string>
-	<string name="detailed_list">Подробный список</string>
-	<string name="grid">Таблица</string>
-	<string name="list_mode">Вид списка</string>
-	<string name="settings">Настройки</string>
-	<string name="remote_sources">Онлайн каталоги</string>
-	<string name="loading_">Загрузка…</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="add_bookmark">Добавить закладку</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="enter_category_name">Введите название</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="processing_">Обработка…</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="newest">Новая</string>
-	<string name="by_rating">По рейтингу</string>
-	<string name="all">Все</string>
-	<string name="sort_order">Сортировка</string>
-	<string name="genre">Жанр</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="clear">Очистить</string>
-	<string name="text_clear_history_prompt">Вы уверены, что хотите очистить историю? Это действие нельзя будет отменить.</string>
-	<string name="remove">Удалить</string>
-	<string name="_s_removed_from_history">\"%s\" удалено из истории</string>
-	<string name="_s_deleted_from_local_storage">\"%s\" удалено с устройства</string>
-	<string name="wait_for_loading_finish">Дождитесь окончания загрузки</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="history_and_cache">История и кэш</string>
-	<string name="clear_pages_cache">Очистить кэш страниц</string>
-	<string name="cache">Кэш</string>
-	<string name="text_file_sizes">Б|кБ|МБ|ГБ|ТБ</string>
-	<string name="standard">Стандартный</string>
-	<string name="webtoon">Манхва</string>
-	<string name="read_mode">Режим чтения</string>
-	<string name="grid_size">Размер таблицы</string>
-	<string name="search_results_on_s">Результаты поиска по %s</string>
-	<string name="search_on_s">Поиск по %s</string>
-	<string name="delete_manga">Удалить мангу</string>
-	<string name="text_delete_local_manga">Вы уверены, что хотите удалить \"%s\" с устройства? \nЭто действие нельзя будет отменить.</string>
-	<string name="reader_settings">Настройки чтения</string>
-	<string name="switch_pages">Листание страниц</string>
-	<string name="taps_on_edges">Нажатия по краям</string>
-	<string name="volume_buttons">Кнопки громкости</string>
-	<string name="_continue">Продолжить</string>
-	<string name="warning">Предупреждение</string>
-	<string name="network_consumption_warning">Данная операция может привести к большому расходу траффика</string>
-	<string name="dont_ask_again">Больше не спрашивать</string>
-	<string name="cancelling_">Отмена…</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="_default">По умолчанию</string>
-	<string name="application_update">Проверять обновление приложения</string>
-	<string name="app_update_available">Доступно обновление приложения</string>
-	<string name="show_notification_app_update">Показывать уведомление при наличии новой версии</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="enabled_d_of_d">Включено %1$d из %2$d</string>
-	<string name="new_chapters">Новые главы</string>
-	<string name="show_notification_new_chapters">Уведомлять об обновлении манги, которую Вы читаете</string>
-	<string name="download">Загрузить</string>
-	<string name="read_from_start">Читать с начала</string>
-	<string name="restart">Перезапустить</string>
-	<string name="notifications_settings">Настройки уведомлений</string>
-	<string name="notification_sound">Звук уведомления</string>
-	<string name="light_indicator">Световая индикация</string>
-	<string name="vibration">Вибросигнал</string>
-	<string name="favourites_categories">Категории избранного</string>
-	<string name="categories_">Категории…</string>
-	<string name="rename">Переименовать</string>
-	<string name="category_delete_confirm">Вы уверены, что хотите удалить категорию \"%s\"? \nВся манга из данной категории будет утеряна.</string>
-	<string name="remove_category">Удалить категорию</string>
-	<string name="text_categories_holder">Категории помогают упорядочивать избранную мангу. Нажмите «+», чтобы создать категорию</string>
-	<string name="text_history_holder">Здесь будет оборажаться манга, которую Вы читаете. Вы можете найти, что почитать, в боковом меню</string>
-	<string name="text_local_holder">У Вас пока нет сохранённой манги. Вы можете сохранить мангу из онлайн каталога или импортировать из файла</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="use_ssl">Защищённое соединение (HTTPS)</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="related">Похожие</string>
-	<string name="new_version_s">Новая версия: %s</string>
-	<string name="size_s">Размер: %s</string>
-	<string name="waiting_for_network">Ожидание подключения…</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">Запрашивать пароль при запуске приложения</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="checking_for_updates">Проверка обновления…</string>
-	<string name="update_check_failed">Ошибка при проверке обновления</string>
-	<string name="no_update_available">Нет доступных обновлений</string>
-	<string name="right_to_left">Справа налево</string>
-	<string name="prefer_rtl_reader">Предпочитать режим Справа налево</string>
-	<string name="prefer_rtl_reader_summary">Вы можете настроить режим чтения для каждой манги отдельно</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="restart_required">Требуется перезапуск</string>
-	<string name="backup_restore">Резервное копирование</string>
-	<string name="create_backup">Создать резервную копию</string>
-	<string name="restore_backup">Восстановить данные</string>
-	<string name="data_restored">Данные восстановлены</string>
-	<string name="preparing_">Подготовка…</string>
-	<string name="file_not_found">Файл не найден</string>
-	<string name="data_restored_success">Все данные успешно восстановлены</string>
-	<string name="data_restored_with_errors">Данные восстановлены, но возникли некоторые ошибки</string>
-	<string name="backup_information">Вы можете создать резервную копию избранного и истории и потом восстановить их</string>
-	<string name="just_now">Только что</string>
-	<string name="yesterday">Вчера</string>
-	<string name="long_ago">Давно</string>
-	<string name="group">Группировать</string>
-	<string name="today">Сегодня</string>
-	<string name="tap_to_try_again">Попробовать ещё раз</string>
-	<string name="reader_mode_hint">Выбранный режим будет сохранён для текущей манги</string>
-	<string name="silent">Без звука</string>
-	<string name="captcha_required">Необходимо пройти CAPTCHA</string>
-	<string name="captcha_solve">Пройти</string>
-	<string name="clear_cookies">Очистить куки</string>
-	<string name="cookies_cleared">Все куки удалены</string>
-	<string name="chapers_checking_progress">Проверка новых глав: %1$d из %2$d</string>
-	<string name="clear_feed">Очистить ленту</string>
-	<string name="text_clear_updates_feed_prompt">Вся история обновлений будет очищена и её нельзя будет вернуть. Вы уверены?</string>
-	<string name="new_chapters_checking">Проверка новых глав</string>
-	<string name="reverse">В обратном порядке</string>
-	<string name="sign_in">Войти</string>
-	<string name="auth_required">Для просмотра этого контента требуется авторизация</string>
-	<string name="default_s">По умолчанию: %s</string>
-	<string name="_and_x_more">…и ещё %1$d</string>
-	<string name="next">Далее</string>
-	<string name="protect_application_subtitle">Enter password that will be required when the application starts</string>
-	<string name="confirm">Confirm</string>
-	<string name="password_length_hint">Password must be at least 4 characters</string>
-	<string name="suggestions">Suggestions</string>
-	<string name="text_suggestion_holder">Start reading manga and you will get personalized suggestions</string>
+    <string name="close_menu">Закрыть меню</string>
+    <string name="open_menu">Открыть меню</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="details">Подробности</string>
+    <string name="chapters">Главы</string>
+    <string name="list">Список</string>
+    <string name="detailed_list">Подробный список</string>
+    <string name="grid">Таблица</string>
+    <string name="list_mode">Вид списка</string>
+    <string name="settings">Настройки</string>
+    <string name="remote_sources">Онлайн каталоги</string>
+    <string name="loading_">Загрузка…</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="add_bookmark">Добавить закладку</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="enter_category_name">Введите название</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="processing_">Обработка…</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="newest">Новая</string>
+    <string name="by_rating">По рейтингу</string>
+    <string name="all">Все</string>
+    <string name="sort_order">Сортировка</string>
+    <string name="genre">Жанр</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="clear">Очистить</string>
+    <string name="text_clear_history_prompt">Вы уверены, что хотите очистить историю? Это действие нельзя будет отменить.</string>
+    <string name="remove">Удалить</string>
+    <string name="_s_removed_from_history">\"%s\" удалено из истории</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" удалено с устройства</string>
+    <string name="wait_for_loading_finish">Дождитесь окончания загрузки</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="history_and_cache">История и кэш</string>
+    <string name="clear_pages_cache">Очистить кэш страниц</string>
+    <string name="cache">Кэш</string>
+    <string name="text_file_sizes">Б|кБ|МБ|ГБ|ТБ</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\" с устройства? \nЭто действие нельзя будет отменить.</string>
+    <string name="reader_settings">Настройки чтения</string>
+    <string name="switch_pages">Листание страниц</string>
+    <string name="taps_on_edges">Нажатия по краям</string>
+    <string name="volume_buttons">Кнопки громкости</string>
+    <string name="_continue">Продолжить</string>
+    <string name="warning">Предупреждение</string>
+    <string name="network_consumption_warning">Данная операция может привести к большому расходу траффика</string>
+    <string name="dont_ask_again">Больше не спрашивать</string>
+    <string name="cancelling_">Отмена…</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="application_update">Проверять обновление приложения</string>
+    <string name="app_update_available">Доступно обновление приложения</string>
+    <string name="show_notification_app_update">Показывать уведомление при наличии новой версии</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="enabled_d_of_d">Включено %1$d из %2$d</string>
+    <string name="new_chapters">Новые главы</string>
+    <string name="show_notification_new_chapters">Уведомлять об обновлении манги, которую Вы читаете</string>
+    <string name="download">Загрузить</string>
+    <string name="read_from_start">Читать с начала</string>
+    <string name="restart">Перезапустить</string>
+    <string name="notifications_settings">Настройки уведомлений</string>
+    <string name="notification_sound">Звук уведомления</string>
+    <string name="light_indicator">Световая индикация</string>
+    <string name="vibration">Вибросигнал</string>
+    <string name="favourites_categories">Категории избранного</string>
+    <string name="categories_">Категории…</string>
+    <string name="rename">Переименовать</string>
+    <string name="category_delete_confirm">Вы уверены, что хотите удалить категорию \"%s\"? \nВся манга из данной категории будет утеряна.</string>
+    <string name="remove_category">Удалить категорию</string>
+    <string name="text_empty_holder_primary">Как-то здесь пусто…</string>
+    <string name="text_search_holder_secondary">Попробуйте переформулировать запрос.</string>
+    <string name="text_categories_holder">Категории помогают упорядочивать избранную мангу. Нажмите «+», чтобы создать категорию</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="use_ssl">Защищённое соединение (HTTPS)</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="related">Похожие</string>
+    <string name="new_version_s">Новая версия: %s</string>
+    <string name="size_s">Размер: %s</string>
+    <string name="waiting_for_network">Ожидание подключения…</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">Запрашивать пароль при запуске приложения</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="checking_for_updates">Проверка обновления…</string>
+    <string name="update_check_failed">Ошибка при проверке обновления</string>
+    <string name="no_update_available">Нет доступных обновлений</string>
+    <string name="right_to_left">Справа налево</string>
+    <string name="prefer_rtl_reader">Предпочитать режим Справа налево</string>
+    <string name="prefer_rtl_reader_summary">Вы можете настроить режим чтения для каждой манги отдельно</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="restart_required">Требуется перезапуск</string>
+    <string name="backup_restore">Резервное копирование и восстановление</string>
+    <string name="create_backup">Создать резервную копию</string>
+    <string name="restore_backup">Восстановить данные</string>
+    <string name="data_restored">Данные восстановлены</string>
+    <string name="preparing_">Подготовка…</string>
+    <string name="file_not_found">Файл не найден</string>
+    <string name="data_restored_success">Все данные успешно восстановлены</string>
+    <string name="data_restored_with_errors">Данные восстановлены, но возникли некоторые ошибки</string>
+    <string name="backup_information">Вы можете создать резервную копию избранного и истории и потом восстановить их</string>
+    <string name="just_now">Только что</string>
+    <string name="yesterday">Вчера</string>
+    <string name="long_ago">Давно</string>
+    <string name="group">Группировать</string>
+    <string name="today">Сегодня</string>
+    <string name="tap_to_try_again">Попробовать ещё раз</string>
+    <string name="reader_mode_hint">Выбранный режим будет сохранён для текущей манги</string>
+    <string name="silent">Без звука</string>
+    <string name="captcha_required">Необходимо пройти CAPTCHA</string>
+    <string name="captcha_solve">Пройти</string>
+    <string name="clear_cookies">Очистить куки</string>
+    <string name="cookies_cleared">Все куки удалены</string>
+    <string name="chapters_checking_progress">Проверка новых глав: %1$d из %2$d</string>
+    <string name="clear_feed">Очистить ленту</string>
+    <string name="text_clear_updates_feed_prompt">Вся история обновлений будет очищена и её нельзя будет вернуть. Вы уверены?</string>
+    <string name="new_chapters_checking">Проверка новых глав</string>
+    <string name="reverse">В обратном порядке</string>
+    <string name="sign_in">Войти</string>
+    <string name="auth_required">Для просмотра этого контента требуется авторизация</string>
+    <string name="default_s">По умолчанию: %s</string>
+    <string name="_and_x_more">…и ещё %1$d</string>
+    <string name="next">Далее</string>
+    <string name="protect_application_subtitle">Введите пароль, который вам понадобится при запуске приложения</string>
+    <string name="confirm">Подтвердить</string>
+    <string name="password_length_hint">Пароль должен содержать не менее 4 символов</string>
+    <string name="hide_toolbar">Прятать заголовок при прокрутке</string>
+    <string name="search_only_on_s">Поиск только по %s</string>
+    <string name="other">Другие</string>
+    <string name="description">Описание</string>
+    <string name="languages">Языки</string>
+	<string name="welcome">Добро пожаловать</string>
+	<string name="text_clear_search_history_prompt">Вы действительно хотите удалить все недавние поисковые запросы? Это действие не может быть отменено.</string>
+	<string name="backup_saved">Резервная копия успешно сохранена</string>
+	<string name="tracker_warning">Некоторые производители могут изменять поведение системы, нарушая работу фоновых задач.</string>
+	<string name="read_more">Подробнее</string>
+	<string name="queued">В очереди</string>
+	<string name="text_downloads_holder">На данный момент нет активных загрузок</string>
+	<string name="chapter_is_missing">Глава отсутствует</string>
+	<string name="chapter_is_missing_text">Эта глава отсутствует на вашем устройстве. Скачайте или прочитайте её онлайн.</string>
+	<string name="about_app_translation_summary">Помочь с переводом приложения</string>
+	<string name="about_app_translation">Перевод</string>
+	<string name="about_author">Автор</string>
+	<string name="about_feedback_4pda">Тема на 4PDA</string>
+	<string name="about_feedback">Обратная связь</string>
+	<string name="about_support_developer">Поддержать разработчика</string>
+	<string name="about_support_developer_summary">Если вам нравится это приложение, вы можете помочь финансово с помощью ЮMoney (бывш. Яндекс.Деньги)</string>
+	<string name="about_gratitudes">Благодарности</string>
+	<string name="about_gratitudes_summary">Эти люди помогают Kotatsu стать лучше!</string>
+	<string name="about_copyright_and_licenses">Авторские права и лицензии</string>
+	<string name="about_license">Лицензия</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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
new file mode 100644
index 000000000..a14534dae
--- /dev/null
+++ b/app/src/main/res/values-si/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="loading_">පූරණය වෙමින්…</string>
+    <string name="settings">සැකසුම්</string>
+    <string name="chapters">පරිච්ඡේද</string>
+    <string name="details">විස්තර</string>
+    <string name="error_occurred">දෝෂයක් සිදුවී ඇත</string>
+    <string name="history">ඉතිහාසය</string>
+    <string name="favourites">ප්‍රියතමයන්</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
index b8b075c5d..4ae0ef5db 100644
--- a/app/src/main/res/values-v29/themes.xml
+++ b/app/src/main/res/values-v29/themes.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-		<item name="windowActionModeOverlay">true</item>
-		<item name="actionModeCloseDrawable">@drawable/ic_cross</item>
-		<item name="actionModeStyle">@style/AppActionMode</item>
-		<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-		<item name="badgeStyle">@style/Widget.MaterialComponents.Badge</item>
-		<item name="android:statusBarColor">@color/status_bar</item>
+	<style name="AppTheme" parent="Base.AppTheme">
+		<!-- We use a transparent nav bar on API 29, as the system is responsible for applying
+			 context background protection -->
 		<item name="android:navigationBarColor">@android:color/transparent</item>
-		<item name="colorOnPrimary">@android:color/white</item>
-		<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.New</item>
 	</style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
index 442ae059a..044349fc7 100644
--- a/app/src/main/res/values-w600dp/dimens.xml
+++ b/app/src/main/res/values-w600dp/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<dimen name="grid_spacing">4dp</dimen>
+	<dimen name="grid_spacing">6dp</dimen>
 	<dimen name="grid_spacing_outer">2dp</dimen>
 	<dimen name="preferred_grid_width">140dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4c8767415..fdb266936 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+	<declare-styleable name="Theme">
+		<attr name="navigationBarDividerColor" format="color" />
+		<attr name="colorControlLight" format="color" />
+		<attr name="colorSurfaceSecondary" format="color" />
+	</declare-styleable>
+
+	<!--CoverImageView attrs-->
+
 	<declare-styleable name="CoverImageView">
 		<attr name="android:orientation" />
 	</declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 07aafe1c4..735d84e13 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<bool name="is_tablet">false</bool>
+	<bool name="use_light_status">false</bool>
+	<bool name="use_light_navigation">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5d1c1d8ba..49c6cab54 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+	<color name="color_primary">#1976D2</color>
+	<color name="color_primary_variant">#1565C0</color>
+	<color name="color_on_secondary">@android:color/white</color>
+
+	<color name="color_control_light">#39000000</color>
+	<color name="color_surface">#FFFFFF</color>
+	<color name="color_background">#FFFFFF</color>
+
+	<!-- Scrim colors -->
+	<color name="system_ui_scrim_light">#B3FFFFFF</color> <!-- 70% white -->
+	<color name="system_ui_scrim_dark">#40272727</color> <!-- 25% grey -->
+
+	<!-- We use a dark scrim by default since light status is API 23+ -->
+	<color name="status_bar_scrim">@color/system_ui_scrim_dark</color>
+	<!-- We use a dark scrim by default since light nav bar is API 27+ -->
+	<color name="nav_bar_scrim">@color/system_ui_scrim_dark</color>
+
+	<!-- Other colors with dark mode alternatives -->
+	<color name="list_divider">#1f000000</color>
+	<color name="error">#B00020</color>
+
+	<!-- AMOLED colors -->
+	<color name="system_ui_scrim_amoled">#B3000000</color>
+
+	<!-- Other Colors -->
+
 	<color name="blue_primary">#1976D2</color>
 	<color name="blue_primary_dark">#1565C0</color>
-	<color name="blue_primary_darker">#283593</color>
 	<color name="red_accent">#EF5350</color>
 	<color name="grey">#424242</color>
 	<color name="grey_dark">#212121</color>
 	<color name="dim">#99000000</color>
-	<color name="error">#D32F2F</color>
-	<color name="status_bar">#33000000</color>
-	<color name="tabs_line">#C3CFDD</color>
+	<color name="shadow">#99000000</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ee61388a6..da8545884 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,13 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<dimen name="grid_spacing">2.5dp</dimen>
+
+	<!-- Common dimensions -->
+	<dimen name="margin_normal">16dp</dimen>
+	<dimen name="margin_small">8dp</dimen>
+	<!-- Navigation -->
+	<dimen name="nav_header_logo_size">36dp</dimen>
+	<dimen name="nav_item_horizontal_padding">24dp</dimen>
+	<!-- Intrinsic height may vary. Use a large radius to ensure a semicircle. -->
+	<dimen name="nav_item_background_corner_radius_left">0dp</dimen>
+	<dimen name="nav_item_background_corner_radius_right">100dp</dimen>
+	<dimen name="nav_item_background_inset_left">0dp</dimen>
+	<dimen name="nav_item_background_inset_right">8dp</dimen>>
+
+	<dimen name="grid_spacing">4dp</dimen>
+	<dimen name="list_spacing">4dp</dimen>
 	<dimen name="grid_spacing_outer">2dp</dimen>
-	<dimen name="manga_list_item_height">84dp</dimen>
+	<dimen name="manga_list_item_height">86dp</dimen>
 	<dimen name="manga_list_details_item_height">120dp</dimen>
 	<dimen name="chapter_list_item_height">46dp</dimen>
 	<dimen name="preferred_grid_width">120dp</dimen>
 	<dimen name="header_height">34dp</dimen>
 	<dimen name="elevation_large">16dp</dimen>
-	<dimen name="list_footer_height">48dp</dimen>
+	<dimen name="list_footer_height_inner">36dp</dimen>
+	<dimen name="list_footer_height_outer">48dp</dimen>
 	<dimen name="screen_padding">16dp</dimen>
+
+	<!--Text dimens-->
+	<dimen name="text_size_h1">22sp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 000000000..5532e13df
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<integer name="search_animation_duration">@android:integer/config_shortAnimTime</integer>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fce999bca..26685e245 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,212 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-	<string name="app_name" translatable="false">Kotatsu</string>
-	<string name="close_menu">Close menu</string>
-	<string name="open_menu">Open menu</string>
-	<string name="local_storage">Local storage</string>
-	<string name="favourites">Favourites</string>
-	<string name="history">History</string>
-	<string name="error_occurred">An error has occurred</string>
-	<string name="network_error">Network connection error</string>
-	<string name="details">Details</string>
-	<string name="chapters">Chapters</string>
-	<string name="list">List</string>
-	<string name="detailed_list">Detailed list</string>
-	<string name="grid">Grid</string>
-	<string name="list_mode">List mode</string>
-	<string name="settings">Settings</string>
-	<string name="remote_sources">Remote sources</string>
-	<string name="loading_">Loading…</string>
-	<string name="chapter_d_of_d">Chapter %1$d of %2$d</string>
-	<string name="close">Close</string>
-	<string name="try_again">Try again</string>
-	<string name="clear_history">Clear history</string>
-	<string name="nothing_found">Nothing found</string>
-	<string name="history_is_empty">History is empty</string>
-	<string name="read">Read</string>
-	<string name="add_bookmark">Add bookmark</string>
-	<string name="you_have_not_favourites_yet">You have not favourites yet</string>
-	<string name="add_to_favourites">Add to favourites</string>
-	<string name="add_new_category">Add new category</string>
-	<string name="add">Add</string>
-	<string name="enter_category_name">Enter category name</string>
-	<string name="save">Save</string>
-	<string name="share">Share</string>
-	<string name="create_shortcut">Create shortcut…</string>
-	<string name="share_s">Share %s</string>
-	<string name="search">Search</string>
-	<string name="search_manga">Search manga</string>
-	<string name="manga_downloading_">Manga downloading…</string>
-	<string name="processing_">Processing…</string>
-	<string name="download_complete">Download complete</string>
-	<string name="downloads">Downloads</string>
-	<string name="by_name">By name</string>
-	<string name="popular">Popular</string>
-	<string name="updated">Updated</string>
-	<string name="newest">Newest</string>
-	<string name="by_rating">By rating</string>
-	<string name="all">All</string>
-	<string name="sort_order">Sort order</string>
-	<string name="genre">Genre</string>
-	<string name="filter">Filter</string>
-	<string name="theme">Theme</string>
-	<string name="light">Light</string>
-	<string name="dark">Dark</string>
-	<string name="automatic">Automatic</string>
-	<string name="pages">Pages</string>
-	<string name="clear">Clear</string>
-	<string name="text_clear_history_prompt">Do you really want to clear all your reading history? This action cannot be undone.</string>
-	<string name="remove">Remove</string>
-	<string name="_s_removed_from_history">\"%s\" removed from history</string>
-	<string name="_s_deleted_from_local_storage">\"%s\" deleted from local storage</string>
-	<string name="wait_for_loading_finish">Wait for the load to finish</string>
-	<string name="save_page">Save page</string>
-	<string name="page_saved">Page saved successful</string>
-	<string name="share_image">Share image</string>
-	<string name="_import">Import</string>
-	<string name="delete">Delete</string>
-	<string name="operation_not_supported">This operation is not supported</string>
-	<string name="text_file_not_supported">Invalid file. Only ZIP and CBZ are supported.</string>
-	<string name="no_description">No description</string>
-	<string name="history_and_cache">History and cache</string>
-	<string name="clear_pages_cache">Clear pages cache</string>
-	<string name="cache">Cache</string>
-	<string name="text_file_sizes">B|kB|MB|GB|TB</string>
-	<string name="standard">Standard</string>
-	<string name="webtoon">Webtoon</string>
-	<string name="read_mode">Read mode</string>
-	<string name="grid_size">Grid size</string>
-	<string name="search_results_on_s">Search results on %s</string>
-	<string name="search_on_s">Search on %s</string>
-	<string name="delete_manga">Delete manga</string>
-	<string name="text_delete_local_manga">Do you really want to delete \"%s\" from your phone\'s local storage? \nThis operation cannot be undone.</string>
-	<string name="reader_settings">Reader settings</string>
-	<string name="switch_pages">Switch pages</string>
-	<string name="taps_on_edges">Taps on edges</string>
-	<string name="volume_buttons">Volume buttons</string>
-	<string name="_continue">Continue</string>
-	<string name="warning">Warning</string>
-	<string name="network_consumption_warning">This operation may consume a lot of network traffic</string>
-	<string name="dont_ask_again">Don`t ask again</string>
-	<string name="cancelling_">Cancelling…</string>
-	<string name="error">Error</string>
-	<string name="clear_thumbs_cache">Clear thumbnails cache</string>
-	<string name="clear_search_history">Clear search history</string>
-	<string name="search_history_cleared">Search history cleared</string>
-	<string name="gestures_only">Gestures only</string>
-	<string name="internal_storage">Internal storage</string>
-	<string name="external_storage">External storage</string>
-	<string name="domain">Domain</string>
-	<string name="_default">Default</string>
-	<string name="application_update">Check for updates automatically</string>
-	<string name="app_update_available">Application update is available</string>
-	<string name="show_notification_app_update">Show notification if update is available</string>
-	<string name="open_in_browser">Open in browser</string>
-	<string name="large_manga_save_confirm">This manga has %s. Do you want to save all of it?</string>
-	<string name="save_manga">Save manga</string>
-	<string name="notifications">Notifications</string>
-	<string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Enabled %1$d of %2$d</string>
-	<string name="new_chapters">New chapters</string>
-	<string name="show_notification_new_chapters">Notify about updates of manga you are reading</string>
-	<string name="download">Download</string>
-	<string name="read_from_start">Read from start</string>
-	<string name="restart">Restart</string>
-	<string name="notifications_settings">Notifications settings</string>
-	<string name="notification_sound">Notification sound</string>
-	<string name="light_indicator">Light indicator</string>
-	<string name="vibration">Vibration</string>
-	<string name="favourites_categories">Favourites categories</string>
-	<string name="categories_">Categories…</string>
-	<string name="rename">Rename</string>
-	<string name="category_delete_confirm">Do you really want to remove category \"%s\" from your favourites? \nAll containing manga will be lost.</string>
-	<string name="remove_category">Remove category</string>
-	<string name="text_categories_holder">You can use categories to organize your favourite manga. Press «+» to create a category</string>
-	<string name="text_history_holder">Manga you are reading will be displayed here. You can find what to read in side menu</string>
-	<string name="text_local_holder">You have not any saved manga yet. You can save it from online sources or import from file</string>
-	<string name="manga_shelf">Manga shelf</string>
-	<string name="recent_manga">Recent manga</string>
-	<string name="pages_animation">Pages animation</string>
-	<string name="manga_save_location">Manga download location</string>
-	<string name="not_available">Not available</string>
-	<string name="cannot_find_available_storage">Cannot find any available storage</string>
-	<string name="other_storage">Other storage</string>
-	<string name="use_ssl">Use secure connection (HTTPS)</string>
-	<string name="done">Done</string>
-	<string name="all_favourites">All favourites</string>
-	<string name="favourites_category_empty">This category is empty</string>
-	<string name="read_later">Read later</string>
-	<string name="updates">Updates</string>
-	<string name="text_feed_holder">Here you will see the new chapters of the manga you are reading</string>
-	<string name="search_results">Search results</string>
-	<string name="related">Related</string>
-	<string name="new_version_s">New version: %s</string>
-	<string name="size_s">Size: %s</string>
-	<string name="waiting_for_network">Waiting for network…</string>
-	<string name="clear_updates_feed">Clear updates feed</string>
-	<string name="updates_feed_cleared">Updates feed cleared</string>
-	<string name="rotate_screen">Rotate screen</string>
-	<string name="update">Update</string>
-	<string name="feed_will_update_soon">Feed update will start soon</string>
-	<string name="track_sources">Check updates for manga</string>
-	<string name="dont_check">Don`t check</string>
-	<string name="enter_password">Enter password</string>
-	<string name="wrong_password">Wrong password</string>
-	<string name="protect_application">Protect application</string>
-	<string name="protect_application_summary">Ask for password on application start</string>
-	<string name="repeat_password">Repeat password</string>
-	<string name="passwords_mismatch">Passwords do not match</string>
-	<string name="about">About</string>
-	<string name="app_version">Version %s</string>
-	<string name="check_for_updates">Check for updates</string>
-	<string name="checking_for_updates">Checking for updates…</string>
-	<string name="update_check_failed">Update check failed</string>
-	<string name="no_update_available">No updates available</string>
-	<string name="right_to_left">Right to left</string>
-	<string name="prefer_rtl_reader">Prefer Right to left reader</string>
-	<string name="prefer_rtl_reader_summary">You can set up the reading mode for each manga separately</string>
-	<string name="create_category">New category</string>
-	<string name="report_github">Create issue on GitHub</string>
-	<string name="scale_mode">Scale mode</string>
-	<string name="zoom_mode_fit_center">Fit center</string>
-	<string name="zoom_mode_fit_height">Fit to height</string>
-	<string name="zoom_mode_fit_width">Fit to width</string>
-	<string name="zoom_mode_keep_start">Keep at start</string>
-	<string name="black_dark_theme">Black dark theme</string>
-	<string name="black_dark_theme_summary">Useful for AMOLED screens</string>
-	<string name="restart_required">Restart required</string>
-	<string name="backup_restore"><![CDATA[Backup & Restore]]></string>
-	<string name="create_backup">Create data backup</string>
-	<string name="restore_backup">Restore from backup</string>
-	<string name="data_restored">Data restored</string>
-	<string name="preparing_">Preparing…</string>
-	<string name="file_not_found">File not found</string>
-	<string name="data_restored_success">All data restored successfully</string>
-	<string name="data_restored_with_errors">The data restored, but there are errors</string>
-	<string name="backup_information">You can create backup of your history and favourites and restore it</string>
-	<string name="just_now">Just now</string>
-	<string name="yesterday">Yesterday</string>
-	<string name="long_ago">Long ago</string>
-	<string name="group">Group</string>
-	<string name="today">Today</string>
-	<string name="tap_to_try_again">Tap to try again</string>
-	<string name="reader_mode_hint">Chosen configuration will be remembered for this manga</string>
-	<string name="silent">Silent</string>
-	<string name="captcha_required">CAPTCHA is required</string>
-	<string name="captcha_solve">Solve</string>
-	<string name="clear_cookies">Clear cookies</string>
-	<string name="cookies_cleared">All cookies was removed</string>
-	<string name="chapers_checking_progress">Checking for new chapters: %1$d of %2$d</string>
-	<string name="clear_feed">Clear feed</string>
-	<string name="text_clear_updates_feed_prompt">All updates history will be cleared and this action cannot be undone. Are you sure?</string>
-	<string name="new_chapters_checking">New chapters checking</string>
-	<string name="reverse">Reverse</string>
-	<string name="sign_in">Sign in</string>
-	<string name="auth_required">You should authorize to view this content</string>
-	<string name="default_s">Default: %s</string>
-	<string name="_and_x_more">…and %1$d more</string>
-	<string name="next">Next</string>
-	<string name="protect_application_subtitle">Enter password that will be required when the application starts</string>
-	<string name="confirm">Confirm</string>
-	<string name="password_length_hint">Password must be at least 4 characters</string>
+    <string name="app_name" translatable="false">Kotatsu</string>
+    <string name="_empty" translatable="false"/>
+    <string name="close_menu">Close menu</string>
+    <string name="open_menu">Open menu</string>
+    <string name="local_storage">Local storage</string>
+    <string name="favourites">Favourites</string>
+    <string name="history">History</string>
+    <string name="error_occurred">An error has occurred</string>
+    <string name="network_error">Network connection error</string>
+    <string name="details">Details</string>
+    <string name="chapters">Chapters</string>
+    <string name="list">List</string>
+    <string name="detailed_list">Detailed list</string>
+    <string name="grid">Grid</string>
+    <string name="list_mode">List mode</string>
+    <string name="settings">Settings</string>
+    <string name="remote_sources">Remote sources</string>
+    <string name="loading_">Loading…</string>
+    <string name="chapter_d_of_d">Chapter %1$d of %2$d</string>
+    <string name="close">Close</string>
+    <string name="try_again">Try again</string>
+    <string name="clear_history">Clear history</string>
+    <string name="nothing_found">Nothing found</string>
+    <string name="history_is_empty">History is empty</string>
+    <string name="read">Read</string>
+    <string name="add_bookmark">Add bookmark</string>
+    <string name="you_have_not_favourites_yet">You have not favourites yet</string>
+    <string name="add_to_favourites">Add to favourites</string>
+    <string name="add_new_category">Add new category</string>
+    <string name="add">Add</string>
+    <string name="enter_category_name">Enter category name</string>
+    <string name="save">Save</string>
+    <string name="share">Share</string>
+    <string name="create_shortcut">Create shortcut…</string>
+    <string name="share_s">Share %s</string>
+    <string name="search">Search</string>
+    <string name="search_manga">Search manga</string>
+    <string name="manga_downloading_">Manga downloading…</string>
+    <string name="processing_">Processing…</string>
+    <string name="download_complete">Download complete</string>
+    <string name="downloads">Downloads</string>
+    <string name="by_name">By name</string>
+    <string name="popular">Popular</string>
+    <string name="updated">Updated</string>
+    <string name="newest">Newest</string>
+    <string name="by_rating">By rating</string>
+    <string name="all">All</string>
+    <string name="sort_order">Sort order</string>
+    <string name="genre">Genre</string>
+    <string name="filter">Filter</string>
+    <string name="theme">Theme</string>
+    <string name="light">Light</string>
+    <string name="dark">Dark</string>
+    <string name="automatic">Automatic</string>
+    <string name="pages">Pages</string>
+    <string name="clear">Clear</string>
+    <string name="text_clear_history_prompt">Do you really want to clear all your reading history? This action cannot be undone.</string>
+    <string name="remove">Remove</string>
+    <string name="_s_removed_from_history">\"%s\" removed from history</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" deleted from local storage</string>
+    <string name="wait_for_loading_finish">Wait for the load to finish</string>
+    <string name="save_page">Save page</string>
+    <string name="page_saved">Page saved successful</string>
+    <string name="share_image">Share image</string>
+    <string name="_import">Import</string>
+    <string name="delete">Delete</string>
+    <string name="operation_not_supported">This operation is not supported</string>
+    <string name="text_file_not_supported">Invalid file. Only ZIP and CBZ are supported.</string>
+    <string name="no_description">No description</string>
+    <string name="history_and_cache">History and cache</string>
+    <string name="clear_pages_cache">Clear pages cache</string>
+    <string name="cache">Cache</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="standard">Standard</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="read_mode">Read mode</string>
+    <string name="grid_size">Grid size</string>
+    <string name="search_on_s">Search on %s</string>
+    <string name="delete_manga">Delete manga</string>
+    <string name="text_delete_local_manga">Do you really want to delete \"%s\" from your phone\'s local storage? \nThis operation cannot be undone.</string>
+    <string name="reader_settings">Reader settings</string>
+    <string name="switch_pages">Switch pages</string>
+    <string name="taps_on_edges">Taps on edges</string>
+    <string name="volume_buttons">Volume buttons</string>
+    <string name="_continue">Continue</string>
+    <string name="warning">Warning</string>
+    <string name="network_consumption_warning">This operation may consume a lot of network traffic</string>
+    <string name="dont_ask_again">Don`t ask again</string>
+    <string name="cancelling_">Cancelling…</string>
+    <string name="error">Error</string>
+    <string name="clear_thumbs_cache">Clear thumbnails cache</string>
+    <string name="clear_search_history">Clear search history</string>
+    <string name="search_history_cleared">Search history cleared</string>
+    <string name="gestures_only">Gestures only</string>
+    <string name="internal_storage">Internal storage</string>
+    <string name="external_storage">External storage</string>
+    <string name="domain">Domain</string>
+    <string name="application_update">Check for updates automatically</string>
+    <string name="app_update_available">Application update is available</string>
+    <string name="show_notification_app_update">Show notification if update is available</string>
+    <string name="open_in_browser">Open in browser</string>
+    <string name="large_manga_save_confirm">This manga has %s. Do you want to save all of it?</string>
+    <string name="save_manga">Save manga</string>
+    <string name="notifications">Notifications</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Enabled %1$d of %2$d</string>
+    <string name="new_chapters">New chapters</string>
+    <string name="show_notification_new_chapters">Notify about updates of manga you are reading</string>
+    <string name="download">Download</string>
+    <string name="read_from_start">Read from start</string>
+    <string name="restart">Restart</string>
+    <string name="notifications_settings">Notifications settings</string>
+    <string name="notification_sound">Notification sound</string>
+    <string name="light_indicator">Light indicator</string>
+    <string name="vibration">Vibration</string>
+    <string name="favourites_categories">Favourites categories</string>
+    <string name="categories_">Categories…</string>
+    <string name="rename">Rename</string>
+    <string name="category_delete_confirm">Do you really want to remove category \"%s\" from your favourites? \nAll containing manga will be lost.</string>
+    <string name="remove_category">Remove category</string>
+    <string name="text_empty_holder_primary">It\'s kind of empty here…</string>
+    <string name="text_categories_holder">You can use categories to organize your favourite manga. Press «+» to create a category</string>
+    <string name="text_search_holder_secondary">Try to reformulate the query.</string>
+    <string name="text_history_holder_primary">Manga you are reading will be displayed here</string>
+    <string name="text_history_holder_secondary">You can find what to read in side menu.</string>
+    <string name="text_local_holder_primary">You have not any saved manga yet</string>
+    <string name="text_local_holder_secondary">You can save it from online sources or import from file.</string>
+    <string name="manga_shelf">Manga shelf</string>
+    <string name="recent_manga">Recent manga</string>
+    <string name="pages_animation">Pages animation</string>
+    <string name="manga_save_location">Manga download location</string>
+    <string name="not_available">Not available</string>
+    <string name="cannot_find_available_storage">Cannot find any available storage</string>
+    <string name="other_storage">Other storage</string>
+    <string name="use_ssl">Use secure connection (HTTPS)</string>
+    <string name="done">Done</string>
+    <string name="all_favourites">All favourites</string>
+    <string name="favourites_category_empty">This category is empty</string>
+    <string name="read_later">Read later</string>
+    <string name="updates">Updates</string>
+    <string name="text_feed_holder">Here you will see the new chapters of the manga you are reading</string>
+    <string name="search_results">Search results</string>
+    <string name="related">Related</string>
+    <string name="new_version_s">New version: %s</string>
+    <string name="size_s">Size: %s</string>
+    <string name="waiting_for_network">Waiting for network…</string>
+    <string name="clear_updates_feed">Clear updates feed</string>
+    <string name="updates_feed_cleared">Updates feed cleared</string>
+    <string name="rotate_screen">Rotate screen</string>
+    <string name="update">Update</string>
+    <string name="feed_will_update_soon">Feed update will start soon</string>
+    <string name="track_sources">Check updates for manga</string>
+    <string name="dont_check">Don`t check</string>
+    <string name="enter_password">Enter password</string>
+    <string name="wrong_password">Wrong password</string>
+    <string name="protect_application">Protect application</string>
+    <string name="protect_application_summary">Ask for password on application start</string>
+    <string name="repeat_password">Repeat password</string>
+    <string name="passwords_mismatch">Passwords do not match</string>
+    <string name="about">About</string>
+    <string name="app_version">Version %s</string>
+    <string name="check_for_updates">Check for updates</string>
+    <string name="checking_for_updates">Checking for updates…</string>
+    <string name="update_check_failed">Update check failed</string>
+    <string name="no_update_available">No updates available</string>
+    <string name="right_to_left">Right to left</string>
+    <string name="prefer_rtl_reader">Prefer Right to left reader</string>
+    <string name="prefer_rtl_reader_summary">You can set up the reading mode for each manga separately</string>
+    <string name="create_category">New category</string>
+    <string name="report_github">Create issue on GitHub</string>
+    <string name="scale_mode">Scale mode</string>
+    <string name="zoom_mode_fit_center">Fit center</string>
+    <string name="zoom_mode_fit_height">Fit to height</string>
+    <string name="zoom_mode_fit_width">Fit to width</string>
+    <string name="zoom_mode_keep_start">Keep at start</string>
+    <string name="black_dark_theme">Black dark theme</string>
+    <string name="black_dark_theme_summary">Useful for AMOLED screens</string>
+    <string name="restart_required">Restart required</string>
+    <string name="backup_restore"><![CDATA[Backup & Restore]]></string>
+    <string name="create_backup">Create data backup</string>
+    <string name="restore_backup">Restore from backup</string>
+    <string name="data_restored">Data restored</string>
+    <string name="preparing_">Preparing…</string>
+    <string name="file_not_found">File not found</string>
+    <string name="data_restored_success">All data restored successfully</string>
+    <string name="data_restored_with_errors">The data restored, but there are errors</string>
+    <string name="backup_information">You can create backup of your history and favourites and restore it</string>
+    <string name="just_now">Just now</string>
+    <string name="yesterday">Yesterday</string>
+    <string name="long_ago">Long ago</string>
+    <string name="group">Group</string>
+    <string name="today">Today</string>
+    <string name="tap_to_try_again">Tap to try again</string>
+    <string name="reader_mode_hint">Chosen configuration will be remembered for this manga</string>
+    <string name="silent">Silent</string>
+    <string name="captcha_required">CAPTCHA is required</string>
+    <string name="captcha_solve">Solve</string>
+    <string name="clear_cookies">Clear cookies</string>
+    <string name="cookies_cleared">All cookies was removed</string>
+    <string name="chapters_checking_progress">Checking for new chapters: %1$d of %2$d</string>
+    <string name="clear_feed">Clear feed</string>
+    <string name="text_clear_updates_feed_prompt">All updates history will be cleared and this action cannot be undone. Are you sure?</string>
+    <string name="new_chapters_checking">New chapters checking</string>
+    <string name="reverse">Reverse</string>
+    <string name="sign_in">Sign in</string>
+    <string name="auth_required">You should authorize to view this content</string>
+    <string name="default_s">Default: %s</string>
+    <string name="_and_x_more">…and %1$d more</string>
+    <string name="next">Next</string>
+    <string name="protect_application_subtitle">Enter password that will be required when the application starts</string>
+    <string name="confirm">Confirm</string>
+    <string name="password_length_hint">Password must be at least 4 characters</string>
+    <string name="hide_toolbar">Hide toolbar when scrolling</string>
+    <string name="search_only_on_s">Search only on %s</string>
+    <string name="text_clear_search_history_prompt">Do you really want to remove all recent search queries? This action cannot be undone.</string>
+    <string name="other">Other</string>
+    <string name="languages">Languages</string>
+	<string name="welcome">Welcome</string>
+	<string name="description">Description</string>
+	<string name="backup_saved">Backup saved successfully</string>
+	<string name="tracker_warning">Some manufacturers can change the system behavior, which may breaks background tasks.</string>
+	<string name="read_more">Read more</string>
+	<string name="queued">Queued</string>
+	<string name="text_downloads_holder">There are currently no active downloads</string>
+	<string name="chapter_is_missing_text">This chapter is missing on your device. Download or read it online.</string>
+	<string name="chapter_is_missing">Chapter is missing</string>
+	<string name="about_app_translation_summary">Translate this app</string>
+	<string name="about_app_translation">Translation</string>
+	<string name="about_author">Author</string>
+	<string name="about_feedback">Feedback</string>
+	<string name="about_feedback_4pda">Topic on 4PDA</string>
+	<string name="about_support_developer">Support the developer</string>
+	<string name="about_support_developer_summary">If you like this app, you can help financially through Yoomoney (ex. Yandex.Money)</string>
+	<string name="about_gratitudes">Gratitudes</string>
+	<string name="about_gratitudes_summary">These people make Kotatsu become better!</string>
+	<string name="about_copyright_and_licenses">Copyright &amp; Licenses</string>
+	<string name="about_license">License</string>
+	<string name="auth_complete">Authorization complete</string>
+	<string name="auth_not_supported_by">Authorization on %s is not supported</string>
+	<string name="text_clear_cookies_prompt">You will be logged out from all sources that you are authorized in</string>
+    <string name="genres">Genres</string>
 	<string name="suggestions">Suggestions</string>
 	<string name="text_suggestion_holder">Start reading manga and you will get personalized suggestions</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 161614112..285d771f8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,63 @@
 <resources>
 
-	<style name="AppToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+	<!-- Widget styles -->
+
+	<style name="Widget.Kotatsu" parent="@android:style/Widget.Material" />
+
+	<style name="Widget.Kotatsu.AppBar" parent="@style/Widget.Design.AppBarLayout">
+		<item name="android:background">?attr/colorSurface</item>
+		<item name="android:elevation">4dp</item>
+	</style>
+
+	<style name="Widget.Kotatsu.Sheet.AppBar" parent="@style/Widget.Kotatsu.AppBar">
+		<item name="android:elevation">0dp</item>
+	</style>
+
+	<style name="Widget.Kotatsu.Toolbar" parent="Widget.MaterialComponents.Toolbar">
+		<item name="android:paddingEnd">8dp</item>
+		<item name="popupTheme">@style/ThemeOverlay.Kotatsu</item>
+		<item name="titleTextAppearance">@style/TextAppearance.Kotatsu.ToolbarTitle</item>
+	</style>
+
+	<style name="Widget.Kotatsu.Tabs" parent="@style/Widget.MaterialComponents.TabLayout">
+		<item name="tabIndicatorFullWidth">false</item>
+		<item name="android:background">@drawable/tabs_background</item>
+		<item name="tabIndicator">@drawable/tab_indicator</item>
+		<item name="tabIconTint">@color/tab_text</item>
+		<item name="tabSelectedTextColor">?colorPrimary</item>
+		<item name="tabTextColor">@color/tab_text</item>
+		<item name="tabTextAppearance">@style/TextAppearance.Kotatsu.Tab</item>
+		<item name="tabIndicatorAnimationMode">elastic</item>
+	</style>
+
+	<style name="Widget.Kotatsu.NavigationView" parent="@style/Widget.MaterialComponents.NavigationView">
+		<item name="itemBackground">@drawable/navigation_item_background</item>
+		<item name="itemHorizontalPadding">@dimen/nav_item_horizontal_padding</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:textSize">18sp</item>
+	</style>
+
+	<style name="Widget.Kotatsu.Chip" parent="Widget.MaterialComponents.Chip.Action">
+		<item name="chipStrokeWidth">1dp</item>
+		<item name="chipStrokeColor">?attr/colorPrimary</item>
+		<item name="chipBackgroundColor">@android:color/transparent</item>
+		<item name="chipIconTint">?attr/colorPrimary</item>
+
+		<!-- Smaller text/height -->
+		<item name="android:textSize">12sp</item>
+
+		<!-- Custom chip states -->
+		<item name="android:clickable">true</item>
+		<item name="android:focusable">true</item>
+	</style>
+
+	<style name="Widget.Kotatsu.ToggleButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
 		<item name="android:checkable">true</item>
 		<item name="android:gravity">center_vertical|start</item>
 		<item name="iconPadding">16dp</item>
@@ -8,36 +65,51 @@
 		<item name="android:paddingBottom">10dp</item>
 	</style>
 
-	<style name="AppPopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
-
-	<style name="AppToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
-		<item name="popupTheme">@style/AppPopupTheme</item>
-		<item name="autoCompleteTextViewStyle">@style/AppSuggestion</item>
-	</style>
-
-	<style name="AppSuggestion" parent="Widget.AppCompat.Light.AutoCompleteTextView">
-		<item name="android:popupBackground">@android:color/background_light</item>
-	</style>
-
-	<style name="AppActionMode" parent="Widget.AppCompat.ActionMode">
+	<style name="Widget.Kotatsu.ActionMode" parent="Widget.AppCompat.ActionMode">
 		<item name="titleTextStyle">?attr/textAppearanceHeadline6</item>
 		<item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
-		<item name="background">@color/grey</item>
 	</style>
 
-	<style name="Widget.MaterialComponents.TabLayout.New">
-		<item name="tabIndicatorFullWidth">false</item>
-		<item name="android:background">@drawable/tabs_background</item>
-		<item name="tabIndicator">@drawable/tab_indicator</item>
-		<item name="tabIconTint">@color/tab_text</item>
-		<item name="tabSelectedTextColor">?colorPrimary</item>
-		<item name="tabTextColor">@color/tab_text</item>
-		<item name="tabTextAppearance">@style/TextAppearance.Design.Tab.New</item>
+	<!-- textAppearance alone doesn't support line spacing attrs. Multiline body text will use
+         style="Widget.Kotatsu.MultilineBody" instead of the equivalent textAppearance.
+	-->
+	<style name="Widget.Kotatsu.MultilineBody">
+		<item name="android:lineSpacingExtra">4sp</item>
+		<item name="android:textColor">?android:textColorSecondary</item>
 	</style>
 
-	<style name="TextAppearance.Design.Tab.New">
+	<!-- TextAppearance -->
+
+	<style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
+		<item name="android:textSize">20sp</item>
+	</style>
+
+	<style name="TextAppearance.Kotatsu.PersistentToolbarTitle" parent="@style/TextAppearance.AppCompat">
+		<item name="android:textSize">16sp</item>
+	</style>
+
+	<style name="TextAppearance.Kotatsu.Tab" parent="@style/TextAppearance.Design.Tab">
 		<item name="textAllCaps">false</item>
 		<item name="android:textAllCaps">false</item>
 	</style>
 
+	<style name="TextAppearance.Kotatsu.Button" parent="TextAppearance.MaterialComponents.Button">
+		<item name="android:letterSpacing">0</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+
+	<style name="TextAppearance.Kotatsu.ListPrimary" parent="TextAppearance.MaterialComponents.Body1">
+		<item name="android:letterSpacing">0</item>
+	</style>
+
+	<style name="TextAppearance.Kotatsu.Body2" parent="TextAppearance.MaterialComponents.Body2" />
+
+	<style name="TextAppearance.Kotatsu.H1" parent="@style/TextAppearance.MaterialComponents.Headline5">
+		<item name="android:textSize">@dimen/text_size_h1</item>
+	</style>
+
+	<style name="TextAppearance.Kotatsu.NoticeBody" parent="@style/Widget.Kotatsu.MultilineBody">
+		<item name="android:textSize">18sp</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ec569d9c4..669a8c4f2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,23 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-	<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+	<!-- Base application theme. -->
+	<style name="Base.AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+		<!-- Customize your theme here. -->
+		<item name="colorPrimary">@color/color_primary</item>
+		<item name="colorPrimaryVariant">@color/color_primary_variant</item>
+		<item name="colorSecondary">?attr/colorPrimary</item>
+		<item name="colorOnSecondary">@color/color_on_secondary</item>
+		<item name="colorControlLight">@color/color_control_light</item>
+
+		<!-- Window decor -->
+		<item name="android:windowLightStatusBar" tools:targetApi="m">@bool/use_light_status</item>
+		<item name="android:statusBarColor">@color/status_bar_scrim</item>
+		<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/use_light_navigation</item>
+		<item name="android:navigationBarColor">@color/nav_bar_scrim</item>
+		<item name="popupTheme">@style/ThemeOverlay.Kotatsu</item>
+
+		<!-- Widget styles -->
+		<item name="toolbarStyle">@style/Widget.Kotatsu.Toolbar</item>
+		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
+		<item name="navigationViewStyle">@style/Widget.Kotatsu.NavigationView</item>
+		<item name="searchViewStyle">@style/Widget.Kotatsu.SearchView</item>
+
+		<!-- Text appearances -->
+		<item name="textAppearanceBody2">@style/TextAppearance.Kotatsu.Body2</item>
+		<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
+		<item name="textAppearanceListItem">@style/TextAppearance.Kotatsu.ListPrimary</item>
+
+		<!-- ActionMode attrs -->
 		<item name="android:windowActionModeOverlay">true</item>
 		<item name="windowActionModeOverlay">true</item>
 		<item name="actionModeCloseDrawable">@drawable/ic_cross</item>
-		<item name="actionModeStyle">@style/AppActionMode</item>
-		<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-		<item name="badgeStyle">@style/Widget.MaterialComponents.Badge</item>
-		<item name="android:statusBarColor">@color/status_bar</item>
-		<item name="colorOnPrimary">@android:color/white</item>
-		<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.New</item>
+		<item name="actionModeStyle">@style/Widget.Kotatsu.ActionMode</item>
 	</style>
 
-	<style name="AppTheme" parent="BaseAppTheme">
-		<item name="colorPrimary">@color/blue_primary</item>
-		<item name="colorPrimaryDark">@color/blue_primary_dark</item>
-		<item name="colorAccent">@color/red_accent</item>
+	<style name="ThemeOverlay.Kotatsu" parent="ThemeOverlay.MaterialComponents.Light">
+		<item name="colorPrimary">@color/color_primary</item>
+		<item name="colorPrimaryVariant">@color/color_primary_variant</item>
 	</style>
 
-	<style name="AppTheme.Amoled" />
+	<style name="AppTheme" parent="Base.AppTheme">
+		<item name="android:statusBarColor">@color/nav_bar_scrim</item>
+	</style>
+
+	<style name="AppTheme.AMOLED" parent="Base.AppTheme" />
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
new file mode 100644
index 000000000..fd82426ce
--- /dev/null
+++ b/app/src/main/res/xml/pref_about.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+	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"
+	app:initialExpandedChildrenCount="5">
+
+	<PreferenceCategory
+		app:iconSpaceReserved="false"
+		app:title="@string/app_name">
+
+		<Preference
+			app:iconSpaceReserved="false"
+			app:key="app_version"
+			app:persistent="false"
+			app:summary="@string/check_for_updates" />
+
+		<SwitchPreference
+			app:defaultValue="true"
+			app:iconSpaceReserved="false"
+			app:isPreferenceVisible="false"
+			app:key="app_update_auto"
+			app:summary="@string/show_notification_app_update"
+			app:title="@string/application_update"
+			tools:isPreferenceVisible="true" />
+
+		<Preference
+			app:iconSpaceReserved="false"
+			app:key="about_app_translation"
+			app:summary="@string/about_app_translation_summary"
+			app:title="@string/about_app_translation" />
+
+		<Preference
+			app:iconSpaceReserved="false"
+			app:key="about_support_developer"
+			app:summary="@string/about_support_developer_summary"
+			app:title="@string/about_support_developer" />
+
+		<Preference
+			app:iconSpaceReserved="false"
+			app:key="about_gratitudes"
+			app:summary="@string/about_gratitudes_summary"
+			app:title="@string/about_gratitudes" />
+
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		app:iconSpaceReserved="false"
+		app:title="@string/about_feedback">
+		<Preference
+			app:iconSpaceReserved="false"
+			app:key="about_feedback_4pda"
+			app:summary="https://4pda.to/forum/index.php?showtopic=697669"
+			app:title="@string/about_feedback_4pda" />
+		<Preference
+			app:iconSpaceReserved="false"
+			app:key="about_feedback_github"
+			app:summary="https://github.com/nv95/Kotatsu/issues"
+			app:title="GitHub" />
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		app:iconSpaceReserved="false"
+		app:key="copyright"
+		app:title="@string/about_copyright_and_licenses">
+
+		<Preference
+			android:fragment="org.koitharu.kotatsu.settings.about.LicenseFragment"
+			app:icon="@drawable/ic_copyleft"
+			app:iconSpaceReserved="false"
+			app:key="about_license"
+			app:title="@string/about_license" />
+
+	</PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_backup.xml b/app/src/main/res/xml/pref_backup.xml
index 417e43b2c..7a61eb336 100644
--- a/app/src/main/res/xml/pref_backup.xml
+++ b/app/src/main/res/xml/pref_backup.xml
@@ -16,7 +16,7 @@
 		app:iconSpaceReserved="false" />
 
 	<Preference
-		android:icon="@drawable/ic_info_outilne"
+		android:icon="@drawable/ic_info_outline"
 		android:persistent="false"
 		android:selectable="false"
 		android:summary="@string/backup_information"
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index 9d69e6c5f..7f9d8bf84 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -20,6 +20,12 @@
 		android:title="@string/black_dark_theme"
 		app:iconSpaceReserved="false" />
 
+	<SwitchPreference
+		android:defaultValue="true"
+		android:key="hide_toolbar"
+		android:title="@string/hide_toolbar"
+		app:iconSpaceReserved="false" />
+
 	<ListPreference
 		android:entries="@array/list_modes"
 		android:key="list_mode_2"
@@ -73,30 +79,14 @@
 		android:title="@string/new_chapters_checking"
 		app:iconSpaceReserved="false" />
 
-	<PreferenceCategory
+	<PreferenceScreen
+		android:fragment="org.koitharu.kotatsu.settings.backup.BackupSettingsFragment"
+		android:title="@string/backup_restore"
+		app:iconSpaceReserved="false" />
+
+	<PreferenceScreen
+		android:fragment="org.koitharu.kotatsu.settings.about.AboutSettingsFragment"
 		android:title="@string/about"
-		app:iconSpaceReserved="false">
-
-		<PreferenceScreen
-			android:fragment="org.koitharu.kotatsu.settings.backup.BackupSettingsFragment"
-			android:title="@string/backup_restore"
-			app:iconSpaceReserved="false" />
-
-		<SwitchPreference
-			android:defaultValue="true"
-			android:key="app_update_auto"
-			android:summary="@string/show_notification_app_update"
-			android:title="@string/application_update"
-			app:iconSpaceReserved="false"
-			app:isPreferenceVisible="false"
-			tools:isPreferenceVisible="true" />
-
-		<Preference
-			android:key="app_version"
-			android:persistent="false"
-			android:summary="@string/check_for_updates"
-			app:iconSpaceReserved="false" />
-
-	</PreferenceCategory>
+		app:iconSpaceReserved="false" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_source.xml b/app/src/main/res/xml/pref_source.xml
index fa59bb8f9..6e773ce26 100644
--- a/app/src/main/res/xml/pref_source.xml
+++ b/app/src/main/res/xml/pref_source.xml
@@ -14,4 +14,11 @@
 		android:title="@string/use_ssl"
 		app:iconSpaceReserved="false" />
 
+	<Preference
+		android:key="auth"
+		android:persistent="false"
+		android:title="@string/sign_in"
+		app:allowDividerAbove="true"
+		app:iconSpaceReserved="false" />
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_tracker.xml b/app/src/main/res/xml/pref_tracker.xml
index 4b0b393ac..9b971ed7c 100644
--- a/app/src/main/res/xml/pref_tracker.xml
+++ b/app/src/main/res/xml/pref_tracker.xml
@@ -24,4 +24,12 @@
 		android:title="@string/notifications_settings"
 		app:iconSpaceReserved="false" />
 
+	<org.koitharu.kotatsu.settings.utils.LinksPreference
+		android:key="track_warning"
+		android:icon="@drawable/ic_info_outline"
+		android:persistent="false"
+		android:selectable="false"
+		android:summary="@string/tracker_warning"
+		app:allowDividerAbove="true" />
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/parsers/TemporaryCookieJar.kt b/app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt
similarity index 75%
rename from app/src/test/java/org/koitharu/kotatsu/parsers/TemporaryCookieJar.kt
rename to app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt
index c04ae731d..45fee5711 100644
--- a/app/src/test/java/org/koitharu/kotatsu/parsers/TemporaryCookieJar.kt
+++ b/app/src/test/java/org/koitharu/kotatsu/core/network/TestCookieJar.kt
@@ -1,16 +1,16 @@
-package org.koitharu.kotatsu.parsers
+package org.koitharu.kotatsu.core.network
 
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
 
-class TemporaryCookieJar : CookieJar {
+class TestCookieJar : CookieJar {
 
 	private val cache = HashMap<CookieKey, Cookie>()
 
 	override fun loadForRequest(url: HttpUrl): List<Cookie> {
 		val time = System.currentTimeMillis()
-		return cache.values.filter { it.matches(url) && it.expiresAt < time }
+		return cache.values.filter { it.matches(url) && it.expiresAt >= time }
 	}
 
 	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
diff --git a/app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt b/app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt
new file mode 100644
index 000000000..56e855f4f
--- /dev/null
+++ b/app/src/test/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepositoryTest.kt
@@ -0,0 +1,126 @@
+package org.koitharu.kotatsu.core.parser
+
+import com.google.common.truth.Truth
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.koin.core.component.inject
+import org.koin.core.parameter.parametersOf
+import org.koin.test.KoinTest
+import org.koin.test.KoinTestRule
+import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.repositoryTestModule
+import org.koitharu.kotatsu.utils.CoroutineTestRule
+import org.koitharu.kotatsu.utils.TestResponse
+import org.koitharu.kotatsu.utils.ext.mapToSet
+import org.koitharu.kotatsu.utils.ext.medianOrNull
+import org.koitharu.kotatsu.utils.isAbsoluteUrl
+import org.koitharu.kotatsu.utils.isRelativeUrl
+
+@RunWith(Parameterized::class)
+class RemoteMangaRepositoryTest(private val source: MangaSource) : KoinTest {
+
+	private val repo by inject<RemoteMangaRepository> {
+		parametersOf(source)
+	}
+
+	@get:Rule
+	val koinTestRule = KoinTestRule.create {
+		printLogger()
+		modules(repositoryTestModule)
+	}
+
+	@get:Rule
+	val coroutineTestRule = CoroutineTestRule()
+
+	@Test
+	fun list() = coroutineTestRule.runBlockingTest {
+		val list = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
+		checkMangaList(list)
+	}
+
+	@Test
+	fun search() = coroutineTestRule.runBlockingTest {
+		val subject = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
+			.first()
+		val list = repo.getList2(offset = 0, query = subject.title, sortOrder = null, tags = null)
+		checkMangaList(list)
+		Truth.assertThat(list.map { it.url }).contains(subject.url)
+	}
+
+	@Test
+	fun tags() = coroutineTestRule.runBlockingTest {
+		val tags = repo.getTags()
+		Truth.assertThat(tags).isNotEmpty()
+		val keys = tags.map { it.key }
+		Truth.assertThat(keys).containsNoDuplicates()
+		Truth.assertThat(keys).doesNotContain("")
+		val titles = tags.map { it.title }
+		Truth.assertThat(titles).containsNoDuplicates()
+		Truth.assertThat(titles).doesNotContain("")
+		Truth.assertThat(tags.mapToSet { it.source }).containsExactly(source)
+
+		val list = repo.getList2(offset = 0, tags = setOf(tags.last()), query = null, sortOrder = null)
+		checkMangaList(list)
+	}
+
+	@Test
+	fun details() = coroutineTestRule.runBlockingTest {
+		val list = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
+		val item = list.first()
+		val details = repo.getDetails(item)
+
+		Truth.assertThat(details.chapters).isNotEmpty()
+		Truth.assertThat(details.publicUrl).isAbsoluteUrl()
+		Truth.assertThat(details.description).isNotNull()
+		Truth.assertThat(details.title).startsWith(item.title)
+		Truth.assertThat(details.source).isEqualTo(source)
+
+		Truth.assertThat(details.chapters?.map { it.id }).containsNoDuplicates()
+		Truth.assertThat(details.chapters?.map { it.number }).containsNoDuplicates()
+		Truth.assertThat(details.chapters?.map { it.name }).doesNotContain("")
+		Truth.assertThat(details.chapters?.mapToSet { it.source }).containsExactly(source)
+	}
+
+	@Test
+	fun pages() = coroutineTestRule.runBlockingTest {
+		val list = repo.getList2(20, query = null, sortOrder = SortOrder.POPULARITY, tags = null)
+		val chapter =
+			repo.getDetails(list.first()).chapters?.firstOrNull() ?: error("Chapter is null")
+		val pages = repo.getPages(chapter)
+
+		Truth.assertThat(pages).isNotEmpty()
+		Truth.assertThat(pages.map { it.id }).containsNoDuplicates()
+		Truth.assertThat(pages.mapToSet { it.source }).containsExactly(source)
+
+		val page = pages.medianOrNull() ?: error("No page")
+		val pageUrl = repo.getPageUrl(page)
+		Truth.assertThat(pageUrl).isNotEmpty()
+		Truth.assertThat(pageUrl).isAbsoluteUrl()
+		val pageResponse = TestResponse.testRequest(pageUrl)
+		Truth.assertThat(pageResponse.code).isIn(200..299)
+		Truth.assertThat(pageResponse.type).isEqualTo("image")
+	}
+
+	private fun checkMangaList(list: List<Manga>) {
+		Truth.assertThat(list).isNotEmpty()
+		Truth.assertThat(list.map { it.id }).containsNoDuplicates()
+		for (item in list) {
+			Truth.assertThat(item.url).isNotEmpty()
+			Truth.assertThat(item.url).isRelativeUrl()
+			Truth.assertThat(item.coverUrl).isAbsoluteUrl()
+			Truth.assertThat(item.title).isNotEmpty()
+			Truth.assertThat(item.publicUrl).isAbsoluteUrl()
+		}
+	}
+
+	companion object {
+
+		@JvmStatic
+		@Parameterized.Parameters(name = "{0}")
+		fun getProviders() = (MangaSource.values().toList() - MangaSource.LOCAL).toTypedArray()
+	}
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/parsers/RepositoryTestModule.kt b/app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt
similarity index 85%
rename from app/src/test/java/org/koitharu/kotatsu/parsers/RepositoryTestModule.kt
rename to app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt
index bb31ee2bc..c28ccdec8 100644
--- a/app/src/test/java/org/koitharu/kotatsu/parsers/RepositoryTestModule.kt
+++ b/app/src/test/java/org/koitharu/kotatsu/core/parser/RepositoryTestModule.kt
@@ -5,14 +5,16 @@ import okhttp3.OkHttpClient
 import org.koin.dsl.module
 import org.koitharu.kotatsu.base.domain.MangaLoaderContext
 import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.network.TestCookieJar
 import org.koitharu.kotatsu.core.network.UserAgentInterceptor
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.parser.SourceSettingsStub
 import org.koitharu.kotatsu.core.prefs.SourceSettings
 import java.util.concurrent.TimeUnit
 
 val repositoryTestModule
 	get() = module {
-		single<CookieJar> { TemporaryCookieJar() }
+		single<CookieJar> { TestCookieJar() }
 		factory {
 			OkHttpClient.Builder()
 				.cookieJar(get())
@@ -25,7 +27,7 @@ val repositoryTestModule
 		single<MangaLoaderContext> {
 			object : MangaLoaderContext(get(), get()) {
 				override fun getSettings(source: MangaSource): SourceSettings {
-					return SourceSettingsMock()
+					return SourceSettingsStub()
 				}
 			}
 		}
diff --git a/app/src/test/java/org/koitharu/kotatsu/parsers/SourceSettingsMock.kt b/app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt
similarity index 67%
rename from app/src/test/java/org/koitharu/kotatsu/parsers/SourceSettingsMock.kt
rename to app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt
index e5bb09bf2..2c2f27461 100644
--- a/app/src/test/java/org/koitharu/kotatsu/parsers/SourceSettingsMock.kt
+++ b/app/src/test/java/org/koitharu/kotatsu/core/parser/SourceSettingsStub.kt
@@ -1,8 +1,8 @@
-package org.koitharu.kotatsu.parsers
+package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.core.prefs.SourceSettings
 
-class SourceSettingsMock : SourceSettings {
+class SourceSettingsStub : SourceSettings {
 
 	override fun getDomain(defaultValue: String) = defaultValue
 
diff --git a/app/src/test/java/org/koitharu/kotatsu/parsers/RemoteRepositoryTest.kt b/app/src/test/java/org/koitharu/kotatsu/parsers/RemoteRepositoryTest.kt
deleted file mode 100644
index 8f5020ddd..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/parsers/RemoteRepositoryTest.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.koitharu.kotatsu.parsers
-
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-import org.koin.core.component.inject
-import org.koin.core.parameter.parametersOf
-import org.koin.test.KoinTest
-import org.koin.test.KoinTestRule
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.AssertX
-import org.koitharu.kotatsu.utils.ext.isDistinctBy
-
-@RunWith(Parameterized::class)
-class RemoteRepositoryTest(source: MangaSource) : KoinTest {
-
-	private val repo by inject<RemoteMangaRepository> {
-		parametersOf(source)
-	}
-
-	@get:Rule
-	val koinTestRule = KoinTestRule.create {
-		printLogger()
-		modules(repositoryTestModule)
-	}
-
-	@Test
-	fun list() {
-		val list = runBlocking { repo.getList(60) }
-		Assert.assertFalse("List is empty", list.isEmpty())
-		Assert.assertTrue("Mangas are not distinct", list.isDistinctBy { it.id })
-		val item = list.random()
-		AssertX.assertUrlRelative("Url is not relative", item.url)
-		AssertX.assertUrlAbsolute("Url is not absolute", item.coverUrl)
-		AssertX.assertContentType("Bad cover at ${item.url}", item.coverUrl, "image/*")
-		AssertX.assertContentType(
-			"invalid public url ${item.publicUrl}",
-			item.publicUrl,
-			"text/html"
-		)
-		Assert.assertFalse("Title is blank at ${item.url}", item.title.isBlank())
-	}
-
-	@Test
-	fun search() {
-		val list = runBlocking { repo.getList(0, query = "tail") }
-		Assert.assertFalse("List is empty", list.isEmpty())
-		Assert.assertTrue("Mangas are not distinct", list.isDistinctBy { it.id })
-		val nextList = runBlocking { repo.getList(list.size, query = "tail") }
-		Assert.assertNotEquals("Search pagination is broken", list, nextList)
-		val item = list.random()
-		AssertX.assertUrlRelative("Url is not relative", item.url)
-		AssertX.assertContentType("Bad cover at ${item.url}", item.coverUrl, "image/*")
-		AssertX.assertContentType(
-			"invalid public url ${item.publicUrl}",
-			item.publicUrl,
-			"text/html"
-		)
-		Assert.assertFalse("Title is blank at ${item.url}", item.title.isBlank())
-	}
-
-	@Test
-	fun tags() {
-		val tags = runBlocking { repo.getTags() }
-		Assert.assertFalse("No tags found", tags.isEmpty())
-		val tag = tags.random()
-		Assert.assertFalse("Tag title is blank for $tag", tag.key.isBlank())
-		Assert.assertFalse("Tag title is blank for $tag", tag.title.isBlank())
-		val list = runBlocking { repo.getList(0, tag = tag) }
-		Assert.assertFalse("List is empty", list.isEmpty())
-		val item = list.random()
-		AssertX.assertUrlRelative("Url is not relative", item.url)
-		AssertX.assertContentType("Bad cover at ${item.coverUrl}", item.coverUrl, "image/*")
-		AssertX.assertContentType(
-			"invalid public url ${item.publicUrl}",
-			item.publicUrl,
-			"text/html"
-		)
-		Assert.assertFalse("Title is blank at ${item.url}", item.title.isBlank())
-	}
-
-	@Test
-	fun details() {
-		val manga = runBlocking { repo.getList(0) }.random()
-		val details = runBlocking { repo.getDetails(manga) }
-		Assert.assertFalse("No chapters at ${details.url}", details.chapters.isNullOrEmpty())
-		AssertX.assertContentType(
-			"invalid public url ${details.publicUrl}",
-			details.publicUrl,
-			"text/html"
-		)
-		Assert.assertFalse(
-			"Description is empty at ${details.url}",
-			details.description.isNullOrEmpty()
-		)
-		Assert.assertTrue(
-			"Chapters are not distinct",
-			details.chapters.orEmpty().isDistinctBy { it.id })
-		val chapter = details.chapters?.randomOrNull() ?: return
-		AssertX.assertUrlRelative("Url is not relative", chapter.url)
-		Assert.assertFalse(
-			"Chapter name missing at ${details.url}:${chapter.number}",
-			chapter.name.isBlank()
-		)
-	}
-
-	@Test
-	fun pages() {
-		val manga = runBlocking { repo.getList(0) }.random()
-		val details = runBlocking { repo.getDetails(manga) }
-		val chapter = checkNotNull(details.chapters?.randomOrNull()) {
-			"No chapters at ${details.url}"
-		}
-		val pages = runBlocking { repo.getPages(chapter) }
-		Assert.assertFalse("Cannot find any page at ${chapter.url}", pages.isEmpty())
-		Assert.assertTrue("Pages are not distinct", pages.isDistinctBy { it.id })
-		val page = pages.randomOrNull() ?: return
-		val fullUrl = runBlocking { repo.getPageUrl(page) }
-		AssertX.assertContentType("Wrong page response from $fullUrl", fullUrl, "image/*")
-	}
-
-	companion object {
-
-		@JvmStatic
-		@Parameterized.Parameters(name = "{0}")
-		fun getProviders() = (MangaSource.values().toList() - MangaSource.LOCAL).toTypedArray()
-	}
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/utils/AssertX.kt b/app/src/test/java/org/koitharu/kotatsu/utils/AssertX.kt
deleted file mode 100644
index e7f9e22cb..000000000
--- a/app/src/test/java/org/koitharu/kotatsu/utils/AssertX.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.junit.Assert
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import java.net.HttpURLConnection
-import java.net.URI
-
-object AssertX : KoinComponent {
-
-	private val okHttp by inject<OkHttpClient>()
-
-	fun assertContentType(message: String, url: String, vararg types: String) {
-		Assert.assertFalse("URL is empty: $message", url.isEmpty())
-		val request = Request.Builder()
-			.url(url)
-			.head()
-			.build()
-		val response = okHttp.newCall(request).execute()
-		when (val code = response.code) {
-			HttpURLConnection.HTTP_OK -> {
-				val type = response.body!!.contentType()
-				Assert.assertTrue(types.any {
-					val x = it.split('/')
-					type?.type == x[0] && (x[1] == "*" || type.subtype == x[1])
-				})
-			}
-			else -> Assert.fail("Invalid response code $code at $url: $message")
-		}
-	}
-
-	fun assertUrlRelative(message: String, url: String) {
-		Assert.assertFalse(message, URI(url).isAbsolute)
-	}
-
-	fun assertUrlAbsolute(message: String, url: String) {
-		Assert.assertTrue(message, URI(url).isAbsolute)
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/utils/CoroutineTestRule.kt b/app/src/test/java/org/koitharu/kotatsu/utils/CoroutineTestRule.kt
new file mode 100644
index 000000000..4558ef197
--- /dev/null
+++ b/app/src/test/java/org/koitharu/kotatsu/utils/CoroutineTestRule.kt
@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.utils
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+
+class CoroutineTestRule(
+	private val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher(),
+) : TestWatcher() {
+
+	override fun starting(description: Description?) {
+		super.starting(description)
+		Dispatchers.setMain(testDispatcher)
+	}
+
+	override fun finished(description: Description?) {
+		super.finished(description)
+		Dispatchers.resetMain()
+		testDispatcher.cleanupTestCoroutines()
+	}
+
+	fun runBlockingTest(block: suspend CoroutineScope.() -> Unit) {
+		runBlocking(testDispatcher) {
+			block()
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt b/app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt
new file mode 100644
index 000000000..2fcc3e18f
--- /dev/null
+++ b/app/src/test/java/org/koitharu/kotatsu/utils/TestResponse.kt
@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.utils
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+data class TestResponse(
+	val code: Int,
+	val type: String?,
+	val subtype: String?,
+) {
+
+	companion object : KoinComponent {
+
+		private val okHttp by inject<OkHttpClient>()
+
+		fun testRequest(url: String): TestResponse {
+			val request = Request.Builder()
+				.url(url)
+				.head()
+				.build()
+			val response = okHttp.newCall(request).execute()
+			val type = response.body?.contentType()
+			return TestResponse(
+				code = response.code,
+				type = type?.type,
+				subtype = type?.subtype,
+			)
+		}
+	}
+}
diff --git a/app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt b/app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt
new file mode 100644
index 000000000..14f62bfc2
--- /dev/null
+++ b/app/src/test/java/org/koitharu/kotatsu/utils/TruthExt.kt
@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.utils
+
+import com.google.common.truth.StringSubject
+import java.util.regex.Pattern
+
+private val PATTERN_URL_ABSOLUTE = Pattern.compile("https?://[^\\s]+", Pattern.CASE_INSENSITIVE)
+private val PATTERN_URL_RELATIVE = Pattern.compile("^/[^\\s]+", Pattern.CASE_INSENSITIVE)
+
+fun StringSubject.isRelativeUrl() = matches(PATTERN_URL_RELATIVE)
+
+fun StringSubject.isAbsoluteUrl() = matches(PATTERN_URL_ABSOLUTE)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c92340660..c7d903dc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.1.3'
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32'
+		classpath 'com.android.tools.build:gradle:7.0.2'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
 
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6a4263d15..24415a607 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
-#Mon Mar 29 19:25:53 EEST 2021
+#Mon Sep 13 08:29:18 EEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
\ No newline at end of file
+# https://gradle.org/release-checksums/
+distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c